1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fix: recent code additions broke savegame compatibility. Some code now also works for UB, as otherwise code gets needlessly complicated.

Browse Source 
- Improved code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6260 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-07-30 18:02:53 +00:00
parent b53fe0cd72
commit 5742725c19
5 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/mercs.cpp
+7 -10
View File
@@ -2616,15 +2616,12 @@ void HandleSpeckWitnessingEmployeeDeath( SOLDIERTYPE* pSoldier ) // anv: handle
#endif
#ifdef JA2UB
#else
void AddJohnAsMerc() // anv: add John as playable merc after escorting Kulbas out of country
{
LaptopSaveInfo.bJohnEscorted = TRUE;
LaptopSaveInfo.uiJohnEscortedDate = GetWorldDay();
return;
}
#endif
void AddJohnAsMerc() // anv: add John as playable merc after escorting Kulbas out of country
{
LaptopSaveInfo.bJohnEscorted = TRUE;
LaptopSaveInfo.uiJohnEscortedDate = GetWorldDay();
return;
}
BOOLEAN ShouldSpeckSayAQuote()
{
@@ -2817,7 +2814,7 @@ BOOLEAN ShouldTheMercSiteServerGoDown()
#else
void GetMercSiteBackOnline()
{
if( IsSpeckComAvailable )
if( IsSpeckComAvailable() )
{
//Add an email telling the user the site is back up
AddEmail( MERC_NEW_SITE_ADDRESS, MERC_NEW_SITE_ADDRESS_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1, -1 , TYPE_EMAIL_EMAIL_EDT);