mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Merge branch 'master' into ExtraMercs
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
#include "../../TacticalAI/AIInternals.h" // ACTING_ON_SCHEDULE
|
||||
#include "../../TacticalAI/NPC.h" // NPCReachedDestination
|
||||
#include "../../Tactical/Animation Control.h" // defines ANIM_...
|
||||
#include "../../Tactical/Soldier Macros.h" // CREATURE_OR_BLOODCAT
|
||||
#include "../../Tactical/Soldier macros.h" // CREATURE_OR_BLOODCAT
|
||||
#include "../../Tactical/opplist.h" // EndMuzzleFlash
|
||||
#include "../../Tactical/Dialogue Control.h" // DialogueQueueIsEmpty
|
||||
#include "../../TileEngine/Isometric Utils.h" // defines NOWHERE
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#include "../../TacticalAI/AIInternals.h" // DEBUGAIMSG
|
||||
#include "../../Tactical/Soldier Control.h" // For SOLDIERTYPE definition
|
||||
#include "../../Tactical/Animation Data.h" // For the definition of, wait for it... BLOODCAT!
|
||||
#include "soldier macros.h"
|
||||
#include "Soldier macros.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include "../include/LegacyArmedVehiclePlan.h"
|
||||
#include "Soldier Control.h" // definition of SOLDIERTYPE
|
||||
#include "aiinternals.h"
|
||||
#include "AIInternals.h"
|
||||
|
||||
namespace AI
|
||||
{
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include "../../TacticalAI/AIInternals.h" // ACTING_ON_SCHEDULE
|
||||
#include "../../TacticalAI/NPC.h" // NPCReachedDestination
|
||||
#include "../../Tactical/Animation Control.h" // defines ANIM_...
|
||||
#include "../../Tactical/Soldier Macros.h" // CREATURE_OR_BLOODCAT
|
||||
#include "../../Tactical/Soldier macros.h" // CREATURE_OR_BLOODCAT
|
||||
#include "../../Tactical/opplist.h" // EndMuzzleFlash
|
||||
#include "../../Tactical/Dialogue Control.h" // DialogueQueueIsEmpty
|
||||
#include "../../TileEngine/Isometric Utils.h" // defines NOWHERE
|
||||
@@ -12,7 +12,7 @@
|
||||
#include "../../Utils/Font Control.h" // ScreenMsg about deadlock
|
||||
#include "../../Utils/message.h" // ditto
|
||||
#include "../../TileEngine/Render Fun.h" // defines InARoom
|
||||
#include "../../Strategic/quests.h" // IN_BROTHEL
|
||||
#include "../../Strategic/Quests.h" // IN_BROTHEL
|
||||
|
||||
|
||||
void HandleAITacticalTraversal(SOLDIERTYPE* pSoldier); // defined in TacticalAI/AIMain.cpp
|
||||
|
||||
Reference in New Issue
Block a user