1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-25 00:37:24 +02:00

* enum serialization/deserialization (si32 as basetype ought to be enough for anybody)

* some fields in classes refactored to use appropriate enums (not yet finished)
This commit is contained in:
mateuszb
2013-02-01 22:04:25 +00:00
parent 096b0d6a36
commit c4e03ef0de
16 changed files with 135 additions and 103 deletions

View File

@ -1312,7 +1312,7 @@ void CMapLoaderH3M::readObjects()
{
CGScholar * sch = new CGScholar();
nobj = sch;
sch->bonusType = buffer[pos++];
sch->bonusType = static_cast<CGScholar::EBonusType>(buffer[pos++]);
sch->bonusID = buffer[pos++];
pos += 6;
break;
@ -2046,7 +2046,7 @@ CGSeerHut * CMapLoaderH3M::readSeerHut()
{
ui8 rewardType = buffer[pos];
++pos;
hut->rewardType = rewardType;
hut->rewardType = static_cast<CGSeerHut::ERewardType>(rewardType);
switch(rewardType)
{
@ -2151,7 +2151,7 @@ CGSeerHut * CMapLoaderH3M::readSeerHut()
void CMapLoaderH3M::readQuest(IQuestObject * guard)
{
guard->quest->missionType = buffer[pos];
guard->quest->missionType = static_cast<CQuest::Emission>(buffer[pos]);
++pos;
switch(guard->quest->missionType)