Ignore:
Timestamp:
Apr 8, 2013, 4:19:36 AM (9 years ago)
Author:
sam
Message:

build: more Emscripten improvements; keyboard input works properly now.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/platform/sdl/sdlinput.cpp

    r2645 r2646  
    145145
    146146    /* Pump all joystick events because no event is coming to us. */
    147 #   if SDL_FORCE_POLL_JOYSTICK && EMSCRIPTEN
     147#   if SDL_FORCE_POLL_JOYSTICK && !EMSCRIPTEN
    148148    SDL_JoystickUpdate();
    149149    for (int j = 0; j < m_joysticks.Count(); j++)
     
    280280    lolstate[Key::Delete] = sdlstate[SDLK_DELETE];
    281281
     282#if SDLK_WORLD_0
    282283    lolstate[Key::World0] = sdlstate[SDLK_WORLD_0];
    283284    lolstate[Key::World1] = sdlstate[SDLK_WORLD_1];
     
    376377    lolstate[Key::World94] = sdlstate[SDLK_WORLD_94];
    377378    lolstate[Key::World95] = sdlstate[SDLK_WORLD_95];
     379#endif
    378380
    379381    lolstate[Key::KP0] = sdlstate[SDLK_KP0];
Note: See TracChangeset for help on using the changeset viewer.