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

changed a few hardcoded numbers to enums (better, but still ugly)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6029 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-04-27 22:23:04 +00:00
parent 130acec2e8
commit 54ffaa2624
8 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Multiplayer/client.cpp
+1 -1
View File
@@ -1116,7 +1116,7 @@ void recieveHIRE(RPCParameters *rpcParameters)
gTacticalStatus.Team[MercCreateStruct.bTeam ].bSide=0; gTacticalStatus.Team[MercCreateStruct.bTeam ].bSide=0;
pSoldier->bVisible = 1; pSoldier->bVisible = 1;
if(MercCreateStruct.ubProfile==64)//slay if(MercCreateStruct.ubProfile==SLAY)//slay
{ {
pSoldier->ubBodyType = REGMALE; pSoldier->ubBodyType = REGMALE;
gMercProfiles[ pSoldier->ubProfile ].ubBodyType = REGMALE; gMercProfiles[ pSoldier->ubProfile ].ubBodyType = REGMALE;
Tactical/Interface Dialogue.cpp
+1 -1
View File
@@ -2724,7 +2724,7 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
AddHistoryToPlayersLog( HISTORY_MERC_MARRIED_OFF, pSoldier->ubProfile, GetWorldTotalMin(), gWorldSectorX, gWorldSectorY ); AddHistoryToPlayersLog( HISTORY_MERC_MARRIED_OFF, pSoldier->ubProfile, GetWorldTotalMin(), gWorldSectorX, gWorldSectorY );
// if Flo is going off with Daryl, then set that fact true // if Flo is going off with Daryl, then set that fact true
if( pSoldier->ubProfile == 44 ) if( pSoldier->ubProfile == FLO )
{ {
SetFactTrue( FACT_PC_MARRYING_DARYL_IS_FLO ); SetFactTrue( FACT_PC_MARRYING_DARYL_IS_FLO );
} }
Tactical/Soldier Create.cpp
+1 -1
View File
@@ -733,7 +733,7 @@ SOLDIERTYPE* TacticalCreateSoldier( SOLDIERCREATE_STRUCT *pCreateStruct, UINT8 *
//CHRISL: make sure nails gets his jacket no matter what //CHRISL: make sure nails gets his jacket no matter what
if(pCreateStruct->ubProfile == 34 && pCreateStruct->fCopyProfileItemsOver == FALSE) if(pCreateStruct->ubProfile == 34 && pCreateStruct->fCopyProfileItemsOver == FALSE)
{ {
CreateItem(188, 100, &Soldier.inv[VESTPOS]); CreateItem(LEATHER_JACKET, 100, &Soldier.inv[VESTPOS]);
} }
} }
Tactical/Turn Based Input.cpp
+2 -2
View File
@@ -4461,7 +4461,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
//Heinz: 28.02.09 BUGFIX: giving G41 to Maria only in cheat mode //Heinz: 28.02.09 BUGFIX: giving G41 to Maria only in cheat mode
// Create object and set // Create object and set
CreateItem( (UINT16) G41, 100, &Object ); CreateItem( G41, 100, &Object );
pSoldier = FindSoldierByProfileID( MARIA, FALSE ); pSoldier = FindSoldierByProfileID( MARIA, FALSE );
@@ -4951,7 +4951,7 @@ void MakeSelectedSoldierTired()
INT32 usMapPos; INT32 usMapPos;
if ( GetMouseMapPos( &usMapPos ) ) if ( GetMouseMapPos( &usMapPos ) )
{ {
CreateItem( (UINT16)TNT, 100, &gTempObject ); CreateItem( TNT, 100, &gTempObject );
AddItemToPool( usMapPos, &gTempObject, -1, 0, 0, 0 ); AddItemToPool( usMapPos, &gTempObject, -1, 0, 0, 0 );
} }
TacticalAI/AIMain.cpp
+1 -1
View File
@@ -943,7 +943,7 @@ UINT8 GetMostThreateningOpponent( SOLDIERTYPE *pSoldier )
continue; continue;
// Special stuff for Carmen the bounty hunter // Special stuff for Carmen the bounty hunter
if (pSoldier->aiData.bAttitude == ATTACKSLAYONLY && pTargetSoldier->ubProfile != 64) if (pSoldier->aiData.bAttitude == ATTACKSLAYONLY && pTargetSoldier->ubProfile != SLAY)
{ {
continue; // next opponent continue; // next opponent
} }
TacticalAI/AIUtils.cpp
+4 -4
View File
@@ -1142,7 +1142,7 @@ INT32 ClosestKnownOpponent(SOLDIERTYPE *pSoldier, INT32 * psGridNo, INT8 * pbLev
} }
// Special stuff for Carmen the bounty hunter // Special stuff for Carmen the bounty hunter
if (pSoldier->aiData.bAttitude == ATTACKSLAYONLY && pOpp->ubProfile != 64) if (pSoldier->aiData.bAttitude == ATTACKSLAYONLY && pOpp->ubProfile != SLAY)
{ {
continue; // next opponent continue; // next opponent
} }
@@ -1245,7 +1245,7 @@ INT32 ClosestSeenOpponent(SOLDIERTYPE *pSoldier, INT32 * psGridNo, INT8 * pbLeve
} }
// Special stuff for Carmen the bounty hunter // Special stuff for Carmen the bounty hunter
if (pSoldier->aiData.bAttitude == ATTACKSLAYONLY && pOpp->ubProfile != 64) if (pSoldier->aiData.bAttitude == ATTACKSLAYONLY && pOpp->ubProfile != SLAY)
{ {
continue; // next opponent continue; // next opponent
} }
@@ -1337,7 +1337,7 @@ INT32 ClosestSeenOpponentWithRoof(SOLDIERTYPE *pSoldier, INT32 * psGridNo, INT8
} }
// Special stuff for Carmen the bounty hunter // Special stuff for Carmen the bounty hunter
if (pSoldier->aiData.bAttitude == ATTACKSLAYONLY && pOpp->ubProfile != 64) if (pSoldier->aiData.bAttitude == ATTACKSLAYONLY && pOpp->ubProfile != SLAY)
{ {
continue; // next opponent continue; // next opponent
} }
@@ -2040,7 +2040,7 @@ INT8 CalcMorale(SOLDIERTYPE *pSoldier)
continue; // next merc continue; // next merc
// Special stuff for Carmen the bounty hunter // Special stuff for Carmen the bounty hunter
if (pSoldier->aiData.bAttitude == ATTACKSLAYONLY && pOpponent->ubProfile != 64) if (pSoldier->aiData.bAttitude == ATTACKSLAYONLY && pOpponent->ubProfile != SLAY)
{ {
continue; // next opponent continue; // next opponent
} }
TacticalAI/Attacks.cpp
+2 -2
View File
@@ -747,7 +747,7 @@ void CalcBestThrow(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestThrow)
} }
// Special stuff for Carmen the bounty hunter // Special stuff for Carmen the bounty hunter
if (pSoldier->aiData.bAttitude == ATTACKSLAYONLY && pOpponent->ubProfile != 64) if (pSoldier->aiData.bAttitude == ATTACKSLAYONLY && pOpponent->ubProfile != SLAY)
{ {
continue; // next opponent continue; // next opponent
} }
@@ -1318,7 +1318,7 @@ void CalcBestStab(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestStab, BOOLEAN fBladeAt
continue; // next merc continue; // next merc
// Special stuff for Carmen the bounty hunter // Special stuff for Carmen the bounty hunter
if (pSoldier->aiData.bAttitude == ATTACKSLAYONLY && pOpponent->ubProfile != 64) if (pSoldier->aiData.bAttitude == ATTACKSLAYONLY && pOpponent->ubProfile != SLAY)
continue; // next opponent continue; // next opponent
#ifdef DEBUGATTACKS #ifdef DEBUGATTACKS
TacticalAI/FindLocations.cpp
+3 -2
View File
@@ -29,6 +29,7 @@
#include "lighting.h" #include "lighting.h"
#include "Buildings.h" #include "Buildings.h"
#include "GameSettings.h" #include "GameSettings.h"
#include "Soldier Profile.h"
#endif #endif
#include "PathAIDebug.h" #include "PathAIDebug.h"
@@ -703,7 +704,7 @@ INT32 FindBestNearbyCover(SOLDIERTYPE *pSoldier, INT32 morale, INT32 *piPercentB
} }
// Special stuff for Carmen the bounty hunter // Special stuff for Carmen the bounty hunter
if (pSoldier->aiData.bAttitude == ATTACKSLAYONLY && pOpponent->ubProfile != 64) if (pSoldier->aiData.bAttitude == ATTACKSLAYONLY && pOpponent->ubProfile != SLAY)
{ {
continue; // next opponent continue; // next opponent
} }
@@ -1168,7 +1169,7 @@ INT32 FindSpotMaxDistFromOpponents(SOLDIERTYPE *pSoldier)
} }
// Special stuff for Carmen the bounty hunter // Special stuff for Carmen the bounty hunter
if (pSoldier->aiData.bAttitude == ATTACKSLAYONLY && pOpponent->ubProfile != 64) if (pSoldier->aiData.bAttitude == ATTACKSLAYONLY && pOpponent->ubProfile != SLAY)
{ {
continue; // next opponent continue; // next opponent
} }