Browse Source

Console visible ingame!

Thomas Buck 11 years ago
parent
commit
0d5e6a5215
3 changed files with 13 additions and 8 deletions
  1. 1
    0
      ChangeLog
  2. 1
    1
      Makefile
  3. 11
    7
      src/Render.cpp

+ 1
- 0
ChangeLog View File

6
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
6
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
7
 
7
 
8
 	[ 20140101 ]
8
 	[ 20140101 ]
9
+	* Fixed Render bug, now console is visible again
9
 	* Implemented CMD + Q shortcut on Mac to quit
10
 	* Implemented CMD + Q shortcut on Mac to quit
10
 	* Added bool mFirstMouseEvent to SDLSystem used to ignore
11
 	* Added bool mFirstMouseEvent to SDLSystem used to ignore
11
 	  the first received mouse event, because its faulty, thanks
12
 	  the first received mouse event, because its faulty, thanks

+ 1
- 1
Makefile View File

15
 MAJOR_VERSION=0
15
 MAJOR_VERSION=0
16
 MINOR_VERSION=1
16
 MINOR_VERSION=1
17
 MICRO_VERSION=2
17
 MICRO_VERSION=2
18
-BUILD_ID=20131231
18
+BUILD_ID=20140101
19
 PRE=
19
 PRE=
20
 VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)$(PRE)
20
 VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)$(PRE)
21
 VERSION_DEB=$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION).$(BUILD_ID)
21
 VERSION_DEB=$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION).$(BUILD_ID)

+ 11
- 7
src/Render.cpp View File

199
 {
199
 {
200
 	char filename[128];
200
 	char filename[128];
201
 	bool fastCard = mFlags & Render::fFastCard;
201
 	bool fastCard = mFlags & Render::fFastCard;
202
-	const char *console = "Toggle the Console with [`] key, Menu with <esc>";
202
+	const char *console = "Toggle the Console with [`] key";
203
+    const char *menu = "Press <esc> for menu";
203
 	int font_id;
204
 	int font_id;
204
 	int snow1_id;
205
 	int snow1_id;
205
 	int snow2_id;
206
 	int snow2_id;
291
 
292
 
292
 	// String 0: OpenRaider version in lower right corner
293
 	// String 0: OpenRaider version in lower right corner
293
 	mString.Scale(0.90);
294
 	mString.Scale(0.90);
294
-	err = mString.glPrintf(mWidth - 14 * strlen(VERSION),
295
-								  mHeight-24*3, 0, VERSION);
295
+	err = mString.glPrintf(mWidth - 10 * strlen(VERSION),
296
+								  mHeight-24, 0, VERSION);
296
 	mString.SetString(0, VERSION);
297
 	mString.SetString(0, VERSION);
297
-	mString.Scale(0.5);
298
 
298
 
299
 	if (err)
299
 	if (err)
300
 	{
300
 	{
302
 	}
302
 	}
303
 
303
 
304
 	// String 1: Used for FPS in game text output
304
 	// String 1: Used for FPS in game text output
305
+	mString.Scale(0.5);
305
 	err = mString.glPrintf(8, 0, 0, "                ");
306
 	err = mString.glPrintf(8, 0, 0, "                ");
306
 
307
 
307
 	if (err)
308
 	if (err)
310
 	}
311
 	}
311
 
312
 
312
 	// String 2: Used for game console
313
 	// String 2: Used for game console
313
-	err = mString.glPrintf(8, -24, 0, console);
314
+    mString.Scale(1.00);
315
+	err = mString.glPrintf(8, 20, 0, console);
316
+    mString.SetString(2, console);
314
 
317
 
315
 	if (err)
318
 	if (err)
316
 	{
319
 	{
319
 
322
 
320
 	// String 3: Used for one line map select menu
323
 	// String 3: Used for one line map select menu
321
 	mString.Scale(1.75);
324
 	mString.Scale(1.75);
322
-	err = mString.glPrintf(mWidth/2-200, mHeight/2-24, 0, "Press <esc> for menu");
323
-	mString.Scale(1.0);
325
+	err = mString.glPrintf(mWidth/2-200, mHeight/2-24, 0, menu);
326
+    mString.SetString(3, menu);
324
 
327
 
325
 	if (err)
328
 	if (err)
326
 	{
329
 	{
328
 	}
331
 	}
329
 
332
 
330
 	// String 4: Used for one line in game text output
333
 	// String 4: Used for one line in game text output
334
+	mString.Scale(1.0);
331
 	err = mString.glPrintf(8, 18*2, 0, "                    ");
335
 	err = mString.glPrintf(8, 18*2, 0, "                    ");
332
 
336
 
333
 	if (err)
337
 	if (err)

Loading…
Cancel
Save