OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- adapted AActor to use TFlags

Browse source
This commit is contained in:
Teemu Piippo 2015-04-04 19:40:43 +03:00
commit ca012bc9be
17 changed files with 127 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/thingdef/thingdef_codeptr.cpp
View file

@ -2023,10 +2023,10 @@ static bool InitSpawnedItem(AActor *self, AActor *mo, int flags)
mo->RenderStyle = self->RenderStyle;
}
if (flags & SIXF_TRANSFERSPRITEFRAME)
{
mo->sprite = self->sprite;
mo->frame = self->frame;
if (flags & SIXF_TRANSFERSPRITEFRAME)
{
mo->sprite = self->sprite;
mo->frame = self->frame;
}
if (flags & SIXF_TRANSFERROLL)
@ -3766,7 +3766,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_ChangeFlag)
}
else
{
DWORD *flagp = (DWORD*) (((char*)self) + fd->structoffset);
ActorFlags *flagp = (ActorFlags*) (((char*)self) + fd->structoffset);
// If these 2 flags get changed we need to update the blockmap and sector links.
bool linkchange = flagp == &self->flags && (fd->flagbit == MF_NOBLOCKMAP || fd->flagbit == MF_NOSECTOR);
@ -4029,19 +4029,19 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetPitch)
ref->SetPitch(pitch, !!(flags & SPF_INTERPOLATE));
}
//===========================================================================
//
// [Nash] A_SetRoll
//
// Set actor's roll (in degrees).
//
//===========================================================================
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetRoll)
{
ACTION_PARAM_START(3);
ACTION_PARAM_ANGLE(roll, 0);
ACTION_PARAM_INT(flags, 1);
//===========================================================================
//
// [Nash] A_SetRoll
//
// Set actor's roll (in degrees).
//
//===========================================================================
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetRoll)
{
ACTION_PARAM_START(3);
ACTION_PARAM_ANGLE(roll, 0);
ACTION_PARAM_INT(flags, 1);
ACTION_PARAM_INT(ptr, 2);
AActor *ref = COPY_AAPTR(self, ptr);
@ -4050,9 +4050,9 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetRoll)
{
ACTION_SET_RESULT(false);
return;
}
ref->SetRoll(roll, !!(flags & SPF_INTERPOLATE));
}
}
ref->SetRoll(roll, !!(flags & SPF_INTERPOLATE));
}
//===========================================================================
//