TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch baldguy into master

Browse source
This commit is contained in:
Kp 2017-01-29 21:17:18 +00:00
parent 07200620a1 877cef9a20
commit 28489e0770
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
similar/main/gamecntl.cpp
View file

@ -1386,6 +1386,7 @@ constexpr cheat_code cheat_codes[] = {
{ "bruin", &game_cheats::extralife },
{ "porgys", &game_cheats::rapidfire },
{ "ahimsa", &game_cheats::robotfiringsuspended },
{ "baldguy", &game_cheats::baldguy },
#elif defined(DXX_BUILD_DESCENT_II)
{ "gabbagabbahey", &game_cheats::lamer },
{ "motherlode", &game_cheats::lamer },

12
similar/main/titles.cpp
View file

@ -1259,13 +1259,11 @@ static int load_briefing_screen(briefing *br, const char *fname)
if (d_stricmp(br->background_name, fname2))
strncpy (br->background_name,fname2, sizeof(br->background_name));
if ((!d_stricmp(fname2, "brief02.pcx") || !d_stricmp(fname2, "brief02h.pcx")) && cheats.baldguy)
if (bald_guy_load("btexture.xxx", &br->background, gr_palette) == 0)
{
return 0;
}
if ((pcx_error = pcx_read_bitmap(fname2, br->background, gr_palette))!=PCX_ERROR_NONE)
if ((!d_stricmp(fname2, "brief02.pcx") || !d_stricmp(fname2, "brief02h.pcx")) && cheats.baldguy &&
(bald_guy_load("btexture.xxx", &br->background, gr_palette) == PCX_ERROR_NONE))
{
}
else if ((pcx_error = pcx_read_bitmap(fname2, br->background, gr_palette))!=PCX_ERROR_NONE)
{
Error( "Error loading briefing screen <%s>, PCX load error: %s (%i)\n",fname2, pcx_errormsg(pcx_error), pcx_error);
}