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

Clean up missionDestroyObjects() and ensure that projectiles are free()d there. 

Make sure that "let me win" cheat works again by fixing assert when grid is
updated with the base (non-off-world) units.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2150 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2007-07-19 22:15:17 +00:00
parent e3b98734d5
commit 74af7fefa1
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mission.c
View File

@ -1068,9 +1068,8 @@ void restoreMissionData(void)
mission.apsDroidLists[inc] = NULL;
for(psObj = (BASE_OBJECT *)apsDroidLists[inc]; psObj; psObj=psObj->psNext)
{
psObj->died = FALSE; //make sure the died flag is not set
gridAddObject(psObj);
//make sure the died flag is not set
psObj->died = FALSE;
}
apsStructLists[inc] = mission.apsStructLists[inc];
@ -4081,18 +4080,18 @@ void missionDestroyObjects(void)
STRUCTURE *psStruct;
UBYTE Player;
debug( LOG_NEVER, "missionDestroyObjects\n" );
debug(LOG_NEVER, "missionDestroyObjects");
proj_FreeAllProjectiles();
for(Player = 0; Player < MAX_PLAYERS; Player++) {
if(Player != selectedPlayer) {
if (Player != selectedPlayer)
{
psDroid = apsDroidLists[Player];
while(psDroid != NULL) {
while (psDroid != NULL)
{
DROID *psNext = psDroid->psNext;
removeDroidBase(psDroid);
// droidRemove(psDroid, apsDroidLists);
// droidRelease(psDroid);
// free(psDroid);
psDroid = psNext;
}
@ -4100,21 +4099,21 @@ void missionDestroyObjects(void)
apsDroidLists[Player] = mission.apsDroidLists[Player];
psDroid = apsDroidLists[Player];
while(psDroid != NULL) {
while (psDroid != NULL)
{
DROID *psNext = psDroid->psNext;
//make sure its died flag is not set since we've swapped the apsDroidList pointers over
psDroid->died = FALSE;
removeDroidBase(psDroid);
// droidRemove(psDroid, apsDroidLists);
// droidRelease(psDroid);
// free(psDroid);
psDroid = psNext;
}
mission.apsDroidLists[Player] = NULL;
psStruct = apsStructLists[Player];
while(psStruct != NULL) {
while (psStruct != NULL)
{
STRUCTURE *psNext = psStruct->psNext;
removeStruct(psStruct, TRUE);
psStruct = psNext;