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

Fix screen handling

develop
lethosor 2014-06-10 12:48:46 -04:00
parent 69c9353196
commit f534c91fb8
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
plugins/tweak.cpp
Unescape Escape View File

@ -355,29 +355,24 @@ struct confirm_embark_hook : df::viewscreen_setupdwarfgamest
DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input)) DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input))
{ {
bool intercept = false; bool intercept = false;
df::viewscreen * top = Gui::getCurViewscreen(); if (this->anon_14 == 0) // Advanced embark screen
VIRTUAL_CAST_VAR(screen, df::viewscreen_setupdwarfgamest, top);
if (screen)
{ {
if (screen->anon_14 == 0) // Advanced embark screen if (confirm_embark_state == ECS_INACTIVE)
{ {
if (confirm_embark_state == ECS_INACTIVE) if (input->count(df::interface_key::SETUP_EMBARK))
{
if (input->count(df::interface_key::SETUP_EMBARK))
{
confirm_embark_state = ECS_CONFIRM;
intercept = true;
}
}
else if (confirm_embark_state == ECS_CONFIRM)
{ {
confirm_embark_state = ECS_CONFIRM;
intercept = true; intercept = true;
if (input->count(df::interface_key::MENU_CONFIRM))
confirm_embark_state = ECS_ACCEPTED;
else if (input->size())
confirm_embark_state = ECS_INACTIVE;
} }
} }
else if (confirm_embark_state == ECS_CONFIRM)
{
intercept = true;
if (input->count(df::interface_key::MENU_CONFIRM))
confirm_embark_state = ECS_ACCEPTED;
else if (input->size())
confirm_embark_state = ECS_INACTIVE;
}
} }
if (!intercept) if (!intercept)
@ -397,8 +392,6 @@ struct confirm_embark_hook : df::viewscreen_setupdwarfgamest
DEFINE_VMETHOD_INTERPOSE(void, render, ()) DEFINE_VMETHOD_INTERPOSE(void, render, ())
{ {
INTERPOSE_NEXT(render)(); INTERPOSE_NEXT(render)();
df::viewscreen * top = Gui::getCurViewscreen();
VIRTUAL_CAST_VAR(screen, df::viewscreen_setupdwarfgamest, top);
auto dim = Screen::getWindowSize(); auto dim = Screen::getWindowSize();
int x = 0, y = 0; int x = 0, y = 0;
if (confirm_embark_state != ECS_INACTIVE) if (confirm_embark_state != ECS_INACTIVE)
@ -412,7 +405,7 @@ struct confirm_embark_hook : df::viewscreen_setupdwarfgamest
OutputString(COLOR_LIGHTGREEN, x, y, Screen::getKeyDisplay(df::interface_key::MENU_CONFIRM)); OutputString(COLOR_LIGHTGREEN, x, y, Screen::getKeyDisplay(df::interface_key::MENU_CONFIRM));
OutputString(COLOR_WHITE, x, y, " = yes, other = no)"); OutputString(COLOR_WHITE, x, y, " = yes, other = no)");
x = 2, y = 4; x = 2, y = 4;
int32_t points = screen->anon_37; int32_t points = this->anon_37;
OutputString(COLOR_WHITE, x, y, "Points left: "); OutputString(COLOR_WHITE, x, y, "Points left: ");
OutputString((points ? COLOR_YELLOW : COLOR_LIGHTGREEN), x, y, std::to_string(points)); OutputString((points ? COLOR_YELLOW : COLOR_LIGHTGREEN), x, y, std::to_string(points));
x = dim.x - 10, y = dim.y - 1; x = dim.x - 10, y = dim.y - 1;
@ -422,7 +415,7 @@ struct confirm_embark_hook : df::viewscreen_setupdwarfgamest
{ {
std::set<df::interface_key> input; std::set<df::interface_key> input;
input.insert(df::interface_key::SETUP_EMBARK); input.insert(df::interface_key::SETUP_EMBARK);
screen->feed(&input); this->feed(&input);
confirm_embark_state = ECS_INACTIVE; confirm_embark_state = ECS_INACTIVE;
} }
} }