Merge branch 'master' into decideaction

This commit is contained in:
Asdow
2025-12-25 18:58:41 +02:00
853 changed files with 134439 additions and 148932 deletions
+10 -10
View File
@@ -1,32 +1,32 @@
#include "ai.h"
#include "AIInternals.h"
#include "Isometric utils.h"
#include "Isometric Utils.h"
#include "Points.h"
#include "overhead.h"
#include "Overhead.h"
#include "opplist.h"
#include "items.h"
#include "Items.h"
#include "Weapons.h"
#include "NPC.h"
#include "Soldier Functions.h"
#include "worldman.h"
#include "Scheduling.h"
#include "Message.h"
#include "message.h"
#include "Structure Wrap.h"
#include "Keys.h"
#include "pathai.h"
#include "PATHAI.H"
#include "Render Fun.h"
#include "Boxing.h"
// #include "Air Raid.h"
#include "Soldier Profile.h"
#include "soldier profile type.h"
#include "Soldier macros.h"
#include "los.h"
#include "LOS.h"
#include "Buildings.h"
#include "strategicmap.h"
#include "Quests.h"
#include "Map Screen Interface Map.h"
#include "soldier ani.h"
#include "rotting corpses.h"
#include "Soldier Ani.h"
#include "Rotting Corpses.h"
#include "GameSettings.h"
#include "Dialogue Control.h"
#include "connect.h"
@@ -571,7 +571,7 @@ INT8 ZombieDecideActionRed(SOLDIERTYPE *pSoldier)
INT8 bInWater, bInDeepWater;
INT8 bSeekPts = 0, bHelpPts = 0, bWatchPts = 0;
BOOLEAN fClimb;
UINT8 ubThreatID = NOBODY;
UINT16 ubThreatID = NOBODY;
INT32 sThreatSpot = NOWHERE;
INT8 bThreatLevel = 0;
@@ -910,7 +910,7 @@ INT8 ZombieDecideActionBlack(SOLDIERTYPE *pSoldier)
INT8 bWeaponIn;
BOOLEAN fClimb;
INT32 iDummy;
UINT8 ubThreatID = NOBODY;
UINT16 ubThreatID = NOBODY;
INT32 sThreatSpot = NOWHERE;
INT8 bThreatLevel = 0;