games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-03 13:01:33 +02:00
Code Issues Releases Activity

Fixed #552

Browse Source
This commit is contained in:
Michał W. Urbańczyk 2010-07-28 10:46:36 +00:00
parent f004cbff3f
commit cc96374a40
3 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/CPreGame.cpp
View File

@ -10,6 +10,7 @@
#include "CGameInfo.h"
#include "CCursorHandler.h"
#include "../hch/CDefHandler.h"
#include "../hch/CDefObjInfoHandler.h"
#include "../hch/CGeneralTextHandler.h"
#include "../hch/CLodHandler.h"
#include "../hch/CTownHandler.h"

2
hch/CObjectHandler.h
View File

@ -207,7 +207,7 @@ public:
template <typename Handler> void serialize(Handler &h, const int version)
{
h & hoverName & pos & ID & subID & id & animPhaseShift & tempOwner & blockVisit;
h & hoverName & pos & ID & subID & id & animPhaseShift & tempOwner & blockVisit & defInfo;
//definfo is handled by map serializer
}
};

98
lib/map.h
View File

@ -329,42 +329,44 @@ struct DLL_EXPORT Mapa : public CMapHeader
for (int k = 0; k <= twoLevel ; k++)
h & terrain[i][j][k];
}
h & defy & objects;
//definfos
std::vector<CGDefInfo*> defs;
// //definfos
// std::vector<CGDefInfo*> defs;
//
// if(h.saving) //create vector with all defs used on map
// {
// for(unsigned int i=0; i<objects.size(); i++)
// if(objects[i])
// objects[i]->defInfo->serial = -1; //set serial to serial -1 - indicates that def is not present in defs vector
//
// for(unsigned int i=0; i<objects.size(); i++)
// {
// if(!objects[i]) continue;
// CGDefInfo *cur = objects[i]->defInfo;
// if(cur->serial < 0)
// {
// cur->serial = defs.size();
// defs.push_back(cur);
// }
// }
// }
//
// h & ((h.saving) ? defs : defy);
if(h.saving) //create vector with all defs used on map
{
for(unsigned int i=0; i<objects.size(); i++)
if(objects[i])
objects[i]->defInfo->serial = -1; //set serial to serial -1 - indicates that def is not present in defs vector
for(unsigned int i=0; i<objects.size(); i++)
{
if(!objects[i]) continue;
CGDefInfo *cur = objects[i]->defInfo;
if(cur->serial < 0)
{
cur->serial = defs.size();
defs.push_back(cur);
}
}
}
h & ((h.saving) ? defs : defy);
//objects
if(h.saving)
{
ui32 hlp = objects.size();
h & hlp;
}
else
{
ui32 hlp;
h & hlp;
objects.resize(hlp);
}
// //objects
// if(h.saving)
// {
// ui32 hlp = objects.size();
// h & hlp;
// }
// else
// {
// ui32 hlp;
// h & hlp;
// objects.resize(hlp);
// }
//static members
h & CGTeleport::objs;
@ -375,20 +377,20 @@ struct DLL_EXPORT Mapa : public CMapHeader
h & CGObelisk::obeliskCount & CGObelisk::visited;
h & CGTownInstance::merchantArtifacts;
for(unsigned int i=0; i<objects.size(); i++)
{
CGObjectInstance *&obj = objects[i];
h & obj;
if (obj)
{
si32 shlp;
//definfo
h & (h.saving ? (shlp=obj->defInfo->serial) : shlp); //read / write pos of definfo in defs vector
if(!h.saving)
obj->defInfo = defy[shlp];
}
}
// for(unsigned int i=0; i<objects.size(); i++)
// {
// CGObjectInstance *&obj = objects[i];
// h & obj;
//
// if (obj)
// {
// si32 shlp;
// //definfo
// h & (h.saving ? (shlp=obj->defInfo->serial) : shlp); //read / write pos of definfo in defs vector
// if(!h.saving)
// obj->defInfo = defy[shlp];
// }
// }
if(!h.saving)
{