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

Fixage.

develop
Petr Mrázek 2012-02-19 20:27:44 +01:00
parent 27e3e0f2c2
commit 252895708f
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
library/modules/Gui.cpp
Unescape Escape View File

@ -45,7 +45,7 @@ using namespace DFHack;
#include "df/world.h" #include "df/world.h"
#include "df/cursor.h" #include "df/cursor.h"
#include "df/viewscreen_dwarfmodest.h" #include "df/viewscreen_dwarfmodest.h"
#include "df/viewscreen_unitjobsst.h" #include "df/viewscreen_joblistst.h"
#include "df/viewscreen_itemst.h" #include "df/viewscreen_itemst.h"
#include "df/ui_unit_view_mode.h" #include "df/ui_unit_view_mode.h"
#include "df/ui_sidebar_menus.h" #include "df/ui_sidebar_menus.h"
@ -84,10 +84,11 @@ bool DFHack::dwarfmode_hotkey(Core *, df::viewscreen *top)
return !!strict_virtual_cast<df::viewscreen_dwarfmodest>(top); return !!strict_virtual_cast<df::viewscreen_dwarfmodest>(top);
} }
//FIXME: this class has a second part (split off in 31.xx)!
bool DFHack::unitjobs_hotkey(Core *, df::viewscreen *top) bool DFHack::unitjobs_hotkey(Core *, df::viewscreen *top)
{ {
// Require the main dwarf mode screen // Require the main dwarf mode screen
return !!strict_virtual_cast<df::viewscreen_unitjobsst>(top); return !!strict_virtual_cast<df::viewscreen_joblistst>(top);
} }
bool DFHack::item_details_hotkey(Core *, df::viewscreen *top) bool DFHack::item_details_hotkey(Core *, df::viewscreen *top)
@ -227,7 +228,7 @@ df::job *DFHack::getSelectedWorkshopJob(Core *c, bool quiet)
bool DFHack::any_job_hotkey(Core *c, df::viewscreen *top) bool DFHack::any_job_hotkey(Core *c, df::viewscreen *top)
{ {
if (VIRTUAL_CAST_VAR(screen, df::viewscreen_unitjobsst, top)) if (VIRTUAL_CAST_VAR(screen, df::viewscreen_joblistst, top))
return vector_get(screen->jobs, screen->cursor_pos) != NULL; return vector_get(screen->jobs, screen->cursor_pos) != NULL;
return workshop_job_hotkey(c,top); return workshop_job_hotkey(c,top);
@ -237,7 +238,7 @@ df::job *DFHack::getSelectedJob(Core *c, bool quiet)
{ {
df::viewscreen *top = c->getTopViewscreen(); df::viewscreen *top = c->getTopViewscreen();
if (VIRTUAL_CAST_VAR(screen, df::viewscreen_unitjobsst, top)) if (VIRTUAL_CAST_VAR(screen, df::viewscreen_joblistst, top))
{ {
df::job *job = vector_get(screen->jobs, screen->cursor_pos); df::job *job = vector_get(screen->jobs, screen->cursor_pos);
@ -259,7 +260,7 @@ static df::unit *getAnyUnit(Core *c, df::viewscreen *top)
using df::global::ui_look_list; using df::global::ui_look_list;
using df::global::ui_selected_unit; using df::global::ui_selected_unit;
if (VIRTUAL_CAST_VAR(screen, df::viewscreen_unitjobsst, top)) if (VIRTUAL_CAST_VAR(screen, df::viewscreen_joblistst, top))
return vector_get(screen->units, screen->cursor_pos); return vector_get(screen->units, screen->cursor_pos);
if (VIRTUAL_CAST_VAR(screen, df::viewscreen_itemst, top)) if (VIRTUAL_CAST_VAR(screen, df::viewscreen_itemst, top))

2
library/xml

@ -1 +1 @@
Subproject commit 7adac2fc155e7f495351376bae9dbaeb014272d4 Subproject commit 56184ced21d1f465f5f255e1c01ac48213c0ea4a