zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-10 23:01:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Backported GZDoom r1246:

Browse source 
* Fixed possible crash when texture for menu item patch cannot be loaded. (From Alexey's Mac OS X port.)
* Fixed iwadinfo.txt definitions of Hexen and Freedoom demos (also from Alexey's port.)
* Added missing LOF_NOJUMP definition.


SVN r3284 (trunk)
This commit is contained in:
Braden Obrzut 2011-08-23 02:39:20 +00:00
parent edfc16906a
commit eafb9da2c1
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/menu/listmenu.cpp
View file

@ -553,7 +553,9 @@ void FListMenuItemPatch::Drawer(bool selected)
} }
int FListMenuItemPatch::GetWidth() int FListMenuItemPatch::GetWidth()
{ {
return TexMan[mTexture]->GetScaledWidth(); return mTexture.isValid()
? TexMan[mTexture]->GetScaledWidth()
: 0;
} }

1
wadsrc/static/actors/constants.txt
View file

@ -61,6 +61,7 @@ const int LOF_NOSOUNDCHECK = 2;
const int LOF_DONTCHASEGOAL = 4; const int LOF_DONTCHASEGOAL = 4;
const int LOF_NOSEESOUND = 8; const int LOF_NOSEESOUND = 8;
const int LOF_FULLVOLSEESOUND = 16; const int LOF_FULLVOLSEESOUND = 16;
const int LOF_NOJUMP = 32;
// Flags for A_Respawn // Flags for A_Respawn
const int RSF_FOG = 1; const int RSF_FOG = 1;

4
wadsrc/static/iwadinfo.txt
View file

@ -115,7 +115,7 @@ IWad
Name = "Hexen: Demo Version" Name = "Hexen: Demo Version"
Game = "Hexen" Game = "Hexen"
Config = "Hexen" Config = "Hexen"
Mapinfo = "mapinfo/doom2.txt" Mapinfo = "mapinfo/hexen.txt"
Compatibility = "Shareware" Compatibility = "Shareware"
MustContain = "TITLE", "MAP01", "WINNOWR" MustContain = "TITLE", "MAP01", "WINNOWR"
BannerColors = "f0 f0 f0", "6b 3c 18" BannerColors = "f0 f0 f0", "6b 3c 18"
@ -205,7 +205,7 @@ IWad
Autoname = "Freedoom1" Autoname = "Freedoom1"
Game = "Doom" Game = "Doom"
Config = "Doom" Config = "Doom"
Mapinfo = "mapinfo/doom2.txt" Mapinfo = "mapinfo/doom1.txt"
MustContain = "E1M1", "FREEDOOM" MustContain = "E1M1", "FREEDOOM"
BannerColors = "32 54 43", "c6 dc d1" BannerColors = "32 54 43", "c6 dc d1"
} }