M Scene.c → Scene.c

@@ -68,6 +68,41 @@ self->sprites[self->nSprites] = sprite;
   self->nSprites++;
 }
 
+void sceneInput(Scene* self, int* counter)
+{
+  while (SDL_PollEvent(&event))
+  {
+    switch (event.type)
+    {
+      case SDL_KEYDOWN:
+        switch (event.key.keysym.sym)
+        {
+          case SDLK_j:
+            *counter = self->time - 1;
+            break;
+          case SDLK_f:
+            toggleFullscreen();
+            break;
+          default: break;
+        }
+        break;
+      case SDL_QUIT:
+        if (playing)
+        {
+          playing = 0;
+          quit = 1;
+        }
+        else
+        {
+          *counter = self->time - 1;
+          playing = 0;
+          quit = 1;
+        }
+        break;
+    }
+  }
+}
+
 void playScene(Scene* self)
 {
   int i, j;
@@ -88,6 +123,7 @@ 
   for (i = 0; i < self->time; i++)
   {
     timeStart(fps);
+    sceneInput(self, &i);
     for (j = 0; j < self->nSprites; j++)
     {
       applySurface(self->sprites[j]->x, self->sprites[j]->y, self->sprites[j]->sprite, screen, NULL);

M Scene.h → Scene.h

@@ -27,4 +27,5 @@ 
 Scene* newScene(int in, int out, int time, SDL_Color incolor, SDL_Color outcolor);
 void buildScene(Scene* self, SLayer* sprite);
 void playScene(Scene* self);
+void sceneInput(Scene* self, int* counter);
 void deleteScene(Scene* target);

M TextBox.c → TextBox.c

@@ -64,34 +64,8 @@ self->message[self->lines] = TTF_RenderText_Solid(font, text, textColor);
   self->lines++;
 }
 
-void displayTextBox(TextBox* self)
+void textBoxInput(TextBox* self, int* textIsRelevent)
 {
-  int textIsRelevent = 1;
-  int offset = -32;
-  int i;
-  SDL_Rect textScroller = {0, 0, 0, 14};
-  actionbutton = 0;
-  while (textIsRelevent)
-  {
-    timeStart(fps);
-    renderBackground();
-    renderForeground();
-
-    applySurface(22, 51, textBoxBG, screen, NULL);
-    if (self->portrait)
-    {
-      applySurface(32, 58, self->portrait, screen, NULL);
-      offset = 0;
-    }
-
-    for (i = self->scrollFrom; i < self->scroll; i++)
-    {
-      applySurface(106 + offset, 64+(14*(i%4)), self->message[i], screen, NULL);
-    }
-
-    textScroller.w = self->cursor*10;
-    applySurface(106 + offset, 64+(14*(self->scroll%4)), self->message[self->scroll], screen, &textScroller);
-
     if (self->cursor != 17)
     {
       self->cursor++;
@@ -99,7 +73,7 @@ while (SDL_PollEvent(&event))
       {
         switch (event.type)
         {
-          case SDL_QUIT: quit=1; playing = 0; textIsRelevent = 0; break;
+          case SDL_QUIT: quit=1; playing = 0; *textIsRelevent = 0; break;
           case SDL_KEYDOWN:
             switch (event.key.keysym.sym)
             {
@@ -125,7 +99,7 @@ while (SDL_PollEvent(&event))
       {
         switch (event.type)
         {
-          case SDL_QUIT: quit = 1; playing = 0; textIsRelevent = 0; break;
+          case SDL_QUIT: quit = 1; playing = 0; *textIsRelevent = 0; break;
           case SDL_KEYDOWN:
             switch (event.key.keysym.sym)
             {
@@ -136,7 +110,7 @@ self->cursor = 0;
                   self->scroll++;
                   self->scrollFrom += 4;
                 }
-                else textIsRelevent = 0;
+                else *textIsRelevent = 0;
                 break;
               case SDLK_f:
                   toggleFullscreen();
@@ -147,6 +121,38 @@ }
         }
       }
     }
+}
+
+void displayTextBox(TextBox* self)
+{
+  int textIsRelevent = 1;
+  int offset = -32;
+  int i;
+  SDL_Rect textScroller = {0, 0, 0, 14};
+  actionbutton = 0;
+  while (textIsRelevent)
+  {
+    timeStart(fps);
+    renderBackground();
+    renderForeground();
+
+    applySurface(22, 51, textBoxBG, screen, NULL);
+    if (self->portrait)
+    {
+      applySurface(32, 58, self->portrait, screen, NULL);
+      offset = 0;
+    }
+
+    for (i = self->scrollFrom; i < self->scroll; i++)
+    {
+      applySurface(106 + offset, 64+(14*(i%4)), self->message[i], screen, NULL);
+    }
+
+    textScroller.w = self->cursor*10;
+    applySurface(106 + offset, 64+(14*(self->scroll%4)), self->message[self->scroll], screen, &textScroller);
+
+    textBoxInput(self, &textIsRelevent);
+
     SDL_Flip(screen);
     timeDilation();
 

M TextBox.h → TextBox.h

@@ -15,3 +15,4 @@ void deleteTextBox(TextBox* target);
 
 void addText(TextBox* self, char* text);
 void displayTextBox(TextBox* self);
+void textBoxInput(TextBox* self, int* textIsRelevent);