fixed (switched) fonts for constant and variable text output

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index d3bf2981968faff2cdada0f4d8895adeed22a252..60d5daa4f12b764c3b989bf11457f2192738386e 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -3276,8 +3276,8 @@ void HandleInfoScreen_Program(int button)
 
 void DrawInfoScreen_Version()
 {
-  int font_header = FONT_TEXT_3;
-  int font_text = FONT_TEXT_2;
+  int font_header = FONT_TEXT_2;
+  int font_text = FONT_TEXT_3;
   int xstep = getFontWidth(font_text);
   int ystep = getFontHeight(font_text);
   int ystart1 = mSY - SY + 100;
@@ -3308,16 +3308,22 @@ void DrawInfoScreen_Version()
   DrawTextF(xstart1, ystart2, font_header, "Name");
   DrawTextF(xstart2, ystart2, font_text, getProgramTitleString());
 
-  ystart2 += ystep;
-  DrawTextF(xstart1, ystart2, font_header, "Version");
-  DrawTextF(xstart2, ystart2, font_text, getProgramVersionString());
-
   if (!strEqual(getProgramVersionString(), getProgramRealVersionString()))
   {
+    ystart2 += ystep;
+    DrawTextF(xstart1, ystart2, font_header, "Version (fake)");
+    DrawTextF(xstart2, ystart2, font_text, getProgramVersionString());
+
     ystart2 += ystep;
     DrawTextF(xstart1, ystart2, font_header, "Version (real)");
     DrawTextF(xstart2, ystart2, font_text, getProgramRealVersionString());
   }
+  else
+  {
+    ystart2 += ystep;
+    DrawTextF(xstart1, ystart2, font_header, "Version");
+    DrawTextF(xstart2, ystart2, font_text, getProgramVersionString());
+  }
 
   ystart2 += ystep;
   DrawTextF(xstart1, ystart2, font_header, "Platform");
@@ -5604,12 +5610,10 @@ static Key getSetupKey()
 
   while (!got_key_event)
   {
-    if (PendingEvent())                /* got event */
-    {
-      Event event;
-
-      NextEvent(&event);
+    Event event;
 
+    if (NextValidEvent(&event))
+    {
       switch (event.type)
       {
         case EVENT_KEYPRESS:
@@ -6290,12 +6294,10 @@ void CustomizeKeyboard(int player_nr)
 
   while (!finished)
   {
-    if (PendingEvent())                /* got event */
-    {
-      Event event;
-
-      NextEvent(&event);
+    Event event;
 
+    if (NextValidEvent(&event))
+    {
       switch (event.type)
       {
         case EVENT_KEYPRESS: