OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Sync scripting branch with what was in trunk on Sunday. I believe that would be revision 2739.

Browse source 
SVN r2790 (scripting)
This commit is contained in:
Randy Heit 2010-09-16 03:14:32 +00:00
commit 99670b708c
317 changed files with 17299 additions and 7273 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/p_states.cpp
View file

@ -848,15 +848,18 @@ bool FStateDefinitions::SetLoop()
int FStateDefinitions::AddStates(FState *state, const char *framechars)
{
bool error = false;
int frame = 0;
int count = 0;
while (*framechars)
{
int frame;
if (*framechars == '^')
frame = '\\'-'A';
bool noframe = false;
if (*framechars == '#')
noframe = true;
else if (*framechars == '^')
frame = '\\' - 'A';
else
frame = ((*framechars)&223)-'A';
frame = (*framechars & 223) - 'A';
framechars++;
if (frame < 0 || frame > 28)
@ -865,7 +868,8 @@ int FStateDefinitions::AddStates(FState *state, const char *framechars)
error = true;
}
state->Frame = (state->Frame&(SF_FULLBRIGHT)) | frame;
state->Frame = frame;
state->SameFrame = noframe;
StateArray.Push(*state);
++count;
}