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

Minor code simplification

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8575 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-06-20 20:08:42 +00:00
parent 8469d4398a
commit 8a82dae027
1 changed files with 28 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TacticalAI/NPC.cpp
+28 -96
View File
@@ -159,101 +159,32 @@ NPCQuoteInfo * LoadQuoteFile( UINT8 ubNPC )
if ( ubNPC == PETER || ubNPC == ALBERTO || ubNPC == CARLO ) if ( ubNPC == PETER || ubNPC == ALBERTO || ubNPC == CARLO )
{ {
sprintf( zFileName, "NPCData\\%03d.npc", ubNPC );
if ( ubNPC == PETER ) if ( !FileExists( zFileName ) )
{ {
sprintf( zFileName, "NPCData\\%03d.npc", PETER ); // use a copy of Herve's data file instead!
if ( !FileExists( zFileName ) ) sprintf( zFileName, "NPCData\\%03d.npc", HERVE );
{ }
// use a copy of Herve's data file instead!
sprintf( zFileName, "NPCData\\%03d.npc", HERVE );
}
}
else if ( ubNPC == ALBERTO )
{
sprintf( zFileName, "NPCData\\%03d.npc", ALBERTO );
if ( !FileExists( zFileName ) )
{
// use a copy of Herve's data file instead!
sprintf( zFileName, "NPCData\\%03d.npc", HERVE );
}
}
else if ( ubNPC == CARLO )
{
sprintf( zFileName, "NPCData\\%03d.npc", CARLO );
if ( !FileExists( zFileName ) )
{
// use a copy of Herve's data file instead!
sprintf( zFileName, "NPCData\\%03d.npc", HERVE );
}
}
} }
#ifdef JA2UB #ifdef JA2UB
if ( ubNPC == MANUEL_UB ) if ( ubNPC == MANUEL_UB||
{ ubNPC == BIGGENS_UB ||
sprintf( zFileName, "NPCData\\%03d.npc", MANUEL_UB ); ubNPC == JOHN_K_UB ||
} ubNPC == TEX_UB ||
ubNPC == GASTON_UB ||
ubNPC == STOGIE_UB ||
ubNPC == JERRY_MILO_UB ||
ubNPC == PGMALE4_UB ||
ubNPC == BETTY_UB ||
ubNPC == RAUL_UB ||
ubNPC == MORRIS_UB ||
ubNPC == RUDY_UB )
{
sprintf( zFileName, "NPCData\\%03d.npc", ubNPC );
}
#endif
if ( ubNPC == BIGGENS_UB )
{
sprintf( zFileName, "NPCData\\%03d.npc", BIGGENS_UB );
}
if ( ubNPC == JOHN_K_UB )
{
sprintf( zFileName, "NPCData\\%03d.npc", JOHN_K_UB );
}
if ( ubNPC == TEX_UB )
{
sprintf( zFileName, "NPCData\\%03d.npc", TEX_UB );
}
if ( ubNPC == GASTON_UB )
{
sprintf( zFileName, "NPCData\\%03d.npc", GASTON_UB );
}
if ( ubNPC == STOGIE_UB )
{
sprintf( zFileName, "NPCData\\%03d.npc", STOGIE_UB );
}
if ( ubNPC == JERRY_MILO_UB )
{
sprintf( zFileName, "NPCData\\%03d.npc", JERRY_MILO_UB );
}
if ( ubNPC == PGMALE4_UB )
{
sprintf( zFileName, "NPCData\\%03d.npc", PGMALE4_UB );
}
if ( ubNPC == BETTY_UB )
{
sprintf( zFileName, "NPCData\\%03d.npc", BETTY_UB );
}
if ( ubNPC == RAUL_UB )
{
sprintf( zFileName, "NPCData\\%03d.npc", RAUL_UB );
}
if ( ubNPC == MORRIS_UB )
{
sprintf( zFileName, "NPCData\\%03d.npc", MORRIS_UB );
}
if ( ubNPC == RUDY_UB )
{
sprintf( zFileName, "NPCData\\%03d.npc", RUDY_UB );
}
#endif
//else if ( ubNPC < FIRST_RPC || ubNPC >= GASTON || (ubNPC < FIRST_NPC && gMercProfiles[ ubNPC ].ubMiscFlags & PROFILE_MISC_FLAG_RECRUITED ) ) //else if ( ubNPC < FIRST_RPC || ubNPC >= GASTON || (ubNPC < FIRST_NPC && gMercProfiles[ ubNPC ].ubMiscFlags & PROFILE_MISC_FLAG_RECRUITED ) )
//new profiles by Jazz //new profiles by Jazz
else if ( gProfilesIMP[ubNPC].ProfilId == ubNPC || gProfilesAIM[ubNPC].ProfilId == ubNPC || gProfilesMERC[ubNPC].ProfilId == ubNPC || ( gProfilesRPC[ubNPC].ProfilId == ubNPC && gMercProfiles[ ubNPC ].ubMiscFlags & PROFILE_MISC_FLAG_RECRUITED ) ) else if ( gProfilesIMP[ubNPC].ProfilId == ubNPC || gProfilesAIM[ubNPC].ProfilId == ubNPC || gProfilesMERC[ubNPC].ProfilId == ubNPC || ( gProfilesRPC[ubNPC].ProfilId == ubNPC && gMercProfiles[ ubNPC ].ubMiscFlags & PROFILE_MISC_FLAG_RECRUITED ) )
@@ -267,8 +198,7 @@ NPCQuoteInfo * LoadQuoteFile( UINT8 ubNPC )
#ifdef JA2UB #ifdef JA2UB
//Ja25: No meanwhiles //Ja25: No meanwhiles
#else #else
// ATE: Put some stuff i here to use a different NPC file if we are in a meanwhile..... // ATE: Put some stuff i here to use a different NPC file if we are in a meanwhile.....
if ( AreInMeanwhile( ) ) if ( AreInMeanwhile( ) )
{ {
@@ -277,13 +207,11 @@ NPCQuoteInfo * LoadQuoteFile( UINT8 ubNPC )
{ {
sprintf( zFileName, "NPCData\\%03d.npc", gubAlternateNPCFileNumsForQueenMeanwhiles[ GetMeanwhileID( ) ] ); sprintf( zFileName, "NPCData\\%03d.npc", gubAlternateNPCFileNumsForQueenMeanwhiles[ GetMeanwhileID( ) ] );
} }
// If we are elliot.... // If we are elliot....
if ( ubNPC == ELLIOT ) else if ( ubNPC == ELLIOT )
{ {
sprintf( zFileName, "NPCData\\%03d.npc", gubAlternateNPCFileNumsForElliotMeanwhiles[ GetMeanwhileID( ) ] ); sprintf( zFileName, "NPCData\\%03d.npc", gubAlternateNPCFileNumsForElliotMeanwhiles[ GetMeanwhileID( ) ] );
} }
} }
#endif #endif
CHECKN( FileExists( zFileName ) ); CHECKN( FileExists( zFileName ) );
@@ -1089,8 +1017,10 @@ UINT8 NPCConsiderTalking( UINT8 ubNPC, UINT8 ubMerc, INT8 bApproach, UINT8 ubRec
if (bApproach <= NUM_REAL_APPROACHES) if (bApproach <= NUM_REAL_APPROACHES)
{ {
pNPCProfile = &(gMercProfiles[ubNPC]); pNPCProfile = &(gMercProfiles[ubNPC]);
// What's our willingness to divulge? // What's our willingness to divulge?
ubTalkDesire = CalcDesireToTalk( ubNPC, ubMerc, bApproach ); ubTalkDesire = CalcDesireToTalk( ubNPC, ubMerc, bApproach );
if ( bApproach < NUM_REAL_APPROACHES && !(pNPCProfile->bApproached & gbFirstApproachFlags[bApproach - 1]) ) if ( bApproach < NUM_REAL_APPROACHES && !(pNPCProfile->bApproached & gbFirstApproachFlags[bApproach - 1]) )
{ {
ApproachedForFirstTime( pNPCProfile, bApproach ); ApproachedForFirstTime( pNPCProfile, bApproach );
@@ -1099,8 +1029,10 @@ UINT8 NPCConsiderTalking( UINT8 ubNPC, UINT8 ubMerc, INT8 bApproach, UINT8 ubRec
else if ( ubNPC == PABLO && bApproach == APPROACH_SECTOR_NOT_SAFE ) // for Pablo, consider as threaten else if ( ubNPC == PABLO && bApproach == APPROACH_SECTOR_NOT_SAFE ) // for Pablo, consider as threaten
{ {
pNPCProfile = &(gMercProfiles[ubNPC]); pNPCProfile = &(gMercProfiles[ubNPC]);
// What's our willingness to divulge? // What's our willingness to divulge?
ubTalkDesire = CalcDesireToTalk( ubNPC, ubMerc, APPROACH_THREATEN ); ubTalkDesire = CalcDesireToTalk( ubNPC, ubMerc, APPROACH_THREATEN );
if ( pNPCProfile->bApproached & gbFirstApproachFlags[APPROACH_THREATEN - 1] ) if ( pNPCProfile->bApproached & gbFirstApproachFlags[APPROACH_THREATEN - 1] )
{ {
ApproachedForFirstTime( pNPCProfile, APPROACH_THREATEN ); ApproachedForFirstTime( pNPCProfile, APPROACH_THREATEN );