[HomeworldSDL] revision 334

HomeworldSDL subversion at homeworldsdl.org
Mon Nov 27 20:25:30 GMT 2006


----------------------------------------------------------------------
r334 | lmop | 2006-11-27 20:25:28 +0000 (Mon, 27 Nov 2006)

Cleans up "end of list" entries for scriptStructEntry and scriptEntry arrays.

----------------------------------------------------------------------

Modified: homeworld/trunk/src/Game/AIPlayer.c
===================================================================
--- homeworld/trunk/src/Game/AIPlayer.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/AIPlayer.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -452,7 +452,7 @@
     makeEntry(AIU_UNARMED_MODIFIER,               scriptSetReal32CB),
     makeEntry(AIU_FIGHTER_VULNERABLE_MODIFIER,    scriptSetReal32CB),
 
-    endEntry
+    END_SCRIPT_ENTRY
 };
 
 

Modified: homeworld/trunk/src/Game/AIResourceMan.c
===================================================================
--- homeworld/trunk/src/Game/AIResourceMan.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/AIResourceMan.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -72,7 +72,8 @@
     makeEntry(RCONTROLLER_POS_FACTOR_ENEMIESPRESENT,scriptSetReal32CB),
     makeEntry(RCONTROLLER_POS_FACTOR_INBETWEEN,scriptSetReal32CB),
     makeEntry(RCONTROLLER_POS_FACTOR_NOTINBETWEEN,scriptSetReal32CB),
-    endEntry
+
+    END_SCRIPT_ENTRY
 };
 
 /*-----------------------------------------------------------------------------

Modified: homeworld/trunk/src/Game/AIShip.c
===================================================================
--- homeworld/trunk/src/Game/AIShip.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/AIShip.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -201,7 +201,8 @@
     makeEntry(DONTUSEVELOCITYPRED_IFBELOW,scriptSetReal32CB),
     { "rowDetails", rowSetDetails, NULL },
     { "AISHIP_OTHER_CALCULATIONS", scriptAIShipPrecalculate, NULL },        // should go last
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 static void scriptAIShipPrecalculate(char *directory,char *field,void *dataToFillIn)

Modified: homeworld/trunk/src/Game/Attack.c
===================================================================
--- homeworld/trunk/src/Game/Attack.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/Attack.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -28,7 +28,8 @@
     { "repositionTime", scriptSetReal32CB, (udword) &(sampleSideStepParameters.repositionTime), (udword) &(sampleSideStepParameters) },
     { "circleRange",    scriptSetReal32CB, (udword) &(sampleSideStepParameters.circleRange), (udword) &(sampleSideStepParameters) },
     { "fullMovementFreedom", scriptSetBool,(udword) &(sampleSideStepParameters.fullMovementFreedom), (udword) &(sampleSideStepParameters) },
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 /*-----------------------------------------------------------------------------

Modified: homeworld/trunk/src/Game/AutoLOD.c
===================================================================
--- homeworld/trunk/src/Game/AutoLOD.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/AutoLOD.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -61,7 +61,8 @@
     makeEntry(alodSlowMaxScale, scriptSetReal32CB),
     makeEntry(alodSlowTargetPolys, scriptSetUdwordCB),
     makeEntry(alodSlowTargetDelta, scriptSetUdwordCB),
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 

Modified: homeworld/trunk/src/Game/Battle.c
===================================================================
--- homeworld/trunk/src/Game/Battle.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/Battle.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -625,7 +625,8 @@
     makeEntry(batRetreatModifier, scriptSetReal32CB),
     makeEntry(batGlobalFrequencyMin, scriptSetReal32CB),
     makeEntry(batGlobalFrequencyMax, scriptSetReal32CB),
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 /*=============================================================================

Modified: homeworld/trunk/src/Game/Camera.c
===================================================================
--- homeworld/trunk/src/Game/Camera.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/Camera.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -92,7 +92,8 @@
     makeEntry(CAMERA_FLOAT_OFFSET_SCALAR2,scriptSetReal32CB),
     makeEntry(CAMERA_MOUSE_SENS_MIN,scriptSetReal32CB),
     makeEntry(CAMERA_MOUSE_SENS_MAX,scriptSetReal32CB),
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 /*=============================================================================

Modified: homeworld/trunk/src/Game/CameraCommand.c
===================================================================
--- homeworld/trunk/src/Game/CameraCommand.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/CameraCommand.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -125,7 +125,8 @@
     makeEntry(CAM_CUBIC_EVAL_TWEAK,scriptSetReal32CB),
     makeEntry(CAM_CUBIC_EVAL_ANGLE_TWEAK,scriptSetReal32CB),
     makeEntry(CollapseTimeDelay,scriptSetReal32CB),
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 /*=============================================================================

Modified: homeworld/trunk/src/Game/Clouds.c
===================================================================
--- homeworld/trunk/src/Game/Clouds.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/Clouds.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -144,7 +144,8 @@
     makeEntry(CLOUD_LIGHTNING_MAIN_GREEN, scriptSetReal32CB),
     makeEntry(CLOUD_LIGHTNING_MAIN_BLUE, scriptSetReal32CB),
     makeEntry(CLOUD_LIGHTNING_MAIN_ALPHA, scriptSetReal32CB),
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 /*

Modified: homeworld/trunk/src/Game/CommandLayer.c
===================================================================
--- homeworld/trunk/src/Game/CommandLayer.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/CommandLayer.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -161,7 +161,8 @@
     makeEntry(SHRINKMAX,scriptSetReal32CB),
     makeEntry(FLY_INTO_WORLD_PERCENT_DIST,scriptSetReal32CB),
     makeEntry(RESCONTROLLER_FOLLOW_BEHIND,scriptSetReal32CB),
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 /*-----------------------------------------------------------------------------

Modified: homeworld/trunk/src/Game/Crates.c
===================================================================
--- homeworld/trunk/src/Game/Crates.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/Crates.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -81,12 +81,10 @@
     makeEntry(CrateClassProbCLASS_NonCombat,scriptSetReal32CB),
     makeEntry(CRATE_EXPIRY_TIME,scriptSetReal32CB),
 
-
     {"shipProbability", scriptSetShipProbCB, SHIP_PROBS },
     {"shipGroupSize", scriptSetShipGroupSizeCB, NUM_IN_GROUPS },
 
-
-    endEntry
+    END_SCRIPT_ENTRY
 };
 
 //crate reward types

Modified: homeworld/trunk/src/Game/Damage.c
===================================================================
--- homeworld/trunk/src/Game/Damage.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/Damage.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -45,7 +45,8 @@
     makeEntry(DMG_LightLimit, scriptSetReal32CB),
     makeEntry(DMG_HeavyLimit, scriptSetReal32CB),
     makeEntry(DMG_DyingLimit, scriptSetReal32CB),
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 

Modified: homeworld/trunk/src/Game/Dock.c
===================================================================
--- homeworld/trunk/src/Game/Dock.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/Dock.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -238,7 +238,7 @@
     makeEntry(SHIP_NEED_REFUEL_PERCENT,scriptSetReal32CB),
     makeEntry(SHIP_NEED_REPAIR_PERCENT,scriptSetReal32CB),
 
-    endEntry
+    END_SCRIPT_ENTRY
 };
 
 /*=============================================================================

Modified: homeworld/trunk/src/Game/FlightMan.c
===================================================================
--- homeworld/trunk/src/Game/FlightMan.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/FlightMan.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -299,7 +299,7 @@
     makeEntry(FLIGHTMAN_NUM_EVASIVEPURE_MANEUVERS[Neutral],scriptSetUwordCB),
     makeEntry(FLIGHTMAN_NUM_EVASIVEPURE_MANEUVERS[Aggressive],scriptSetUwordCB),
 
-    endEntry
+    END_SCRIPT_ENTRY
 };
 
 /*=============================================================================

Modified: homeworld/trunk/src/Game/Formation.c
===================================================================
--- homeworld/trunk/src/Game/Formation.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/Formation.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -101,7 +101,8 @@
     makeEntry(FORMATION_ERROR_NEGLIGIBLE,scriptSetReal32CB),
     makeEntry(TARGETDRONE_FORMATION_SIZE,scriptSetReal32CB),
     makeEntry(SPHERESIZE_IGNORE_NUMDECLINATIONS,scriptSetReal32CB),
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 udword formationSortType[NO_FORMATION] =
@@ -3265,7 +3266,8 @@
     { "SlotPositionInfo[SLOT_P2MultiBeamFrigate2]", scriptSetSlotInfoCB, (udword)&paradeTypeInfos[0].slotinfos[SLOT_P2MultiBeamFrigate2], (udword)&paradeTypeInfos[0] },
     { "SlotPositionInfo[SLOT_P2MultiBeamFrigate3]", scriptSetSlotInfoCB, (udword)&paradeTypeInfos[0].slotinfos[SLOT_P2MultiBeamFrigate3], (udword)&paradeTypeInfos[0] },
     { "SlotPositionInfo[SLOT_Misc]", scriptSetSlotInfoCB, (udword)&paradeTypeInfos[0].slotinfos[SLOT_Misc], (udword)&paradeTypeInfos[0] },
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 void scriptSetSlotInfoCB(char *directory,char *field,void *dataToFillIn)

Modified: homeworld/trunk/src/Game/LOD.c
===================================================================
--- homeworld/trunk/src/Game/LOD.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/LOD.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -79,7 +79,8 @@
     { "pSpriteFile5", lodSpriteFileRead, (udword)(&lodStaticInfo.level[5].pData), (udword)(&lodStaticInfo)},
     { "baseScalar",   lodColorScalarRead,0,            0},
     { "stripeScalar", lodColorScalarRead,2,          1},
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 //scaling factor for the LOD's

Modified: homeworld/trunk/src/Game/LevelLoad.c
===================================================================
--- homeworld/trunk/src/Game/LevelLoad.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/LevelLoad.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -85,7 +85,8 @@
     { "Asteroid2", scriptSetUword2CB, (udword)&resourceDistTemplate.probResources[Asteroid2][0], (udword)&resourceDistTemplate },
     { "Asteroid3", scriptSetUword2CB, (udword)&resourceDistTemplate.probResources[Asteroid3][0], (udword)&resourceDistTemplate },
     { "Asteroid4", scriptSetUword2CB, (udword)&resourceDistTemplate.probResources[Asteroid4][0], (udword)&resourceDistTemplate },
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 scriptStructEntry DustCloudDistScriptTable[] =
@@ -94,14 +95,16 @@
     { "DustCloud1", scriptSetUword2CB, (udword)&resourceDistTemplate.probResources[DustCloud1][0], (udword)&resourceDistTemplate },
     { "DustCloud2", scriptSetUword2CB, (udword)&resourceDistTemplate.probResources[DustCloud2][0], (udword)&resourceDistTemplate },
     { "DustCloud3", scriptSetUword2CB, (udword)&resourceDistTemplate.probResources[DustCloud3][0], (udword)&resourceDistTemplate },
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 scriptStructEntry GasCloudDistScriptTable[] =
 {
     { "GasCloud0", scriptSetUword2CB, (udword)&resourceDistTemplate.probResources[GasCloud0][0], (udword)&resourceDistTemplate },
     { "GasCloud1", scriptSetUword2CB, (udword)&resourceDistTemplate.probResources[GasCloud1][0], (udword)&resourceDistTemplate },
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 scriptStructEntry MissionSphereScriptTable[] =
@@ -113,7 +116,8 @@
     { "AISphere", scriptSetAISphereCB, 0,0 },
     { "Resources", scriptSetResourcesCB, 0,0 },
     { "Derelict", scriptSetDerelictCB, 0,0 },
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 scriptEntry SMMissionTweaks[] =
@@ -128,7 +132,8 @@
     makeEntry(smUniverseSizeY,scriptSetReal32CB),
     makeEntry(smUniverseSizeZ,scriptSetReal32CB),
     makeEntry(SongNumber,     scriptSetSdwordCB),
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 scriptStructEntry MissionScriptTable[] =
@@ -136,7 +141,8 @@
     { "MissionSphere", scriptSetMissionSphereCB, 0,0 },
     { "Lighting", scriptSetLightingCB, 0,0 },
     { "Background", scriptSetBackgroundCB, 0,0 },
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 static void llExcludeShip(char *directory,char *field,void *dataToFillIn);
@@ -173,13 +179,14 @@
     { "IncludeDerelict",llExcludeDerelict,  (void *)1},     //Type
     { "AvailableColorSchemes",llAvailableColorScheme, NULL},//race <shiptype|all> scheme#[,scheme#[,...]]
 
-    { NULL,NULL,0 }
+    END_SCRIPT_ENTRY
 };
 
 scriptEntry MissionPreloadScriptTablePass2[] =
 {
     { "MissionSphere", scriptPreMissionSphereCB, NULL },
-    { NULL,NULL,0 }
+
+    END_SCRIPT_ENTRY
 };
 
 bool needR1CapitalShip = FALSE;
@@ -189,7 +196,8 @@
 {
     { "Ships", scriptSetShipsToBeNeeded, 0,0 },
     { "Derelict", scriptSetDerelictToBeNeeded, 0,0 },
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 bool missionman = FALSE;

Modified: homeworld/trunk/src/Game/Nebulae.c
===================================================================
--- homeworld/trunk/src/Game/Nebulae.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/Nebulae.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -133,7 +133,8 @@
     makeEntry(NEB_VEL_BASE, scriptSetReal32CB),
     makeEntry(NEB_TENDRIL_RADIUS_BASE, scriptSetReal32CB),
     makeEntry(NEB_TENDRIL_RADIUS_RANGE, scriptSetReal32CB),
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 nebulae_t nebNebulae[NEB_MAX_NEBULAE];

Modified: homeworld/trunk/src/Game/Ping.c
===================================================================
--- homeworld/trunk/src/Game/Ping.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/Ping.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -110,7 +110,8 @@
 //    { "pingBobDoingCollisionBobs", scriptSetBool, &pingBattleBlobProperties.bobDoingCollisionBobs },
 
     { "pingTOLingerTime",       scriptSetReal32CB, &pingTOLingerTime },
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 //TO stuff

Modified: homeworld/trunk/src/Game/PlugScreen.c
===================================================================
--- homeworld/trunk/src/Game/PlugScreen.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/PlugScreen.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -73,7 +73,8 @@
     { "GameLink",        psPlugLinkSet, (void *)PLT_GameOn },
     { "TimeOut",         psTimeoutSet,  NULL },
     { "Mouse",           scriptSetBool, &psMouseFlag },
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 /*=============================================================================

Modified: homeworld/trunk/src/Game/ResCollect.c
===================================================================
--- homeworld/trunk/src/Game/ResCollect.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/ResCollect.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -120,7 +120,8 @@
     makeEntry(regenerateRUs,scriptSetSdwordCB),
     makeEntry(CHECK_HARV_OUTOFWORLD_RESOURCE_RATE,scriptSetUdwordCB),
     makeEntry(CHECK_SHIP_OUTOFWORLD_RATE,scriptSetUdwordCB),
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 sdword RESOURCE_NOT_ACCESSIBLE_SECONDS = 60;

Modified: homeworld/trunk/src/Game/ResearchAPI.c
===================================================================
--- homeworld/trunk/src/Game/ResearchAPI.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/ResearchAPI.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -253,8 +253,7 @@
     makeMPCR2TechEntry(RepairTech),
     makeMPCR2TechEntry(SalvageTech),
 
-
-    endEntry
+    END_SCRIPT_ENTRY
 };
 
 static NumStrXlate techtypeinfo[] =

Modified: homeworld/trunk/src/Game/ScenPick.c
===================================================================
--- homeworld/trunk/src/Game/ScenPick.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/ScenPick.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -122,7 +122,8 @@
     {"Font", spDescriptionFontSet, NULL},
     {"Color", scriptSetRGBCB, &spDescriptionColor},
     {"DropShadow", scriptSetBool8, &spDescriptionShadow},
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 scriptEntry spDescriptionTweaksFrench[] =
@@ -131,7 +132,8 @@
     {"Font", spDescriptionFontSet, NULL},
     {"Color", scriptSetRGBCB, &spDescriptionColor},
     {"DropShadow", scriptSetBool8, &spDescriptionShadow},
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 scriptEntry spDescriptionTweaksGerman[] =
@@ -140,7 +142,8 @@
     {"Font", spDescriptionFontSet, NULL},
     {"Color", scriptSetRGBCB, &spDescriptionColor},
     {"DropShadow", scriptSetBool8, &spDescriptionShadow},
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 scriptEntry spDescriptionTweaksSpanish[] =
@@ -149,7 +152,8 @@
     {"Font", spDescriptionFontSet, NULL},
     {"Color", scriptSetRGBCB, &spDescriptionColor},
     {"DropShadow", scriptSetBool8, &spDescriptionShadow},
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 scriptEntry spDescriptionTweaksItalian[] =
@@ -158,7 +162,8 @@
     {"Font", spDescriptionFontSet, NULL},
     {"Color", scriptSetRGBCB, &spDescriptionColor},
     {"DropShadow", scriptSetBool8, &spDescriptionShadow},
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 /*=============================================================================

Modified: homeworld/trunk/src/Game/Sensors.c
===================================================================
--- homeworld/trunk/src/Game/Sensors.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/Sensors.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -515,7 +515,8 @@
     { "FOW_DustGasK3",              scriptSetReal32CB, &smFOW_DustGasK3 },
     { "FOW_DustGasK4",              scriptSetReal32CB, &smFOW_DustGasK4 },
     { "smFOWBlobUpdateTime",        scriptSetReal32CB, &smFOWBlobUpdateTime },
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 /*=============================================================================

Modified: homeworld/trunk/src/Game/ShipView.c
===================================================================
--- homeworld/trunk/src/Game/ShipView.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/ShipView.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -193,9 +193,10 @@
 {
     makeEntry(svAngle, scriptSetReal32CB),
     makeEntry(svDeclination, scriptSetReal32CB),
-        makeEntry(svZoomInScalar, scriptSetReal32CB),
-        makeEntry(svZoomOutScalar,scriptSetReal32CB),
-    endEntry
+    makeEntry(svZoomInScalar, scriptSetReal32CB),
+    makeEntry(svZoomOutScalar,scriptSetReal32CB),
+    
+    END_SCRIPT_ENTRY
 };
 /*
 

Modified: homeworld/trunk/src/Game/SinglePlayer.c
===================================================================
--- homeworld/trunk/src/Game/SinglePlayer.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/SinglePlayer.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -218,8 +218,10 @@
     makeEntry(SINGLEPLAYER_MISSION14_SPHERE_OVERRIDE,scriptSetReal32CB),
     makeEntry(SUBMESSAGE_SAFETY_TIMEOUT,scriptSetReal32CB),
     makeEntry(SINGLEPLAYER_BOBBIGGESTRADIUS_LEVEL6,scriptSetReal32CB),
+
     { "BaseFleetStrengthForLevel",SetBaseFleetStrCB,NULL },
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 static void SetWarpFleetCB(char *directory,char *field,void *dataToFillIn);
@@ -231,20 +233,23 @@
 {
     { "WarpStartRU", scriptSetSdwordCB, &universe.players[0].resourceUnits},
     { "WarpFleet", SetWarpFleetCB, NULL },
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 scriptEntry WarpCalcFleetStrengthTable[] =
 {
     { "WarpStartRU", WarpFleetRUStrengthCB, NULL},
     { "WarpFleet", WarpFleetStrengthCB, NULL },
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 scriptEntry WarpPreLoadTable[] =
 {
     { "WarpFleet", WarpPreLoadCB, NULL },
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 static sdword WarpToLevelEnabled();
@@ -263,7 +268,8 @@
     { "MissionStartEnemyRUs", scriptSetSdwordCB, &universe.players[1].resourceUnits },
     { "MissionStartEnemyRace", scriptSetShipRaceCB, &universe.players[1].race },
     { "Asteroid0sCanMove", scriptSetBool, &singlePlayerGameInfo.asteroid0sCanMove },
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 fibfileheader *spHyperspaceRollCallHandle = NULL;

Modified: homeworld/trunk/src/Game/SoundEvent.c
===================================================================
--- homeworld/trunk/src/Game/SoundEvent.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/SoundEvent.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -207,7 +207,8 @@
 
 	makeEntry(RANDOM_AMBIENCE_MINFREQ,scriptSetReal32CB),
     makeEntry(RANDOM_AMBIENCE_ADDRANDOM,scriptSetSdwordCB),
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 

Modified: homeworld/trunk/src/Game/SpeechEvent.c
===================================================================
--- homeworld/trunk/src/Game/SpeechEvent.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/SpeechEvent.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -287,7 +287,8 @@
     { "eq5", scriptSetReal32CB, (udword)&streamEQ[0].eq[5], (udword)&streamEQ[0] },
     { "eq6", scriptSetReal32CB, (udword)&streamEQ[0].eq[6], (udword)&streamEQ[0] },
     { "eq7", scriptSetReal32CB, (udword)&streamEQ[0].eq[7], (udword)&streamEQ[0] },
-    endEntry
+    
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 scriptStructEntry streamDelaySciptTable[] =
@@ -303,7 +304,8 @@
     { "eq5", scriptSetReal32CB, (udword)&streamdelay[0].eq[5], (udword)&streamdelay[0] },
     { "eq6", scriptSetReal32CB, (udword)&streamdelay[0].eq[6], (udword)&streamdelay[0] },
     { "eq7", scriptSetReal32CB, (udword)&streamdelay[0].eq[7], (udword)&streamdelay[0] },
-    endEntry
+    
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 scriptStructEntry streamEffectScriptTable[] =
@@ -325,7 +327,8 @@
     { "ToneLevel", scriptSetReal32CB, (udword)&cleaneffect[0].fToneLev, (udword)&cleaneffect[0] },
     { "LimitLevel", scriptSetReal32CB, (udword)&cleaneffect[0].fLimitLev, (udword)&cleaneffect[0] },
     { "PitchShift", scriptSetReal32CB, (udword)&cleaneffect[0].fPitchShift, (udword)&cleaneffect[0] },
-    endEntry
+    
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 

Modified: homeworld/trunk/src/Game/StatScript.c
===================================================================
--- homeworld/trunk/src/Game/StatScript.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/StatScript.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -126,32 +126,35 @@
     { "OffsetZ",    scriptSetReal32CB, (udword) &(gunStaticTemplate.offset.z), (udword) &gunStaticTemplate },
     { "SlaveDriver",scriptSetSdwordCB, (udword) &(gunStaticTemplate.slaveDriver), (udword) &gunStaticTemplate },
 
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 static scriptStructEntry StaticDockInfoScriptTable[] =
 {
     { "DockPoint",  scriptSetDockPointCB, 0, 0 },
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 static scriptStructEntry StaticDockOverideInfoScriptTable[] =
 {
     { "DockOveride",  scriptSetDockOverideCB, 0, 0 },
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 static scriptStructEntry StaticSalvageInfoScriptTable[] =
 {
     { "SalvagePoint",  scriptSetSalvagePointCB, 0, 0 },
 
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 static scriptStructEntry StaticNavLightInfoScriptTable[] =
 {
     { "NavLight",  scriptSetNAVLightCB, 0, 0 },
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 /*=============================================================================
@@ -1908,7 +1911,7 @@
     { "type.resourceLumpSumTime",    scriptSetUdwordCB,  (udword) &(gameTemplate.resourceLumpSumTime), (udword) &gameTemplate },
     { "type.resourceLumpSumAmount",    scriptSetUdwordCB,  (udword) &(gameTemplate.resourceLumpSumAmount), (udword) &gameTemplate },
 
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 #define GT_NUMGAMES  0

Modified: homeworld/trunk/src/Game/StatScript.h
===================================================================
--- homeworld/trunk/src/Game/StatScript.h	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/StatScript.h	2006-11-27 20:25:28 UTC (rev 334)
@@ -42,8 +42,9 @@
 =============================================================================*/
 
 // for filling in scriptEntry
-#define makeEntry(var,callback) { str$(var), callback, &(var) }
-#define endEntry                { NULL,      NULL,     NULL   }
+#define makeEntry(var,callback)  { str$(var), callback, &(var) }
+#define END_SCRIPT_STRUCT_ENTRY  { NULL, NULL, 0, 0 }
+#define END_SCRIPT_ENTRY         { NULL, NULL, NULL }
 
 /*=============================================================================
     Functions:

Modified: homeworld/trunk/src/Game/Stats.c
===================================================================
--- homeworld/trunk/src/Game/Stats.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/Stats.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -187,9 +187,11 @@
 scriptEntry GatherStatsScriptTable[] =
 {
     makeEntry(ForceTotalRefresh,scriptSetBool),
+
     {"StatsForRace", StatsForRaceCB, NULL},
     {"StatsFor",     StatsForCB, NULL},
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 static void StatsForRaceCB(char *directory,char *field,void *dataToFillIn)
@@ -901,14 +903,17 @@
 scriptEntry FancyFightScriptTable[] =
 {
     makeEntry(ShowFancyFights,scriptSetBool),
+
     { "DoStatsFor", SetFlightEntrysCB, NULL },
-    endEntry
+
+    END_SCRIPT_ENTRY
 };
 
 scriptEntry FancyFightPreLoadScriptTable[] =
 {
     { "DoStatsFor", SetFlightEntrysPreLoadCB, NULL },
-    endEntry
+
+    END_SCRIPT_ENTRY
 };
 
 void SetFlightEntrysCB(char *directory,char *field,void *dataToFillIn)

Modified: homeworld/trunk/src/Game/StringSupport.c
===================================================================
--- homeworld/trunk/src/Game/StringSupport.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/StringSupport.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -666,7 +666,7 @@
 
     strEntry(strCheatDetect),
 
-    endEntry
+    END_SCRIPT_ENTRY
 };
 
 

Modified: homeworld/trunk/src/Game/Tactics.c
===================================================================
--- homeworld/trunk/src/Game/Tactics.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/Tactics.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -461,7 +461,7 @@
 
     makeEntry(DELAY_FORMTIGHTNESS_CHANGE,scriptSetReal32CB),
 
-    endEntry
+    END_SCRIPT_ENTRY
 };
 
 void tacticsStartUp()

Modified: homeworld/trunk/src/Game/TitanNet.c
===================================================================
--- homeworld/trunk/src/Game/TitanNet.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/TitanNet.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -156,7 +156,8 @@
     makeEntry(ROOM_MIN_THRESHOLD,scriptSetUdwordCB),
     makeEntry(ROOM_MAX_THRESHOLD,scriptSetUdwordCB),
     makeEntry(WAIT_SHUTDOWN_MS,scriptSetUdwordCB),
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 /*=============================================================================

Modified: homeworld/trunk/src/Game/Trails.c
===================================================================
--- homeworld/trunk/src/Game/Trails.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/Trails.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -132,7 +132,8 @@
     makeEntry(TRAIL_GLOW_2_GREEN, scriptSetSdwordCB),
     makeEntry(TRAIL_GLOW_2_BLUE, scriptSetSdwordCB),
     makeEntry(TRAIL_EXPANSION_TICKS, scriptSetSdwordCB),
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 

Modified: homeworld/trunk/src/Game/Tweak.c
===================================================================
--- homeworld/trunk/src/Game/Tweak.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/Tweak.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -1000,6 +1000,6 @@
 
     makeEntry(armourPiercingModifier,scriptSetReal32CB),
 
-    endEntry
+    END_SCRIPT_ENTRY
 };
 

Modified: homeworld/trunk/src/Game/UIControls.c
===================================================================
--- homeworld/trunk/src/Game/UIControls.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/UIControls.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -63,7 +63,8 @@
     makeEntry(TB_HyperspaceColor, scriptSetRGBCB),
     makeEntry(TB_CompleteColor, scriptSetRGBCB),
     makeEntry(TB_IncompleteColor, scriptSetRGBCB),
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 void uicButtonDraw(regionhandle reg);

Modified: homeworld/trunk/src/Game/Universe.c
===================================================================
--- homeworld/trunk/src/Game/Universe.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Game/Universe.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -491,7 +491,8 @@
     { "MaxJobsPerClass[Fighter]",       scriptSetSdwordCB, &cmMaxJobsPerClass[CLASS_Fighter]},
     { "MaxJobsPerClass[Resource]",      scriptSetSdwordCB, &cmMaxJobsPerClass[CLASS_Resource]},
     { "MaxJobsPerClass[NonCombat]",     scriptSetSdwordCB, &cmMaxJobsPerClass[CLASS_NonCombat]},
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 scriptStructEntry ShipStaticScriptTable[] =
@@ -510,8 +511,6 @@
     { "collBoxOffsetY",scriptSetReal32CB, (udword) &(ShipStaticInfoR1[0].staticheader.staticCollInfo.collBoxOffsetY), (udword) &(ShipStaticInfoR1[0]) },
     { "collBoxOffsetZ",scriptSetReal32CB, (udword) &(ShipStaticInfoR1[0].staticheader.staticCollInfo.collBoxOffsetZ), (udword) &(ShipStaticInfoR1[0]) },
 
-
-
     { "immobile",        scriptSetBool8,    (udword) &(ShipStaticInfoR1[0].staticheader.immobile), (udword) &(ShipStaticInfoR1[0]) },
     { "rightOfWay",      scriptSetSbyteCB,  (udword) &(ShipStaticInfoR1[0].staticheader.rightOfWay), (udword) &(ShipStaticInfoR1[0]) },
     { "collspheresize", scriptSetReal32CB,  (udword) &(ShipStaticInfoR1[0].staticheader.staticCollInfo.collspheresize),  (udword) &(ShipStaticInfoR1[0]) },
@@ -664,14 +663,15 @@
     { "NUMBER_OF_SALVAGE_POINTS", scriptSetSalvageStatCB,(udword) &(ShipStaticInfoR1[0]),(udword) &(ShipStaticInfoR1[0]) },
     { "Overlay_Selection_Scalar",       scriptSetReal32CB,  (udword) &(ShipStaticInfoR1[0].tacticalSelectionScale), (udword) &(ShipStaticInfoR1[0]) },
 
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 scriptStructEntry HierarchyBindingTable[] =
 {
     { "BindGun",                        setGunBindInfo,     0, 0 },
     { "BindAnimations",                 setAnimationBindInfo,0, 0 },
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 scriptStructEntry MadMaxMadInfoLoad[] =
@@ -682,7 +682,7 @@
     { "MadMothershipDockingAnims",      setMothershipDoorAnimInfo,0,0 },
     { "MadSpecialCaseAnims",      setSpecialCaseAnimInfo,0,0 },
 
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 scriptStructEntry AsteroidStaticScriptTable[] =
@@ -700,7 +700,6 @@
     { "collBoxOffsetY",scriptSetReal32CB, (udword) &(asteroidStaticInfos[0].staticheader.staticCollInfo.collBoxOffsetY), (udword) &(asteroidStaticInfos[0]) },
     { "collBoxOffsetZ",scriptSetReal32CB, (udword) &(asteroidStaticInfos[0].staticheader.staticCollInfo.collBoxOffsetZ), (udword) &(asteroidStaticInfos[0]) },
 
-
     { "immobile",        scriptSetBool8,    (udword) &(asteroidStaticInfos[0].staticheader.immobile), (udword) &(asteroidStaticInfos[0]) },
     { "rightOfWay",      scriptSetSbyteCB,  (udword) &(asteroidStaticInfos[0].staticheader.rightOfWay), (udword) &(asteroidStaticInfos[0]) },
     { "approxcollmodifier", scriptSetReal32CB,  (udword) &(asteroidStaticInfos[0].staticheader.staticCollInfo.approxcollmodifier),  (udword) &(asteroidStaticInfos[0]) },
@@ -722,7 +721,8 @@
     { "breakinto[Asteroid3]",scriptSetUdwordCB, (udword) &(asteroidStaticInfos[0].breakinto[Asteroid3]), (udword) &(asteroidStaticInfos[0]) },
     { "breakinto[Asteroid4]",scriptSetUdwordCB, (udword) &(asteroidStaticInfos[0].breakinto[Asteroid4]), (udword) &(asteroidStaticInfos[0]) },
     { "preciseSelection",scriptSetUdwordCB,(udword) &(ShipStaticInfoR1[0].staticheader.staticCollInfo.preciseSelection), (udword) &(ShipStaticInfoR1[0]) },
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 scriptStructEntry DustCloudStaticScriptTable[] =
@@ -755,7 +755,8 @@
     { "dustcloudCanShrink",scriptSetBool8, (udword) &(dustcloudStaticInfos[0].dustcloudCanShrink), (udword) &(dustcloudStaticInfos[0]) },
     { "dustcloudMinShrink",scriptSetReal32CB, (udword) &(dustcloudStaticInfos[0].dustcloudMinShrink), (udword) &(dustcloudStaticInfos[0]) },
     { "preciseSelection",scriptSetUdwordCB,(udword) &(ShipStaticInfoR1[0].staticheader.staticCollInfo.preciseSelection), (udword) &(ShipStaticInfoR1[0]) },
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 scriptStructEntry NebulaStaticScriptTable[] =
@@ -786,7 +787,8 @@
     { "nebulaCanShrink",scriptSetBool8, (udword) &(nebulaStaticInfos[0].nebulaCanShrink), (udword) &(nebulaStaticInfos[0]) },
     { "nebulaMinShrink",scriptSetReal32CB, (udword) &(nebulaStaticInfos[0].nebulaMinShrink), (udword) &(nebulaStaticInfos[0]) },
     { "preciseSelection",scriptSetUdwordCB,(udword) &(ShipStaticInfoR1[0].staticheader.staticCollInfo.preciseSelection), (udword) &(ShipStaticInfoR1[0]) },
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 scriptStructEntry GasCloudStaticScriptTable[] =
@@ -818,7 +820,8 @@
     { "gascloudCanShrink",scriptSetBool8, (udword) &(gascloudStaticInfos[0].gascloudCanShrink), (udword) &(gascloudStaticInfos[0]) },
     { "gascloudMinShrink",scriptSetReal32CB, (udword) &(gascloudStaticInfos[0].gascloudMinShrink), (udword) &(gascloudStaticInfos[0]) },
     { "preciseSelection",scriptSetUdwordCB,(udword) &(ShipStaticInfoR1[0].staticheader.staticCollInfo.preciseSelection), (udword) &(ShipStaticInfoR1[0]) },
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 scriptStructEntry DerelictStaticScriptTable[] =
@@ -877,7 +880,7 @@
     { "renderlistFade",       scriptSetReal32CB,    (udword) &(derelictStaticInfos[0].renderlistFade),      (udword) &(derelictStaticInfos[0]) },
     { "renderlistLimit",      scriptSetReal32SqrCB, (udword) &(derelictStaticInfos[0].renderlistLimitSqr),  (udword) &(derelictStaticInfos[0]) },
 
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 scriptStructEntry MissileStaticScriptTable[] =
@@ -915,7 +918,8 @@
     { "turnspeed[TURN_PITCH]",          scriptSetReal32CB,  (udword) &(missileStaticInfos[0].turnspeedstat[TURN_PITCH]), (udword) &(missileStaticInfos[0]) },
     { "turnspeed[TURN_ROLL]",           scriptSetReal32CB,  (udword) &(missileStaticInfos[0].turnspeedstat[TURN_ROLL]), (udword) &(missileStaticInfos[0]) },
     { "preciseSelection",scriptSetUdwordCB,(udword) &(ShipStaticInfoR1[0].staticheader.staticCollInfo.preciseSelection), (udword) &(ShipStaticInfoR1[0]) },
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 scriptStructEntry MineStaticScriptTable[] =
@@ -958,7 +962,7 @@
     { "MINE_RANGESQR_FORCED",           scriptSetReal32SqrCB,  (udword) &(mineStaticInfos[0].MINE_RANGESQR_FORCED), (udword) &(mineStaticInfos[0]) },
     { "preciseSelection",scriptSetUdwordCB,(udword) &(ShipStaticInfoR1[0].staticheader.staticCollInfo.preciseSelection), (udword) &(ShipStaticInfoR1[0]) },
 
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 /*=============================================================================

Modified: homeworld/trunk/src/SDL/utility.c
===================================================================
--- homeworld/trunk/src/SDL/utility.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/SDL/utility.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -542,7 +542,8 @@
 scriptEntry WonStuffSet[] =
 {
     makeEntry(HomeworldCRC,scriptSetHomeworldCRC),
-    endEntry
+    
+    END_SCRIPT_ENTRY
 };
 
 //render task
@@ -1064,7 +1065,8 @@
     {"ResInjAmmount",           scriptSetUdwordCB, &tpGameCreated.resourceInjectionsAmount},
     {"ResLumpSumTime",          scriptSetUdwordCB, &tpGameCreated.resourceLumpSumTime},
     {"ResLumpSumAmmount" ,      scriptSetUdwordCB, &tpGameCreated.resourceLumpSumAmount},
-    endEntry
+
+    END_SCRIPT_ENTRY
 };
 /*=============================================================================
     Functions:

Modified: homeworld/trunk/src/Ships/AdvanceSupportFrigate.c
===================================================================
--- homeworld/trunk/src/Ships/AdvanceSupportFrigate.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Ships/AdvanceSupportFrigate.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -33,7 +33,7 @@
 {
     { "repairApproachDistance",    scriptSetReal32CB, (udword) &(AdvanceSupportFrigateStatic.repairApproachDistance), (udword) &(AdvanceSupportFrigateStatic) },
 
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 

Modified: homeworld/trunk/src/Ships/Carrier.c
===================================================================
--- homeworld/trunk/src/Ships/Carrier.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Ships/Carrier.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -37,7 +37,7 @@
 {
     { "repairApproachDistance",    scriptSetReal32CB, (udword) &(CarrierStatic.repairApproachDistance), (udword) &(CarrierStatic) },
 
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 void CarrierStaticInit(char *directory,char *filename,struct ShipStaticInfo *statinfo)

Modified: homeworld/trunk/src/Ships/CloakGenerator.c
===================================================================
--- homeworld/trunk/src/Ships/CloakGenerator.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Ships/CloakGenerator.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -43,7 +43,7 @@
     { "ReChargeRate",     scriptSetReal32CB, (udword) &(CloakGeneratorStatic.ReChargeRate), (udword) &(CloakGeneratorStatic) },
     { "MinCharge",     scriptSetReal32CB, (udword) &(CloakGeneratorStatic.MinCharge), (udword) &(CloakGeneratorStatic) },
 
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 void CloakGeneratorStaticInit(char *directory,char *filename,struct ShipStaticInfo *statinfo)

Modified: homeworld/trunk/src/Ships/DDDFrigate.c
===================================================================
--- homeworld/trunk/src/Ships/DDDFrigate.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Ships/DDDFrigate.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -43,7 +43,7 @@
     { "externalRegenerateRate",  scriptSetReal32CB, (udword) &(DDDFrigateStaticRace1.externalRegenerateRate), (udword) &(DDDFrigateStaticRace1) },
     { "droneDeploymentRange",  scriptSetReal32CB, (udword) &(DDDFrigateStaticRace1.droneDeploymentRange), (udword) &(DDDFrigateStaticRace1) },
 
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 void DDDFrigateStaticInit(char *directory,char *filename,struct ShipStaticInfo *statinfo)

Modified: homeworld/trunk/src/Ships/DFGFrigate.c
===================================================================
--- homeworld/trunk/src/Ships/DFGFrigate.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Ships/DFGFrigate.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -41,7 +41,7 @@
     { "percentageThatGetThrough",    scriptSetUdwordCB, (udword) &(DFGFrigateStatic.percentageThatGetThrough), (udword) &(DFGFrigateStatic) },
     { "angleVariance",    scriptSetUdwordCB, (udword) &(DFGFrigateStatic.angleVariance), (udword) &(DFGFrigateStatic) },
 
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 

Modified: homeworld/trunk/src/Ships/DefenseFighter.c
===================================================================
--- homeworld/trunk/src/Ships/DefenseFighter.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Ships/DefenseFighter.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -71,7 +71,7 @@
     { "flightmanEvasiveFront",  scriptSetFlightManEvasiveFrontCB,   (udword) &(DefenseFighterStatic.flightmanProb),     (udword) &(DefenseFighterStatic) },
     { "flightmanEvasivePure",   scriptSetFlightManEvasivePureCB,    (udword) &(DefenseFighterStatic.flightmanProb),     (udword) &(DefenseFighterStatic) },
 
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 void DefenseFighterStaticInit(char *directory,char *filename,struct ShipStaticInfo *statinfo)

Modified: homeworld/trunk/src/Ships/GenericDefender.c
===================================================================
--- homeworld/trunk/src/Ships/GenericDefender.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Ships/GenericDefender.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -55,7 +55,8 @@
 {
     { "CIRCLE_RIGHT_VELOCITY",    scriptSetReal32CB, (udword) &(HeavyDefenderStaticRace1.CIRCLE_RIGHT_VELOCITY), (udword) &(HeavyDefenderStaticRace1) },
     { "CIRCLE_RIGHT_THRUST",      scriptSetReal32CB, (udword) &(HeavyDefenderStaticRace1.CIRCLE_RIGHT_THRUST), (udword) &(HeavyDefenderStaticRace1) },
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 void GenericDefenderStaticInit(char *directory,char *filename,struct ShipStaticInfo *statinfo)

Modified: homeworld/trunk/src/Ships/GenericInterceptor.c
===================================================================
--- homeworld/trunk/src/Ships/GenericInterceptor.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Ships/GenericInterceptor.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -162,7 +162,7 @@
     { "faceTargetAccuracy",     scriptSetCosAngCB_ARRAY,            (udword) &(GenericInterceptorStatic.faceTargetAccuracy),(udword) &(GenericInterceptorStatic) },
     { "maxAttackTime",          scriptSetReal32CB_ARRAY,            (udword) &(GenericInterceptorStatic.maxAttackTime),     (udword) &(GenericInterceptorStatic) },
 
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 scriptStructEntry CloakedFighterStaticScriptTable[] =
@@ -174,7 +174,7 @@
     { "VisibleState",               scriptSetReal32CB, (udword) &(CloakedFighterStatic.VisibleState),               (udword) &(CloakedFighterStatic) },
     { "battleReCloakTime",          scriptSetReal32CB, (udword) &(CloakedFighterStatic.battleReCloakTime),          (udword) &(CloakedFighterStatic) },
 
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 void GenericInterceptorStaticInit(char *directory,char *filename,struct ShipStaticInfo *statinfo)

Modified: homeworld/trunk/src/Ships/GravWellGenerator.c
===================================================================
--- homeworld/trunk/src/Ships/GravWellGenerator.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Ships/GravWellGenerator.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -62,9 +62,7 @@
     { "yrot",    scriptSetReal32CB, (udword) &(GravWellGeneratorStatic.yrot), (udword) &(GravWellGeneratorStatic) },
     { "zrot",    scriptSetReal32CB, (udword) &(GravWellGeneratorStatic.zrot), (udword) &(GravWellGeneratorStatic) },
 
-
-
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 void GravWellGeneratorStaticInit(char *directory,char *filename,struct ShipStaticInfo *statinfo)

Modified: homeworld/trunk/src/Ships/MinelayerCorvette.c
===================================================================
--- homeworld/trunk/src/Ships/MinelayerCorvette.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Ships/MinelayerCorvette.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -85,7 +85,8 @@
     { "forced_drop_lifetime",    scriptSetReal32CB, (udword) &(MinelayerCorvetteStatic.forced_drop_lifetime), (udword) &(MinelayerCorvetteStatic) },
     { "gunReFireTime",    scriptSetReal32CB, (udword) &(MinelayerCorvetteStatic.gunReFireTime), (udword) &(MinelayerCorvetteStatic) },
     { "mineRegenerateTime",    scriptSetReal32CB, (udword) &(MinelayerCorvetteStatic.mineRegenerateTime), (udword) &(MinelayerCorvetteStatic) },
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 bool MinelayerCorvetteStaticMineDrop(Ship *ship,SpaceObjRotImpTarg *target);

Modified: homeworld/trunk/src/Ships/MissileDestroyer.c
===================================================================
--- homeworld/trunk/src/Ships/MissileDestroyer.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Ships/MissileDestroyer.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -49,7 +49,8 @@
     { "MissileRegenerateTime",scriptSetReal32CB,(udword) &(MissileDestroyerStaticRace1.missileRegenerateTime),(udword) &(MissileDestroyerStaticRace1) },
     { "MissileVolleyTime",scriptSetReal32CB,(udword) &(MissileDestroyerStaticRace1.missileVolleyTime),(udword) &(MissileDestroyerStaticRace1) },
     { "MissileLagVolleyTime",scriptSetReal32CB,(udword) &(MissileDestroyerStaticRace1.missileLagVolleyTime),(udword) &(MissileDestroyerStaticRace1) },
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 void MissileDestroyerStaticInit(char *directory,char *filename,struct ShipStaticInfo *statinfo)

Modified: homeworld/trunk/src/Ships/Mothership.c
===================================================================
--- homeworld/trunk/src/Ships/Mothership.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Ships/Mothership.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -72,12 +72,9 @@
 
     { "specialDoorOffset", scriptSetSpecialDoorOffsetCB,(udword) &(MothershipStatic), (udword) &(MothershipStatic)},
 
-
-
-
     { "specialDoorInterpolationPerSecond",              scriptSetReal32CB, (udword) &(MothershipStatic.specialDoorInterpolationPerSecond), (udword) &(MothershipStatic) },
 
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 real32 DOCKPOINT_BUSY_TOO_LONG = UNIVERSE_UPDATE_RATE * 60;

Modified: homeworld/trunk/src/Ships/P1MissileCorvette.c
===================================================================
--- homeworld/trunk/src/Ships/P1MissileCorvette.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Ships/P1MissileCorvette.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -42,7 +42,8 @@
     { "MissileRegenerateTime",scriptSetReal32CB,(udword) &(P1MissileCorvetteStatic.missileRegenerateTime),(udword) &(P1MissileCorvetteStatic) },
     { "MissileVolleyTime",scriptSetReal32CB,(udword) &(P1MissileCorvetteStatic.missileVolleyTime),(udword) &(P1MissileCorvetteStatic) },
     { "MissileLagVolleyTime",scriptSetReal32CB,(udword) &(P1MissileCorvetteStatic.missileLagVolleyTime),(udword) &(P1MissileCorvetteStatic) },
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 void P1MissileCorvetteStaticInit(char *directory,char *filename,struct ShipStaticInfo *statinfo)

Modified: homeworld/trunk/src/Ships/P2MultiBeamFrigate.c
===================================================================
--- homeworld/trunk/src/Ships/P2MultiBeamFrigate.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Ships/P2MultiBeamFrigate.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -73,7 +73,8 @@
 
 //    {"MultiBeamRange", scriptsetReal32CB, &(P2MultiBeamFrigateStatic.MultiBeamRange)},
 //    {"MultiBeamRange", scriptsetReal32CB, &(P2MultiBeamFrigateStatic.MultiBeamRange)},
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 void P2MultiBeamFrigateStaticInit(char *directory,char *filename,struct ShipStaticInfo *statinfo)

Modified: homeworld/trunk/src/Ships/Probe.c
===================================================================
--- homeworld/trunk/src/Ships/Probe.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Ships/Probe.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -27,7 +27,8 @@
 scriptStructEntry ProbeStaticScriptTable[] =
 {
     { "ProbeDispatchMaxVelocity",     scriptSetReal32CB, (udword) &(ProbeStatic.ProbeDispatchMaxVelocity), (udword) &(ProbeStatic) },
-    { NULL,NULL,0,0 }
+
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 real32 ProbeGetMaxVelocity(Ship *ship)

Modified: homeworld/trunk/src/Ships/ProximitySensor.c
===================================================================
--- homeworld/trunk/src/Ships/ProximitySensor.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Ships/ProximitySensor.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -49,7 +49,7 @@
     { "blipColor",    scriptSetRGBACB, (udword) &(ProximitySensorStatic.blipColor), (udword) &(ProximitySensorStatic) },
     { "blipThickness",    scriptSetSdwordCB, (udword) &(ProximitySensorStatic.blipThickness), (udword) &(ProximitySensorStatic) },
 
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 

Modified: homeworld/trunk/src/Ships/RepairCorvette.c
===================================================================
--- homeworld/trunk/src/Ships/RepairCorvette.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Ships/RepairCorvette.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -112,8 +112,7 @@
     { "capitalShipHealthPerSecond",    scriptSetReal32CB, (udword) &(RepairCorvetteStatic.capitalShipHealthPerSecond), (udword) &(RepairCorvetteStatic) },
     { "AngleDotProdThreshold",    scriptSetReal32CB, (udword) &(RepairCorvetteStatic.AngleDotProdThreshold), (udword) &(RepairCorvetteStatic) },
 
-
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 void RepairCorvetteStaticInit(char *directory,char *filename,struct ShipStaticInfo *statinfo)

Modified: homeworld/trunk/src/Ships/ResearchShip.c
===================================================================
--- homeworld/trunk/src/Ships/ResearchShip.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Ships/ResearchShip.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -50,8 +50,7 @@
     { "R2DockFinalDistance",    scriptSetReal32CB, (udword) &(ResearchShipStatic.R2DockFinalDistance), (udword) &(ResearchShipStatic) },
     { "RotationAngle",    scriptSetReal32CB, (udword) &(ResearchShipStatic.RotationAngle), (udword) &(ResearchShipStatic) },
 
-
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 void ResearchShipStaticInit(char *directory,char *filename,struct ShipStaticInfo *statinfo)

Modified: homeworld/trunk/src/Ships/ResourceCollector.c
===================================================================
--- homeworld/trunk/src/Ships/ResourceCollector.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Ships/ResourceCollector.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -35,7 +35,7 @@
 {
     { "repairApproachDistance",    scriptSetReal32CB, (udword) &(ResourceCollectorStatic.repairApproachDistance), (udword) &(ResourceCollectorStatic) },
 
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 void ResourceCollectorStaticInit(char *directory,char *filename,struct ShipStaticInfo *statinfo)

Modified: homeworld/trunk/src/Ships/ResourceController.c
===================================================================
--- homeworld/trunk/src/Ships/ResourceController.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Ships/ResourceController.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -37,7 +37,7 @@
 {
     { "repairApproachDistance",    scriptSetReal32CB, (udword) &(ResourceControllerStatic.repairApproachDistance), (udword) &(ResourceControllerStatic) },
 
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 

Modified: homeworld/trunk/src/Ships/SalCapCorvette.c
===================================================================
--- homeworld/trunk/src/Ships/SalCapCorvette.c	2006-11-27 19:22:10 UTC (rev 333)
+++ homeworld/trunk/src/Ships/SalCapCorvette.c	2006-11-27 20:25:28 UTC (rev 334)
@@ -106,7 +106,7 @@
     { "maxPushingVelocitySingle",    scriptSetReal32CB, (udword) &(SalCapCorvetteStatic.maxPushingVelocitySingle), (udword) &(SalCapCorvetteStatic) },
     { "noLightClampingDistance",    scriptSetReal32CB, (udword) &(SalCapCorvetteStatic.noLightClampingDistance), (udword) &(SalCapCorvetteStatic) },
 
-    { NULL,NULL,0,0 }
+    END_SCRIPT_STRUCT_ENTRY
 };
 
 




More information about the Commits mailing list