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

changed a few hardcoded numbers to enums (better, but still ugly)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6029 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-04-27 22:23:04 +00:00
parent 130acec2e8
commit 54ffaa2624
8 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface Dialogue.cpp
+1 -1
View File
@@ -2724,7 +2724,7 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
AddHistoryToPlayersLog( HISTORY_MERC_MARRIED_OFF, pSoldier->ubProfile, GetWorldTotalMin(), gWorldSectorX, gWorldSectorY );
// if Flo is going off with Daryl, then set that fact true
if( pSoldier->ubProfile == 44 )
if( pSoldier->ubProfile == FLO )
{
SetFactTrue( FACT_PC_MARRYING_DARYL_IS_FLO );
}
Tactical/Soldier Create.cpp
+1 -1
View File
@@ -733,7 +733,7 @@ SOLDIERTYPE* TacticalCreateSoldier( SOLDIERCREATE_STRUCT *pCreateStruct, UINT8 *
//CHRISL: make sure nails gets his jacket no matter what
if(pCreateStruct->ubProfile == 34 && pCreateStruct->fCopyProfileItemsOver == FALSE)
{
CreateItem(188, 100, &Soldier.inv[VESTPOS]);
CreateItem(LEATHER_JACKET, 100, &Soldier.inv[VESTPOS]);
}
}
Tactical/Turn Based Input.cpp
+2 -2
View File
@@ -4461,7 +4461,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
//Heinz: 28.02.09 BUGFIX: giving G41 to Maria only in cheat mode
// Create object and set
CreateItem( (UINT16) G41, 100, &Object );
CreateItem( G41, 100, &Object );
pSoldier = FindSoldierByProfileID( MARIA, FALSE );
@@ -4951,7 +4951,7 @@ void MakeSelectedSoldierTired()
INT32 usMapPos;
if ( GetMouseMapPos( &usMapPos ) )
{
CreateItem( (UINT16)TNT, 100, &gTempObject );
CreateItem( TNT, 100, &gTempObject );
AddItemToPool( usMapPos, &gTempObject, -1, 0, 0, 0 );
}