zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Be consistent with whitespace tabs. 

SVN r4235 (trunk)
This commit is contained in:
Randy Heit 2013-04-30 02:41:59 +00:00
parent 10934f4d70
commit e92560b4da
1 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/thingdef/thingdef_codeptr.cpp
View File

@ -3741,10 +3741,10 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CheckFlag)
//=========================================================================== //===========================================================================
DEFINE_ACTION_FUNCTION(AActor, A_RemoveMaster) DEFINE_ACTION_FUNCTION(AActor, A_RemoveMaster)
{ {
if (self->master != NULL) if (self->master != NULL)
{ {
P_RemoveThing(self->master); P_RemoveThing(self->master);
} }
} }
//=========================================================================== //===========================================================================
@ -3754,18 +3754,18 @@ DEFINE_ACTION_FUNCTION(AActor, A_RemoveMaster)
//=========================================================================== //===========================================================================
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_RemoveChildren) DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_RemoveChildren)
{ {
TThinkerIterator<AActor> it; TThinkerIterator<AActor> it;
AActor * mo; AActor * mo;
ACTION_PARAM_START(1); ACTION_PARAM_START(1);
ACTION_PARAM_BOOL(removeall,0); ACTION_PARAM_BOOL(removeall,0);
while ( (mo = it.Next()) ) while ( (mo = it.Next()) )
{ {
if ( ( mo->master == self ) && ( ( mo->health <= 0 ) || removeall) ) if ( ( mo->master == self ) && ( ( mo->health <= 0 ) || removeall) )
{ {
P_RemoveThing(mo); P_RemoveThing(mo);
} }
} }
} }
//=========================================================================== //===========================================================================
@ -3775,18 +3775,18 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_RemoveChildren)
//=========================================================================== //===========================================================================
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_RemoveSiblings) DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_RemoveSiblings)
{ {
TThinkerIterator<AActor> it; TThinkerIterator<AActor> it;
AActor * mo; AActor * mo;
ACTION_PARAM_START(1); ACTION_PARAM_START(1);
ACTION_PARAM_BOOL(removeall,0); ACTION_PARAM_BOOL(removeall,0);
while ( (mo = it.Next()) ) while ( (mo = it.Next()) )
{ {
if ( ( mo->master == self->master ) && ( mo != self ) && ( ( mo->health <= 0 ) || removeall) ) if ( ( mo->master == self->master ) && ( mo != self ) && ( ( mo->health <= 0 ) || removeall) )
{ {
P_RemoveThing(mo); P_RemoveThing(mo);
} }
} }
} }
//=========================================================================== //===========================================================================
@ -3796,10 +3796,10 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_RemoveSiblings)
//=========================================================================== //===========================================================================
DEFINE_ACTION_FUNCTION(AActor, A_RaiseMaster) DEFINE_ACTION_FUNCTION(AActor, A_RaiseMaster)
{ {
if (self->master != NULL) if (self->master != NULL)
{ {
P_Thing_Raise(self->master); P_Thing_Raise(self->master);
} }
} }
//=========================================================================== //===========================================================================
@ -3809,16 +3809,16 @@ DEFINE_ACTION_FUNCTION(AActor, A_RaiseMaster)
//=========================================================================== //===========================================================================
DEFINE_ACTION_FUNCTION(AActor, A_RaiseChildren) DEFINE_ACTION_FUNCTION(AActor, A_RaiseChildren)
{ {
TThinkerIterator<AActor> it; TThinkerIterator<AActor> it;
AActor * mo; AActor * mo;
while ((mo = it.Next())) while ((mo = it.Next()))
{ {
if ( mo->master == self ) if ( mo->master == self )
{ {
P_Thing_Raise(mo); P_Thing_Raise(mo);
} }
} }
} }
//=========================================================================== //===========================================================================
@ -3828,16 +3828,16 @@ DEFINE_ACTION_FUNCTION(AActor, A_RaiseChildren)
//=========================================================================== //===========================================================================
DEFINE_ACTION_FUNCTION(AActor, A_RaiseSiblings) DEFINE_ACTION_FUNCTION(AActor, A_RaiseSiblings)
{ {
TThinkerIterator<AActor> it; TThinkerIterator<AActor> it;
AActor * mo; AActor * mo;
while ( (mo = it.Next()) ) while ( (mo = it.Next()) )
{ {
if ( ( mo->master == self->master ) && ( mo != self ) ) if ( ( mo->master == self->master ) && ( mo != self ) )
{ {
P_Thing_Raise(mo); P_Thing_Raise(mo);
} }
} }
} }
//=========================================================================== //===========================================================================