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

Use std::swap in swapMissionPointers.

master
Cyp 2011-02-25 19:57:40 +01:00
parent ae2ce18314
commit 1c44b38fbd
2 changed files with 28 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/mission.cpp
View File

@ -1420,63 +1420,29 @@ void processMissionLimbo(void)
// Pay special attention on what is getting swapped!
void swapMissionPointers(void)
{
void *pVoid;
UDWORD udwTemp, inc;
debug(LOG_SAVE, "called");
// Swap psMapTiles
pVoid = (void*)psMapTiles;
psMapTiles = mission.psMapTiles;
mission.psMapTiles = (MAPTILE *)pVoid;
// Swap map sizes
udwTemp = mapWidth;
mapWidth = mission.mapWidth;
mission.mapWidth = udwTemp;
udwTemp = mapHeight;
mapHeight = mission.mapHeight;
mission.mapHeight = udwTemp;
std::swap(psMapTiles, mission.psMapTiles);
std::swap(mapWidth, mission.mapWidth);
std::swap(mapHeight, mission.mapHeight);
//swap gateway zones
pVoid = (void*)gwGetGateways();
GATEWAY *gateway = gwGetGateways();
gwSetGateways(mission.psGateways);
mission.psGateways = (struct _gateway *)pVoid;
// Swap scroll limits
udwTemp = scrollMinX;
scrollMinX = mission.scrollMinX;
mission.scrollMinX = udwTemp;
udwTemp = scrollMinY;
scrollMinY = mission.scrollMinY;
mission.scrollMinY = udwTemp;
udwTemp = scrollMaxX;
scrollMaxX = mission.scrollMaxX;
mission.scrollMaxX = udwTemp;
udwTemp = scrollMaxY;
scrollMaxY = mission.scrollMaxY;
mission.scrollMaxY = udwTemp;
for (inc = 0; inc < MAX_PLAYERS; inc++)
mission.psGateways = gateway;
std::swap(scrollMinX, mission.scrollMinX);
std::swap(scrollMinY, mission.scrollMinY);
std::swap(scrollMaxX, mission.scrollMaxX);
std::swap(scrollMaxY, mission.scrollMaxY);
for (unsigned inc = 0; inc < MAX_PLAYERS; inc++)
{
pVoid = (void*)apsDroidLists[inc];
apsDroidLists[inc] = mission.apsDroidLists[inc];
mission.apsDroidLists[inc] = (DROID *)pVoid;
pVoid = (void*)apsStructLists[inc];
apsStructLists[inc] = mission.apsStructLists[inc];
mission.apsStructLists[inc] = (STRUCTURE *)pVoid;
pVoid = (void*)apsFeatureLists[inc];
apsFeatureLists[inc] = mission.apsFeatureLists[inc];
mission.apsFeatureLists[inc] = (FEATURE *)pVoid;
pVoid = (void*)apsFlagPosLists[inc];
apsFlagPosLists[inc] = mission.apsFlagPosLists[inc];
mission.apsFlagPosLists[inc] = (FLAG_POSITION *)pVoid;
pVoid = (void*)apsExtractorLists[inc];
apsExtractorLists[inc] = mission.apsExtractorLists[inc];
mission.apsExtractorLists[inc] = (STRUCTURE *)pVoid;
std::swap(apsDroidLists[inc], mission.apsDroidLists[inc]);
std::swap(apsStructLists[inc], mission.apsStructLists[inc]);
std::swap(apsFeatureLists[inc], mission.apsFeatureLists[inc]);
std::swap(apsFlagPosLists[inc], mission.apsFlagPosLists[inc]);
std::swap(apsExtractorLists[inc], mission.apsExtractorLists[inc]);
}
pVoid = (void*)apsSensorList[0];
apsSensorList[0] = mission.apsSensorList[0];
mission.apsSensorList[0] = (BASE_OBJECT *)pVoid;
pVoid = (void*)apsOilList[0];
apsOilList[0] = mission.apsOilList[0];
mission.apsOilList[0] = (FEATURE *)pVoid;
std::swap(apsSensorList[0], mission.apsSensorList[0]);
std::swap(apsOilList[0], mission.apsOilList[0]);
}
void endMission(void)

22
src/missiondef.h
View File

@ -38,26 +38,26 @@
//this is used to compare the value passed in from the scripts with which is multiplied by 100
#define LZ_COMPROMISED_TIME 99999900
typedef struct _landing_zone
struct LANDING_ZONE
{
uint8_t x1;
uint8_t y1;
uint8_t x2;
uint8_t y2;
} LANDING_ZONE;
};
//storage structure for values that need to be kept between missions
typedef struct _mission
struct MISSION
{
UDWORD type; //defines which start and end functions to use - see levels_type in levels.h
MAPTILE *psMapTiles; //the original mapTiles
UDWORD mapWidth; //the original mapWidth
UDWORD mapHeight; //the original mapHeight
struct _gateway *psGateways; //the gateway list
UDWORD scrollMinX; //scroll coords for original map
UDWORD scrollMinY;
UDWORD scrollMaxX;
UDWORD scrollMaxY;
int32_t mapWidth; //the original mapWidth
int32_t mapHeight; //the original mapHeight
struct _gateway * psGateways; //the gateway list
int32_t scrollMinX; //scroll coords for original map
int32_t scrollMinY;
int32_t scrollMaxX;
int32_t scrollMaxY;
STRUCTURE *apsStructLists[MAX_PLAYERS], *apsExtractorLists[MAX_PLAYERS]; //original object lists
DROID *apsDroidLists[MAX_PLAYERS];
FEATURE *apsFeatureLists[MAX_PLAYERS];
@ -86,6 +86,6 @@ typedef struct _mission
UWORD iTranspExitTileX[MAX_PLAYERS];
UWORD iTranspExitTileY[MAX_PLAYERS];
} MISSION;
};
#endif // __INCLUDED_MISSIONDEF_H__