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

src/game.c: Minor beautification. 

configure.ac: YY_NO_INPUT prevents Flex from defining input(), which we do not need, since we use our own YY_INPUT instead. Maybe we should use Flex's function instead?
lib/script/script_parser.y: scriptStoreVarTypes() was defined but never used.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3300 4a71c877-e1ca-e34f-864e-861f7616d084
master
Dennis Schridde 2008-01-01 15:18:25 +00:00
parent 1afd50b629
commit 3f6b52bef1
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -227,8 +227,8 @@ WZ_CFLAGS="${WZ_CFLAGS} -DLOCALEDIR=\"\\\"\${localedir}\\\"\""
# add some required C flags here # add some required C flags here
# -DYY_STATIC is required by flex # YY_NO_INPUT to prevent Flex from defining input(): We use our own YY_INPUT instead.
WZ_CFLAGS="${WZ_CFLAGS} -DYY_STATIC" WZ_CFLAGS="${WZ_CFLAGS} -DYY_NO_INPUT"
CPPFLAGS="${CPPFLAGS} -I\$(top_srcdir)" CPPFLAGS="${CPPFLAGS} -I\$(top_srcdir)"

2
lib/script/script_parser.y
View File

@ -1721,6 +1721,7 @@ static CODE_ERROR scriptCodeEvent(EVENT_SYMBOL *psEvent, TRIGGER_SYMBOL *psTrig,
} }
#endif #endif
#ifdef UNUSED
/* Store the types of a list of variables into a code block. /* Store the types of a list of variables into a code block.
* The order of the list is reversed so that the type of the * The order of the list is reversed so that the type of the
* first variable defined is stored first. * first variable defined is stored first.
@ -1736,6 +1737,7 @@ static void scriptStoreVarTypes(VAR_SYMBOL *psVar)
PUT_INDEX(ip, psVar->type); PUT_INDEX(ip, psVar->type);
} }
} }
#endif
/* Change the error action for the ALLOC macro's to what it /* Change the error action for the ALLOC macro's to what it
* should be inside a rule body. * should be inside a rule body.

7
src/game.c
View File

@ -6339,19 +6339,16 @@ BOOL loadSaveDroidV19(char *pFileData, UDWORD filesize, UDWORD numDroids, UDWORD
/* code for all versions after save name change v19*/ /* code for all versions after save name change v19*/
BOOL loadSaveDroidV(char *pFileData, UDWORD filesize, UDWORD numDroids, UDWORD version, DROID **ppsCurrentDroidLists) BOOL loadSaveDroidV(char *pFileData, UDWORD filesize, UDWORD numDroids, UDWORD version, DROID **ppsCurrentDroidLists)
{ {
SAVE_DROID *psSaveDroid, sSaveDroid; SAVE_DROID sSaveDroid, *psSaveDroid = &sSaveDroid;
// DROID_TEMPLATE *psTemplate, sTemplate; // DROID_TEMPLATE *psTemplate, sTemplate;
DROID *psDroid; DROID *psDroid;
DROID_GROUP *psCurrentTransGroup; DROID_GROUP *psCurrentTransGroup = NULL;
UDWORD count; UDWORD count;
UDWORD NumberOfSkippedDroids=0; UDWORD NumberOfSkippedDroids=0;
UDWORD sizeOfSaveDroid = 0; UDWORD sizeOfSaveDroid = 0;
// DROID_GROUP *psGrp; // DROID_GROUP *psGrp;
UBYTE i; UBYTE i;
psCurrentTransGroup = NULL;
psSaveDroid = &sSaveDroid;
if (version <= VERSION_20) if (version <= VERSION_20)
{ {
sizeOfSaveDroid = sizeof(SAVE_DROID_V20); sizeOfSaveDroid = sizeof(SAVE_DROID_V20);