Fixes to materials.

develop
Petr Mrázek 2011-07-22 02:44:36 +02:00
parent 131c32494a
commit 7325808c98
2 changed files with 6 additions and 6 deletions

@ -209,7 +209,7 @@ namespace DFHack
std::vector<int16_t> strand_chances; std::vector<int16_t> strand_chances;
public: public:
t_matglossInorganic(); //t_matglossInorganic();
bool isOre(); bool isOre();
bool isGem(); bool isGem();

@ -835,31 +835,31 @@ bool Maps::SortBlockEvents(uint32_t x, uint32_t y, uint32_t z, vector <t_vein *>
if(!off.vein_ice_vptr && cname == "block_square_event_frozen_liquidst") if(!off.vein_ice_vptr && cname == "block_square_event_frozen_liquidst")
{ {
off.vein_ice_vptr = type; off.vein_ice_vptr = type;
Core::getInstance().con.printerr("%s %x\n",cname.c_str(), type); //Core::getInstance().con.printerr("%s %x\n",cname.c_str(), type);
goto retry; goto retry;
} }
else if(!off.vein_mineral_vptr &&cname == "block_square_event_mineralst") else if(!off.vein_mineral_vptr &&cname == "block_square_event_mineralst")
{ {
off.vein_mineral_vptr = type; off.vein_mineral_vptr = type;
Core::getInstance().con.printerr("%s %x\n",cname.c_str(), type); //Core::getInstance().con.printerr("%s %x\n",cname.c_str(), type);
goto retry; goto retry;
} }
else if(!off.vein_spatter_vptr && cname == "block_square_event_material_spatterst") else if(!off.vein_spatter_vptr && cname == "block_square_event_material_spatterst")
{ {
off.vein_spatter_vptr = type; off.vein_spatter_vptr = type;
Core::getInstance().con.printerr("%s %x\n",cname.c_str(), type); //Core::getInstance().con.printerr("%s %x\n",cname.c_str(), type);
goto retry; goto retry;
} }
else if(!off.vein_grass_vptr && cname=="block_square_event_grassst") else if(!off.vein_grass_vptr && cname=="block_square_event_grassst")
{ {
off.vein_grass_vptr = type; off.vein_grass_vptr = type;
Core::getInstance().con.printerr("%s %x\n",cname.c_str(), type); //Core::getInstance().con.printerr("%s %x\n",cname.c_str(), type);
goto retry; goto retry;
} }
else if(!off.vein_worldconstruction_vptr && cname=="block_square_event_world_constructionst") else if(!off.vein_worldconstruction_vptr && cname=="block_square_event_world_constructionst")
{ {
off.vein_worldconstruction_vptr = type; off.vein_worldconstruction_vptr = type;
Core::getInstance().con.printerr("%s %x\n",cname.c_str(), type); //Core::getInstance().con.printerr("%s %x\n",cname.c_str(), type);
goto retry; goto retry;
} }
#ifdef DEBUG #ifdef DEBUG