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

- Fixed compilation error for JA2UB define (by anv)

Browse Source 
- Added missing string to _FrenchText.cpp
- Renamed the "#if (defined JA2UB)" to "#ifdef JA2UB" so we are consistent through the code


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6719 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-12-28 18:27:09 +00:00
parent 5bf82b9d82
commit 44cf72a2e0
37 changed files with 78 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Hourly Update.cpp
+11 -7
View File
@@ -42,13 +42,13 @@ void HourlyStealUpdate(); // Flugente: certain characters might steal equipment
extern INT32 GetCurrentBalance( void );
extern void PayOffSkyriderDebtIfAny( );
#if (defined JA2UB)
#ifdef JA2UB
//no UB
#else
void HourlyCheckIfSlayAloneSoHeCanLeave();
#endif
#if (defined JA2UB)
#ifdef JA2UB
//no UB
#else
void HourlyHelicopterRepair();
@@ -113,7 +113,7 @@ CHAR16 zString[128];
HourlyStealUpdate();
#if (defined JA2UB)
#ifdef JA2UB
// no UB
#else
HourlyCheckIfSlayAloneSoHeCanLeave();
@@ -121,13 +121,17 @@ CHAR16 zString[128];
// WDS - New AI
HourlyCheckStrategicAI();
#ifdef JA2UB
// no UB
#else
PayOffSkyriderDebtIfAny();
HourlyHelicopterRepair();
#endif
if ( GetWorldHour() % 6 == 0 ) // 4 times a day
{
UpdateRegenCounters();
{ UpdateRegenCounters();
}
// WANNE: This check should avoid the resaving of a loaded auto-save game, when entering tactical
@@ -548,7 +552,7 @@ void HourlyStealUpdate()
}
}
#if (defined JA2UB)
#ifdef JA2UB
// no JA25 UB
#else
void HourlyCheckIfSlayAloneSoHeCanLeave()
@@ -578,7 +582,7 @@ void HourlyCheckIfSlayAloneSoHeCanLeave()
}
#endif
#if (defined JA2UB)
#ifdef JA2UB
// no JA25 UB
#else
void HourlyHelicopterRepair()