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

Merge remote-tracking branch 'lethosor/fix-global-crash' into develop

develop
lethosor 2023-08-01 00:22:01 -04:00
parent 95753f618c e55984c529
commit 6e54210a66
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/Core.cpp
Unescape Escape View File

@ -1896,8 +1896,8 @@ void Core::doUpdate(color_ostream &out)
strict_virtual_cast<df::viewscreen_savegamest>(screen); strict_virtual_cast<df::viewscreen_savegamest>(screen);
// save data (do this before updating last_world_data_ptr and triggering unload events) // save data (do this before updating last_world_data_ptr and triggering unload events)
if ((df::global::game->main_interface.options.do_manual_save && !d->last_manual_save_request) || if ((df::global::game && df::global::game->main_interface.options.do_manual_save && !d->last_manual_save_request) ||
(df::global::plotinfo->main.autosave_request && !d->last_autosave_request) || (df::global::plotinfo && df::global::plotinfo->main.autosave_request && !d->last_autosave_request) ||
(is_load_save && !d->was_load_save && strict_virtual_cast<df::viewscreen_savegamest>(screen))) (is_load_save && !d->was_load_save && strict_virtual_cast<df::viewscreen_savegamest>(screen)))
{ {
doSaveData(out); doSaveData(out);
@ -1959,8 +1959,10 @@ void Core::doUpdate(color_ostream &out)
// Execute per-frame handlers // Execute per-frame handlers
onUpdate(out); onUpdate(out);
if (df::global::game && df::global::plotinfo) {
d->last_autosave_request = df::global::plotinfo->main.autosave_request; d->last_autosave_request = df::global::plotinfo->main.autosave_request;
d->last_manual_save_request = df::global::game->main_interface.options.do_manual_save; d->last_manual_save_request = df::global::game->main_interface.options.do_manual_save;
}
d->was_load_save = is_load_save; d->was_load_save = is_load_save;
out << std::flush; out << std::flush;

2
library/LuaTools.cpp
Unescape Escape View File

@ -2172,6 +2172,7 @@ void DFHack::Lua::Core::Reset(color_ostream &out, const char *where)
inhibit_m_down = true; inhibit_m_down = true;
} }
if (df::global::enabler) {
if (!df::global::enabler->mouse_lbut) if (!df::global::enabler->mouse_lbut)
inhibit_l_down = false; inhibit_l_down = false;
if (!df::global::enabler->mouse_rbut) if (!df::global::enabler->mouse_rbut)
@ -2179,3 +2180,4 @@ void DFHack::Lua::Core::Reset(color_ostream &out, const char *where)
if (!df::global::enabler->mouse_mbut) if (!df::global::enabler->mouse_mbut)
inhibit_m_down = false; inhibit_m_down = false;
} }
}

2
library/lua/argparse.lua
Unescape Escape View File

@ -3,7 +3,6 @@
local _ENV = mkmodule('argparse') local _ENV = mkmodule('argparse')
local getopt = require('3rdparty.alt_getopt') local getopt = require('3rdparty.alt_getopt')
local guidm = require('gui.dwarfmode')
function processArgs(args, validArgs) function processArgs(args, validArgs)
local result = {} local result = {}
@ -174,6 +173,7 @@ end
function coords(arg, arg_name, skip_validation) function coords(arg, arg_name, skip_validation)
if arg == 'here' then if arg == 'here' then
local guidm = require('gui.dwarfmode') -- globals may not be available yet
local cursor = guidm.getCursorPos() local cursor = guidm.getCursorPos()
if not cursor then if not cursor then
arg_error(arg_name, arg_error(arg_name,

2
library/lua/gui.lua
Unescape Escape View File

@ -9,7 +9,7 @@ local getval = utils.getval
local to_pen = dfhack.pen.parse local to_pen = dfhack.pen.parse
CLEAR_PEN = to_pen{tile=df.global.init.texpos_border_interior, ch=32, fg=0, bg=0, write_to_lower=true} CLEAR_PEN = to_pen{tile=dfhack.internal.getAddress('init') and df.global.init.texpos_border_interior, ch=32, fg=0, bg=0, write_to_lower=true}
TRANSPARENT_PEN = to_pen{tile=0, ch=0} TRANSPARENT_PEN = to_pen{tile=0, ch=0}
KEEP_LOWER_PEN = to_pen{ch=32, fg=0, bg=0, keep_lower=true} KEEP_LOWER_PEN = to_pen{ch=32, fg=0, bg=0, keep_lower=true}

3
library/modules/Textures.cpp
Unescape Escape View File

@ -121,6 +121,9 @@ static size_t load_textures(color_ostream & out, const char * fname,
// unloaded. // unloaded.
// //
void Textures::init(color_ostream &out) { void Textures::init(color_ostream &out) {
if (!enabler)
return;
auto & textures = enabler->textures; auto & textures = enabler->textures;
long num_textures = textures.raws.size(); long num_textures = textures.raws.size();
if (num_textures <= g_dfhack_logo_texpos_start) if (num_textures <= g_dfhack_logo_texpos_start)