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

CGHeroInstance* can be serialized over network even when hero has been defeated. Strongly typed hero type ID introduced.

Browse Source 
Should fix #1260.
This commit is contained in:
Michał W. Urbańczyk
2013-05-18 22:30:48 +00:00
parent f95e6c233b
commit be7c2bd07f
19 changed files with 113 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/mapping/CMap.h
View File

@@ -366,11 +366,17 @@ public:
int3 grailPos;
int grailRadious;
//Central lists of items in game. Position of item in the vectors below is their (instance) id.
std::vector< ConstTransitivePtr<CGObjectInstance> > objects;
std::vector< ConstTransitivePtr<CGHeroInstance> > heroes;
std::vector< ConstTransitivePtr<CGTownInstance> > towns;
std::vector< ConstTransitivePtr<CArtifactInstance> > artInstances;
std::vector< ConstTransitivePtr<CQuest> > quests;
std::vector< ConstTransitivePtr<CGHeroInstance> > allHeroes; //indexed by [hero_type_id]; on map, disposed, prisons, etc.
//Helper lists
std::vector< ConstTransitivePtr<CGHeroInstance> > heroesOnMap;
/// associative list to identify which hero/creature id belongs to which object id(index for objects)
bmap<si32, ObjectInstanceID> questIdentifierToId;
@@ -428,7 +434,7 @@ public:
}
h & customDefs & objects;
h & heroes & towns & artInstances;
h & heroesOnMap & towns & artInstances;
// static members
h & CGTeleport::objs;