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

Linux build works again.

develop
Petr Mrázek 2012-06-14 02:25:15 +02:00
parent 456c637d82
commit 2781723f7b
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/Core.cpp
Unescape Escape View File

@ -1220,9 +1220,8 @@ bool Core::ncurses_wgetch(int in, int & out)
return true; return true;
} }
int UnicodeAwareSym(const SDL::Event& event) int UnicodeAwareSym(const SDL::KeyboardEvent& ke)
{ {
auto ke = (const SDL::KeyboardEvent &) event;
// Assume keyboard layouts don't change the order of numbers: // Assume keyboard layouts don't change the order of numbers:
if( '0' <= ke.ksym.sym && ke.ksym.sym <= '9') return ke.ksym.sym; if( '0' <= ke.ksym.sym && ke.ksym.sym <= '9') return ke.ksym.sym;
if(SDL::K_F1 <= ke.ksym.sym && ke.ksym.sym <= SDL::K_F12) return ke.ksym.sym; if(SDL::K_F1 <= ke.ksym.sym && ke.ksym.sym <= SDL::K_F12) return ke.ksym.sym;

2
library/Hooks-linux.cpp
Unescape Escape View File

@ -79,7 +79,7 @@ DFhackCExport int SDL_PollEvent(SDL::Event* event)
{ {
DFHack::Core & c = DFHack::Core::getInstance(); DFHack::Core & c = DFHack::Core::getInstance();
// if we consume the event, ask SDL for more. // if we consume the event, ask SDL for more.
if(!c.SDL_Event(event)) if(!c.DFH_SDL_Event(event))
goto pollevent_again; goto pollevent_again;
} }
return orig_return; return orig_return;

3
plugins/workflow.cpp
Unescape Escape View File

@ -971,9 +971,6 @@ static void compute_job_outputs(color_ostream &out, ProtectedJob *pj)
case MillPlants: case MillPlants:
PLANT_PROCESS_MAT(MILL, mill); PLANT_PROCESS_MAT(MILL, mill);
break; break;
case BrewDrink:
PLANT_PROCESS_MAT(DRINK, drink);
break;
case ProcessPlants: case ProcessPlants:
PLANT_PROCESS_MAT(THREAD, thread); PLANT_PROCESS_MAT(THREAD, thread);
break; break;