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

- UB Improvements / Cleanup (by Jazz)

Browse Source 
o Now there are 2 ways to play UB (1.13 and Vanilla): vfs_config.UB113.ini, vfs_config.UBVanilla.ini
o UB: Source Code cleanup: Replaced hardcoded merc profiles with proper ENUMS, ...
o Updated / added UB-Config values


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6330 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-08-28 17:06:43 +00:00
parent ee8d4f6eb9
commit a5abf4d91a
23 changed files with 255 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TileEngine/Explosion Control.cpp
+4 -4
View File
@@ -3560,7 +3560,7 @@ void PerformItemAction( INT32 sGridNo, OBJECTTYPE * pObj )
HavePersonAtGridnoStop( sGridNo );
//Make Biggens run for cover and then detonate the explosives
TriggerNPCRecord( 61 , 17 ); //BIGGENS
TriggerNPCRecord( BIGGENS_UB , 17 ); //BIGGENS
}
break;
@@ -3571,7 +3571,7 @@ void PerformItemAction( INT32 sGridNo, OBJECTTYPE * pObj )
HavePersonAtGridnoStop( sGridNo );
//Have Biggens spit out a warning about the bombs
TriggerNPCRecord( 61, 16 ); //BIGGENS
TriggerNPCRecord( BIGGENS_UB, 16 ); //BIGGENS
}
break;
@@ -5094,10 +5094,10 @@ BOOLEAN ShouldThePlayerStopWhenWalkingOnBiggensActionItem( UINT8 ubRecordNum )
{
SOLDIERTYPE *pSoldier=NULL;
pSoldier = FindSoldierByProfileID( 61, TRUE ); //BIGGENS
pSoldier = FindSoldierByProfileID( BIGGENS_UB, TRUE ); //BIGGENS
//if biggens hasnt said the quote before, or is on the players team
if( HasNpcSaidQuoteBefore( 61, ubRecordNum ) || ( pSoldier != NULL || gMercProfiles[ 61 ].bLife <= 0 ) ) //BIGGENS
if( HasNpcSaidQuoteBefore( BIGGENS_UB, ubRecordNum ) || ( pSoldier != NULL || gMercProfiles[ BIGGENS_UB ].bLife <= 0 ) ) //BIGGENS
{
return( FALSE );
}