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

Remove unused aMapLinePoints global. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4891 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2008-05-02 21:10:08 +00:00
parent 1423e2d742
commit 6f7ee5236e
5 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/game.c
View File

@ -2334,11 +2334,6 @@ BOOL loadGame(const char *pGameToLoad, BOOL keepObjects, BOOL freeMem, BOOL User
{ {
// free(psMapTiles); // free(psMapTiles);
} }
if (aMapLinePoints)
{
free(aMapLinePoints);
aMapLinePoints = NULL;
}
//clear all the messages? //clear all the messages?
releaseAllProxDisp(); releaseAllProxDisp();
} }
@ -2732,7 +2727,6 @@ BOOL loadGame(const char *pGameToLoad, BOOL keepObjects, BOOL freeMem, BOOL User
//load the map and the droids then swap pointers //load the map and the droids then swap pointers
// psMapTiles = NULL; // psMapTiles = NULL;
// aMapLinePoints = NULL;
//load in the map file //load in the map file
aFileName[fileExten] = '\0'; aFileName[fileExten] = '\0';
strcat(aFileName, "mission.map"); strcat(aFileName, "mission.map");
@ -2891,7 +2885,6 @@ BOOL loadGame(const char *pGameToLoad, BOOL keepObjects, BOOL freeMem, BOOL User
{ {
LOADBARCALLBACK(); // loadingScreenCallback(); LOADBARCALLBACK(); // loadingScreenCallback();
psMapTiles = NULL; psMapTiles = NULL;
aMapLinePoints = NULL;
//load in the map file //load in the map file
aFileName[fileExten] = '\0'; aFileName[fileExten] = '\0';
strcat(aFileName, "game.map"); strcat(aFileName, "game.map");
@ -3515,13 +3508,7 @@ error:
{ {
// free(psMapTiles); // free(psMapTiles);
} }
if (aMapLinePoints)
{
free(aMapLinePoints);
aMapLinePoints = NULL;
}
psMapTiles = NULL; psMapTiles = NULL;
aMapLinePoints = NULL;
/*if (!loadFile("blank.map", &pFileData, &fileSize)) /*if (!loadFile("blank.map", &pFileData, &fileSize))
{ {

5
src/map.c
View File

@ -120,9 +120,6 @@ typedef struct _zonemap_save_header {
UDWORD mapWidth = 0, mapHeight = 0; UDWORD mapWidth = 0, mapHeight = 0;
MAPTILE *psMapTiles = NULL; MAPTILE *psMapTiles = NULL;
/* The map tiles generated by map calc line */
TILE_COORD *aMapLinePoints = NULL;
/* Look up table that returns the terrain type of a given tile texture */ /* Look up table that returns the terrain type of a given tile texture */
UBYTE terrainTypes[MAX_TILE_TEXTURES]; UBYTE terrainTypes[MAX_TILE_TEXTURES];
@ -143,8 +140,6 @@ BOOL mapNew(UDWORD width, UDWORD height)
freeAllFeatures(); freeAllFeatures();
freeAllFlagPositions(); freeAllFlagPositions();
proj_FreeAllProjectiles(); proj_FreeAllProjectiles();
free(aMapLinePoints);
aMapLinePoints = NULL;
free(psMapTiles); free(psMapTiles);
psMapTiles = NULL; psMapTiles = NULL;
initStructLimits(); initStructLimits();

3
src/map.h
View File

@ -276,9 +276,6 @@ typedef struct _tile_coord
MAPTILE *psTile; MAPTILE *psTile;
} TILE_COORD; } TILE_COORD;
/* The map tiles generated by map calc line */
extern TILE_COORD *aMapLinePoints;
/* Return height of x,y */ /* Return height of x,y */
extern SWORD map_Height(int x, int y); extern SWORD map_Height(int x, int y);

4
src/mission.c
View File

@ -327,7 +327,6 @@ BOOL missionShutDown(void)
} }
psMapTiles = mission.psMapTiles; psMapTiles = mission.psMapTiles;
aMapLinePoints = mission.aMapLinePoints;
mapWidth = mission.mapWidth; mapWidth = mission.mapWidth;
mapHeight = mission.mapHeight; mapHeight = mission.mapHeight;
psGateways = mission.psGateways; psGateways = mission.psGateways;
@ -727,7 +726,6 @@ void saveMissionData(void)
//save the mission data //save the mission data
mission.psMapTiles = psMapTiles; mission.psMapTiles = psMapTiles;
mission.aMapLinePoints = aMapLinePoints;
mission.mapWidth = mapWidth; mission.mapWidth = mapWidth;
mission.mapHeight = mapHeight; mission.mapHeight = mapHeight;
mission.scrollMinX = scrollMinX; mission.scrollMinX = scrollMinX;
@ -900,7 +898,6 @@ void restoreMissionData(void)
psMapTiles = mission.psMapTiles; psMapTiles = mission.psMapTiles;
aMapLinePoints = mission.aMapLinePoints;
mapWidth = mission.mapWidth; mapWidth = mission.mapWidth;
mapHeight = mission.mapHeight; mapHeight = mission.mapHeight;
scrollMinX = mission.scrollMinX; scrollMinX = mission.scrollMinX;
@ -910,7 +907,6 @@ void restoreMissionData(void)
psGateways = mission.psGateways; psGateways = mission.psGateways;
//and clear the mission pointers //and clear the mission pointers
mission.psMapTiles = NULL; mission.psMapTiles = NULL;
mission.aMapLinePoints = NULL;
mission.mapWidth = 0; mission.mapWidth = 0;
mission.mapHeight = 0; mission.mapHeight = 0;
mission.scrollMinX = 0; mission.scrollMinX = 0;

1
src/missiondef.h
View File

@ -46,7 +46,6 @@ typedef struct _mission
//MISSION_TYPE type; //defines which start and end functions to use //MISSION_TYPE type; //defines which start and end functions to use
UDWORD type; //defines which start and end functions to use - see levels_type in levels.h UDWORD type; //defines which start and end functions to use - see levels_type in levels.h
MAPTILE *psMapTiles; //the original mapTiles MAPTILE *psMapTiles; //the original mapTiles
TILE_COORD *aMapLinePoints; //the original mapLinePoints
UDWORD mapWidth; //the original mapWidth UDWORD mapWidth; //the original mapWidth
UDWORD mapHeight; //the original mapHeight UDWORD mapHeight; //the original mapHeight
struct _gateway *psGateways; //the gateway list struct _gateway *psGateways; //the gateway list