games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Merge branch 'develop' into feature/VCMIMapFormat1

Browse Source 
Conflicts:
	lib/CArtHandler.cpp
This commit is contained in:
AlexVinS
2016-01-01 20:28:52 +03:00
parent f33bcee84c 9fd1cff090
commit 37d0dad70a
114 changed files with 1077 additions and 813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mapping/CMap.h
View File

@@ -319,12 +319,12 @@ public:
//Helper lists
std::vector< ConstTransitivePtr<CGHeroInstance> > heroesOnMap;
std::map<TeleportChannelID, shared_ptr<TeleportChannel> > teleportChannels;
std::map<TeleportChannelID, std::shared_ptr<TeleportChannel> > teleportChannels;
/// associative list to identify which hero/creature id belongs to which object id(index for objects)
std::map<si32, ObjectInstanceID> questIdentifierToId;
unique_ptr<CMapEditManager> editManager;
std::unique_ptr<CMapEditManager> editManager;
int3 ***guardingCreaturePositions;