zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 07:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed merge errors in SW.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-22 01:04:26 +02:00
parent e6031654f2
commit b8cfa94568
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/sw/src/draw.cpp
View file

@ -2009,7 +2009,7 @@ drawscreen(PLAYERp pp)
tx = camerapp->oposx + mulscale16(camerapp->posx - camerapp->oposx, smoothratio); tx = camerapp->oposx + mulscale16(camerapp->posx - camerapp->oposx, smoothratio);
ty = camerapp->oposy + mulscale16(camerapp->posy - camerapp->oposy, smoothratio); ty = camerapp->oposy + mulscale16(camerapp->posy - camerapp->oposy, smoothratio);
tz = camerapp->oposz + mulscale16(camerapp->posz - camerapp->oposz, 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)) pp == Player+myconnectindex && TEST(pp->Flags, PF_DEAD))
{ {
tq16ang = camerapp->q16ang; tq16ang = camerapp->q16ang;

2
source/sw/src/game.cpp
View file

@ -953,7 +953,7 @@ void InitLevelGlobals(void)
sumowasseen = FALSE; sumowasseen = FALSE;
zillawasseen = FALSE; zillawasseen = FALSE;
memset(BossSpriteNum,-1,sizeof(BossSpriteNum)); memset(BossSpriteNum,-1,sizeof(BossSpriteNum));
InterpolateSectObj = !CommEnabled && !PedanticMode; InterpolateSectObj = !CommEnabled;// && !PedanticMode;
} }
void InitLevelGlobals2(void) void InitLevelGlobals2(void)

6
source/sw/src/interp.h
View file

@ -23,7 +23,6 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
*/ */
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
BEGIN_SW_NS
#ifndef INTERP_H #ifndef INTERP_H
@ -31,6 +30,8 @@ BEGIN_SW_NS
#include "build.h" #include "build.h"
BEGIN_SW_NS
#define SHORT_MAXINTERPOLATIONS 256 #define SHORT_MAXINTERPOLATIONS 256
extern short short_numinterpolations, short_startofdynamicinterpolations; extern short short_numinterpolations, short_startofdynamicinterpolations;
extern short short_oldipos[SHORT_MAXINTERPOLATIONS]; 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 setspriteinterpolation(spritetype *sp) { togglespriteinterpolation(sp, 1); }
static void FORCE_INLINE stopspriteinterpolation(spritetype *sp) { togglespriteinterpolation(sp, 0); } static void FORCE_INLINE stopspriteinterpolation(spritetype *sp) { togglespriteinterpolation(sp, 0); }
#endif
END_SW_NS END_SW_NS
#endif