zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-12 06:41:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed: StartConversation didn't check for a valid target.

Browse source 
SVN r165 (trunk)
This commit is contained in:
Christoph Oelckers 2006-06-04 14:49:17 +00:00
parent 15681d0588
commit 9e5d7c3289
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gameconfigfile.cpp
View file

@ -563,7 +563,7 @@ FString FGameConfigFile::GetConfigPath (bool tryProg)
if (path.IsEmpty()) if (path.IsEmpty())
{ {
if (Args.CheckParm ("-cdrom")) if (Args.CheckParm ("-cdrom"))
return copystring ("c:\\zdoomdat\\zdoom.ini"); return "c:\\zdoomdat\\zdoom.ini";
path = progdir; path = progdir;
path += "zdoom.ini"; path += "zdoom.ini";
@ -611,7 +611,7 @@ void FGameConfigFile::AddAutoexec (DArgs *list, const char *game)
#ifndef unix #ifndef unix
if (Args.CheckParm ("-cdrom")) if (Args.CheckParm ("-cdrom"))
{ {
path = copystring ("c:\\zdoomdat\\autoexec.cfg"); path = "c:\\zdoomdat\\autoexec.cfg";
} }
else else
{ {

6
src/p_lnspec.cpp
View file

@ -2638,6 +2638,12 @@ FUNC(LS_StartConversation)
AActor *target = iterator.Next(); AActor *target = iterator.Next();
// Nothing to talk to
if (target == NULL)
{
return false;
}
// Only living players are allowed to start conversations // Only living players are allowed to start conversations
if (it == NULL || it->player == NULL || it->player->mo != it || it->health<=0) if (it == NULL || it->player == NULL || it->player->mo != it || it->health<=0)
{ {