Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qwzm: Port over level parsing fix from pie2wzm. Fix connector parsing error. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6588 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2009-02-04 23:25:30 +00:00
parent 9b26e6c1bd
commit ea999b01a7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/qwzm/conversion.cpp
View File

@ -88,7 +88,7 @@ void QWzmViewer::loadPIE(QString inputFile)
WZ_FACE *faceList;
WZ_POSITION *posList;
num = fscanf(fp, "LEVEL %d\n", &x);
num = fscanf(fp, "\nLEVEL %d\n", &x);
if (num != 1 || level + 1 != x)
{
fprintf(stderr, "Bad LEVEL directive in %s, was %d should be %d.\n", input, x, level + 1);
@ -361,11 +361,11 @@ void QWzmViewer::loadPIE(QString inputFile)
}
num = fscanf(fp, "\nCONNECTORS %d", &psMesh->connectors);
if (num == 1 && x > 0)
if (num == 1 && psMesh->connectors > 0)
{
psMesh->connectorArray = (CONNECTOR *)malloc(sizeof(CONNECTOR) * psMesh->connectors);
for (j = 0; j < x; ++j)
for (j = 0; j < psMesh->connectors; j++)
{
CONNECTOR *conn = &psMesh->connectorArray[j];
int a, b, c;
@ -373,7 +373,7 @@ void QWzmViewer::loadPIE(QString inputFile)
num = fscanf(fp, "\n%d %d %d", &a, &b, &c);
if (num != 3)
{
fprintf(stderr, "Bad CONNECTORS directive entry level %d, number %d\n", level, j);
fprintf(stderr, "Bad CONNECTORS directive in %s entry level %d, number %d\n", input, level, j);
exit(1);
}
conn->pos.x = a;