OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Changed parameter storage for states to use a separate member variable

Browse source 
instead of forcing it into misc1/misc2. Although this increases the EXE's
  size by 30k it has several advantages:
  * State parameters are no longer limited to 65535 for all states combined.
  * State parameters can be used with long durations.
  * Some special handling in the weapon state set functions can be removed.


SVN r364 (trunk)
This commit is contained in:
Christoph Oelckers 2006-10-29 11:01:00 +00:00
commit 88ca8e630c
5 changed files with 64 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/p_pspr.cpp
View file

@ -91,33 +91,15 @@ void P_SetPsprite (player_t *player, int position, FState *state)
else
psp->tics = state->GetTics(); // could be 0
if (!(state->Frame & SF_STATEPARAM))
{
if (state->GetMisc1())
{ // Set coordinates.
psp->sx = state->GetMisc1()<<FRACBITS;
}
if (state->GetMisc2())
{
psp->sy = state->GetMisc2()<<FRACBITS;
}
if (state->GetMisc1())
{ // Set coordinates.
psp->sx = state->GetMisc1()<<FRACBITS;
}
else // for parameterized action functions this must be done differently!
if (state->GetMisc2())
{
unsigned int index = state->GetMisc1_2();
psp->sy = state->GetMisc2()<<FRACBITS;
}
if (index > 0 && index < StateParameters.Size() - 2)
{
if (StateParameters[index])
{ // Set coordinates.
psp->sx = (fixed_t)StateParameters[index] << FRACBITS;
}
if (StateParameters[index+1])
{
psp->sy = (fixed_t)StateParameters[index+1] << FRACBITS;
}
}
}
if (state->GetAction())
{
// The parameterized action functions need access to the current state and
@ -163,31 +145,13 @@ void P_SetPspriteNF (player_t *player, int position, FState *state)
psp->state = state;
psp->tics = state->GetTics(); // could be 0
if (!(state->Frame & SF_STATEPARAM))
{
if (state->GetMisc1())
{ // Set coordinates.
psp->sx = state->GetMisc1()<<FRACBITS;
}
if (state->GetMisc2())
{
psp->sy = state->GetMisc2()<<FRACBITS;
}
if (state->GetMisc1())
{ // Set coordinates.
psp->sx = state->GetMisc1()<<FRACBITS;
}
else // for parameterized action functions this must be done differently!
if (state->GetMisc2())
{
unsigned int index = state->GetMisc1_2();
if (index > 0 && index < StateParameters.Size()-2)
{
if (StateParameters[index])
{ // Set coordinates.
psp->sx = (fixed_t)StateParameters[index] << FRACBITS;
}
if (StateParameters[index+1])
{
psp->sy = (fixed_t)StateParameters[index+1] << FRACBITS;
}
}
psp->sy = state->GetMisc2()<<FRACBITS;
}
state = psp->state->GetNextState();
} while (!psp->tics); // An initial state of 0 could cycle through.