Split animated faces into different textures

nxengine · Apr 8, 2019 · e0a1c42 · e0a1c42
1 parent 6ac1673
commit e0a1c42
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 21 deletions.
diff --git a/data/Face.pbm b/data/Face.pbm
diff --git a/data/Face_0.pbm b/data/Face_0.pbm
diff --git a/data/Face_1.pbm b/data/Face_1.pbm
diff --git a/data/Face_2.pbm b/data/Face_2.pbm
diff --git a/data/sprites.sif b/data/sprites.sif
diff --git a/src/TextBox/TextBox.cpp b/src/TextBox/TextBox.cpp
@@ -160,16 +160,8 @@ void TextBox::SetFace(int newface)
   // stat("TextBox::SetFace(%d)", newface);
   fFace        = newface;
   fFaceXOffset = -FACE_W;
-  if (settings->animated_facepics)
-  {
-    faceFrame = 0;
-    faceStep = 1;
-  }
-  else
-  {
-    faceFrame = 2;
-    faceStep = 0;
-  }
+  faceFrame = 0;
+  faceStep = 1;
 }
 
 void TextBox::ShowCursor(bool enable)
@@ -273,10 +265,7 @@ void TextBox::TickTextBox()
     }
     else
     {
-      if (settings->animated_facepics)
-        faceFrame = 0;
-      else
-        faceFrame = 2;
+      faceFrame = 0;
       faceStep = 0;
     }
   }
@@ -312,7 +301,11 @@ void TextBox::DrawTextBox()
   // draw face
   if (fFace != 0)
   {
-    Renderer::getInstance()->sprites.drawSprite((fCoords.x + 14) + fFaceXOffset, fCoords.y + CONTENT_Y - 3, SPR_FACES, fFace + (30*faceFrame));
+    if (settings->animated_facepics)
+      Renderer::getInstance()->sprites.drawSprite((fCoords.x + 14) + fFaceXOffset, fCoords.y + CONTENT_Y - 3, SPR_FACES_0 + faceFrame, fFace);
+    else
+      Renderer::getInstance()->sprites.drawSprite((fCoords.x + 14) + fFaceXOffset, fCoords.y + CONTENT_Y - 3, SPR_FACES, fFace);
+
     text_x += (FACE_W + 8); // move text over by width of face
 
     // face slide-in animation
@@ -371,11 +364,6 @@ void TextBox::AddNextChar(void)
       }
     }
   }
-  else
-  {
-    faceStep = 0;
-    faceFrame = 2;
-  }
 
   while (!fCharsWaiting.empty())
   {

diff --git a/src/autogen/sprites.h b/src/autogen/sprites.h
@@ -491,3 +491,7 @@
 #define SPR_SAVESELECTOR_SIDES 487
 #define SPR_SAVESELECTOR_MIDDLE 488
 #define SPR_SS_HEALTH_ICON 489
+
+#define SPR_FACES_0 490
+#define SPR_FACES_1 491
+#define SPR_FACES_2 492
diff --git a/src/graphics/Sprites.h b/src/graphics/Sprites.h
@@ -2,7 +2,7 @@
 #ifndef _SPRITES_H
 #define _SPRITES_H
 
-#define MAX_SPRITESHEETS 64
+#define MAX_SPRITESHEETS 128
 #define MAX_SPRITES 512
 
 #include "../siflib/sif.h"