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

Merge pull request #3683 from myk002/myk_arena 

[overlay] support overlays on the load arena screen
develop
Myk 2023-08-19 02:20:01 -07:00 committed by GitHub
parent b21eef9573 d9fa827b20
commit 07eaa3644e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/lua/hotkeys.lua
Unescape Escape View File

@ -37,6 +37,7 @@ HotspotMenuWidget.ATTRS{
'initial_prep', 'initial_prep',
--'legends', -- conflicts with vanilla export button and info text --'legends', -- conflicts with vanilla export button and info text
'loadgame', 'loadgame',
-- 'new_arena', -- conflicts with vanilla panel layouts
-- 'new_region', -- conflicts with vanilla panel layouts -- 'new_region', -- conflicts with vanilla panel layouts
'savegame', 'savegame',
'setupdwarfgame', 'setupdwarfgame',

3
plugins/overlay.cpp
Unescape Escape View File

@ -8,6 +8,7 @@
#include "df/viewscreen_initial_prepst.h" #include "df/viewscreen_initial_prepst.h"
#include "df/viewscreen_legendsst.h" #include "df/viewscreen_legendsst.h"
#include "df/viewscreen_loadgamest.h" #include "df/viewscreen_loadgamest.h"
#include "df/viewscreen_new_arenast.h"
#include "df/viewscreen_new_regionst.h" #include "df/viewscreen_new_regionst.h"
#include "df/viewscreen_savegamest.h" #include "df/viewscreen_savegamest.h"
#include "df/viewscreen_setupdwarfgamest.h" #include "df/viewscreen_setupdwarfgamest.h"
@ -112,6 +113,7 @@ IMPLEMENT_HOOKS(game_cleaner)
IMPLEMENT_HOOKS(initial_prep) IMPLEMENT_HOOKS(initial_prep)
IMPLEMENT_HOOKS(legends) IMPLEMENT_HOOKS(legends)
IMPLEMENT_HOOKS(loadgame) IMPLEMENT_HOOKS(loadgame)
IMPLEMENT_HOOKS(new_arena)
IMPLEMENT_HOOKS(new_region) IMPLEMENT_HOOKS(new_region)
IMPLEMENT_HOOKS(savegame) IMPLEMENT_HOOKS(savegame)
IMPLEMENT_HOOKS(setupdwarfgame) IMPLEMENT_HOOKS(setupdwarfgame)
@ -146,6 +148,7 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
INTERPOSE_HOOKS_FAILED(initial_prep) || INTERPOSE_HOOKS_FAILED(initial_prep) ||
INTERPOSE_HOOKS_FAILED(legends) || INTERPOSE_HOOKS_FAILED(legends) ||
INTERPOSE_HOOKS_FAILED(loadgame) || INTERPOSE_HOOKS_FAILED(loadgame) ||
INTERPOSE_HOOKS_FAILED(new_arena) ||
INTERPOSE_HOOKS_FAILED(new_region) || INTERPOSE_HOOKS_FAILED(new_region) ||
INTERPOSE_HOOKS_FAILED(savegame) || INTERPOSE_HOOKS_FAILED(savegame) ||
INTERPOSE_HOOKS_FAILED(setupdwarfgame) || INTERPOSE_HOOKS_FAILED(setupdwarfgame) ||