~ubuntu-branches/ubuntu/trusty/manaplus/trusty

« back to all changes in this revision

Viewing changes to src/input/keyboarddata.h

  • Committer: Package Import Robot
  • Author(s): Patrick Matthäi
  • Date: 2013-10-07 10:26:14 UTC
  • mfrom: (1.1.11)
  • Revision ID: package-import@ubuntu.com-20131007102614-tg2zjdz8vmtl6n7i
Tags: 1.3.9.29-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
211
211
        COND_NOMODAL | COND_NOAWAY | COND_NONPCINPUT},
212
212
    {"keyQuit",
213
213
        INPUT_KEYBOARD, SDLK_ESCAPE,
 
214
#if defined(USE_SDL2) && defined(ANDROID)
 
215
        INPUT_KEYBOARD, SDLK_AC_BACK,
 
216
#else
214
217
        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
 
218
#endif
215
219
        Input::GRP_DEFAULT,
216
220
        &ActionManager::quit,
217
221
        Input::KEY_NO_VALUE, 50,
1857
1861
        COND_DEFAULT},
1858
1862
    {"keyGUICancel",
1859
1863
        INPUT_KEYBOARD, SDLK_ESCAPE,
 
1864
#if defined(USE_SDL2) && defined(ANDROID)
 
1865
        INPUT_KEYBOARD, SDLK_AC_BACK,
 
1866
#else
1860
1867
        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
 
1868
#endif
1861
1869
        Input::GRP_GUICHAN,
1862
1870
        nullptr,
1863
1871
        Input::KEY_NO_VALUE, 50,