diff --git a/data/Memory-ng.xml b/data/Memory-ng.xml index f331c10d2..1db405dae 100644 --- a/data/Memory-ng.xml +++ b/data/Memory-ng.xml @@ -1747,6 +1747,67 @@ + + + + +
+ + +
+ + +
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+ + +
+ + +
+ + + +
+
+ + + +
+
+
+
+
+
+ + +
+ + +
+ + +
+
+
+ + + diff --git a/tools/examples/creaturedump.cpp b/tools/examples/creaturedump.cpp index eb611eefe..dddd6e018 100644 --- a/tools/examples/creaturedump.cpp +++ b/tools/examples/creaturedump.cpp @@ -134,7 +134,7 @@ likeType printLike40d(DFHack::t_like like, const matGlosses & mat,const vector< void printCreature(DFHack::Context * DF, const DFHack::t_creature & creature) { uint32_t dayoflife; - cout << "address: " << hex << creature.origin << dec << " creature type: " << Materials->raceEx[creature.race].rawname + cout << "address: " << hex << creature.origin << dec << ", creature race: " << creature.race << "/" << Materials->raceEx[creature.race].rawname << "[" << Materials->raceEx[creature.race].tile_character << "," << Materials->raceEx[creature.race].tilecolor.fore << "," << Materials->raceEx[creature.race].tilecolor.back @@ -172,7 +172,7 @@ void printCreature(DFHack::Context * DF, const DFHack::t_creature & creature) if(creature.civ) { - cout << "civilization: " << creature.civ; + cout << ", civilization: " << creature.civ; addendl = true; } @@ -191,7 +191,7 @@ void printCreature(DFHack::Context * DF, const DFHack::t_creature & creature) cout << endl; addendl = false; } - cout << "profession: " << mem->getProfession(creature.profession) << "(" << (int) creature.profession << ")"; + cout << ", profession: " << mem->getProfession(creature.profession) << "(" << (int) creature.profession << ")"; if(creature.custom_profession[0]) {