zdoom/gzdoom-last-svn
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-last-svn.git synced 2025-06-04 11:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: The railgun attack functions still read their puff parameters as names

Browse source 
even though they are now passed as class pointers.
- Fixed: The state parser counted one parameter too many for a varargs function.
- Fixed: FStateExpressions could copy unresolved default parameter expressions.
  When these were resolved and changed later all copied pointers pointed to
  invalid data.

git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@195 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
Christoph Oelckers 2008-10-28 22:56:10 +00:00
parent 794e1d0bec
commit 11b8d6994d
9 changed files with 29 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/thingdef/thingdef_codeptr.cpp
View file

@ -1053,7 +1053,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_RailAttack)
ACTION_PARAM_COLOR(Color2, 4);
ACTION_PARAM_BOOL(Silent, 5);
ACTION_PARAM_FLOAT(MaxDiff, 6);
ACTION_PARAM_NAME(PuffTypeName, 7);
ACTION_PARAM_CLASS(PuffType, 7);
if (!self->player) return;
@ -1065,7 +1065,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_RailAttack)
if (!weapon->DepleteAmmo(weapon->bAltFire, true)) return; // out of ammo
}
P_RailAttack (self, Damage, Spawnofs_XY, Color1, Color2, MaxDiff, Silent, PuffTypeName);
P_RailAttack (self, Damage, Spawnofs_XY, Color1, Color2, MaxDiff, Silent, PuffType);
}
//==========================================================================
@ -1084,7 +1084,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CustomRailgun)
ACTION_PARAM_BOOL(Silent, 4);
ACTION_PARAM_BOOL(aim, 5);
ACTION_PARAM_FLOAT(MaxDiff, 6);
ACTION_PARAM_NAME(PuffTypeName, 7);
ACTION_PARAM_CLASS(PuffType, 7);
if (aim && self->target == NULL)
{
@ -1122,7 +1122,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CustomRailgun)
}
}
P_RailAttack (self, Damage, Spawnofs_XY, Color1, Color2, MaxDiff, Silent, PuffTypeName);
P_RailAttack (self, Damage, Spawnofs_XY, Color1, Color2, MaxDiff, Silent, PuffType);
}
//===========================================================================