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

Windows offset for save name, some tweaks, updated stonesense submodule to current.

develop
Petr Mrázek 2011-10-23 22:23:54 +02:00
parent 56e8e8009a
commit 998d85919f
4 changed files with 51 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Memory.xml
Unescape Escape View File

@ -2304,6 +2304,9 @@
<Offset name="countdown" value="0xc"/> <Offset name="countdown" value="0xc"/>
</Group> </Group>
</Group> </Group>
<Group name="World">
<Address name="save_folder" value="0x1847A40" />
</Group>
</Offsets> </Offsets>
cmake cmake
item vector: item vector:

3
library/include/dfhack/modules/Creatures.h
Unescape Escape View File

@ -597,7 +597,8 @@ namespace DFHack
uint32_t unk_48c; // blood_max? uint32_t unk_48c; // blood_max?
uint32_t blood_count; // 490 uint32_t blood_count; // 490
uint32_t unk_494; uint32_t unk_494;
std::vector<void*> unk_498; // dirt, grime, FB blood, mud and plain old filth stuck to the poor thing's parts and pieces
std::vector<void*> contaminants;
std::vector<uint16_t> unk_4a8; std::vector<uint16_t> unk_4a8;
std::vector<uint16_t> unk_4b8; std::vector<uint16_t> unk_4b8;
uint32_t unk_4c8; uint32_t unk_4c8;

87
plugins/filltraffic.cpp
Unescape Escape View File

@ -54,42 +54,45 @@ DFhackCExport command_result filltraffic(DFHack::Core * c, std::vector<std::stri
if(params[i] == "help" || params[i] == "?") if(params[i] == "help" || params[i] == "?")
{ {
c->con.print("Flood-fill selected traffic type from the cursor.\n" c->con.print("Flood-fill selected traffic type from the cursor.\n"
"Traffic Type Codes:\n" "Traffic Type Codes:\n"
" H: High Traffic\n" "\tH: High Traffic\n"
" N: Normal Traffic\n" "\tN: Normal Traffic\n"
" L: Low Traffic\n" "\tL: Low Traffic\n"
" R: Restricted Traffic\n" "\tR: Restricted Traffic\n"
"Other Options:\n" "Other Options:\n"
" X: Fill accross z-levels.\n" "\tX: Fill accross z-levels.\n"
" B: Include buildings and stockpiles.\n" "\tB: Include buildings and stockpiles.\n"
" P: Include empty space.\n" "\tP: Include empty space.\n"
"Example:\n"
"'filltraffic H' - When used in a room with doors,\n"
" it will set traffic to HIGH in just that room."
); );
return CR_OK; return CR_OK;
} }
switch (toupper(params[i][0])) switch (toupper(params[i][0]))
{ {
case 'H': case 'H':
target = traffic_high; break; target = traffic_high; break;
case 'N': case 'N':
target = traffic_normal; break; target = traffic_normal; break;
case 'L': case 'L':
target = traffic_low; break; target = traffic_low; break;
case 'R': case 'R':
target = traffic_restricted; break; target = traffic_restricted; break;
case 'X': case 'X':
updown = true; break; updown = true; break;
case 'B': case 'B':
checkbuilding = false; break; checkbuilding = false; break;
case 'P': case 'P':
checkpit = false; break; checkpit = false; break;
} }
} }
//Initialization. //Initialization.
c->Suspend(); c->Suspend();
DFHack::Maps * Maps = c->getMaps(); DFHack::Maps * Maps = c->getMaps();
DFHack::Gui * Gui = c->getGui(); DFHack::Gui * Gui = c->getGui();
// init the map // init the map
if(!Maps->Start()) if(!Maps->Start())
@ -111,17 +114,17 @@ DFhackCExport command_result filltraffic(DFHack::Core * c, std::vector<std::stri
return CR_FAILURE; return CR_FAILURE;
} }
DFHack::DFCoord xy ((uint32_t)cx,(uint32_t)cy,cz); DFHack::DFCoord xy ((uint32_t)cx,(uint32_t)cy,cz);
MapExtras::MapCache * MCache = new MapExtras::MapCache(Maps); MapExtras::MapCache * MCache = new MapExtras::MapCache(Maps);
DFHack::t_designation des = MCache->designationAt(xy); DFHack::t_designation des = MCache->designationAt(xy);
int16_t tt = MCache->tiletypeAt(xy); int16_t tt = MCache->tiletypeAt(xy);
DFHack::t_occupancy oc; DFHack::t_occupancy oc;
if (checkbuilding) if (checkbuilding)
oc = MCache->occupancyAt(xy); oc = MCache->occupancyAt(xy);
source = des.bits.traffic; source = des.bits.traffic;
if(source == target) if(source == target)
{ {
c->con.printerr("This tile is already set to the target traffic type.\n"); c->con.printerr("This tile is already set to the target traffic type.\n");
@ -130,13 +133,13 @@ DFhackCExport command_result filltraffic(DFHack::Core * c, std::vector<std::stri
return CR_FAILURE; return CR_FAILURE;
} }
if(DFHack::isWallTerrain(tt)) if(DFHack::isWallTerrain(tt))
{ {
c->con.printerr("This tile is a wall. Please select a passable tile.\n"); c->con.printerr("This tile is a wall. Please select a passable tile.\n");
delete MCache; delete MCache;
c->Resume(); c->Resume();
return CR_FAILURE; return CR_FAILURE;
} }
if(checkpit && DFHack::isOpenTerrain(tt)) if(checkpit && DFHack::isOpenTerrain(tt))
{ {

2
plugins/stonesense

@ -1 +1 @@
Subproject commit c140ed8d6dbe05854ee1499540814d5f358a960a Subproject commit 8a907d1cb391aebf8447a5921544517e48af02c7