1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- UB Improvements / Cleanup (by Jazz)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6334 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-08-29 11:53:39 +00:00
parent a5abf4d91a
commit 25dd0b084e
16 changed files with 734 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TacticalAI/NPC.cpp
+72
View File
@@ -53,6 +53,13 @@
#include "Encyclopedia.h"
#ifdef JA2UB
#include "Ja25_Tactical.h"
#include "Ja25_Tactical.h"
#include "ub_config.h"
#endif
//forward declarations of common classes to eliminate includes
class OBJECTTYPE;
class SOLDIERTYPE;
@@ -178,6 +185,71 @@ NPCQuoteInfo * LoadQuoteFile( UINT8 ubNPC )
}
}
#ifdef JA2UB
if ( ubNPC == MANUEL_UB )
{
sprintf( zFileName, "NPCData\\%03d.npc", MANUEL_UB );
}
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 ) )
//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 ) )