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

************************************************************

Browse Source 
* Merged Source Code from Development Trunk: Revision 4063 *
************************************************************
- Source Code is merged from: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- This will be the Source for the Beta 2011 Test

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-01-18 09:11:09 +00:00
parent 44e1646410
commit 91087ca8c0
469 changed files with 118108 additions and 24678 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Boxing.cpp
+16 -1
View File
@@ -24,6 +24,7 @@
#include "Animation Data.h"
#include "Font Control.h"
#include "message.h"
#include "GameSettings.h" // added by SANDRO
#endif
INT32 gsBoxerGridNo[ NUM_BOXERS ] = { 11393, 11233, 11073 };
@@ -386,10 +387,24 @@ BOOLEAN PickABoxer( void )
pBoxer->stats.bDexterity = __min( 100, pBoxer->stats.bDexterity + gubBoxersRests * 5 );
pBoxer->stats.bAgility = __min( 100, pBoxer->stats.bAgility + gubBoxersRests * 5 );
pBoxer->stats.bLifeMax = __min( 100, pBoxer->stats.bLifeMax + gubBoxersRests * 5 );
// give the 2nd boxer Hand to hand - SANDRO
if ( (uiLoop == NUM_BOXERS - 2) )
{
if (gGameOptions.fNewTraitSystem) // SANDRO - traits
pBoxer->stats.ubSkillTraits[0] = MARTIAL_ARTS_NT;
else
pBoxer->stats.ubSkillTraits[0] = HANDTOHAND_OT;
}
// give the 3rd boxer martial arts
if ( (uiLoop == NUM_BOXERS - 1) && pBoxer->ubBodyType == REGMALE )
{
pBoxer->stats.ubSkillTrait1 = MARTIALARTS;
if (gGameOptions.fNewTraitSystem) // SANDRO - traits
{
pBoxer->stats.ubSkillTraits[0] = MARTIAL_ARTS_NT;
pBoxer->stats.ubSkillTraits[1] = MARTIAL_ARTS_NT;
}
else
pBoxer->stats.ubSkillTraits[0] = MARTIALARTS_OT;
}
return( TRUE );
}