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

cleaned up code: various stuff (out-of-bounds, null-pointer, uninitialized vars,...) (by CleaningWoman)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6101 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-05-27 20:38:52 +00:00
parent 921394b24c
commit f92f70c78d
39 changed files with 167 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TacticalAI/NPC.cpp
+38 -33
View File
@@ -2328,41 +2328,46 @@ void Converse( UINT8 ubNPC, UINT8 ubMerc, INT8 bApproach, UINT32 uiApproachData
{
pSoldier = FindSoldierByProfileID( ubNPC, FALSE );
// stupid hack CC
if (pSoldier && ubNPC == KYLE)
{
// make sure he has keys
pSoldier->flags.bHasKeys = TRUE;
}
if (pSoldier && pSoldier->sGridNo == pQuotePtr->usGoToGridNo )
{
// search for quotes to trigger immediately!
pSoldier->ubQuoteRecord = ubRecordNum + 1; // add 1 so that the value is guaranteed nonzero
NPCReachedDestination( pSoldier, TRUE );
}
else
{
// turn off cowering
if ( pNPC->flags.uiStatusFlags & SOLDIER_COWERING)
{
//pNPC->flags.uiStatusFlags &= ~SOLDIER_COWERING;
pNPC->EVENT_InitNewSoldierAnim( STANDING, 0 , FALSE );
}
if (pSoldier)
{
// stupid hack CC
if (ubNPC == KYLE)
{
// make sure he has keys
pSoldier->flags.bHasKeys = TRUE;
}
pSoldier->ubQuoteRecord = ubRecordNum + 1; // add 1 so that the value is guaranteed nonzero
if (pSoldier->sGridNo == pQuotePtr->usGoToGridNo )
{
// search for quotes to trigger immediately!
pSoldier->ubQuoteRecord = ubRecordNum + 1; // add 1 so that the value is guaranteed nonzero
NPCReachedDestination( pSoldier, TRUE );
}
else
{
// turn off cowering
if ( pNPC->flags.uiStatusFlags & SOLDIER_COWERING) // FIXME: Dereferencing null pointer
{
//pNPC->flags.uiStatusFlags &= ~SOLDIER_COWERING;
pNPC->EVENT_InitNewSoldierAnim( STANDING, 0 , FALSE );
}
if (pQuotePtr->sActionData == NPC_ACTION_TELEPORT_NPC)
{
BumpAnyExistingMerc( pQuotePtr->usGoToGridNo );
TeleportSoldier( pSoldier, pQuotePtr->usGoToGridNo, FALSE );
// search for quotes to trigger immediately!
NPCReachedDestination( pSoldier, FALSE );
}
else
{
NPCGotoGridNo( ubNPC, pQuotePtr->usGoToGridNo, ubRecordNum );
}
}
pSoldier->ubQuoteRecord = ubRecordNum + 1; // add 1 so that the value is guaranteed nonzero
if (pQuotePtr->sActionData == NPC_ACTION_TELEPORT_NPC)
{
BumpAnyExistingMerc( pQuotePtr->usGoToGridNo );
TeleportSoldier( pSoldier, pQuotePtr->usGoToGridNo, FALSE );
// search for quotes to trigger immediately!
NPCReachedDestination( pSoldier, FALSE );
}
else
{
NPCGotoGridNo( ubNPC, pQuotePtr->usGoToGridNo, ubRecordNum );
}
}
}
}
// Trigger other NPC?