From: Holger Schemel <info@artsoft.org>
Date: Tue, 22 Apr 2003 21:13:02 +0000 (+0200)
Subject: rnd-20030422-2-src
X-Git-Tag: 3.0.0^2~86
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=a6f92ff31331edb70bdd380518fe217a78788f7e

rnd-20030422-2-src
---

diff --git a/CHANGES b/CHANGES
index 0d9b2eee..ca0d819e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
-Pre-Release Version 2.2.0rc6 [?? ??? ????]
+Pre-Release Version 2.2.0rc6 [22 APR 2003]
 ------------------------------------------
+	- added missing source file
+	- fixed little font directive bug
+	- added actual CHANGES file ;-)
 
 Pre-Release Version 2.2.0rc5 [20 APR 2003]
 ------------------------------------------
diff --git a/src/conftime.h b/src/conftime.h
index 895ef92b..32cd1cc2 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2003-04-22 01:54]"
+#define COMPILE_DATE_STRING "[2003-04-22 23:10]"
diff --git a/src/main.c b/src/main.c
index 836b436f..1289c0b6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3018,15 +3018,18 @@ struct FontInfo font_info[NUM_FONTS + 1] =
   { "font.text_2"		},
   { "font.text_3"		},
   { "font.text_4"		},
-  { "font.input"		},
-  { "font.input.active"		},
+  { "font.input_1.active"	},
+  { "font.input_1"		},
+  { "font.input_2.active"	},
+  { "font.input_2"		},
   { "font.option_off"		},
   { "font.option_on"		},
   { "font.value_1"		},
   { "font.value_2"		},
   { "font.value_old"		},
-  { "font.tape_recorder"	},
   { "font.level_number"		},
+  { "font.tape_recorder"	},
+  { "font.game_info"		},
 };
 
 
diff --git a/src/main.h b/src/main.h
index a690c064..a7adb261 100644
--- a/src/main.h
+++ b/src/main.h
@@ -846,10 +846,10 @@
 #define FONT_TEXT_2				9
 #define FONT_TEXT_3				10
 #define FONT_TEXT_4				11
-#define FONT_INPUT_1				12
-#define FONT_INPUT_1_ACTIVE			13
-#define FONT_INPUT_2				14
-#define FONT_INPUT_2_ACTIVE			15
+#define FONT_INPUT_1_ACTIVE			12
+#define FONT_INPUT_1				13
+#define FONT_INPUT_2_ACTIVE			14
+#define FONT_INPUT_2				15
 #define FONT_OPTION_OFF				16
 #define FONT_OPTION_ON				17
 #define FONT_VALUE_1				18
diff --git a/src/tape.c b/src/tape.c
index 43c97f5c..69ed9f93 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -50,7 +50,7 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS];
 #define VIDEO_DATE_LABEL_YPOS	(VIDEO_DISPLAY1_YPOS)
 #define VIDEO_DATE_LABEL_XSIZE	(VIDEO_DISPLAY_XSIZE)
 #define VIDEO_DATE_LABEL_YSIZE	(VIDEO_DISPLAY_YSIZE)
-#define VIDEO_DATE_XPOS		(VIDEO_DISPLAY1_XPOS + 1)
+#define VIDEO_DATE_XPOS		(VIDEO_DISPLAY1_XPOS + 2)
 #define VIDEO_DATE_YPOS		(VIDEO_DISPLAY1_YPOS + 14)
 #define VIDEO_DATE_XSIZE	(VIDEO_DISPLAY_XSIZE)
 #define VIDEO_DATE_YSIZE	16
@@ -78,7 +78,7 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS];
 #define VIDEO_PAUSE_SYMBOL_YPOS	(VIDEO_DISPLAY2_YPOS)
 #define VIDEO_PAUSE_SYMBOL_XSIZE 17
 #define VIDEO_PAUSE_SYMBOL_YSIZE 13
-#define VIDEO_TIME_XPOS		(VIDEO_DISPLAY2_XPOS + 38)
+#define VIDEO_TIME_XPOS		(VIDEO_DISPLAY2_XPOS + 39)
 #define VIDEO_TIME_YPOS		(VIDEO_DISPLAY2_YPOS + 14)
 #define VIDEO_TIME_XSIZE	50
 #define VIDEO_TIME_YSIZE	16