OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Removed A_JumpSet and merged its functionality with A_Jump by turning

Browse source 
A_Jump into a varargs function.
- Fixed: P_MorphPlayer() should check that the desired type is actually a
  PlayerPawn.
- Added an optional parameter to the morphme ccmd that specifies the player
  class to morph into.
- Changed the SetActorPitch, SetActorAngle, Thing_Spawn*, Thing_Projectile*,
  and Thing_Move functions so that TID 0 affects the activator.


SVN r362 (trunk)
This commit is contained in:
Randy Heit 2006-10-27 03:03:34 +00:00
commit bcca366e8f
13 changed files with 168 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/thingdef_codeptr.cpp
View file

@ -405,33 +405,23 @@ static void DoJump(AActor * self, FState * CallingState, int offset)
void A_Jump(AActor * self)
{
FState * CallingState;
int index=CheckIndex(2, &CallingState);
int index = CheckIndex(3, &CallingState);
int maxchance;
if (index>=0 && pr_cajump() < clamp<int>(EvalExpressionI (StateParameters[index], self), 0, 255))
DoJump(self, CallingState, StateParameters[index+1]);
if (pStateCall != NULL) pStateCall->Result=false; // Jumps should never set the result for inventory state chains!
}
//==========================================================================
//
// State jump function
//
//==========================================================================
void A_JumpSet(AActor * self)
{
FState * CallingState;
int index=CheckIndex(21, &CallingState);
int i;
if (index>=0 && pr_cajump() < clamp<int>(EvalExpressionI (StateParameters[index], self), 0, 256))
if (index >= 0 &&
StateParameters[index] >= 2 &&
(maxchance = clamp<int>(EvalExpressionI (StateParameters[index + 1], self), 0, 256),
maxchance == 256 || pr_cajump() < maxchance))
{
// Find out how many targets are actually used
for (i = 0; i < 20 && StateParameters[index+i+1] != 0; ++i)
{ }
DoJump(self, CallingState, StateParameters[index + (pr_cajump() % i) + 1]);
if (StateParameters[index] == 2)
{
DoJump(self, CallingState, StateParameters[index + 2]);
}
else
{
DoJump(self, CallingState, StateParameters[index + (pr_cajump() % (StateParameters[index] - 1)) + 2]);
}
}
if (pStateCall != NULL) pStateCall->Result=false; // Jumps should never set the result for inventory state chains!
}