| author | ecalot
<ecalot> 2004-07-19 13:15:40 UTC |
| committer | ecalot
<ecalot> 2004-07-19 13:15:40 UTC |
| parent | 647aae7812161e2607406c14d743e050075eb764 |
| FP/src/Makefile | +1 | -1 |
| FP/src/include/input.h | +2 | -1 |
| FP/src/out/input.c | +45 | -41 |
diff --git a/FP/src/Makefile b/FP/src/Makefile index 3ab3104..115bdba 100644 --- a/FP/src/Makefile +++ b/FP/src/Makefile @@ -47,7 +47,7 @@ LINKERRELEASE = #Binary code files OBJFILES = main.o kernel.o resources.o dat.o disk.o compress.o \ - output.o maps.o config.o drawscreen.o titles.o + output.o maps.o config.o drawscreen.o titles.o input.o EXEFILE = bin/freeprince #Use this to temporary remove an option diff --git a/FP/src/include/input.h b/FP/src/include/input.h index 2b9b77a..4bc0f6c 100644 --- a/FP/src/include/input.h +++ b/FP/src/include/input.h @@ -42,8 +42,9 @@ typedef struct { int upPressed; int leftPressed; int rightPressed; + int downPressed; tAction actionPerformed; -} tKey +} tKey; void inputInitKey(tKey* key); int inputGetEvent(tKey* key); diff --git a/FP/src/out/input.c b/FP/src/out/input.c index 94c2d80..984f58e 100644 --- a/FP/src/out/input.c +++ b/FP/src/out/input.c @@ -33,6 +33,7 @@ input.c: FreePrince : Input interface #include <SDL/SDL.h> #include "input.h" +#include <stdio.h> /* only for the printf debug */ void inputInitKey(tKey* key) { key->shiftPressed=0; @@ -44,46 +45,48 @@ void inputInitKey(tKey* key) { } void editKey(tKey* key,SDLKey sdlkey,int status) { - switch (sdlkey): - /* keys */ - case SDLK_UP: - key->upPressed=status; - break; - case SDLK_DOWN: - key->downPressed=status; - break; - case SDLK_RIGHT: - key->rightPressed=status; - break; - case SDLK_LEFT: - key->leftPressed=status; - break; - case SDLK_HOME: - key->upPressed=status; - key->leftPressed=status; - break; - case SDLK_END: - key->downPressed=status; - key->leftPressed=status; - break; - case SDLK_PAGEUP: - key->upPressed=status; - key->rightPressed=status; - break; - case SDLK_PAGEDOWN: - key->downPressed=status; - key->rightPressed=status; - break; - /* mods*/ - case SDLK_RSHIFT: - case SDLK_LSHIFT: - key->ShiftPressed=status; - break; - case SDLK_RCTRL: - case SDLK_LCTRL: - key->controlPressed=status; - break; - } + switch (sdlkey) { + /* keys */ + case SDLK_UP: + key->upPressed=status; + break; + case SDLK_DOWN: + key->downPressed=status; + break; + case SDLK_RIGHT: + key->rightPressed=status; + break; + case SDLK_LEFT: + key->leftPressed=status; + break; + case SDLK_HOME: + key->upPressed=status; + key->leftPressed=status; + break; + case SDLK_END: + key->downPressed=status; + key->leftPressed=status; + break; + case SDLK_PAGEUP: + key->upPressed=status; + key->rightPressed=status; + break; + case SDLK_PAGEDOWN: + key->downPressed=status; + key->rightPressed=status; + break; + /* mods*/ + case SDLK_RSHIFT: + case SDLK_LSHIFT: + key->shiftPressed=status; + break; + case SDLK_RCTRL: + case SDLK_LCTRL: + key->controlPressed=status; + break; + default: + break; + } } int inputGetEvent(tKey* key) { @@ -104,7 +107,8 @@ int inputGetEvent(tKey* key) { return 0; } } - + printf("inputGetEvent: unreachable code\n"); + return 0; } static SDL_TimerID timer;