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

replaced a few hardcoded numbers with enums/ini setting

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6047 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-05-01 17:03:31 +00:00
parent e508e91cff
commit 6cbcc995de
4 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameSettings.cpp
+1 -1
View File
@@ -2286,7 +2286,7 @@ void LoadModSettings(){
gModSettings.ubOmertaDropOffZ = iniReader.ReadInteger("Gear Dropoff", "OMERTA_DROPOFF_Z", 0); gModSettings.ubOmertaDropOffZ = iniReader.ReadInteger("Gear Dropoff", "OMERTA_DROPOFF_Z", 0);
gModSettings.iOmertaDropOff = iniReader.ReadInteger("Gear Dropoff", "OMERTA_DROPOFF_GRIDNO", 4868); gModSettings.iOmertaDropOff = iniReader.ReadInteger("Gear Dropoff", "OMERTA_DROPOFF_GRIDNO", 4868);
gModSettings.sRocketRifleGridNo = iniReader.ReadInteger("Alma", "ROCKETRIFLE_POSITION", 10472);
} }
INT16 DynamicAdjustAPConstants(INT16 iniReadValue, INT16 iniDefaultValue, BOOLEAN reverse) INT16 DynamicAdjustAPConstants(INT16 iniReadValue, INT16 iniDefaultValue, BOOLEAN reverse)
{ {
GameSettings.h
+2
View File
@@ -1661,6 +1661,8 @@ typedef struct
UINT8 ubOmertaDropOffZ; UINT8 ubOmertaDropOffZ;
INT32 iOmertaDropOff; INT32 iOmertaDropOff;
INT32 sRocketRifleGridNo;
}MOD_SETTINGS; }MOD_SETTINGS;
extern MOD_SETTINGS gModSettings; extern MOD_SETTINGS gModSettings;
Strategic/Quests.cpp
+12 -12
View File
@@ -732,7 +732,7 @@ BOOLEAN CheckFact( UINT16 usFact, UINT8 ubProfileID )
gubFact[FACT_IRA_NOT_PRESENT] = !CheckNPCWithin( ubProfileID, IRA, 10 ); gubFact[FACT_IRA_NOT_PRESENT] = !CheckNPCWithin( ubProfileID, IRA, 10 );
break; break;
case FACT_IRA_TALKING: case FACT_IRA_TALKING:
gubFact[FACT_IRA_TALKING] = ( gubSrcSoldierProfile == 59 ); gubFact[FACT_IRA_TALKING] = ( gubSrcSoldierProfile == IRA );
break; break;
case FACT_IRA_UNHIRED_AND_ALIVE: case FACT_IRA_UNHIRED_AND_ALIVE:
if ( gMercProfiles[ IRA ].bMercStatus != MERC_IS_DEAD && CheckNPCSector( IRA, 10, 1, 1) && !(gMercProfiles[IRA].ubMiscFlags & PROFILE_MISC_FLAG_RECRUITED) ) if ( gMercProfiles[ IRA ].bMercStatus != MERC_IS_DEAD && CheckNPCSector( IRA, 10, 1, 1) && !(gMercProfiles[IRA].ubMiscFlags & PROFILE_MISC_FLAG_RECRUITED) )
@@ -787,22 +787,22 @@ BOOLEAN CheckFact( UINT16 usFact, UINT8 ubProfileID )
case FACT_BRENDA_IN_STORE_AND_ALIVE: case FACT_BRENDA_IN_STORE_AND_ALIVE:
// ensure alive // ensure alive
if ( gMercProfiles[ 85 ].bMercStatus == MERC_IS_DEAD) if ( gMercProfiles[ BRENDA ].bMercStatus == MERC_IS_DEAD)
{ {
gubFact[FACT_BRENDA_IN_STORE_AND_ALIVE] = FALSE; gubFact[FACT_BRENDA_IN_STORE_AND_ALIVE] = FALSE;
} }
// ensure in a building and nearby // ensure in a building and nearby
else if ( !(NPCInRoom( 85, gModSettings.usPornShopRoomBrenda ) ) ) else if ( !(NPCInRoom( BRENDA, gModSettings.usPornShopRoomBrenda ) ) )
{ {
gubFact[FACT_BRENDA_IN_STORE_AND_ALIVE] = FALSE; gubFact[FACT_BRENDA_IN_STORE_AND_ALIVE] = FALSE;
} }
else else
{ {
gubFact[FACT_BRENDA_IN_STORE_AND_ALIVE] = CheckNPCWithin( ubProfileID, 85, 12 ); gubFact[FACT_BRENDA_IN_STORE_AND_ALIVE] = CheckNPCWithin( ubProfileID, BRENDA, 12 );
} }
break; break;
case FACT_BRENDA_DEAD: case FACT_BRENDA_DEAD:
gubFact[FACT_BRENDA_DEAD] = (gMercProfiles[ 85 ].bMercStatus == MERC_IS_DEAD); gubFact[FACT_BRENDA_DEAD] = (gMercProfiles[ BRENDA ].bMercStatus == MERC_IS_DEAD);
break; break;
case FACT_NPC_IS_ENEMY: case FACT_NPC_IS_ENEMY:
gubFact[FACT_NPC_IS_ENEMY] = CheckNPCIsEnemy( ubProfileID ) || gMercProfiles[ ubProfileID ].ubMiscFlags2 & PROFILE_MISC_FLAG2_NEEDS_TO_SAY_HOSTILE_QUOTE; gubFact[FACT_NPC_IS_ENEMY] = CheckNPCIsEnemy( ubProfileID ) || gMercProfiles[ ubProfileID ].ubMiscFlags2 & PROFILE_MISC_FLAG2_NEEDS_TO_SAY_HOSTILE_QUOTE;
@@ -813,7 +813,7 @@ BOOLEAN CheckFact( UINT16 usFact, UINT8 ubProfileID )
break; break;
*/ */
case FACT_SPIKE_AT_DOOR: case FACT_SPIKE_AT_DOOR:
gubFact[FACT_SPIKE_AT_DOOR] = CheckNPCAt( 93, 9817 ); gubFact[FACT_SPIKE_AT_DOOR] = CheckNPCAt( SPIKE, 9817 );
break; break;
case FACT_WOUNDED_MERCS_NEARBY: case FACT_WOUNDED_MERCS_NEARBY:
gubFact[usFact] = (NumWoundedMercsNearby( ubProfileID ) > 0); gubFact[usFact] = (NumWoundedMercsNearby( ubProfileID ) > 0);
@@ -825,7 +825,7 @@ BOOLEAN CheckFact( UINT16 usFact, UINT8 ubProfileID )
gubFact[usFact] = (NumWoundedMercsNearby( ubProfileID ) > 1); gubFact[usFact] = (NumWoundedMercsNearby( ubProfileID ) > 1);
break; break;
case FACT_HANS_AT_SPOT: case FACT_HANS_AT_SPOT:
gubFact[usFact] = CheckNPCAt( 117, gModSettings.iHansGridNo ); gubFact[usFact] = CheckNPCAt( HANS, gModSettings.iHansGridNo );
break; break;
case FACT_MULTIPLE_MERCS_CLOSE: case FACT_MULTIPLE_MERCS_CLOSE:
gubFact[usFact] = ( NumMercsNear( ubProfileID, 3 ) > 1 ); gubFact[usFact] = ( NumMercsNear( ubProfileID, 3 ) > 1 );
@@ -855,13 +855,13 @@ BOOLEAN CheckFact( UINT16 usFact, UINT8 ubProfileID )
gubFact[usFact] = CheckTalkerFemale(); gubFact[usFact] = CheckTalkerFemale();
break; break;
case FACT_CARMEN_IN_C5: case FACT_CARMEN_IN_C5:
gubFact[usFact] = CheckNPCSector( 78, 5, MAP_ROW_C, 0 ); gubFact[usFact] = CheckNPCSector( CARMEN, 5, MAP_ROW_C, 0 );
break; break;
case FACT_JOEY_IN_C5: case FACT_JOEY_IN_C5:
gubFact[usFact] = CheckNPCSector( 90, 5, MAP_ROW_C, 0 ); gubFact[usFact] = CheckNPCSector( JOEY, 5, MAP_ROW_C, 0 );
break; break;
case FACT_JOEY_NEAR_MARTHA: case FACT_JOEY_NEAR_MARTHA:
gubFact[usFact] = CheckNPCWithin( 90, 109, 5 ) && ( CheckGuyVisible( MARTHA, JOEY ) || CheckGuyVisible( JOEY, MARTHA ) ); gubFact[usFact] = CheckNPCWithin( JOEY, MARTHA, 5 ) && ( CheckGuyVisible( MARTHA, JOEY ) || CheckGuyVisible( JOEY, MARTHA ) );
break; break;
case FACT_JOEY_DEAD: case FACT_JOEY_DEAD:
gubFact[usFact] = gMercProfiles[ JOEY ].bMercStatus == MERC_IS_DEAD; gubFact[usFact] = gMercProfiles[ JOEY ].bMercStatus == MERC_IS_DEAD;
@@ -882,7 +882,7 @@ BOOLEAN CheckFact( UINT16 usFact, UINT8 ubProfileID )
gubFact[usFact] = ( gWorldSectorX == 13 && gWorldSectorY == MAP_ROW_C && gbWorldSectorZ == 0 ); gubFact[usFact] = ( gWorldSectorX == 13 && gWorldSectorY == MAP_ROW_C && gbWorldSectorZ == 0 );
break; break;
case FACT_CARMEN_HAS_TEN_THOUSAND: case FACT_CARMEN_HAS_TEN_THOUSAND:
gubFact[usFact] = ( gMercProfiles[ 78 ].uiMoney >= 10000 ); gubFact[usFact] = ( gMercProfiles[ CARMEN ].uiMoney >= 10000 );
break; break;
case FACT_SLAY_IN_SECTOR: case FACT_SLAY_IN_SECTOR:
gubFact[usFact] = (gMercProfiles[ SLAY ].sSectorX == gWorldSectorX && gMercProfiles[ SLAY ].sSectorY == gWorldSectorY && gMercProfiles[ SLAY ].bSectorZ == gbWorldSectorZ ); gubFact[usFact] = (gMercProfiles[ SLAY ].sSectorX == gWorldSectorX && gMercProfiles[ SLAY ].sSectorY == gWorldSectorY && gMercProfiles[ SLAY ].bSectorZ == gbWorldSectorZ );
@@ -1160,7 +1160,7 @@ BOOLEAN CheckFact( UINT16 usFact, UINT8 ubProfileID )
break; break;
case FACT_ROCKET_RIFLE_EXISTS: case FACT_ROCKET_RIFLE_EXISTS:
gubFact[usFact] = ItemTypeExistsAtLocation( 10472, ROCKET_RIFLE, 0, NULL ); gubFact[usFact] = ItemTypeExistsAtLocation( gModSettings.sRocketRifleGridNo, ROCKET_RIFLE, 0, NULL );
break; break;
case FACT_PABLO_ALIVE: case FACT_PABLO_ALIVE:
Tactical/Dialogue Control.cpp
+4 -4
View File
@@ -1988,15 +1988,15 @@ CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
ubFileNumID = ubCharacterNum; ubFileNumID = ubCharacterNum;
// ATE: If we are merc profile ID #151-154, all use 151's data.... // ATE: If we are merc profile ID #151-154, all use 151's data....
if ( ubCharacterNum >= 151 && ubCharacterNum <= 154 ) if ( ubCharacterNum >= HERVE && ubCharacterNum <= CARLO )
{ {
ubFileNumID = 151; ubFileNumID = HERVE;
} }
// If we are character #155, check fact! // If we are character #155, check fact!
if ( ubCharacterNum == 155 && !gubFact[ 220 ] ) if ( ubCharacterNum == MANNY && !gubFact[ FACT_MANNY_IS_BARTENDER ] )
{ {
ubFileNumID = 155; ubFileNumID = MANNY;
} }
if ( fWavFile ) if ( fWavFile )