From 8f1a2ebf7f29a346589680c6e0e102ab029596b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 6 Feb 2012 04:47:13 +0100 Subject: [PATCH] Added missing keybinding mention to 'ls', DFusion hotfix. --- CMakeLists.txt | 2 +- library/Core.cpp | 1 + plugins/Dfusion/src/lua_Process.cpp | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cf87ba54f..ae0e9e1c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ set(DF_VERSION_MINOR "31") set(DF_VERSION_PATCH "25") set(DF_VERSION "${DF_VERSION_MAJOR}.${DF_VERSION_MINOR}.${DF_VERSION_PATCH}") -set(DFHACK_RELEASE "9") +set(DFHACK_RELEASE "9a") ## where to install things (after the build is done, classic 'make install' or package structure) # the dfhack libraries will be installed here: diff --git a/library/Core.cpp b/library/Core.cpp index 69a67a48a..e06dd3f3c 100644 --- a/library/Core.cpp +++ b/library/Core.cpp @@ -354,6 +354,7 @@ static void runInteractiveCommand(Core *core, PluginManager *plug_mgr, int &clue " cls - Clear the console.\n" " fpause - Force DF to pause.\n" " die - Force DF to close immediately\n" + " keybinding - Modify bindings of commands to keys\n" " belongs COMMAND - Tell which plugin a command belongs to.\n" " plug [PLUGIN|v] - List plugin state and detailed description.\n" " load PLUGIN|all - Load a plugin by name or load all possible plugins.\n" diff --git a/plugins/Dfusion/src/lua_Process.cpp b/plugins/Dfusion/src/lua_Process.cpp index 8ea73e973..6d2b3d877 100644 --- a/plugins/Dfusion/src/lua_Process.cpp +++ b/plugins/Dfusion/src/lua_Process.cpp @@ -175,9 +175,9 @@ static int lua_Process_getMemRanges(lua_State *S) { st.push(i); st.newtable(); - st.push(ranges[i].start); // WARNING!! lua has only 32bit numbers, possible loss of data!! + st.push((uint32_t)ranges[i].start); // WARNING!! lua has only 32bit numbers, possible loss of data!! st.setfield("start"); - st.push(ranges[i].end); + st.push((uint32_t)ranges[i].end); st.setfield("end"); st.push(std::string(ranges[i].name)); st.setfield("name");