OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Merged SetState and SetStateNF into a single function.

Browse source 
- Added new sprite #### and frame character # to specify the behavior of sprite ---- on a
  per-sprite and per-frame basis respectively.

SVN r2291 (trunk)
This commit is contained in:
Randy Heit 2010-04-19 02:46:50 +00:00
commit 178587fff2
15 changed files with 85 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/g_hexen/a_spike.cpp
View file

@ -107,9 +107,9 @@ DEFINE_ACTION_FUNCTION(AActor, A_ThrustRaise)
{ // Reached it's target height
actor->args[0] = 1;
if (actor->args[1])
actor->SetStateNF (actor->FindState ("BloodThrustInit2"));
actor->SetState (actor->FindState ("BloodThrustInit2"), true);
else
actor->SetStateNF (actor->FindState ("ThrustInit2"));
actor->SetState (actor->FindState ("ThrustInit2"), true);
}
// Lose the dirt clump
@ -131,9 +131,9 @@ DEFINE_ACTION_FUNCTION(AActor, A_ThrustLower)
{
self->args[0] = 0;
if (self->args[1])
self->SetStateNF (self->FindState ("BloodThrustInit1"));
self->SetState (self->FindState ("BloodThrustInit1"), true);
else
self->SetStateNF (self->FindState ("ThrustInit1"));
self->SetState (self->FindState ("ThrustInit1"), true);
}
}