From ac41de351534fe2cb06ba0ee93ad759ffb66c5a8 Mon Sep 17 00:00:00 2001 From: SpaceViking Date: Fri, 15 Jun 2007 03:01:57 +0000 Subject: [PATCH] Update inventory arrays to be vectors. Add class for inventory. Change some structs that use inventories to classes to provide constructors, destructors, etc. Note that with this update all file operations should still be compatible with previous files. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@972 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Utils/Event Pump.cpp | 1 - Utils/Music Control.cpp | 1 - Utils/Timer Control.cpp | 1 - Utils/XML_Strings.cpp | 4 +--- 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Utils/Event Pump.cpp b/Utils/Event Pump.cpp index d9e7aa84..882b7f5c 100644 --- a/Utils/Event Pump.cpp +++ b/Utils/Event Pump.cpp @@ -9,7 +9,6 @@ #include "wcheck.h" #include "Event Pump.h" #include "Timer.h" - #include "Soldier Control.h" #include "Sound Control.h" #include "Overhead.h" #include "weapons.h" diff --git a/Utils/Music Control.cpp b/Utils/Music Control.cpp index c0c572da..49106fc6 100644 --- a/Utils/Music Control.cpp +++ b/Utils/Music Control.cpp @@ -8,7 +8,6 @@ #include "gamescreen.h" #include "jascreens.h" #include "Creature Spreading.h" - #include "soldier control.h" #include "overhead.h" #include "timer control.h" #include "strategicmap.h" diff --git a/Utils/Timer Control.cpp b/Utils/Timer Control.cpp index 22da562c..f5a9f7d3 100644 --- a/Utils/Timer Control.cpp +++ b/Utils/Timer Control.cpp @@ -8,7 +8,6 @@ #include "wcheck.h" #include "stdlib.h" #include "debug.h" - #include "Soldier Control.h" #include "Timer Control.h" #include "overhead.h" #include "handle items.h" diff --git a/Utils/XML_Strings.cpp b/Utils/XML_Strings.cpp index 51564e94..8fbb91d4 100644 --- a/Utils/XML_Strings.cpp +++ b/Utils/XML_Strings.cpp @@ -1,10 +1,9 @@ -#ifdef PRECOMPILEDHEADERS +#ifdef JA2_PRECOMPILEDHEADERS #include "Tactical All.h" #else #include "sgp.h" #include "overhead types.h" #include "Sound Control.h" - #include "Soldier Control.h" #include "overhead.h" #include "Event Pump.h" #include "weapons.h" @@ -24,7 +23,6 @@ #include "campaign.h" #include "items.h" #include "text.h" - #include "Soldier Profile.h" #include "tile animation.h" #include "Dialogue Control.h" #include "SkillCheck.h"