ref: 9c1b1ff29054c4e8c0ea6ef243594b5a5273351e
parent: 31569586850b0db9d96902888c77264f80618d10
parent: 84407a7a27988b19240975c5e94a3d0e9fc3b468
author: Simon Howard <fraggle@gmail.com>
date: Sun Nov 3 01:23:21 EST 2013
Merge from trunk. Subversion-branch: /branches/v2-branch Subversion-revision: 2742
--- a/src/doom/g_game.c
+++ b/src/doom/g_game.c
@@ -1716,8 +1716,8 @@
// Set the sky to use.
//
- // Note: This IS broken, but it is how Vanilla Doom behaves.
- // See http://doom.wikia.com/wiki/Sky_never_changes_in_Doom_II.
+ // Note: This IS broken, but it is how Vanilla Doom behaves.
+ // See http://doomwiki.org/wiki/Sky_never_changes_in_Doom_II.
//
// Because we set the sky here at the start of a game, not at the
// start of a level, the sky texture never changes unless we
--- a/src/strife/g_game.c
+++ b/src/strife/g_game.c
@@ -2047,8 +2047,8 @@
// Set the sky to use.
//
- // Note: This IS broken, but it is how Vanilla Doom behaves.
- // See http://doom.wikia.com/wiki/Sky_never_changes_in_Doom_II.
+ // Note: This IS broken, but it is how Vanilla Doom behaves.
+ // See http://doomwiki.org/wiki/Sky_never_changes_in_Doom_II.
//
// Because we set the sky here at the start of a game, not at the
// start of a level, the sky texture never changes unless we
--- a/textscreen/txt_largefont.h
+++ b/textscreen/txt_largefont.h
@@ -1790,34 +1790,34 @@
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
// 176:
- 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
- 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
- 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
- 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
- 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
- 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
- 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
- 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
+ 0x03, 0x03, 0x03, 0x03, 0x30, 0x30, 0x30, 0x30,
+ 0x03, 0x03, 0x03, 0x03, 0x30, 0x30, 0x30, 0x30,
+ 0x03, 0x03, 0x03, 0x03, 0x30, 0x30, 0x30, 0x30,
+ 0x03, 0x03, 0x03, 0x03, 0x30, 0x30, 0x30, 0x30,
+ 0x03, 0x03, 0x03, 0x03, 0x30, 0x30, 0x30, 0x30,
+ 0x03, 0x03, 0x03, 0x03, 0x30, 0x30, 0x30, 0x30,
+ 0x03, 0x03, 0x03, 0x03, 0x30, 0x30, 0x30, 0x30,
+ 0x03, 0x03, 0x03, 0x03, 0x30, 0x30, 0x30, 0x30,
// 177:
- 0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa,
- 0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa,
- 0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa,
- 0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa,
- 0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa,
- 0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa,
- 0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa,
- 0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa,
+ 0x33, 0x33, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xcc,
+ 0x33, 0x33, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xcc,
+ 0x33, 0x33, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xcc,
+ 0x33, 0x33, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xcc,
+ 0x33, 0x33, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xcc,
+ 0x33, 0x33, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xcc,
+ 0x33, 0x33, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xcc,
+ 0x33, 0x33, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xcc,
// 178:
- 0xdd, 0xdd, 0x77, 0x77, 0xdd, 0xdd, 0x77, 0x77,
- 0xdd, 0xdd, 0x77, 0x77, 0xdd, 0xdd, 0x77, 0x77,
- 0xdd, 0xdd, 0x77, 0x77, 0xdd, 0xdd, 0x77, 0x77,
- 0xdd, 0xdd, 0x77, 0x77, 0xdd, 0xdd, 0x77, 0x77,
- 0xdd, 0xdd, 0x77, 0x77, 0xdd, 0xdd, 0x77, 0x77,
- 0xdd, 0xdd, 0x77, 0x77, 0xdd, 0xdd, 0x77, 0x77,
- 0xdd, 0xdd, 0x77, 0x77, 0xdd, 0xdd, 0x77, 0x77,
- 0xdd, 0xdd, 0x77, 0x77, 0xdd, 0xdd, 0x77, 0x77,
+ 0xf3, 0xf3, 0xf3, 0xf3, 0x3f, 0x3f, 0x3f, 0x3f,
+ 0xf3, 0xf3, 0xf3, 0xf3, 0x3f, 0x3f, 0x3f, 0x3f,
+ 0xf3, 0xf3, 0xf3, 0xf3, 0x3f, 0x3f, 0x3f, 0x3f,
+ 0xf3, 0xf3, 0xf3, 0xf3, 0x3f, 0x3f, 0x3f, 0x3f,
+ 0xf3, 0xf3, 0xf3, 0xf3, 0x3f, 0x3f, 0x3f, 0x3f,
+ 0xf3, 0xf3, 0xf3, 0xf3, 0x3f, 0x3f, 0x3f, 0x3f,
+ 0xf3, 0xf3, 0xf3, 0xf3, 0x3f, 0x3f, 0x3f, 0x3f,
+ 0xf3, 0xf3, 0xf3, 0xf3, 0x3f, 0x3f, 0x3f, 0x3f,
// 179:
0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0,