MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Infinite loop fix related to block events. Added traction bench to known buildings.

develop
Petr Mrázek 2010-04-11 13:03:00 +02:00
parent 7e0a560574
commit 5ef87773be
2 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dfhack/modules/Maps.cpp
Unescape Escape View File

@ -378,21 +378,28 @@ try_again:
} }
else else
{ {
if(g_pProcess->readClassName(type) == "block_square_event_frozen_liquidst") string cname = g_pProcess->readClassName(type);
if(ices && cname == "block_square_event_frozen_liquidst")
{ {
off.vein_ice_vptr = type; off.vein_ice_vptr = type;
goto try_again; goto try_again;
} }
else if(g_pProcess->readClassName(type) == "block_square_event_mineralst") else if(veins && cname == "block_square_event_mineralst")
{ {
off.vein_mineral_vptr = type; off.vein_mineral_vptr = type;
goto try_again; goto try_again;
} }
else if(g_pProcess->readClassName(type) == "block_square_event_material_spatterst") else if(splatter && cname == "block_square_event_material_spatterst")
{ {
off.vein_spatter_vptr = type; off.vein_spatter_vptr = type;
goto try_again; goto try_again;
} }
#ifdef DEBUG
else
{
cerr << "unknown vein " << cname << endl;
}
#endif
// or it was something we don't care about // or it was something we don't care about
} }
} }

48
output/Memory.xml
Unescape Escape View File

@ -2820,8 +2820,20 @@
(for stonesense) (for stonesense)
==================================================================== ====================================================================
<VTable name="building_vtable"> <VTable name="building_vtable">
<multiclass name="building_trapst" typeoffset="0x138">
<class name="building_leverst" type="0x0"/>
<class name="building_pressure_platest" type="0x1"/>
<class name="building_cage_trapst" type="0x2"/>
<class name="building_stonefall_trapst" type="0x3"/>
<class name="building_weapon_trapst" type="0x4"/>
</multiclass>
<class name="building_constructionst"/>
<class name="building_road_pavedst"/>
<class name="building_road_dirtst"/>
<class name="building_roadst"/>
<class name="building_wagonst"/>
<class name="building_tradedepotst"/>
<multiclass name="building_workshopst" typeoffset="0x138"> <multiclass name="building_workshopst" typeoffset="0x138">
<!--<class name="building_alchemists_laboratoryst" type="0x0"/>-->
<class name="building_carpenters_workshopst" type="0x0"/> <class name="building_carpenters_workshopst" type="0x0"/>
<class name="building_farmers_workshopst" type="0x1"/> <class name="building_farmers_workshopst" type="0x1"/>
<class name="building_masons_workshopst" type="0x2"/> <class name="building_masons_workshopst" type="0x2"/>
@ -2855,33 +2867,22 @@
<class name="building_magma_glass_furnacest" type="0x5"/> <class name="building_magma_glass_furnacest" type="0x5"/>
<class name="building_magma_kilnst" type="0x6"/> <class name="building_magma_kilnst" type="0x6"/>
</multiclass> </multiclass>
<multiclass name="building_siegeenginest" typeoffset="0x138">
<class name="building_catapultst" type="0x0"/>
<class name="building_ballistast" type="0x1"/>
</multiclass>
<multiclass name="building_trapst" typeoffset="0x138">
<class name="building_leverst" type="0x0"/>
<class name="building_pressure_platest" type="0x1"/>
<class name="building_cage_trapst" type="0x2"/>
<class name="building_stonefall_trapst" type="0x3"/>
<class name="building_weapon_trapst" type="0x4"/>
</multiclass>
<class name="building_constructionst"/>
<class name="building_road_pavedst"/>
<class name="building_road_dirtst"/>
<class name="building_roadst"/>
<class name="building_wagonst"/>
<class name="building_tradedepotst"/>
<class name="building_animaltrapst"/> <class name="building_animaltrapst"/>
<class name="building_farmplotst"/> <class name="building_farmplotst"/>
<class name="building_window_glassst"/>
<class name="building_window_gemst"/>
<class name="building_windowst"/> <class name="building_windowst"/>
<class name="building_statuest"/> <class name="building_statuest"/>
<class name="building_wellst"/>
<class name="building_coffinst"/> <class name="building_coffinst"/>
<class name="building_shopst"/> <class name="building_shopst"/>
<class name="building_chairst"/> <class name="building_chairst"/>
<class name="building_tablest"/> <class name="building_tablest"/>
<class name="building_bedst"/> <class name="building_bedst"/>
<class name="building_traction_benchst"/>
<multiclass name="building_siegeenginest" typeoffset="0x138">
<class name="building_catapultst" type="0x0"/>
<class name="building_ballistast" type="0x1"/>
</multiclass>
<class name="building_cagest"/> <class name="building_cagest"/>
<class name="building_chainst"/> <class name="building_chainst"/>
<class name="building_windmillstst"/> <class name="building_windmillstst"/>
@ -2893,6 +2894,7 @@
<class name="building_axle_verticalst"/> <class name="building_axle_verticalst"/>
<class name="building_axle_horizontalst"/> <class name="building_axle_horizontalst"/>
<class name="building_gear_assemblyst"/> <class name="building_gear_assemblyst"/>
<class name="building_trapst"/>
<class name="building_bars_floorst"/> <class name="building_bars_floorst"/>
<class name="building_bars_verticalst"/> <class name="building_bars_verticalst"/>
<class name="building_grate_floorst"/> <class name="building_grate_floorst"/>
@ -2905,11 +2907,11 @@
<class name="building_weaponrackst"/> <class name="building_weaponrackst"/>
<class name="building_cabinetst"/> <class name="building_cabinetst"/>
<class name="building_boxst"/> <class name="building_boxst"/>
<class name="building_actualst"/>
<class name="building_civzonest"/>
<class name="building_stockpilest"/> <class name="building_stockpilest"/>
<class name="building_window_gemst"/> <class name="building_wellst"/>
<class name="building_window_glassst"/> <class name="building_civzonest"/><!-- zone -->
<class name="building_actualst"/>
<class name="buildingst"/>
</VTable> </VTable>
</Entry> </Entry>