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

**********************************************************

Browse Source 
** Big Maps Projects code (incl. Multiplayer v1.5 **
**********************************************************
- Merged Big Maps Project code from BMP+MP trunk (Revision: 3340)
o Complete SVN Revision history: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- Before THIS merge, I made a branch of the existing 1.13 source
o SVN Branch: https://81.169.133.124/source/ja2/branches/JA2_rev.3336/src
- Removed old VS 6.0 and VS 2003 project and solutions files, because compilation is broken long time ago
- I will add VS 2010 projects and solution file in the next few days

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3341 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2010-02-28 18:38:52 +00:00
parent a98c44ac78
commit 14750c6903
461 changed files with 23615 additions and 120157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Strategic AI.cpp
+6 -6
View File
@@ -249,7 +249,7 @@ void ValidateWeights( INT32 iID );
void ValidateGroup( GROUP *pGroup );
void ValidateLargeGroup( GROUP *pGroup );
extern BOOLEAN TeleportSoldier( SOLDIERTYPE *pSoldier, INT16 sGridNo, BOOLEAN fForce );
extern BOOLEAN TeleportSoldier( SOLDIERTYPE *pSoldier, INT32 sGridNo, BOOLEAN fForce );
//The army composition defines attributes for the various garrisons. The priority reflects how important the sector is
@@ -900,7 +900,7 @@ void ValidatePlayersAreInOneGroupOnly()
pSoldier = MercPtrs[ i ];
if( !pSoldier->bActive || !pSoldier->stats.bLife || !pSoldier->ubGroupID )
if( !pSoldier || !pSoldier->bActive || !pSoldier->stats.bLife || !pSoldier->ubGroupID )
{ //non-existant, dead, or in no group (don't care, skip to next merc)
continue;
}
@@ -4570,7 +4570,7 @@ void HourlyCheckStrategicAI()
#include "VFS/vfs.h"
#include "VFS/Tools/Log.h"
static CLog& s_stratD = *CLog::Create(L"Strategic Decisions.txt", true);
static CLog& s_stratD = *CLog::create(L"Strategic Decisions.txt", true);
void LogStrategicMsg( STR8 str, ... )
{
@@ -4590,7 +4590,7 @@ void LogStrategicMsg( STR8 str, ... )
#ifndef USE_VFS
fprintf( fp, "%s\n", string );
#else
s_stratD << string << CLog::endl;
s_stratD << string << CLog::ENDL;
#endif
if( gfDisplayStrategicAILogs )
@@ -4626,7 +4626,7 @@ void LogStrategicEvent( STR8 str, ... )
fprintf( fp, "\n%S:\n", WORLDTIMESTR );
fprintf( fp, "%s\n", string );
#else
s_stratD.Endl() << WORLDTIMESTR << ":" << CLog::endl << string << CLog::endl;
s_stratD.endl() << WORLDTIMESTR << ":" << CLog::ENDL << string << CLog::ENDL;
#endif
if( gfDisplayStrategicAILogs )
{
@@ -4653,7 +4653,7 @@ void ClearStrategicLog()
fclose( fp );
#else
s_stratD.Flush();
s_stratD.flush();
#endif
}
#endif