aboutsummaryrefslogtreecommitdiff
path: root/src/sdl
diff options
context:
space:
mode:
authorgameblabla2017-12-26 20:53:38 -0500
committergameblabla2017-12-26 20:53:38 -0500
commitcb8a6ed34f2689f0dc862e3a9fa780074bd7cb20 (patch)
tree1803c1f8eb5e69b7d4231de57c94c1f3c2fc2464 /src/sdl
parentd1a7f112382fcc4a58de8617271298d8b9ec1fdc (diff)
downloadhydracastlelabyrinth-cb8a6ed34f2689f0dc862e3a9fa780074bd7cb20.tar.gz
hydracastlelabyrinth-cb8a6ed34f2689f0dc862e3a9fa780074bd7cb20.tar.bz2
hydracastlelabyrinth-cb8a6ed34f2689f0dc862e3a9fa780074bd7cb20.zip
GCW0 & DC commits
Diffstat (limited to 'src/sdl')
-rw-r--r--src/sdl/audio.c2
-rw-r--r--src/sdl/input.c9
2 files changed, 10 insertions, 1 deletions
diff --git a/src/sdl/audio.c b/src/sdl/audio.c
index b66ce1e..20b036d 100644
--- a/src/sdl/audio.c
+++ b/src/sdl/audio.c
@@ -26,7 +26,7 @@ PHL_Music PHL_LoadMusic(char* fname, int loop)
char buff[4096];
strcpy(buff, "data/");
strcat(buff, fname);
- strcat(buff, ".mid");
+ strcat(buff, ".ogg");
ret.snd = Mix_LoadMUS(buff);
return ret;
}
diff --git a/src/sdl/input.c b/src/sdl/input.c
index bf9de55..662b85b 100644
--- a/src/sdl/input.c
+++ b/src/sdl/input.c
@@ -69,6 +69,15 @@ void Input_KeyEvent(SDL_Event* evt)
case SDLK_2: bL = w; break;
case SDLK_SPACE: bSelect = w; break;
case SDLK_RETURN: bStart = w; break;
+#elif defined(DINGUX)
+ case SDLK_LSHIFT: bFaceUp = w; break;
+ case SDLK_LALT: bFaceDown = w; break;
+ case SDLK_LCTRL: bFaceLeft = w; break;
+ case SDLK_SPACE: bFaceRight = w; break;
+ case SDLK_BACKSPACE: bR = w; break;
+ case SDLK_TAB: bL = w; break;
+ case SDLK_ESCAPE: bSelect = w; break;
+ case SDLK_RETURN: bStart = w; break;
#else
case SDLK_e: bFaceUp = w; break;
case SDLK_x: bFaceDown = w; break;