1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Show "No mission available" after starting a mission

Browse Source 
Consume supplies after mission starts
This commit is contained in:
rftrdev
2022-10-14 17:31:07 -07:00
parent c8465baee2
commit 2e17b4ff14
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Rebel Command.cpp
+10 -3
View File
@@ -2118,6 +2118,12 @@ BOOLEAN SetupMissionAgentBox(UINT16 x, UINT16 y, INT8 index)
else if (agentIndex[index] > static_cast<INT8>(mercs.size())) agentIndex[index] = 0; else if (agentIndex[index] > static_cast<INT8>(mercs.size())) agentIndex[index] = 0;
// rftr todo: handle RCAM_NONE (ie, mission prep in progress!) // rftr todo: handle RCAM_NONE (ie, mission prep in progress!)
if (rebelCommandSaveInfo.availableMissions[index] == RCAM_NONE)
{
swprintf(sText, L"No mission available");
DrawTextToScreen(sText, x, y+155, 230, FONT14ARIAL, FONT_MCOLOR_BLACK, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED);
return FALSE;
}
// draw mission title // draw mission title
switch (rebelCommandSaveInfo.availableMissions[index]) switch (rebelCommandSaveInfo.availableMissions[index])
@@ -2513,8 +2519,6 @@ void StartMission(INT8 index)
return; return;
} }
rebelCommandSaveInfo.iSupplies -= cost;
// todo do something with agentIndex[index] and missionIndex[index] (rebelCommandSaveInfo.availableMissions[index]) // todo do something with agentIndex[index] and missionIndex[index] (rebelCommandSaveInfo.availableMissions[index])
// confirmation popup // confirmation popup
std::vector<SOLDIERTYPE*> mercs; std::vector<SOLDIERTYPE*> mercs;
@@ -2673,9 +2677,12 @@ void StartMission(INT8 index)
//AddStrategicEvent(EVENT_REBELCOMMAND, GetWorldTotalMin() + 60 * 24, MissionHelpers::missionParam); //AddStrategicEvent(EVENT_REBELCOMMAND, GetWorldTotalMin() + 60 * 24, MissionHelpers::missionParam);
AddStrategicEvent(EVENT_REBELCOMMAND, GetWorldTotalMin() + 60, MissionHelpers::missionParam); // rftr todo: DELETE ME AddStrategicEvent(EVENT_REBELCOMMAND, GetWorldTotalMin() + 60, MissionHelpers::missionParam); // rftr todo: DELETE ME
missionMap.insert(std::make_pair(static_cast<RebelCommandAgentMissions>(evt.missionId), MissionHelpers::missionParam)); missionMap.insert(std::make_pair(static_cast<RebelCommandAgentMissions>(evt.missionId), MissionHelpers::missionParam));
rebelCommandSaveInfo.iSupplies -= GetMissionCost();
} }
RenderWebsite(); // update the mission list to show that we've started
redraw = TRUE;
}); });
} }
// end website // end website