OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added a big-endian fix for actor flag fields that aren't four bytes wide.

Browse source 
SVN r4251 (trunk)
This commit is contained in:
Randy Heit 2013-05-05 00:01:51 +00:00
commit 9072c25e65
5 changed files with 99 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/thingdef/thingdef_codeptr.cpp
View file

@ -3629,14 +3629,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_ChangeFlag)
bool linkchange = flagp == &self->flags && (fd->flagbit == MF_NOBLOCKMAP || fd->flagbit == MF_NOSECTOR);
if (linkchange) self->UnlinkFromWorld();
if (expression)
{
*flagp |= fd->flagbit;
}
else
{
*flagp &= ~fd->flagbit;
}
ModActorFlag(self, fd, expression);
if (linkchange) self->LinkToWorld();
}
kill_after = self->CountsAsKill();
@ -3721,13 +3714,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CheckFlag)
if (fd != NULL)
{
if (fd->structoffset == -1)
{
if (CheckDeprecatedFlags(owner, cls->ActorInfo, fd->flagbit)) {
ACTION_JUMP(jumpto);
}
}
else if ( fd->flagbit & *(DWORD*)(((char*)owner) + fd->structoffset))
if (CheckActorFlag(owner, fd))
{
ACTION_JUMP(jumpto);
}