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

New tags in CivGroupNames.xml: Side, CustomSide allow setting custom side for civilian group.

Browse Source 
NewEye: fix possible bug.
InitShopKeeperSubTitledText: correctly initialize data.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8764 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2020-02-27 10:51:45 +00:00
parent 9d1ebb6eb9
commit 8b53d273f9
11 changed files with 121 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Create.cpp
+9
View File
@@ -815,6 +815,15 @@ SOLDIERTYPE* TacticalCreateSoldier( SOLDIERCREATE_STRUCT *pCreateStruct, UINT8 *
Soldier.sInsertionGridNo = pCreateStruct->sInsertionGridNo;
Soldier.bOldLife = Soldier.stats.bLifeMax;
// set custom side for civilian group
if (Soldier.bTeam == CIV_TEAM &&
Soldier.ubCivilianGroup != NON_CIV_GROUP &&
zCivGroupName[Soldier.ubCivilianGroup].fCustomSide &&
zCivGroupName[Soldier.ubCivilianGroup].bSide >= 0)
{
Soldier.bSide = zCivGroupName[Soldier.ubCivilianGroup].bSide;
}
// Flugente: disease can affect a soldier's health
// not for us, and not for individual militia (their health is affected by their hourly healing instead)
if ( gGameExternalOptions.fDisease && gGameExternalOptions.fDiseaseStrategic && Soldier.bTeam != OUR_TEAM && Soldier.bTeam != CREATURE_TEAM && !ARMED_VEHICLE((&Soldier)) &&