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

- 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
Tactical/Soldier Control.cpp
+1 -1
View File
@@ -9934,7 +9934,7 @@ UINT8 SOLDIERTYPE::SoldierTakeDamage( INT8 bHeight, INT16 sLifeDeduct, INT16 sPo
#ifdef JA2UB
//if the attacker is MORRIS, AND he didnt kill the person
if( Menptr[ ubAttacker ].ubProfile == 75 ) //MORRIS
if( Menptr[ ubAttacker ].ubProfile == MORRIS_UB ) //MORRIS
{
//if the soldier is hurt, but not dead
if( this->stats.bLife < bOldLife && this->stats.bLife > 0 )