2.3: More savegame safeguards. Closes ticket:2627.

perim · perim · commit fc0f87807eea · 2011-05-01T11:16:00.000+02:00
diff --git a/ChangeLog b/ChangeLog
@@ -3,7 +3,7 @@
    * New: Two new 2 player maps - Vision and Roughness (commit:697afb16d5244f9715952f8762b1011c6d75101e)
    * Change: Increase recycled experience storage in memory (commit:703665b4b7df1282eee29a7064961bc66152a847)
    * Change: Set a window icon (ticket:2465, commit:ac792c67d4bb66618ae7ff712844c4eebb70a496)
-   * Fix: Prevent savegame corruption (ticket:2100, commit:a974722e397b7072fb59d0114e2a4ef9f8d509d8)
+   * Fix: Prevent savegame corruption (ticket:2100, commit:a974722e397b7072fb59d0114e2a4ef9f8d509d8, commit:cc156a668fb5291e38eab33ff77138a05e29fa28)
  * Mods:
    * Fix: 1.10 Balance (commit:9943ff3a4b67b0f64a9e2ee163c8ccac711be72e)
  * Translations:
diff --git a/src/display3d.c b/src/display3d.c
@@ -1875,6 +1875,7 @@ void displayProximityMsgs( void )
 			}
 			else
 			{
+				if (!psProxDisp->psMessage->pViewData) continue; // sanity check
 				x = ((BASE_OBJECT *)psProxDisp->psMessage->pViewData)->pos.x;
 				y = ((BASE_OBJECT *)psProxDisp->psMessage->pViewData)->pos.y;
 			}
diff --git a/src/objmem.c b/src/objmem.c
@@ -871,8 +871,6 @@ BASE_OBJECT *getBaseObjFromId(UDWORD id)
 			}
 		}
 	}
-	ASSERT(!"couldn't find a BASE_OBJ with ID", "getBaseObjFromId() failed for id %d", id);
-
 	return NULL;
 }
 
diff --git a/src/scriptobj.c b/src/scriptobj.c
@@ -740,9 +740,6 @@ BOOL scrValDefSave(INTERP_VAL *psVal, char *pBuffer, UDWORD *pSize)
 	RESEARCH	*psResearch;
 	char		*pPos;
 	DROID		*psCDroid;
-#ifdef _DEBUG
-	BASE_OBJECT	*psObj;
-#endif
 
 	switch (psVal->type)
 	{
@@ -780,12 +777,7 @@ BOOL scrValDefSave(INTERP_VAL *psVal, char *pBuffer, UDWORD *pSize)
 			else
 			{
 				*((UDWORD*)pBuffer) = ((BASE_OBJECT *)psVal->v.oval)->id;
-#ifdef _DEBUG
-				psObj = getBaseObjFromId(((BASE_OBJECT *)psVal->v.oval)->id);
-				ASSERT( psObj == (BASE_OBJECT *)psVal->v.oval,"scrValDefSave failed to find object, continue" );
-#endif
 			}
-
 			endian_udword((UDWORD*)pBuffer);
 		}
 		*pSize = sizeof(UDWORD);
@@ -1346,14 +1338,12 @@ BOOL scrValDefLoad(SDWORD version, INTERP_VAL *psVal, char *pBuffer, UDWORD size
 				psCDroid = (DROID *)getBaseObjFromId(id);
 				if (!psCDroid)
 				{
-					debug( LOG_FATAL, "scrValDefLoad: couldn't find object id %d", id );
-					abort();
+					debug(LOG_INFO, "Could not find object id %d", id);
 				}
 				else
 				{
 					grpJoin((DROID_GROUP*)(psVal->v.oval), psCDroid);
 				}
-
 				pPos += sizeof(UDWORD);
 				members -= 1;
 			}

Original file line number	Diff line number	Diff line change
`@@ -1875,6 +1875,7 @@ void displayProximityMsgs( void )`
`1875`	`1875`	`}`
`1876`	`1876`	`else`
`1877`	`1877`	`{`
	`1878`	`+ if (!psProxDisp->psMessage->pViewData) continue; // sanity check`
`1878`	`1879`	`x = ((BASE_OBJECT *)psProxDisp->psMessage->pViewData)->pos.x;`
`1879`	`1880`	`y = ((BASE_OBJECT *)psProxDisp->psMessage->pViewData)->pos.y;`
`1880`	`1881`	`}`
Original file line number	Diff line number	Diff line change
`@@ -871,8 +871,6 @@ BASE_OBJECT *getBaseObjFromId(UDWORD id)`
`871`	`871`	`}`
`872`	`872`	`}`
`873`	`873`	`}`
`874`		`- ASSERT(!"couldn't find a BASE_OBJ with ID", "getBaseObjFromId() failed for id %d", id);`
`875`		`-`
`876`	`874`	`return NULL;`
`877`	`875`	`}`
`878`	`876`
Original file line number	Diff line number	Diff line change
`@@ -740,9 +740,6 @@ BOOL scrValDefSave(INTERP_VAL psVal, char pBuffer, UDWORD *pSize)`
`740`	`740`	`RESEARCH *psResearch;`
`741`	`741`	`char *pPos;`
`742`	`742`	`DROID *psCDroid;`
`743`		`-#ifdef _DEBUG`
`744`		`- BASE_OBJECT *psObj;`
`745`		`-#endif`
`746`	`743`
`747`	`744`	`switch (psVal->type)`
`748`	`745`	`{`
`@@ -780,12 +777,7 @@ BOOL scrValDefSave(INTERP_VAL psVal, char pBuffer, UDWORD *pSize)`
`780`	`777`	`else`
`781`	`778`	`{`
`782`	`779`	`((UDWORD)pBuffer) = ((BASE_OBJECT *)psVal->v.oval)->id;`
`783`		`-#ifdef _DEBUG`
`784`		`- psObj = getBaseObjFromId(((BASE_OBJECT *)psVal->v.oval)->id);`
`785`		`- ASSERT( psObj == (BASE_OBJECT *)psVal->v.oval,"scrValDefSave failed to find object, continue" );`
`786`		`-#endif`
`787`	`780`	`}`
`788`		`-`
`789`	`781`	`endian_udword((UDWORD*)pBuffer);`
`790`	`782`	`}`
`791`	`783`	`*pSize = sizeof(UDWORD);`
`@@ -1346,14 +1338,12 @@ BOOL scrValDefLoad(SDWORD version, INTERP_VAL psVal, char pBuffer, UDWORD size`
`1346`	`1338`	`psCDroid = (DROID *)getBaseObjFromId(id);`
`1347`	`1339`	`if (!psCDroid)`
`1348`	`1340`	`{`
`1349`		`- debug( LOG_FATAL, "scrValDefLoad: couldn't find object id %d", id );`
`1350`		`- abort();`
	`1341`	`+ debug(LOG_INFO, "Could not find object id %d", id);`
`1351`	`1342`	`}`
`1352`	`1343`	`else`
`1353`	`1344`	`{`
`1354`	`1345`	`grpJoin((DROID_GROUP*)(psVal->v.oval), psCDroid);`
`1355`	`1346`	`}`
`1356`		`-`
`1357`	`1347`	`pPos += sizeof(UDWORD);`
`1358`	`1348`	`members -= 1;`
`1359`	`1349`	`}`