StepBetween: renamed stuff back to the way it was. Thought I had already done that.

expwnent · expwnent · commit f8abd5c595e5 · 2013-01-05T18:09:50.000-05:00
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
@@ -1309,7 +1309,7 @@ static const LuaWrapper::FunctionReg dfhack_maps_module[] = {
     WRAPM(Maps, enableBlockUpdates),
     WRAPM(Maps, getGlobalInitFeature),
     WRAPM(Maps, getLocalInitFeature),
-    WRAPM(Maps, canPathBetween),
+    WRAPM(Maps, canWalkBetween),
     WRAPM(Maps, spawnFlow),
     WRAPN(hasTileAssignment, hasTileAssignment),
     WRAPN(getTileAssignment, getTileAssignment),
diff --git a/library/include/modules/Maps.h b/library/include/modules/Maps.h
@@ -308,7 +308,7 @@ extern DFHACK_EXPORT bool SortBlockEvents(df::map_block *block,
 /// remove a block event from the block by address
 extern DFHACK_EXPORT bool RemoveBlockEvent(uint32_t x, uint32_t y, uint32_t z, df::block_square_event * which );
 
-DFHACK_EXPORT bool canPathBetween(df::coord pos1, df::coord pos2);
+DFHACK_EXPORT bool canWalkBetween(df::coord pos1, df::coord pos2);
 DFHACK_EXPORT bool canStepBetween(df::coord pos1, df::coord pos2);
 }
 }
diff --git a/library/modules/Maps.cpp b/library/modules/Maps.cpp
@@ -524,7 +524,7 @@ bool Maps::ReadGeology(vector<vector<int16_t> > *layer_mats, vector<df::coord2d>
     return true;
 }
 
-bool Maps::canPathBetween(df::coord pos1, df::coord pos2)
+bool Maps::canWalkBetween(df::coord pos1, df::coord pos2)
 {
     auto block1 = getTileBlock(pos1);
     auto block2 = getTileBlock(pos2);
diff --git a/plugins/devel/stepBetween.cpp b/plugins/devel/stepBetween.cpp
@@ -80,7 +80,7 @@ df::coord prev;
 command_result stepBetween (color_ostream &out, std::vector <std::string> & parameters)
 {
     df::coord bob = Gui::getCursorPos();
-    out.print("(%d,%d,%d), (%d,%d,%d): canWalkBetween = %d, canPathBetween = %d\n", prev.x, prev.y, prev.z, bob.x, bob.y, bob.z, Maps::canStepBetween(prev, bob), Maps::canPathBetween(prev,bob));
+    out.print("(%d,%d,%d), (%d,%d,%d): canStepBetween = %d, canWalkBetween = %d\n", prev.x, prev.y, prev.z, bob.x, bob.y, bob.z, Maps::canStepBetween(prev, bob), Maps::canWalkBetween(prev,bob));
 
     prev = bob;
     return CR_OK;
diff --git a/plugins/fix-armory.cpp b/plugins/fix-armory.cpp
@@ -475,7 +475,7 @@ static bool try_store_item(df::building *target, df::item *item)
     df::coord tpos(target->centerx, target->centery, target->z);
     df::coord ipos = Items::getPosition(item);
 
-    if (!Maps::canPathBetween(tpos, ipos))
+    if (!Maps::canWalkBetween(tpos, ipos))
         return false;
 
     // Check if the target has enough space left

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ extern DFHACK_EXPORT bool SortBlockEvents(df::map_block *block,`
`308`	`308`	`/// remove a block event from the block by address`
`309`	`309`	`extern DFHACK_EXPORT bool RemoveBlockEvent(uint32_t x, uint32_t y, uint32_t z, df::block_square_event * which );`
`310`	`310`
`311`		`-DFHACK_EXPORT bool canPathBetween(df::coord pos1, df::coord pos2);`
	`311`	`+DFHACK_EXPORT bool canWalkBetween(df::coord pos1, df::coord pos2);`
`312`	`312`	`DFHACK_EXPORT bool canStepBetween(df::coord pos1, df::coord pos2);`
`313`	`313`	`}`
`314`	`314`	`}`
Original file line number	Diff line number	Diff line change
`@@ -524,7 +524,7 @@ bool Maps::ReadGeology(vector<vector<int16_t> > *layer_mats, vector<df::coord2d>`
`524`	`524`	`return true;`
`525`	`525`	`}`
`526`	`526`
`527`		`-bool Maps::canPathBetween(df::coord pos1, df::coord pos2)`
	`527`	`+bool Maps::canWalkBetween(df::coord pos1, df::coord pos2)`
`528`	`528`	`{`
`529`	`529`	`auto block1 = getTileBlock(pos1);`
`530`	`530`	`auto block2 = getTileBlock(pos2);`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ df::coord prev;`
`80`	`80`	`command_result stepBetween (color_ostream &out, std::vector <std::string> & parameters)`
`81`	`81`	`{`
`82`	`82`	`df::coord bob = Gui::getCursorPos();`
`83`		`- out.print("(%d,%d,%d), (%d,%d,%d): canWalkBetween = %d, canPathBetween = %d\n", prev.x, prev.y, prev.z, bob.x, bob.y, bob.z, Maps::canStepBetween(prev, bob), Maps::canPathBetween(prev,bob));`
	`83`	`+ out.print("(%d,%d,%d), (%d,%d,%d): canStepBetween = %d, canWalkBetween = %d\n", prev.x, prev.y, prev.z, bob.x, bob.y, bob.z, Maps::canStepBetween(prev, bob), Maps::canWalkBetween(prev,bob));`
`84`	`84`
`85`	`85`	`prev = bob;`
`86`	`86`	`return CR_OK;`