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

[refactor]

Browse Source 
* spells are now more configurable (unused yet, WiP)
* a few more cleanups
This commit is contained in:
alexvins
2013-01-15 14:20:48 +00:00
parent 264ce77ec9
commit 68e91ada1c
13 changed files with 1202 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Mapping/CMapService.cpp
View File

@ -955,7 +955,7 @@ void CMapLoaderH3M::readDefInfo()
defInfo->visitMap[zi] = reverse(bytes[6 + zi]);
}
pos += 16;
if(defInfo->id != Obj::HERO && defInfo->id != 70)
if(defInfo->id != Obj::HERO && defInfo->id != Obj::RANDOM_HERO)
{
CGDefInfo * h = VLC->dobjinfo->gobjs[defInfo->id][defInfo->subid];
if(!h)
@ -1160,11 +1160,22 @@ void CMapLoaderH3M::readObjects()
case Obj::FLOTSAM:
case Obj::SEA_CHEST:
case Obj::SHIPWRECK_SURVIVOR:
case Obj::TREASURE_CHEST:
{
nobj = new CGPickable();
break;
}
case Obj::TREASURE_CHEST:
if(defInfo->subid == 0)
{
nobj = new CGPickable();
}
else
{
//WoG pickable object
//TODO: possible special handling
nobj = new CGObjectInstance();
}
break;
case Obj::MONSTER: //Monster
case Obj::RANDOM_MONSTER:
case Obj::RANDOM_MONSTER_L1: