zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-01 22:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

- handle G_StartSlideshow

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-29 04:17:58 +01:00
parent de1b89707d
commit d4ee52f606
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/g_game.cpp
View file

@ -2859,17 +2859,17 @@ bool G_CheckDemoStatus (void)
return false; return false;
} }
void G_StartSlideshow(FName whichone) void G_StartSlideshow(FLevelLocals *Level, FName whichone)
{ {
gameaction = ga_slideshow; gameaction = ga_slideshow;
SelectedSlideshow = whichone == NAME_None ? level.info->slideshow : whichone; SelectedSlideshow = whichone == NAME_None ? Level->info->slideshow : whichone;
} }
DEFINE_ACTION_FUNCTION(FLevelLocals, StartSlideshow) DEFINE_ACTION_FUNCTION(FLevelLocals, StartSlideshow)
{ {
PARAM_PROLOGUE; PARAM_SELF_STRUCT_PROLOGUE(FLevelLocals);
PARAM_NAME(whichone); PARAM_NAME(whichone);
G_StartSlideshow(whichone); G_StartSlideshow(self, whichone);
return 0; return 0;
} }

2
src/g_game.h
View file

@ -68,7 +68,7 @@ void G_Ticker (void);
bool G_Responder (event_t* ev); bool G_Responder (event_t* ev);
void G_ScreenShot (char *filename); void G_ScreenShot (char *filename);
void G_StartSlideshow(FName whichone); void G_StartSlideshow(FLevelLocals *Level, FName whichone);
FString G_BuildSaveName (const char *prefix, int slot); FString G_BuildSaveName (const char *prefix, int slot);

2
src/p_acs.cpp
View file

@ -6619,7 +6619,7 @@ doplaysound: if (funcIndex == ACSF_PlayActorSound)
return ScriptCall(activator, argCount, args); return ScriptCall(activator, argCount, args);
case ACSF_StartSlideshow: case ACSF_StartSlideshow:
G_StartSlideshow(FName(Level->Behaviors.LookupString(args[0]))); G_StartSlideshow(Level, FName(Level->Behaviors.LookupString(args[0])));
break; break;
case ACSF_GetSectorHealth: case ACSF_GetSectorHealth: