mirror of
https://github.com/DrBeef/Raze.git
synced 2024-11-15 08:52:00 +00:00
- fixed merge errors in SW.
This commit is contained in:
parent
e6031654f2
commit
b8cfa94568
3 changed files with 6 additions and 4 deletions
|
@ -2009,7 +2009,7 @@ drawscreen(PLAYERp pp)
|
|||
tx = camerapp->oposx + mulscale16(camerapp->posx - camerapp->oposx, smoothratio);
|
||||
ty = camerapp->oposy + mulscale16(camerapp->posy - camerapp->oposy, smoothratio);
|
||||
tz = camerapp->oposz + mulscale16(camerapp->posz - camerapp->oposz, smoothratio);
|
||||
if (PEDANTIC_MODE || pp->sop_control ||
|
||||
if (/*PEDANTIC_MODE ||*/ pp->sop_control ||
|
||||
pp == Player+myconnectindex && TEST(pp->Flags, PF_DEAD))
|
||||
{
|
||||
tq16ang = camerapp->q16ang;
|
||||
|
|
|
@ -953,7 +953,7 @@ void InitLevelGlobals(void)
|
|||
sumowasseen = FALSE;
|
||||
zillawasseen = FALSE;
|
||||
memset(BossSpriteNum,-1,sizeof(BossSpriteNum));
|
||||
InterpolateSectObj = !CommEnabled && !PedanticMode;
|
||||
InterpolateSectObj = !CommEnabled;// && !PedanticMode;
|
||||
}
|
||||
|
||||
void InitLevelGlobals2(void)
|
||||
|
|
|
@ -23,7 +23,6 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
|
|||
Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
|
||||
*/
|
||||
//-------------------------------------------------------------------------
|
||||
BEGIN_SW_NS
|
||||
|
||||
#ifndef INTERP_H
|
||||
|
||||
|
@ -31,6 +30,8 @@ BEGIN_SW_NS
|
|||
|
||||
#include "build.h"
|
||||
|
||||
BEGIN_SW_NS
|
||||
|
||||
#define SHORT_MAXINTERPOLATIONS 256
|
||||
extern short short_numinterpolations, short_startofdynamicinterpolations;
|
||||
extern short short_oldipos[SHORT_MAXINTERPOLATIONS];
|
||||
|
@ -54,5 +55,6 @@ void togglespriteinterpolation(spritetype *sp, int set);
|
|||
static void FORCE_INLINE setspriteinterpolation(spritetype *sp) { togglespriteinterpolation(sp, 1); }
|
||||
static void FORCE_INLINE stopspriteinterpolation(spritetype *sp) { togglespriteinterpolation(sp, 0); }
|
||||
|
||||
#endif
|
||||
END_SW_NS
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue