rnd-20140205-1-src

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 4c7a117f890ee24df18e5da0ccd90c62ea9a47ba..eb8d100d920eff39b9304e7ff1507df31935f622 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -4859,8 +4859,12 @@ struct ConfigInfo image_config[] =
   { "tape.label.gfx.date.x",                   "305"                   },
   { "tape.label.gfx.date.y",                   "285"                   },
   { "tape.label.gfx.date.width",               "90"                    },
   { "tape.label.gfx.date.x",                   "305"                   },
   { "tape.label.gfx.date.y",                   "285"                   },
   { "tape.label.gfx.date.width",               "90"                    },

-  { "tape.label.gfx.date.height",              "13"                    },
-  { "tape.label.gfx.time",                     UNDEFINED_FILENAME      },
+  { "tape.label.gfx.date.height",              "31"                    },
+  { "tape.label.gfx.time",                     "RocksDoor.png"         },
+  { "tape.label.gfx.time.x",                   "345"                   },
+  { "tape.label.gfx.time.y",                   "335"                   },
+  { "tape.label.gfx.time.width",               "45"                    },
+  { "tape.label.gfx.time.height",              "13"                    },

 
   { "request.button.gfx.yes",                  "RocksDoor.png"         },
   { "request.button.gfx.yes.x",                        "302"                   },
 
   { "request.button.gfx.yes",                  "RocksDoor.png"         },
   { "request.button.gfx.yes.x",                        "302"                   },


@@ -6691,8 +6695,8 @@ struct ConfigInfo image_config[] =
 
   { "tape.label.date.x",                       "5"                     },
   { "tape.label.date.y",                       "5"                     },
 
   { "tape.label.date.x",                       "5"                     },
   { "tape.label.date.y",                       "5"                     },

-  { "tape.label.time.x",                       "-1"                    },
-  { "tape.label.time.y",                       "-1"                    },
+  { "tape.label.time.x",                       "45"                    },
+  { "tape.label.time.y",                       "55"                    },

 
   { "tape.text.date.x",                                "7"                     },
   { "tape.text.date.y",                                "19"                    },
 
   { "tape.text.date.x",                                "7"                     },
   { "tape.text.date.y",                                "19"                    },

diff --git a/src/conftime.h b/src/conftime.h
index 3922a95af873d35649dce7990d4ddb1134ae9acb..bd76bddd27d91f5733d32957b3b8ffa4403285f9 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2014-01-29 01:41"
+#define COMPILE_DATE_STRING "2014-02-05 21:45"

diff --git a/src/libgame/text.c b/src/libgame/text.c
index 61feaae192fc68869015f868261d124ed2024150..69132fa04623b0092423a3a8d4de9d05b63677bf 100644 (file)
--- a/src/libgame/text.c
+++ b/src/libgame/text.c
@@ -195,10 +195,14 @@ void getFontCharSource(int font_nr, char c, Bitmap **bitmap, int *x, int *y)
 int maxWordLengthInString(char *text)
 {
   char *text_ptr;
 int maxWordLengthInString(char *text)
 {
   char *text_ptr;

-  int max_word_len = 0;
+  int word_len = 0, max_word_len = 0;

 
   for (text_ptr = text; *text_ptr; text_ptr++)
 
   for (text_ptr = text; *text_ptr; text_ptr++)

-    max_word_len = (*text_ptr != ' ' ? max_word_len + 1 : 0);
+  {
+    word_len = (*text_ptr != ' ' ? word_len + 1 : 0);
+
+    max_word_len = MAX(word_len, max_word_len);
+  }

 
   return max_word_len;
 }
 
   return max_word_len;
 }

diff --git a/src/tools.c b/src/tools.c
index 5cbf8053324b2f9ab255e5739cc374ef007eab1c..95f12fc1d5ca157f11fbfea1a3f9ee002e725fc0 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -3166,9 +3166,17 @@ void ShowEnvelopeRequest(char *text, unsigned int req_state, int action)
   /* (important: after "BackToFront()", but before "SetDrawtoField()") */
   game_status = last_game_status;      /* restore current game status */
 
   /* (important: after "BackToFront()", but before "SetDrawtoField()") */
   game_status = last_game_status;      /* restore current game status */
 

+#if 1
+  if (action == ACTION_CLOSING &&
+      game_status == GAME_MODE_PLAYING &&
+      level.game_engine_type == GAME_ENGINE_TYPE_RND)
+    SetDrawtoField(DRAW_BUFFERED);
+#else

   if (game_status == GAME_MODE_PLAYING &&
       level.game_engine_type == GAME_ENGINE_TYPE_RND)
     SetDrawtoField(DRAW_BUFFERED);
   if (game_status == GAME_MODE_PLAYING &&
       level.game_engine_type == GAME_ENGINE_TYPE_RND)
     SetDrawtoField(DRAW_BUFFERED);

+#endif
+

 #else
   BackToFront();
 #endif
 #else
   BackToFront();
 #endif