Skip to content

Commit

Permalink
Small cleanup of mission code.
Browse files Browse the repository at this point in the history
  • Loading branch information
@perim
perim committed Jan 29, 2013
1 parent 9c3df96 commit 404d4f7
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 100 deletions.
111 changes: 22 additions & 89 deletions src/mission.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
#include "lib/framework/wzapp.h"
#include "lib/framework/math_ext.h"
#include "lib/ivis_opengl/bitimage.h"
#include "lib/ivis_opengl/textdraw.h"
#include "lib/ivis_opengl/piestate.h"
#include "lib/ivis_opengl/pieblitfunc.h"
#include "lib/gamelib/gtime.h"
#include "lib/script/script.h"
Expand Down Expand Up @@ -139,9 +137,6 @@ static LANDING_ZONE sLandingZone[MAX_NOGO_AREAS];
//flag to indicate when the droids in a Transporter are flown to safety and not the next mission
static bool bDroidsToSafety;

/* mission result holder */
static bool g_bMissionResult;

// return positions for vtols
Vector2i asVTOLReturnPos[MAX_PLAYERS];

Expand Down Expand Up @@ -179,14 +174,12 @@ static void adjustMissionPower(void);
static void saveMissionPower(void);
static UDWORD getHomeLandingX(void);
static UDWORD getHomeLandingY(void);
static void fillTimeDisplay(char *psText, UDWORD time, bool bHours);
static void processPreviousCampDroids(void);
static bool intAddTransporterTimer(void);
static void clearCampaignUnits(void);
static void emptyTransporters(bool bOffWorld);

bool MissionResUp = false;
bool ClosingMissionRes = false;

static SDWORD g_iReinforceTime = 0;

Expand Down Expand Up @@ -304,8 +297,6 @@ void releaseMission(void)
//called to shut down when mid-mission on an offWorld map
bool missionShutDown(void)
{
UDWORD inc;

debug(LOG_SAVE, "called, mission is %s", missionIsOffworld() ? "off-world" : "main map");
if (missionIsOffworld())
{
Expand All @@ -318,7 +309,7 @@ bool missionShutDown(void)
releaseAllProxDisp();
gwShutDown();

for (inc = 0; inc < MAX_PLAYERS; inc++)
for (int inc = 0; inc < MAX_PLAYERS; inc++)
{
apsDroidLists[inc] = mission.apsDroidLists[inc];
mission.apsDroidLists[inc] = NULL;
Expand Down Expand Up @@ -597,7 +588,6 @@ void addTransporterTimerInterface(void)
}

#define OFFSCREEN_HEIGHT 600

#define EDGE_SIZE 1

/* pick nearest map edge to point */
Expand Down Expand Up @@ -693,11 +683,9 @@ void missionFlyTransportersIn(SDWORD iPlayer, bool bTrackTransporter)
psTransporter->body = psTransporter->originalBody;

/* set fly-in order */
orderDroidLoc(psTransporter, DORDER_TRANSPORTIN,
iLandX, iLandY, ModeImmediate);
orderDroidLoc(psTransporter, DORDER_TRANSPORTIN, iLandX, iLandY, ModeImmediate);

audio_PlayObjDynamicTrack(psTransporter, ID_SOUND_BLIMP_FLIGHT,
moveCheckDroidMovingAndVisible);
audio_PlayObjDynamicTrack(psTransporter, ID_SOUND_BLIMP_FLIGHT, moveCheckDroidMovingAndVisible);

//only want to fly one transporter in at a time now - AB 14/01/99
break;
Expand Down Expand Up @@ -743,8 +731,7 @@ static void saveMissionData(void)

bRepairExists = false;
//set any structures currently being built to completed for the selected player
for (psStruct = apsStructLists[selectedPlayer]; psStruct != NULL; psStruct =
psStruct->psNext)
for (psStruct = apsStructLists[selectedPlayer]; psStruct; psStruct = psStruct->psNext)
{
if (psStruct->status == SS_BEING_BUILT)
{
Expand All @@ -762,8 +749,7 @@ static void saveMissionData(void)
}
}
//check if have a completed repair facility on home world
if (psStruct->pStructureType->type == REF_REPAIR_FACILITY &&
psStruct->status == SS_BUILT)
if (psStruct->pStructureType->type == REF_REPAIR_FACILITY && psStruct->status == SS_BUILT)
{
bRepairExists = true;
}
Expand All @@ -772,8 +758,7 @@ static void saveMissionData(void)
//repair all droids back at home base if have a repair facility
if (bRepairExists)
{
for (psDroid = apsDroidLists[selectedPlayer]; psDroid != NULL;
psDroid = psDroid->psNext)
for (psDroid = apsDroidLists[selectedPlayer]; psDroid != NULL; psDroid = psDroid->psNext)
{
if (droidIsDamaged(psDroid))
{
Expand Down Expand Up @@ -815,9 +800,6 @@ static void saveMissionData(void)
//save the power settings
saveMissionPower();

//reset before loading in the new game
//resetFactoryNumFlag();

//init before loading in the new game
initFactoryNumFlag();

Expand Down Expand Up @@ -1022,8 +1004,7 @@ void restoreMissionLimboData(void)

/*the droids stored in the mission droid list need to be added back
into the current droid list*/
for (psDroid = mission.apsDroidLists[selectedPlayer]; psDroid != NULL;
psDroid = psNext)
for (psDroid = mission.apsDroidLists[selectedPlayer]; psDroid; psDroid = psNext)
{
psNext = psDroid->psNext;
//remove out of stored list and add to current Droid list
Expand All @@ -1036,15 +1017,13 @@ void restoreMissionLimboData(void)
//the location of the droid should be valid!
}
}
ASSERT(mission.apsDroidLists[selectedPlayer] == NULL,
"restoreMissionLimboData: list should be empty");
ASSERT(mission.apsDroidLists[selectedPlayer] == NULL, "list should be empty");
}

/*Saves the necessary data when moving from one campaign to the start of the
next - saves out the list of droids for the selected player*/
void saveCampaignData(void)
{
UBYTE inc;
DROID *psDroid, *psNext, *psSafeDroid, *psNextSafe, *psCurr, *psCurrNext;

debug(LOG_SAVE, "called");
Expand Down Expand Up @@ -1108,14 +1087,12 @@ void saveCampaignData(void)
reverseObjectList(&mission.apsDroidLists[selectedPlayer]);

//find the *first* transporter
for (psDroid = mission.apsDroidLists[selectedPlayer]; psDroid != NULL;
psDroid = psDroid->psNext)
for (psDroid = mission.apsDroidLists[selectedPlayer]; psDroid; psDroid = psDroid->psNext)
{
if (psDroid->droidType == DROID_TRANSPORTER || psDroid->droidType == DROID_SUPERTRANSPORTER)
{
//fill it with droids from the mission list
for (psSafeDroid = mission.apsDroidLists[selectedPlayer]; psSafeDroid !=
NULL; psSafeDroid = psNextSafe)
for (psSafeDroid = mission.apsDroidLists[selectedPlayer]; psSafeDroid; psSafeDroid = psNextSafe)
{
psNextSafe = psSafeDroid->psNext;
if (psSafeDroid != psDroid)
Expand All @@ -1142,7 +1119,7 @@ void saveCampaignData(void)
}

//clear all other droids
for (inc = 0; inc < MAX_PLAYERS; inc++)
for (int inc = 0; inc < MAX_PLAYERS; inc++)
{
psDroid = apsDroidLists[inc];

Expand Down Expand Up @@ -1289,9 +1266,7 @@ static bool startMissionBetween(void)
//check no units left with any settings that are invalid
static void clearCampaignUnits(void)
{
DROID *psDroid;

for (psDroid = apsDroidLists[selectedPlayer]; psDroid != NULL; psDroid = psDroid->psNext)
for (DROID *psDroid = apsDroidLists[selectedPlayer]; psDroid; psDroid = psDroid->psNext)
{
orderDroid(psDroid, DORDER_STOP, ModeImmediate);
setDroidBase(psDroid, NULL);
Expand Down Expand Up @@ -2022,49 +1997,19 @@ UDWORD missionGetReinforcementTime(void)
}

//fills in a hours(if bHours = true), minutes and seconds display for a given time in 1000th sec
void fillTimeDisplay(char *psText, UDWORD time, bool bHours)
static void fillTimeDisplay(char *psText, UDWORD time, bool bHours)
{
UDWORD calcTime, inc = 0;

//this is only for the transporter timer - never have hours!
if (time == LZ_COMPROMISED_TIME)
{
psText[inc++] = (UBYTE)('-');
psText[inc++] = (UBYTE)('-');
//seperator
psText[inc++] = (UBYTE)(':');
psText[inc++] = (UBYTE)('-');
psText[inc++] = (UBYTE)('-');
//terminate the timer text
psText[inc] = '\0';
strcpy(psText, "--:--");
}
else
{

if (bHours)
{
//hours
calcTime = time / (60 * 60 * GAME_TICKS_PER_SEC);
psText[inc++] = (UBYTE)('0' + calcTime / 10);
psText[inc++] = (UBYTE)('0' + calcTime % 10);
time -= (calcTime * (60 * 60 * GAME_TICKS_PER_SEC));
//seperator
psText[inc++] = (UBYTE)(':');
}
//minutes
calcTime = time / (60 * GAME_TICKS_PER_SEC);
psText[inc++] = (UBYTE)('0' + calcTime / 10);
psText[inc++] = (UBYTE)('0' + calcTime % 10);
time -= (calcTime * (60 * GAME_TICKS_PER_SEC));
//seperator
psText[inc++] = (UBYTE)(':');
//seconds
calcTime = time / GAME_TICKS_PER_SEC;
psText[inc++] = (UBYTE)('0' + calcTime / 10);
psText[inc++] = (UBYTE)('0' + calcTime % 10);
//terminate the timer text
psText[inc] = '\0';

struct tm tmp;
time_t secs = time / GAME_TICKS_PER_SEC;
localtime_r(&secs, &tmp);
strftime(psText, WIDG_MAXSTR, bHours ? "%T" : "%R", &tmp);
}
}

Expand Down Expand Up @@ -2456,9 +2401,6 @@ static bool _intAddMissionResult(bool result, bool bPlaySuccess)

bool intAddMissionResult(bool result, bool bPlaySuccess)
{
/* save result */
g_bMissionResult = result;

return _intAddMissionResult(result, bPlaySuccess);
}

Expand All @@ -2471,7 +2413,6 @@ void intRemoveMissionResultNoAnim(void)
cdAudio_Stop();

MissionResUp = false;
ClosingMissionRes = false;
intMode = INT_NORMAL;

//reset the pauses
Expand Down Expand Up @@ -2842,16 +2783,12 @@ UWORD getLandingY(SDWORD iPlayer)
//returns the x coord for where the Transporter can land back at home base
UDWORD getHomeLandingX(void)
{
//return world_coord((mission.homeLZ.x1 + (mission.homeLZ.x2 -
// mission.homeLZ.x1)/2));
return map_coord(mission.homeLZ_X);
}

//returns the y coord for where the Transporter can land back at home base
UDWORD getHomeLandingY(void)
{
//return world_coord(mission.homeLZ.y1 + (mission.homeLZ.y2 -
// mission.homeLZ.y1)/2);
return map_coord(mission.homeLZ_Y);
}

Expand Down Expand Up @@ -3074,6 +3011,7 @@ void setDroidsToSafetyFlag(bool set)
{
bDroidsToSafety = set;
}

bool getDroidsToSafetyFlag(void)
{
return bDroidsToSafety;
Expand All @@ -3085,6 +3023,7 @@ void setPlayCountDown(UBYTE set)
{
bPlayCountDown = set;
}

bool getPlayCountDown(void)
{
return bPlayCountDown;
Expand All @@ -3094,18 +3033,14 @@ bool getPlayCountDown(void)
//checks to see if the player has any droids (except Transporters left)
bool missionDroidsRemaining(UDWORD player)
{
bool bDroidsRemaining = false;
for (DROID *psDroid = apsDroidLists[player]; psDroid != NULL; psDroid = psDroid->psNext)
{
if (psDroid->droidType != DROID_TRANSPORTER && psDroid->droidType != DROID_SUPERTRANSPORTER)
{
bDroidsRemaining = true;
//don't bother looking for more
break;
return true;
}
}

return bDroidsRemaining;
return false;
}

/*called when a Transporter gets to the edge of the world and the droids are
Expand Down Expand Up @@ -3166,8 +3101,6 @@ void resetMissionWidgets(void)
{
addTransporterTimerInterface();
}
//if not a reinforceable mission and a transporter exists, then add the launch button
//if (!missionCanReEnforce())
//check not a typical reinforcement mission
else if (!missionForReInforcements())
{
Expand Down
1 change: 0 additions & 1 deletion src/mission.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ extern void swapMissionPointers(void);

// status of the mission result screens.
extern bool MissionResUp;
extern bool ClosingMissionRes;

extern void intRemoveMissionResult(void);
extern void intRemoveMissionResultNoAnim(void);
Expand Down
13 changes: 3 additions & 10 deletions src/transporter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#include "lib/framework/math_ext.h"
#include "lib/widget/label.h"
#include "lib/widget/widget.h"
#include "lib/ivis_opengl/textdraw.h"

#include "stats.h"
#include "hci.h"
Expand All @@ -53,9 +52,6 @@
#include "selection.h"
#include "lib/sound/audio.h"
#include "lib/sound/audio_id.h"
// FIXME Direct iVis implementation include!
#include "lib/framework/fixedpoint.h"
#include "lib/ivis_opengl/piematrix.h"
#include "mapgrid.h"
#include "visibility.h"
#include "multiplay.h"
Expand Down Expand Up @@ -147,7 +143,7 @@ static void intRemoveTransContentNoAnim(void);
static bool intAddTransButtonForm(void);
static bool intAddTransContentsForm(void);
static bool intAddDroidsAvailForm(void);
void intRemoveTransContent(void);
static void intRemoveTransContent(void);
static DROID *transInterfaceDroidList(void);
static void intTransporterAddDroid(UDWORD id);
static void intRemoveTransDroidsAvail(void);
Expand Down Expand Up @@ -375,7 +371,6 @@ bool intAddTransporterContents(void)
sButFInit.width = iV_GetImageWidth(IntImages, IMAGE_LAUNCHUP);
sButFInit.height = iV_GetImageHeight(IntImages, IMAGE_LAUNCHUP);
sButFInit.pTip = _("Launch Transport");
//sButInit.pText = "Launch";
sButFInit.pDisplay = intDisplayImageHilight;

sButFInit.UserData = PACKDWORD_TRI(0, IMAGE_LAUNCHDOWN, IMAGE_LAUNCHUP);
Expand Down Expand Up @@ -519,8 +514,7 @@ bool intAddTransButtonForm(void)
}

//set the number of tabs required
sFormInit.numMajor = numForms((OBJ_BUTWIDTH + OBJ_GAP) * numButtons,
OBJ_WIDTH - OBJ_GAP);
sFormInit.numMajor = numForms((OBJ_BUTWIDTH + OBJ_GAP) * numButtons, OBJ_WIDTH - OBJ_GAP);

sFormInit.pUserData = &StandardTab;
sFormInit.pTabDisplay = intDisplayTab;
Expand Down Expand Up @@ -1408,8 +1402,7 @@ bool checkTransporterSpace(DROID const *psTransporter, DROID const *psAssigned,

//work out how much space is currently left
capacity = TRANSPORTER_CAPACITY;
for (psDroid = psTransporter->psGroup->psList; psDroid != NULL && psDroid !=
psTransporter; psDroid = psNext)
for (psDroid = psTransporter->psGroup->psList; psDroid != NULL && psDroid != psTransporter; psDroid = psNext)
{
psNext = psDroid->psGrpNext;
capacity -= transporterSpaceRequired(psDroid);
Expand Down

3 comments on commit 404d4f7

@perim
Copy link
Member Author

@perim perim commented on 404d4f7 Jan 30, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uhh. This is standard C89. Try adding a #include <time.h> ?

@perim
Copy link
Member Author

@perim perim commented on 404d4f7 Jan 30, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

include bracket time.h bracket end. stupid html filter.

@perim
Copy link
Member Author

@perim perim commented on 404d4f7 Jan 31, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, can change it to use localtime() instead. We are not using threads in that part of the code anyway.

Please sign in to comment.