Changeset 40995d3 in opengl-game for game-gui-sdl.cpp


Ignore:
Timestamp:
Oct 1, 2019, 3:14:06 AM (5 years ago)
Author:
Dmitry Portnoy <dmp1488@…>
Branches:
feature/imgui-sdl, master, points-test
Children:
4d84c72
Parents:
7563b8a (diff), a0da009 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of medievaltech.com:opengl-game

File:
1 edited

Legend:

Unmodified
Added
Removed
  • game-gui-sdl.cpp

    r7563b8a r40995d3  
    122122         case SDL_AUDIODEVICEREMOVED:
    123123         case SDL_TEXTEDITING: // TODO: Research this one later
    124             event = nullptr;
    125             return 0;
     124            event->type = UI_EVENT_UNKNOWN;
     125            event->unknown.eventType = e.type;
    126126            break;
    127127         default:
    128             cout << "Unknown event type: 0x" << hex << e.type << dec << endl;
    129             event = nullptr;
    130             return 0;
     128            event->type = UI_EVENT_UNKNOWN;
     129            event->unknown.eventType = 0;
    131130      }
    132131
Note: See TracChangeset for help on using the changeset viewer.