From f8c164fddedc7662fede6ee32c5e4fb3932998e0 Mon Sep 17 00:00:00 2001 From: Giel van Schijndel Date: Sun, 15 Apr 2007 14:15:31 +0000 Subject: [PATCH] * Fix inconsistent newlines and set svn:eol-style to native in lib/ and src/ git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1465 4a71c877-e1ca-e34f-864e-861f7616d084 --- lib/framework/macros.h | 20 ++++----- src/aiexperience.h | 100 ++++++++++++++++++++--------------------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/lib/framework/macros.h b/lib/framework/macros.h index 618b661ec..4d7e9bd11 100644 --- a/lib/framework/macros.h +++ b/lib/framework/macros.h @@ -17,13 +17,13 @@ along with Warzone 2100; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/*! \file macros.h - * \brief Various macro definitions - */ -#ifndef MACROS_H -#define MACROS_H - -#define MIN(a, b) (((a) < (b)) ? (a) : (b)) -#define MAX(a, b) (((a) < (b)) ? (b) : (a)) - -#endif // MACROS_H +/*! \file macros.h + * \brief Various macro definitions + */ +#ifndef MACROS_H +#define MACROS_H + +#define MIN(a, b) (((a) < (b)) ? (a) : (b)) +#define MAX(a, b) (((a) < (b)) ? (b) : (a)) + +#endif // MACROS_H diff --git a/src/aiexperience.h b/src/aiexperience.h index e0b0a379b..5f3dcf9e3 100644 --- a/src/aiexperience.h +++ b/src/aiexperience.h @@ -17,53 +17,53 @@ along with Warzone 2100; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -//aiexperience.h -#define MAX_OIL_ENTRIES 600 //(Max number of derricks or oil resources) / 2 - -#define MAX_OIL_DEFEND_LOCATIONS 100 //max number of attack locations to store -#define MAX_OIL_LOCATIONS 300 //max number of oil locations to store -#define MAX_BASE_DEFEND_LOCATIONS 30 //max number of base locations to store -#define SAME_LOC_RANGE 8 //if within this range, consider it the same loc - -extern SDWORD baseLocation[MAX_PLAYERS][MAX_PLAYERS][2]; -extern SDWORD oilLocation[MAX_PLAYERS][MAX_OIL_LOCATIONS][2]; -extern SDWORD baseDefendLocation[MAX_PLAYERS][MAX_BASE_DEFEND_LOCATIONS][2]; -extern SDWORD oilDefendLocation[MAX_PLAYERS][MAX_OIL_DEFEND_LOCATIONS][2]; - -extern SDWORD baseDefendLocPrior[MAX_PLAYERS][MAX_BASE_DEFEND_LOCATIONS]; -extern SDWORD oilDefendLocPrior[MAX_PLAYERS][MAX_OIL_DEFEND_LOCATIONS]; - -extern BOOL SavePlayerAIExperience(SDWORD nPlayer, BOOL bNotify); -extern BOOL LoadPlayerAIExperience(SDWORD nPlayer, BOOL bNotify); - -extern BOOL LoadAIExperience(BOOL bNotify); -extern BOOL SaveAIExperience(BOOL bNotify); - - -extern BOOL ExperienceRecallOil(SDWORD nPlayer); -extern void InitializeAIExperience(void); -extern BOOL OilResourceAt(UDWORD OilX,UDWORD OilY, SDWORD VisibleToPlayer); - -extern BOOL ReadAISaveData(SDWORD nPlayer); -extern BOOL WriteAISaveData(SDWORD nPlayer); - -extern BOOL SetUpInputFile(SDWORD nPlayer); -extern BOOL SetUpOutputFile(SDWORD nPlayer); - -extern BOOL StoreBaseDefendLoc(SDWORD x, SDWORD y, SDWORD nPlayer); -extern BOOL StoreOilDefendLoc(SDWORD x, SDWORD y, SDWORD nPlayer); - -extern BOOL SortBaseDefendLoc(SDWORD nPlayer); -extern BOOL SortOilDefendLoc(SDWORD nPlayer); - -extern SDWORD GetOilDefendLocIndex(SDWORD x, SDWORD y, SDWORD nPlayer); -extern SDWORD GetBaseDefendLocIndex(SDWORD x, SDWORD y, SDWORD nPlayer); - -extern BOOL CanRememberPlayerBaseLoc(SDWORD lookingPlayer, SDWORD enemyPlayer); -extern BOOL CanRememberPlayerBaseDefenseLoc(SDWORD player, SDWORD index); -extern BOOL CanRememberPlayerOilDefenseLoc(SDWORD player, SDWORD index); - -extern void BaseExperienceDebug(SDWORD nPlayer); -extern void OilExperienceDebug(SDWORD nPlayer); - -extern BOOL canRecallOilAt(SDWORD nPlayer, SDWORD x, SDWORD y); +//aiexperience.h +#define MAX_OIL_ENTRIES 600 //(Max number of derricks or oil resources) / 2 + +#define MAX_OIL_DEFEND_LOCATIONS 100 //max number of attack locations to store +#define MAX_OIL_LOCATIONS 300 //max number of oil locations to store +#define MAX_BASE_DEFEND_LOCATIONS 30 //max number of base locations to store +#define SAME_LOC_RANGE 8 //if within this range, consider it the same loc + +extern SDWORD baseLocation[MAX_PLAYERS][MAX_PLAYERS][2]; +extern SDWORD oilLocation[MAX_PLAYERS][MAX_OIL_LOCATIONS][2]; +extern SDWORD baseDefendLocation[MAX_PLAYERS][MAX_BASE_DEFEND_LOCATIONS][2]; +extern SDWORD oilDefendLocation[MAX_PLAYERS][MAX_OIL_DEFEND_LOCATIONS][2]; + +extern SDWORD baseDefendLocPrior[MAX_PLAYERS][MAX_BASE_DEFEND_LOCATIONS]; +extern SDWORD oilDefendLocPrior[MAX_PLAYERS][MAX_OIL_DEFEND_LOCATIONS]; + +extern BOOL SavePlayerAIExperience(SDWORD nPlayer, BOOL bNotify); +extern BOOL LoadPlayerAIExperience(SDWORD nPlayer, BOOL bNotify); + +extern BOOL LoadAIExperience(BOOL bNotify); +extern BOOL SaveAIExperience(BOOL bNotify); + + +extern BOOL ExperienceRecallOil(SDWORD nPlayer); +extern void InitializeAIExperience(void); +extern BOOL OilResourceAt(UDWORD OilX,UDWORD OilY, SDWORD VisibleToPlayer); + +extern BOOL ReadAISaveData(SDWORD nPlayer); +extern BOOL WriteAISaveData(SDWORD nPlayer); + +extern BOOL SetUpInputFile(SDWORD nPlayer); +extern BOOL SetUpOutputFile(SDWORD nPlayer); + +extern BOOL StoreBaseDefendLoc(SDWORD x, SDWORD y, SDWORD nPlayer); +extern BOOL StoreOilDefendLoc(SDWORD x, SDWORD y, SDWORD nPlayer); + +extern BOOL SortBaseDefendLoc(SDWORD nPlayer); +extern BOOL SortOilDefendLoc(SDWORD nPlayer); + +extern SDWORD GetOilDefendLocIndex(SDWORD x, SDWORD y, SDWORD nPlayer); +extern SDWORD GetBaseDefendLocIndex(SDWORD x, SDWORD y, SDWORD nPlayer); + +extern BOOL CanRememberPlayerBaseLoc(SDWORD lookingPlayer, SDWORD enemyPlayer); +extern BOOL CanRememberPlayerBaseDefenseLoc(SDWORD player, SDWORD index); +extern BOOL CanRememberPlayerOilDefenseLoc(SDWORD player, SDWORD index); + +extern void BaseExperienceDebug(SDWORD nPlayer); +extern void OilExperienceDebug(SDWORD nPlayer); + +extern BOOL canRecallOilAt(SDWORD nPlayer, SDWORD x, SDWORD y);