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

Space Viking's many mercs changes plus numerous generic bug fixes

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2498 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
SpaceViking
2009-01-15 01:26:13 +00:00
parent f64f58fbf8
commit f26095d86f
138 changed files with 3493 additions and 3265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TacticalAI/NPC.cpp
+14 -14
View File
@@ -327,7 +327,7 @@ BOOLEAN ReloadQuoteFileIfLoaded( UINT8 ubNPC )
BOOLEAN RefreshNPCScriptRecord( UINT8 ubNPC, UINT8 ubRecord )
{
UINT8 ubLoop;
UINT8 ubLoop;
NPCQuoteInfo * pNewArray;
if ( ubNPC == NO_PROFILE )
@@ -460,7 +460,7 @@ BOOLEAN ReloadCivQuoteFileIfLoaded( UINT8 ubIndex )
void ShutdownNPCQuotes( void )
{
UINT8 ubLoop;
UINT8 ubLoop;
for ( ubLoop = 0; ubLoop < NUM_PROFILES; ubLoop++ )
{
@@ -618,7 +618,7 @@ UINT8 CalcDesireToTalk( UINT8 ubNPC, UINT8 ubMerc, INT8 bApproach )
void ApproachedForFirstTime( MERCPROFILESTRUCT * pNPCProfile, INT8 bApproach )
{
UINT8 ubLoop;
UINT8 ubLoop;
UINT32 uiTemp;
pNPCProfile->bApproached |= gbFirstApproachFlags[bApproach - 1];
@@ -1499,7 +1499,7 @@ void ReplaceLocationInNPCDataFromProfileID( UINT8 ubNPC, INT16 sOldGridNo, INT16
void ResetOncePerConvoRecords( NPCQuoteInfo * pNPCQuoteInfoArray )
{
UINT8 ubLoop;
UINT8 ubLoop;
for ( ubLoop = 0; ubLoop < NUM_NPC_QUOTE_RECORDS; ubLoop++ )
{
@@ -1522,7 +1522,7 @@ void ResetOncePerConvoRecordsForNPC( UINT8 ubNPC )
void ResetOncePerConvoRecordsForAllNPCsInLoadedSector( void )
{
UINT8 ubLoop;
UINT8 ubLoop;
if ( gWorldSectorX == 0 || gWorldSectorY == 0 )
{
@@ -2314,7 +2314,7 @@ void NPCReachedDestination( SOLDIERTYPE * pNPC, BOOLEAN fAlreadyThere )
UINT8 ubNPC;
NPCQuoteInfo * pQuotePtr;
NPCQuoteInfo * pNPCQuoteInfoArray;
UINT8 ubLoop;
UINT8 ubLoop;
UINT8 ubQuoteRecord;
if ( pNPC->ubQuoteRecord == 0 )
@@ -2441,7 +2441,7 @@ void TriggerNPCRecordImmediately( UINT8 ubTriggerNPC, UINT8 ubTriggerNPCRec )
void PCsNearNPC( UINT8 ubNPC )
{
UINT8 ubLoop;
UINT8 ubLoop;
NPCQuoteInfo * pNPCQuoteInfoArray;
SOLDIERTYPE *pSoldier;
NPCQuoteInfo * pQuotePtr;
@@ -2482,7 +2482,7 @@ void PCsNearNPC( UINT8 ubNPC )
BOOLEAN PCDoesFirstAidOnNPC( UINT8 ubNPC )
{
UINT8 ubLoop;
UINT8 ubLoop;
NPCQuoteInfo * pNPCQuoteInfoArray;
SOLDIERTYPE *pSoldier;
NPCQuoteInfo * pQuotePtr;
@@ -2573,7 +2573,7 @@ BOOLEAN TriggerNPCWithIHateYouQuote( UINT8 ubTriggerNPC )
NPCQuoteInfo * pNPCQuoteInfoArray;
NPCQuoteInfo *pQuotePtr;
BOOLEAN fDisplayDialogue = TRUE;
UINT8 ubLoop;
UINT8 ubLoop;
if (EnsureQuoteFileLoaded( ubTriggerNPC ) == FALSE)
{
@@ -2605,7 +2605,7 @@ BOOLEAN NPCHasUnusedRecordWithGivenApproach( UINT8 ubNPC, UINT8 ubApproach )
// Check if we have a quote that could be used
NPCQuoteInfo * pNPCQuoteInfoArray;
NPCQuoteInfo *pQuotePtr;
UINT8 ubLoop;
UINT8 ubLoop;
if (EnsureQuoteFileLoaded( ubNPC ) == FALSE)
{
@@ -2633,7 +2633,7 @@ BOOLEAN NPCHasUnusedHostileRecord( UINT8 ubNPC, UINT8 ubApproach )
// Check if we have a quote that could be used
NPCQuoteInfo * pNPCQuoteInfoArray;
NPCQuoteInfo *pQuotePtr;
UINT8 ubLoop;
UINT8 ubLoop;
if (EnsureQuoteFileLoaded( ubNPC ) == FALSE)
{
@@ -2696,7 +2696,7 @@ BOOLEAN GetInfoForAbandoningEPC( UINT8 ubNPC, UINT16 * pusQuoteNum, UINT16 * pus
// Check if we have a quote that could be used
NPCQuoteInfo * pNPCQuoteInfoArray;
NPCQuoteInfo *pQuotePtr;
UINT8 ubLoop;
UINT8 ubLoop;
if (EnsureQuoteFileLoaded( ubNPC ) == FALSE)
{
@@ -2725,7 +2725,7 @@ BOOLEAN TriggerNPCWithGivenApproach( UINT8 ubTriggerNPC, UINT8 ubApproach, BOOLE
NPCQuoteInfo * pNPCQuoteInfoArray;
NPCQuoteInfo *pQuotePtr;
BOOLEAN fDisplayDialogue = TRUE;
UINT8 ubLoop;
UINT8 ubLoop;
if (EnsureQuoteFileLoaded( ubTriggerNPC ) == FALSE)
{
@@ -3383,7 +3383,7 @@ BOOLEAN RecordHasDialogue( UINT8 ubNPC, UINT8 ubRecord )
INT8 FindCivQuoteFileIndex( INT16 sSectorX, INT16 sSectorY, INT16 sSectorZ )
{
UINT8 ubLoop;
UINT8 ubLoop;
if ( sSectorZ > 0 )
{