all repos — hyperkaos @ 4a5b926621d4baa39658026738e45f1e65d25fd5

lightweight modular puzzle/adventure game engine in C with SDL 1.2 

Merge branch 'master' of https://gitlab.com/nilix/hyperkaos
Iris Lightshard nilix@nilfm.cc
commit

4a5b926621d4baa39658026738e45f1e65d25fd5

parent

4c5fc219516d2e8c75111f33f0f67bec9ded2e71

5 files changed, 52 insertions(+), 30 deletions(-)

jump to
M Engine.c → Engine.c 
@@ -6,7 +6,9 @@ #include "SDL/SDL_image.h"
 #include "SDL/SDL_ttf.h"
 #include "SDL/SDL_mixer.h"
 
+#include "config.h"
 #include "enum.h"
+
 #include "Engine.h"
 #include "Timer.h"
 #include "Player.h"

@@ -16,6 +18,7 @@ #include "TextBox.h"
 #include "Kaos.h"
 #include "HyperKaos.h"
 #include "Scene.h"
+
 #include "extern.h"
 
 //

@@ -89,25 +92,25 @@ {
       case SDL_KEYDOWN:
         switch (event.key.keysym.sym)
         {
-          case SDLK_w:
+          case DPAD_UP:
             hero->bearing.y = -2;
             break;
-          case SDLK_a:
+          case DPAD_LEFT:
             hero->bearing.x = -2;
             break;
-          case SDLK_s:
+          case DPAD_DOWN:
             hero->bearing.y = 2;
             break;
-          case SDLK_d:
+          case DPAD_RIGHT:
             hero->bearing.x = 2;
             break;
-          case SDLK_j:
+          case A_BUTTON:
             actionbutton = 1;
             break;
-          case SDLK_q:
+          case PAUSE_BUTTON:
             pausemenu();
             break;
-          case SDLK_f:
+          case FS_BUTTON:
             toggleFullscreen();
             break;
           default: break;

@@ -116,31 +119,31 @@ break;
       case SDL_KEYUP:
         switch( event.key.keysym.sym )
         {
-          case SDLK_w:
+          case DPAD_UP:
             if (hero->bearing.y < 0)
             {
               hero->bearing.y = 0;
             }
             break;
-          case SDLK_a:
+          case DPAD_LEFT:
             if (hero->bearing.x < 0)
             {
               hero->bearing.x = 0 ;
             }
             break;
-          case SDLK_s:
+          case DPAD_DOWN:
             if (hero->bearing.y > 0)
             {
               hero->bearing.y = 0;
             }
             break;
-          case SDLK_d:
+          case DPAD_RIGHT:
             if (hero->bearing.x > 0)
             {
               hero->bearing.x = 0;
             }
             break;
-          case SDLK_j:
+          case A_BUTTON:
             actionbutton = 0;
             break;
           default: break;

@@ -340,17 +343,17 @@ {
         case SDL_KEYDOWN:
           switch (event.key.keysym.sym)
           {
-            case SDLK_w:
+            case DPAD_UP:
               menucounter--;
               break;
-            case SDLK_s:
+            case DPAD_DOWN:
               menucounter++;
               break;
 
-            case SDLK_j:
+            case A_BUTTON:
               select = 1;
               break;
-            case SDLK_f:
+            case FS_BUTTON:
               toggleFullscreen();
               break;
             default: break;

@@ -451,19 +454,19 @@ {
         case SDL_KEYDOWN:
           switch (event.key.keysym.sym)
           {
-            case SDLK_w:
+            case DPAD_UP:
               menucounter--;
               break;
-            case SDLK_s:
+            case DPAD_DOWN:
               menucounter++;
               break;
-            case SDLK_j:
+            case A_BUTTON:
               select = 1;
               break;
-            case SDLK_q:
+            case PAUSE_BUTTON:
               paused = 0;
               break;
-            case SDLK_f:
+            case FS_BUTTON:
               toggleFullscreen();
               break;
             default: break;
M Kaos.c → Kaos.c 
@@ -3,6 +3,8 @@ #include "SDL/SDL_image.h"
 #include "SDL/SDL_ttf.h"
 #include "SDL/SDL_mixer.h"
 
+#include "config.h"
+
 #include "enum.h"
 #include "Engine.h"
 #include "Timer.h"

@@ -98,17 +100,17 @@ case SDL_QUIT: quit = 1; playing = 0; textIsRelevent = 0; break;
         case SDL_KEYDOWN:
           switch(event.key.keysym.sym)
           {
-             case SDLK_a:
-             case SDLK_d:
+             case DPAD_LEFT:
+             case DPAD_RIGHT:
                if (choice == 0) choice = 1;
                else choice = 0;
                break;
-             case SDLK_j:
+             case A_BUTTON:
                textIsRelevent = 0;
                if (choice == 0) run(kSelf->path1);
                else run(kSelf->path2);
                break;
-             case SDLK_f:
+             case FS_BUTTON:
               toggleFullscreen();
               break;
             default: break;
M Scene.c → Scene.c 
@@ -5,6 +5,8 @@ #include <SDL/SDL_image.h>
 #include <SDL/SDL_ttf.h>
 #include <SDL/SDL_mixer.h>
 
+#include "config.h"
+
 #include "Scene.h"
 #include "Timer.h"
 #include "Engine.h"

@@ -77,10 +79,10 @@ {
       case SDL_KEYDOWN:
         switch (event.key.keysym.sym)
         {
-          case SDLK_j:
+          case A_BUTTON:
             *counter = self->time - 1;
             break;
-          case SDLK_f:
+          case FS_BUTTON:
             toggleFullscreen();
             break;
           default: break;
M TextBox.c → TextBox.c 
@@ -2,6 +2,9 @@ #include "SDL/SDL.h"
 #include "SDL/SDL_image.h"
 #include "SDL/SDL_ttf.h"
 #include "SDL/SDL_mixer.h"
+
+#include "config.h"
+
 #include "Engine.h"
 #include "Timer.h"
 #include "Player.h"

@@ -77,8 +80,11 @@ case SDL_QUIT: quit=1; playing = 0; *textIsRelevent = 0; break;
           case SDL_KEYDOWN:
             switch (event.key.keysym.sym)
             {
-              case SDLK_j:
+              case A_BUTTON:
                 if (self->cursor < 15) self->cursor += 3;
+                break;
+              case FS_BUTTON:
+                toggleFullscreen();
                 break;
               default: break;
             }

@@ -103,7 +109,7 @@ case SDL_QUIT: quit = 1; playing = 0; *textIsRelevent = 0; break;
           case SDL_KEYDOWN:
             switch (event.key.keysym.sym)
             {
-              case SDLK_j:
+              case A_BUTTON:
                 if (self->scroll + 1 != self->lines)
                 {
                   self->cursor = 0;

@@ -112,7 +118,7 @@ self->scrollFrom += 4;
                 }
                 else *textIsRelevent = 0;
                 break;
-              case SDLK_f:
+              case FS_BUTTON:
                   toggleFullscreen();
                 break;
A config.h 
@@ -0,0 +1,9 @@ 
+/* see http://sdlk.beuc.net/sdl.wiki/SDLKey for keysyms */
+
+#define DPAD_UP       SDLK_w
+#define DPAD_DOWN     SDLK_s
+#define DPAD_LEFT     SDLK_a
+#define DPAD_RIGHT    SDLK_d
+#define A_BUTTON      SDLK_j
+#define FS_BUTTON     SDLK_f
+#define PAUSE_BUTTON  SDLK_q