1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00

first part of town configuration:

- moved almost all loading to TownHandler
- CBuildings and CStructures are now part of CTown
- merged hall.json into buildings.json

Should not cause any crashes or glitches
This commit is contained in:
Ivan Savenko
2012-09-02 10:33:41 +00:00
parent 3e346e737a
commit 44cc848edc
23 changed files with 816 additions and 786 deletions

View File

@@ -87,7 +87,7 @@ void LibClasses::init()
tlog0<<"\tCreature handler: "<<pomtime.getDiff()<<std::endl;
townh = new CTownHandler;
townh->loadStructures();
townh->load();
tlog0<<"\tTown handler: "<<pomtime.getDiff()<<std::endl;
objh = new CObjectHandler;
@@ -98,10 +98,6 @@ void LibClasses::init()
dobjinfo->load();
tlog0<<"\tDef information handler: "<<pomtime.getDiff()<<std::endl;
buildh = new CBuildingHandler;
buildh->loadBuildings();
tlog0<<"\tBuilding handler: "<<pomtime.getDiff()<<std::endl;
spellh = new CSpellHandler;
spellh->loadSpells();
tlog0<<"\tSpell handler: "<<pomtime.getDiff()<<std::endl;
@@ -118,7 +114,6 @@ void LibClasses::clear()
delete townh;
delete objh;
delete dobjinfo;
delete buildh;
delete spellh;
delete modh;
makeNull();
@@ -133,7 +128,6 @@ void LibClasses::makeNull()
townh = NULL;
objh = NULL;
dobjinfo = NULL;
buildh = NULL;
spellh = NULL;
modh = NULL;
}