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

Forward port various minimal-impact stuff from tagfile load patch to reduce patch size. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5053 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2008-05-11 20:51:41 +00:00
parent c67a3ef1be
commit 92ceea0131
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/game.c
View File

@ -2217,6 +2217,7 @@ static BOOL getNameFromComp(UDWORD compType, char *pDest, UDWORD compIndex);
//adjust the name depending on type of save game and whether resourceNames are used
static BOOL getSaveObjectName(char *pName);
static bool gameLoad(const char* fileName);
/* set the global scroll values to use for the save game */
static void setMapScroll(void);
@ -2335,16 +2336,10 @@ BOOL loadGame(const char *pGameToLoad, BOOL keepObjects, BOOL freeMem, BOOL User
freeAllStructs();
freeAllFeatures();
// droidTemplateShutDown();
if (psMapTiles)
{
// free(psMapTiles);
}
//clear all the messages?
releaseAllProxDisp();
}
if (!keepObjects)
{
//initialise the lists
@ -2392,7 +2387,6 @@ BOOL loadGame(const char *pGameToLoad, BOOL keepObjects, BOOL freeMem, BOOL User
//JPS 25 feb
}
if (saveGameVersion >= VERSION_11)
{
//camera position
@ -2732,7 +2726,6 @@ BOOL loadGame(const char *pGameToLoad, BOOL keepObjects, BOOL freeMem, BOOL User
}
//load the map and the droids then swap pointers
// psMapTiles = NULL;
//load in the map file
aFileName[fileExten] = '\0';
strcat(aFileName, "mission.map");

1
src/map.c
View File

@ -745,6 +745,7 @@ BOOL mapSaveTagged(char *pFileName)
tagWrite(0x08, psTile->height);
tagWrite(0x09, psTile->tileVisBits);
tagWrite(0x0a, psTile->tileInfoBits);
tagWrite(0x0b, (psTile->texture & TILE_ROTMASK) >> TILE_ROTSHIFT);
psTile++;
x++;