rnd-20020713-1-src

diff --git a/CHANGES b/CHANGES
index 506f6ea90d6e68b3a59b5807bb65763a766947bf..c5e1c905435ad709e8a05c53d6ea25d849c051ef 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -12,7 +12,7 @@ Release Version 2.1.0 [XX XXX XXXX]
          this is now an element property for gems in the level editor,
          although existing converted levels use the new EM gems behaviour
        - bug fixed that prevented walking through tubes when gravity on
          this is now an element property for gems in the level editor,
          although existing converted levels use the new EM gems behaviour
        - bug fixed that prevented walking through tubes when gravity on

-       - added Boulderdash style "snap-pushing" (thanks to Achim Härtel)
+       - added Boulder Dash style "snap-pushing" (thanks to Achim Härtel)

        - fixed memory leak in image loading code
        - fixed some "solid" elements that were accidentally destructible
        - fixed some tape stuff
        - fixed memory leak in image loading code
        - fixed some "solid" elements that were accidentally destructible
        - fixed some tape stuff


@@ -64,7 +64,7 @@ Release Version 2.0.0 [01 JAN 2001]
 
 Release Version 1.4.0 [27 OCT 1999]
 -----------------------------------
 
 Release Version 1.4.0 [27 OCT 1999]
 -----------------------------------

-       - new Boulderdash elements for better game emulation
+       - new Boulder Dash elements for better game emulation

        - new cool medium-sized crystal font
        - new elements and graphics for Diamond Caves II levels
        - new elements and graphics for Emerald Mine Club levels
        - new cool medium-sized crystal font
        - new elements and graphics for Diamond Caves II levels
        - new elements and graphics for Emerald Mine Club levels


@@ -151,7 +151,7 @@ Version 1.0 [9 APR 1997] [NOT RELEASED]
          there are diagonal directions with keyboard playing
          and the fire buttons are mapped to the shift keys)
        - a lot of new elements for better emulation of levels
          there are diagonal directions with keyboard playing
          and the fire buttons are mapped to the shift keys)
        - a lot of new elements for better emulation of levels

-         from the games "Boulderdash", "Emerald Mine" and
+         from the games "Boulder Dash", "Emerald Mine" and

          "Sokoban". New elements to build "Dynablaster" style
          levels.
        - enhanced functionality of the level tape recorder
          "Sokoban". New elements to build "Dynablaster" style
          levels.
        - enhanced functionality of the level tape recorder

diff --git a/src/libgame/text.c b/src/libgame/text.c
index 89f04c4922db6c45e4883678d316c4345fd37574..19dc2471b71463d2a5a89b87ca001f43e7051ec6 100644 (file)
--- a/src/libgame/text.c
+++ b/src/libgame/text.c
@@ -152,16 +152,16 @@ void DrawTextExt(DrawBuffer *bitmap, int x, int y,
     else if (c == '\\')                        /* bad luck ... */
       c = '/';
 
     else if (c == '\\')                        /* bad luck ... */
       c = '/';
 

-    if ((c >= 32 && c <= 95) || c == '°')
+    if ((c >= 32 && c <= 95) || c == '°' || c == '´')

     {
       int src_x = ((c - 32) % FONT_CHARS_PER_LINE) * font_width;
       int src_y = ((c - 32) / FONT_CHARS_PER_LINE) * font_height + font_start;
       int dest_x = x, dest_y = y;
 
     {
       int src_x = ((c - 32) % FONT_CHARS_PER_LINE) * font_width;
       int src_y = ((c - 32) / FONT_CHARS_PER_LINE) * font_height + font_start;
       int dest_x = x, dest_y = y;
 

-      if (c == '°')
+      if (c == '°' || c == '´')                /* map '°' and 'TM' signs */

       {
       {

-       src_x = (FONT_CHARS_PER_LINE + 1) * font_width;
-       src_y = 3 * font_height + font_start;
+       src_x = FONT_CHARS_PER_LINE * font_width;
+       src_y = (c == '°' ? 1 : 2) * font_height + font_start;

       }
 
       if (print_inverse)
       }
 
       if (print_inverse)

diff --git a/src/screens.c b/src/screens.c
index a09d3ec02c73c4fcb2535b3ed4855d5966034bc8..627ba8074b7998fac809b922aad5261659b23e97 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -867,10 +867,10 @@ void HandleHelpScreen(int button)
   }
   else
   {
   }
   else
   {

-    if (DelayReached(&hs_delay,GAME_FRAME_DELAY * 2))
+    if (DelayReached(&hs_delay, GAME_FRAME_DELAY * 2))

     {
       if (helpscreen_state < num_helpscreen_els_pages)
     {
       if (helpscreen_state < num_helpscreen_els_pages)

-       DrawHelpScreenElAction(helpscreen_state*MAX_HELPSCREEN_ELS);
+       DrawHelpScreenElAction(helpscreen_state * MAX_HELPSCREEN_ELS);

     }
 
     /* !!! workaround for playing "music" that is really a sound loop (and
     }
 
     /* !!! workaround for playing "music" that is really a sound loop (and

diff --git a/src/timestamp.h b/src/timestamp.h
index 31ddd1ca48b5e85081244f0d200f20feb4f90057..c1c160cee6a9d787cc704f361f0d1ba55f65649a 100644 (file)
--- a/src/timestamp.h
+++ b/src/timestamp.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2002-06-29 20:35]"
+#define COMPILE_DATE_STRING "[2002-07-13 18:18]"