mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-17 21:51:17 +02:00
Code Issues Projects Releases Wiki Activity

remove remapping of keys, like numpad keys to normal and vice versa

Browse Source
This commit is contained in:
titiger
2015-12-02 01:26:44 +01:00
parent eb4eddfb3a
commit 982137afed
1 changed files with 58 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
source/shared_lib/sources/platform/sdl/window.cpp
View File

@@ -911,91 +911,64 @@ bool isKeyPressed(SDL_Keycode compareKey, SDL_KeyboardEvent input,vector<int> mo
bool result = (c == compareKey); bool result = (c == compareKey);
//printf("result = %d input = %d compare = %d\n",result,c,compareKey); //printf("result = %d input = %d compare = %d\n",result,c,compareKey);
if(result == false) { // if(result == false) {
if(compareKey == SDLK_RETURN) { // if(compareKey == SDLK_RETURN) {
result = (c == SDLK_KP_ENTER); // result = (c == SDLK_KP_ENTER);
} // }
else if(compareKey == SDLK_KP_ENTER) { // else if(compareKey == SDLK_KP_ENTER) {
result = (c == SDLK_RETURN); // result = (c == SDLK_RETURN);
} // }
else if(compareKey == SDLK_ASTERISK) { // else if(compareKey == SDLK_ASTERISK) {
result = (c == SDLK_KP_MULTIPLY); // result = (c == SDLK_KP_MULTIPLY);
} // }
else if(compareKey == SDLK_KP_MULTIPLY) { // else if(compareKey == SDLK_KP_MULTIPLY) {
result = (c == SDLK_ASTERISK); // result = (c == SDLK_ASTERISK);
} // }
else if(compareKey == SDLK_BACKSPACE) { // else if(compareKey == SDLK_BACKSPACE) {
result = (c == SDLK_DELETE); // result = (c == SDLK_DELETE);
} // }
else if( compareKey >= SDLK_0 && compareKey <= SDLK_9) { // else if (compareKey == SDLK_0) {
switch(compareKey) { // result = (c == SDLK_KP_0);
case SDLK_0: // } else if (compareKey == SDLK_1) {
result = (c == SDLK_KP_0); // result = (c == SDLK_KP_1);
break; // } else if (compareKey == SDLK_2) {
case SDLK_1: // result = (c == SDLK_KP_2);
result = (c == SDLK_KP_1); // } else if (compareKey == SDLK_3) {
break; // result = (c == SDLK_KP_3);
case SDLK_2: // } else if (compareKey == SDLK_4) {
result = (c == SDLK_KP_2); // result = (c == SDLK_KP_4);
break; // } else if (compareKey == SDLK_5) {
case SDLK_3: // result = (c == SDLK_KP_5);
result = (c == SDLK_KP_3); // } else if (compareKey == SDLK_6) {
break; // result = (c == SDLK_KP_6);
case SDLK_4: // } else if (compareKey == SDLK_7) {
result = (c == SDLK_KP_4); // result = (c == SDLK_KP_7);
break; // } else if (compareKey == SDLK_8) {
case SDLK_5: // result = (c == SDLK_KP_8);
result = (c == SDLK_KP_5); // } else if (compareKey == SDLK_9) {
break; // result = (c == SDLK_KP_9);
case SDLK_6: // } else if (compareKey == SDLK_KP_0) {
result = (c == SDLK_KP_6); // result = (c == SDLK_0);
break; // } else if (compareKey == SDLK_KP_1) {
case SDLK_7: // result = (c == SDLK_1);
result = (c == SDLK_KP_7); // } else if (compareKey == SDLK_KP_2) {
break; // result = (c == SDLK_2);
case SDLK_8: // } else if (compareKey == SDLK_KP_3) {
result = (c == SDLK_KP_8); // result = (c == SDLK_3);
break; // } else if (compareKey == SDLK_KP_4) {
case SDLK_9: // result = (c == SDLK_4);
result = (c == SDLK_KP_9); // } else if (compareKey == SDLK_KP_5) {
break; // result = (c == SDLK_5);
} // } else if (compareKey == SDLK_KP_6) {
} // result = (c == SDLK_6);
else if(compareKey >= SDLK_KP_0 && compareKey <= SDLK_KP_9) { // } else if (compareKey == SDLK_KP_7) {
switch(compareKey) { // result = (c == SDLK_7);
case SDLK_KP_0: // } else if (compareKey == SDLK_KP_8) {
result = (c == SDLK_0); // result = (c == SDLK_8);
break; // } else if (compareKey == SDLK_KP_9) {
case SDLK_KP_1: // result = (c == SDLK_9);
result = (c == SDLK_1); // }
break; // }
case SDLK_KP_2:
result = (c == SDLK_2);
break;
case SDLK_KP_3:
result = (c == SDLK_3);
break;
case SDLK_KP_4:
result = (c == SDLK_4);
break;
case SDLK_KP_5:
result = (c == SDLK_5);
break;
case SDLK_KP_6:
result = (c == SDLK_6);
break;
case SDLK_KP_7:
result = (c == SDLK_7);
break;
case SDLK_KP_8:
result = (c == SDLK_8);
break;
case SDLK_KP_9:
result = (c == SDLK_9);
break;
}
}
}
if(result == true) { if(result == true) {
//printf("input.keysym.mod = %d\n",input.keysym.mod); //printf("input.keysym.mod = %d\n",input.keysym.mod);