X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=b67573e61a4d9c9c552a796ac979e429f0086ade;hb=0f007d1d01007a58b0493c60143f2b0bf58ff1b1;hp=83c436140e665996b01aed85bf21115ffdebbc04;hpb=2e1d1c6ba8e6aaaca977b4a7d652a5fafccb68c0;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 83c43614..b67573e6 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -1482,6 +1482,8 @@ void DrawMainMenu()
   LoadLevel(level_nr);
   LoadScore(level_nr);
 
+  SaveLevelSetup_SeriesInfo();
+
   // set this after "ChangeViewportPropertiesIfNeeded()" (which may reset it)
   SetDrawDeactivationMask(REDRAW_NONE);
   SetDrawBackgroundMask(REDRAW_FIELD);
@@ -1785,6 +1787,8 @@ void HandleMainMenu_SelectLevel(int step, int direction, int selected_level_nr)
     LoadTape(level_nr);
     DrawCompleteVideoDisplay();
 
+    SaveLevelSetup_SeriesInfo();
+
     /* needed because DrawPreviewLevelInitial() takes some time */
     BackToFront();
     /* SyncDisplay(); */
@@ -3304,9 +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");
@@ -5593,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:
@@ -6279,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: