teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-20 18:52:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: changed animation storage to be independent of the animated values' types.

Browse source
This commit is contained in:
Christoph Oelckers 2022-01-27 18:31:08 +01:00
parent a9cf6feb60
commit 59e834fdad
2 changed files with 46 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/duke/src/funct.h
View file

@ -239,6 +239,4 @@ void loadcons();
void recordoldspritepos();
void DrawStatusBar();
int* animateptr(int i, bool write = true);
END_DUKE_NS

61
source/games/duke/src/sectors.cpp
View file

@ -277,30 +277,62 @@ int findotherplayer(int p, int* d)
//
//---------------------------------------------------------------------------
int* animateptr(int type, int index, bool write)
double getanimatevalue(int type, int index)
{
switch (type)
{
case anim_floorz:
return sector[index].floorz;
case anim_ceilingz:
return sector[index].ceilingz;
case anim_vertexx:
return wall[index].wall_int_pos().X;
case anim_vertexy:
return wall[index].wall_int_pos().Y;
default:
assert(false);
return 0;
}
}
double getanimatevalue(int i)
{
return getanimatevalue(animatetype[i], animatetarget[i]);
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void setanimatevalue(int type, int index, double value)
{
static int scratch;
switch (type)
{
case anim_floorz:
return sector[index].floorzptr(!write);
sector[index].setfloorz((int)value);
break;
case anim_ceilingz:
return sector[index].ceilingzptr(!write);
sector[index].setceilingz((int)value);
break;
case anim_vertexx:
if (write) wall[index].moved();
return &wall[index].__wall_int_pos.X;
wall[index].moved();
wall[index].__wall_int_pos.X = (int)value;
break;
case anim_vertexy:
if (write) wall[index].moved();
return &wall[index].__wall_int_pos.Y;
wall[index].moved();
wall[index].__wall_int_pos.Y = (int)value;
break;
default:
assert(false);
return &scratch;
}
}
int* animateptr(int i, bool write)
void setanimatevalue(int i, double value)
{
return animateptr(animatetype[i], animatetarget[i], write);
return setanimatevalue(animatetype[i], animatetarget[i], value);
}
//---------------------------------------------------------------------------
@ -315,7 +347,7 @@ void doanimations(void)
for (i = animatecnt - 1; i >= 0; i--)
{
a = *animateptr(i, false);
a = (int)getanimatevalue(i);
v = animatevel[i] * TICSPERFRAME;
auto dasectp = animatesect[i];
@ -365,8 +397,7 @@ void doanimations(void)
}
}
}
*animateptr(i, true) = a;
setanimatevalue(i, a);
}
}
@ -412,12 +443,12 @@ static int dosetanimation(sectortype* animsect, int animtype, int animtarget, in
break;
}
auto animptr = animateptr(animtype, animtarget, false);
auto animval = (int)getanimatevalue(animtype, animtarget);
animatesect[j] = animsect;
animatetype[j] = animtype;
animatetarget[j] = animtarget;
animategoal[j] = thegoal;
if (thegoal >= *animptr)
if (thegoal >= animval)
animatevel[j] = thevel;
else
animatevel[j] = -thevel;