- disabled help screen in Exhumed and save menus in Deer Huntin'.

This commit is contained in:
Christoph Oelckers 2020-02-29 12:55:12 +01:00
parent 69e018d0c4
commit 4bc0531bf7
5 changed files with 12 additions and 7 deletions

View file

@ -51,7 +51,11 @@
void ImageScreen::Drawer()
{
if (mDesc->type == 0)
if (mDesc == nullptr)
{
// don't let bogus definitions crash this.
}
else if (mDesc->type == 0)
{
auto tileindexp = NameToTileIndex.CheckKey(FName(mDesc->text, true));
int tileindex = 0;

View file

@ -75,6 +75,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "savegamehelp.h"
#include "c_dispatch.h"
#include "s_soundinternal.h"
#include "common/menu/menu.h"
BEGIN_PS_NS
@ -1835,6 +1836,7 @@ int GameInterface::app_main()
int stopTitle = kFalse;
levelnew = 1;
help_disabled = true;
// Create the global level table. Parts of the engine need it, even though the game itself does not.
for (int i = 0; i <= 32; i++)
{

View file

@ -190,6 +190,9 @@ static void ServeSample(const char** ptr, uint32_t* length)
void PlayMovie(const char* fileName)
{
CurFrame = TileFiles.tileCreate(kMovieTile, 320, 200);
if (CurFrame == nullptr) return;
int bDoFade = kTrue;
int hFx = -1;
auto fp = fileSystem.OpenFileReader(fileName, 0);
@ -199,10 +202,6 @@ void PlayMovie(const char* fileName)
return;
}
tileLoad(kMovieTile);
CurFrame = TileFiles.tileMakeWritable(kMovieTile);
fp.Read(lh, sizeof(lh));
// sound stuff

View file

@ -652,7 +652,7 @@ void GameInterface::MenuClosed()
bool GameInterface::CanSave()
{
if (ud.recstat == 2) return false;
if (ud.recstat == 2 || DEER) return false;
auto &myplayer = *g_player[myconnectindex].ps;
if (sprite[myplayer.i].extra <= 0)
{

View file

@ -469,7 +469,7 @@ ImageScroller "HelpMenu"
animatedtransition
}
}
ifgame(Redneck, RedneckRides)
ifgame(Redneck, RedneckRides, Deer)
{
ImageItem "TEXTSTORY"
ImageItem "F1HELP"