games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Move TTeleportExitsList to CObjectHandler.h

Browse Source 
Not a perfect solution, but this is the best location for now.
This commit is contained in:
ArseniyShestakov 2015-12-05 01:14:03 +03:00
parent eced16945e
commit 01c5bc25e5
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/CGameInterface.h
View File

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

4
lib/mapObjects/CObjectHandler.h
View File

@ -22,6 +22,10 @@ class CGObjectInstance;
struct MetaString; struct MetaString;
struct BattleResult; 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 class DLL_LINKAGE IObjectInterface
{ {
public: public:

2
lib/mapObjects/MiscObjects.h
View File

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