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

Remove some dead code 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9239 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2010-01-15 14:05:17 +00:00 committed by Git SVN Gateway
parent ceed2c4ce1
commit a9ba027836
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/scriptfuncs.c
View File

@ -1552,7 +1552,6 @@ BOOL scrSetAssemblyPoint(void)
// test for structure is idle or not // test for structure is idle or not
BOOL scrStructureIdle(void) BOOL scrStructureIdle(void)
{ {
// INTERP_VAL sVal;
STRUCTURE *psBuilding; STRUCTURE *psBuilding;
BOOL idle; BOOL idle;
@ -1560,24 +1559,13 @@ BOOL scrStructureIdle(void)
{ {
return false; return false;
} }
// DBPRINTF(("scrStructureIdle called\n"));
if (psBuilding == NULL) if (psBuilding == NULL)
{ {
ASSERT( false, "scrStructureIdle: NULL structure" ); ASSERT( false, "scrStructureIdle: NULL structure" );
return false; return false;
} }
//test for idle idle = structureIdle(psBuilding);
idle = false;
if (structureIdle(psBuilding))
{
idle = true;
}
// DBPRINTF(("structure %p is %d\n",psBuilding,idle));
scrFunctionResult.v.bval = idle; scrFunctionResult.v.bval = idle;
if (!stackPushResult(VAL_BOOL, &scrFunctionResult)) if (!stackPushResult(VAL_BOOL, &scrFunctionResult))
{ {

3
src/scripttabs.c
View File

@ -2117,7 +2117,6 @@ CALLBACK_SYMBOL asCallbackTable[] =
{ "CALL_GAMEINIT", (TRIGGER_TYPE)CALL_GAMEINIT, NULL, 0, {VAL_VOID} }, { "CALL_GAMEINIT", (TRIGGER_TYPE)CALL_GAMEINIT, NULL, 0, {VAL_VOID} },
{ "CALL_DELIVPOINTMOVED", (TRIGGER_TYPE)CALL_DELIVPOINTMOVED, NULL, 0, {VAL_VOID} }, { "CALL_DELIVPOINTMOVED", (TRIGGER_TYPE)CALL_DELIVPOINTMOVED, NULL, 0, {VAL_VOID} },
{ "CALL_DROIDDESIGNED", (TRIGGER_TYPE)CALL_DROIDDESIGNED, NULL, 0, {VAL_VOID} }, { "CALL_DROIDDESIGNED", (TRIGGER_TYPE)CALL_DROIDDESIGNED, NULL, 0, {VAL_VOID} },
//{ "CALL_RESEARCHCOMPLETED", (TRIGGER_TYPE)CALL_RESEARCHCOMPLETED, NULL, 0, {VAL_VOID} }, - callback function added
{ "CALL_DROIDBUILT", (TRIGGER_TYPE)CALL_DROIDBUILT, NULL, 0, {VAL_VOID} }, { "CALL_DROIDBUILT", (TRIGGER_TYPE)CALL_DROIDBUILT, NULL, 0, {VAL_VOID} },
{ "CALL_POWERGEN_BUILT", (TRIGGER_TYPE)CALL_POWERGEN_BUILT, NULL, 0, {VAL_VOID} }, { "CALL_POWERGEN_BUILT", (TRIGGER_TYPE)CALL_POWERGEN_BUILT, NULL, 0, {VAL_VOID} },
{ "CALL_RESEX_BUILT", (TRIGGER_TYPE)CALL_RESEX_BUILT, NULL, 0, {VAL_VOID} }, { "CALL_RESEX_BUILT", (TRIGGER_TYPE)CALL_RESEX_BUILT, NULL, 0, {VAL_VOID} },
@ -2149,7 +2148,7 @@ CALLBACK_SYMBOL asCallbackTable[] =
{ "CALL_DESIGN_PROPULSION", (TRIGGER_TYPE)CALL_DESIGN_PROPULSION, NULL, 0, {VAL_VOID} }, { "CALL_DESIGN_PROPULSION", (TRIGGER_TYPE)CALL_DESIGN_PROPULSION, NULL, 0, {VAL_VOID} },
// callback triggers with parameters // callback triggers with parameters
{ "CALL_RESEARCHCOMPLETED", (TRIGGER_TYPE)CALL_RESEARCHCOMPLETED, { "CALL_RESEARCHCOMPLETED", (TRIGGER_TYPE)CALL_RESEARCHCOMPLETED,
scrCBResCompleted, 3, { VAL_REF|(INTERP_TYPE)ST_RESEARCH, VAL_REF|(INTERP_TYPE)ST_STRUCTURE, VAL_INT } }, scrCBResCompleted, 3, { VAL_REF|(INTERP_TYPE)ST_RESEARCH, VAL_REF|(INTERP_TYPE)ST_STRUCTURE, VAL_INT } },
{ "CALL_NEWDROID", (TRIGGER_TYPE)CALL_NEWDROID, { "CALL_NEWDROID", (TRIGGER_TYPE)CALL_NEWDROID,