1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00

Merge branch 'develop' into feature/VCMIMapFormat1

This commit is contained in:
AlexVinS
2015-12-05 13:04:04 +03:00
29 changed files with 425 additions and 85 deletions

View File

@@ -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: