Browse Source

Move TTeleportExitsList to CObjectHandler.h

Not a perfect solution, but this is the best location for now.
ArseniyShestakov 10 years ago
parent
commit
01c5bc25e5
3 changed files with 5 additions and 3 deletions
  1. 1 1
      lib/CGameInterface.h
  2. 4 0
      lib/mapObjects/CObjectHandler.h
  3. 0 2
      lib/mapObjects/MiscObjects.h

+ 1 - 1
lib/CGameInterface.h

@@ -7,7 +7,7 @@
 
 #include "spells/ViewSpellInt.h"
 
-#include "mapObjects/MiscObjects.h"
+#include "mapObjects/CObjectHandler.h"
 
 /*
  * CGameInterface.h, part of VCMI engine

+ 4 - 0
lib/mapObjects/CObjectHandler.h

@@ -22,6 +22,10 @@ class CGObjectInstance;
 struct MetaString;
 struct BattleResult;
 
+// This one teleport-specific, but has to be available everywhere in callbacks and netpacks
+// For now it's will be there till teleports code refactored and moved into own file
+typedef std::vector<std::pair<ObjectInstanceID, int3>> TTeleportExitsList;
+
 class DLL_LINKAGE IObjectInterface
 {
 public:

+ 0 - 2
lib/mapObjects/MiscObjects.h

@@ -247,8 +247,6 @@ public:
 	ui32 defaultResProduction();
 };
 
-typedef std::vector<std::pair<ObjectInstanceID, int3>> TTeleportExitsList;
-
 struct DLL_LINKAGE TeleportChannel
 {
 	enum EPassability {UNKNOWN, IMPASSABLE, PASSABLE};