jepler/fruitjam-doom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from trunk.

Browse source 
Subversion-branch: /branches/v2-branch
Subversion-revision: 2742
This commit is contained in:
Simon Howard 2013-11-03 06:23:21 +00:00
commit 9c1b1ff290
3 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/doom/g_game.c
View file

@ -1716,8 +1716,8 @@ G_InitNew
// 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

4
src/strife/g_game.c
View file

@ -2047,8 +2047,8 @@ G_InitNew
// 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

48
textscreen/txt_largefont.h
View file

@ -1790,34 +1790,34 @@ static uint8_t large_font_data[] =
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,