2.3: Add safeguard against savegame corruption when saving script data. This closes ticket:2625.

Author: perim

ChangeLog

@@ -1,6 +1,6 @@
 2011-04-xx: Version 2.3.8
  * General:
-   * New: Two new 2 player maps - Vision and Roughness (697afb16d5244f9715952f8762b1011c6d75101e)
+   * 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)

src/scriptobj.c

@@ -562,31 +562,6 @@ BOOL scrGroupObjGet(UDWORD index)
 		return false;
 	}
 
-	//fix: turn off caching, since it can screw up everything if returns outdated values
-	// recalculate the values if necessary
-/*
-	if (lgGameTime != gameTime || psScrLastGroup != psGroup)
-	{
-		lgGameTime = gameTime;
-		psScrLastGroup = psGroup;
-		lgMembers = 0;
-		lgHealth = 0;
-		lgX = lgY = 0;
-		for(psCurr = psGroup->psList; psCurr; psCurr = psCurr->psGrpNext)
-		{
-			lgMembers += 1;
-			lgX += (SDWORD)psCurr->pos.x;
-			lgY += (SDWORD)psCurr->pos.y;
-			lgHealth += (SDWORD)((100 * psCurr->body)/psCurr->originalBody);
-		}
-		if (lgMembers > 0)
-		{
-			lgX = lgX / lgMembers;
-			lgY = lgY / lgMembers;
-			lgHealth = lgHealth / lgMembers;
-		}
-	}
-*/
 	switch (index)
 	{
 	case GROUPID_POSX:
@@ -798,7 +773,7 @@ BOOL scrValDefSave(INTERP_VAL *psVal, char *pBuffer, UDWORD *pSize)
 		// just save the id
 		if (pBuffer)
 		{
-			if (psVal->v.oval == NULL)
+			if (psVal->v.oval == NULL || ((BASE_OBJECT *)psVal->v.oval)->died > 1 || !getBaseObjFromId(((BASE_OBJECT *)psVal->v.oval)->id))
 			{
 				*((UDWORD*)pBuffer) = UDWORD_MAX;
 			}
@@ -1197,26 +1172,8 @@ BOOL scrValDefLoad(SDWORD version, INTERP_VAL *psVal, char *pBuffer, UDWORD size
 				 *
 				 * Thus loading of these strings is practically impossible.
 				 */
-#if 0
-				const char * const str = strresGetString(psStringRes, id);
-				if (!str)
-				{
-					debug(LOG_FATAL, "Couldn't find string with id %u", id);
-					abort();
-					return false;
-				}
-
-				psVal->v.sval = strdup(str);
-				if (!psVal->v.sval)
-				{
-					debug(LOG_FATAL, "Out of memory");
-					abort();
-					return false;
-				}
-#else
 				debug(LOG_ERROR, "Incompatible savegame format version %u, should be at least version 4", (unsigned int)version);
 				return false;
-#endif
 			}
 		}
 		else