zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-28 15:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

- allow passing the activator to ScriptCall.

Browse source
This commit is contained in:
Christoph Oelckers 2017-03-29 00:43:12 +02:00
parent 19e7d60275
commit 054d9a5bcc
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/p_acs.cpp
View file

@ -5345,7 +5345,7 @@ static int SwapActorTeleFog(AActor *activator, int tid)
return count; return count;
} }
static int ScriptCall(unsigned argc, int32_t *args) static int ScriptCall(AActor *activator, unsigned argc, int32_t *args)
{ {
int retval = 0; int retval = 0;
if (argc >= 2) if (argc >= 2)
@ -5372,13 +5372,19 @@ static int ScriptCall(unsigned argc, int32_t *args)
// Note that this array may not be reallocated so its initial size must be the maximum possible elements. // Note that this array may not be reallocated so its initial size must be the maximum possible elements.
TArray<FString> strings(argc); TArray<FString> strings(argc);
TArray<VMValue> params; TArray<VMValue> params;
int p = 1;
if (func->Proto->ArgumentTypes.Size() > 0 && func->Proto->ArgumentTypes[0] == NewPointer(RUNTIME_CLASS(AActor)))
{
params.Push(activator);
p = 0;
}
for (unsigned i = 2; i < argc; i++) for (unsigned i = 2; i < argc; i++)
{ {
if (func->Proto->ArgumentTypes.Size() < i - 1) if (func->Proto->ArgumentTypes.Size() < i - p)
{ {
I_Error("Too many parameters in call to %s.%s", clsname, funcname); I_Error("Too many parameters in call to %s.%s", clsname, funcname);
} }
auto argtype = func->Proto->ArgumentTypes[i - 2]; auto argtype = func->Proto->ArgumentTypes[i - p - 1];
// The only types allowed are int, bool, double, Name, Sound, Color and String // The only types allowed are int, bool, double, Name, Sound, Color and String
if (argtype == TypeSInt32 || argtype == TypeColor) if (argtype == TypeSInt32 || argtype == TypeColor)
{ {
@ -6810,7 +6816,7 @@ doplaysound: if (funcIndex == ACSF_PlayActorSound)
return (args[0] + 32768) & ~0xffff; return (args[0] + 32768) & ~0xffff;
case ACSF_ScriptCall: case ACSF_ScriptCall:
return ScriptCall(argCount, args); return ScriptCall(activator, argCount, args);
case ACSF_StartSlideshow: case ACSF_StartSlideshow:
G_StartSlideshow(FName(FBehavior::StaticLookupString(args[0]))); G_StartSlideshow(FName(FBehavior::StaticLookupString(args[0])));