zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-02 14:40:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

SW: Fix compilation after backporting upstream's input changes.

Browse source
This commit is contained in:
Mitchell Richters 2020-05-19 23:14:15 +10:00 committed by Christoph Oelckers
parent 3913a05713
commit 2c0ad0dd12
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -318,7 +318,7 @@ void
DemoReadBuffer(void) DemoReadBuffer(void)
{ {
memset(&DemoBuffer, -1, sizeof(DemoBuffer)); memset(&DemoBuffer, -1, sizeof(DemoBuffer));
DemoReadPackets(DemoBuffer, sizeof(DemoBuffer)/sizeof(*DemoBuffer), DemoFileIn); //DemoReadPackets(DemoBuffer, sizeof(DemoBuffer)/sizeof(*DemoBuffer), DemoFileIn);
} }
void void

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

@ -1397,7 +1397,7 @@ FString GameInterface::GetCoordString()
out.AppendFormat("POSX:%d ", pp->posx); out.AppendFormat("POSX:%d ", pp->posx);
out.AppendFormat("POSY:%d ", pp->posy); out.AppendFormat("POSY:%d ", pp->posy);
out.AppendFormat("POSZ:%d ", pp->posz); out.AppendFormat("POSZ:%d ", pp->posz);
out.AppendFormat("ANG:%d\n", (int32_t)pp->pang); out.AppendFormat("ANG:%d\n", fix16_to_int(pp->camq16ang));
return out; return out;
} }
@ -2127,7 +2127,7 @@ drawscreen(PLAYERp pp)
if (dimensionmode != 6)// && !ScreenSavePic) if (dimensionmode != 6)// && !ScreenSavePic)
{ {
// Cameras must be done before the main loop. // Cameras must be done before the main loop.
JS_DrawCameras(pp, tx, ty, tz, tang, thoriz); JS_DrawCameras(pp, tx, ty, tz, tq16ang, tq16horiz);
} }
screen->BeginScene(); screen->BeginScene();

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

@ -618,7 +618,7 @@ void LoadDemoRun(void)
break; break;
} }
if (i == ARRAY_SSIZE(DemoName)) if (i == ARRAY_SSIZE(DemoName))
initputs("WARNING: demos.run is too long, ignoring remaining files\n"); Printf("WARNING: demos.run is too long, ignoring remaining files\n");
fclose(fin); fclose(fin);
} }
@ -635,7 +635,7 @@ void LoadDemoRun(void)
break; break;
} }
if (i == ARRAY_SSIZE(DemoText)) if (i == ARRAY_SSIZE(DemoText))
initputs("WARNING: demotxt.run is too long, trimming the text\n"); Printf("WARNING: demotxt.run is too long, trimming the text\n");
fclose(fin); fclose(fin);
} }
@ -2809,7 +2809,7 @@ void ManualPlayerInsert(PLAYERp pp)
npp->posx = pp->posx; npp->posx = pp->posx;
npp->posy = pp->posy; npp->posy = pp->posy;
npp->posz = pp->posz; npp->posz = pp->posz;
npp->pang = pp->pang; npp->q16ang = pp->q16ang;
npp->cursectnum = pp->cursectnum; npp->cursectnum = pp->cursectnum;
myconnectindex = numplayers; myconnectindex = numplayers;
@ -2839,7 +2839,7 @@ void BotPlayerInsert(PLAYERp pp)
npp->posx = pp->posx; npp->posx = pp->posx;
npp->posy = pp->posy; npp->posy = pp->posy;
npp->posz = pp->posz-Z(100); npp->posz = pp->posz-Z(100);
npp->pang = pp->pang; npp->q16ang = pp->q16ang;
npp->cursectnum = pp->cursectnum; npp->cursectnum = pp->cursectnum;
//myconnectindex = numplayers; //myconnectindex = numplayers;
@ -3045,6 +3045,9 @@ short MirrorDelay;
double elapsedInputTicks; double elapsedInputTicks;
double scaleAdjustmentToInterval(double x) { return x * (120 / synctics) / (1000.0 / elapsedInputTicks); } double scaleAdjustmentToInterval(double x) { return x * (120 / synctics) / (1000.0 / elapsedInputTicks); }
void DoPlayerTurn(PLAYERp pp, fix16_t *pq16ang, fix16_t q16angvel);
void DoPlayerHorizon(PLAYERp pp, fix16_t *pq16horiz, fix16_t q16aimvel);
void void
getinput(SW_PACKET *loc, SWBOOL tied) getinput(SW_PACKET *loc, SWBOOL tied)
{ {
@ -3290,8 +3293,6 @@ getinput(SW_PACKET *loc, SWBOOL tied)
} }
else if (!TEST(pp->Flags, PF_DEAD)) else if (!TEST(pp->Flags, PF_DEAD))
{ {
void DoPlayerTurn(PLAYERp pp, fix16_t *pq16ang, fix16_t q16angvel);
void DoPlayerHorizon(PLAYERp pp, fix16_t *pq16horiz, fix16_t q16aimvel);
if (!TEST(pp->Flags, PF_CLIMBING)) if (!TEST(pp->Flags, PF_CLIMBING))
DoPlayerTurn(pp, &pp->camq16ang, q16angvel); DoPlayerTurn(pp, &pp->camq16ang, q16angvel);
DoPlayerHorizon(pp, &pp->camq16horiz, q16aimvel); DoPlayerHorizon(pp, &pp->camq16horiz, q16aimvel);

1
source/sw/src/interp.cpp
View file

@ -33,7 +33,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
BEGIN_SW_NS BEGIN_SW_NS
#define MAXINTERPOLATIONS 1024
int numinterpolations = 0; int numinterpolations = 0;
int oldipos[MAXINTERPOLATIONS]; int oldipos[MAXINTERPOLATIONS];
int bakipos[MAXINTERPOLATIONS]; int bakipos[MAXINTERPOLATIONS];

3
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; extern short short_numinterpolations;
extern short short_oldipos[SHORT_MAXINTERPOLATIONS]; extern short short_oldipos[SHORT_MAXINTERPOLATIONS];

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

@ -33,7 +33,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
BEGIN_SW_NS BEGIN_SW_NS
#define SHORT_MAXINTERPOLATIONS 256
short short_numinterpolations = 0; short short_numinterpolations = 0;
short short_oldipos[SHORT_MAXINTERPOLATIONS]; short short_oldipos[SHORT_MAXINTERPOLATIONS];
short short_bakipos[SHORT_MAXINTERPOLATIONS]; short short_bakipos[SHORT_MAXINTERPOLATIONS];
@ -111,4 +110,5 @@ void short_restoreinterpolations(void) // Stick at end of drawsc
for (i = short_numinterpolations - 1; i >= 0; i--) for (i = short_numinterpolations - 1; i >= 0; i--)
*short_curipos[i] = short_bakipos[i]; *short_curipos[i] = short_bakipos[i];
} }
END_SW_NS END_SW_NS

3
source/sw/src/network.cpp
View file

@ -44,7 +44,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
BEGIN_SW_NS BEGIN_SW_NS
void getinput(SW_PACKET*); void getinput(SW_PACKET *, SWBOOL);
/* /*
SYNC BUG NOTES: SYNC BUG NOTES:
@ -925,7 +925,6 @@ faketimerhandler(void)
{ {
int i, j, k; int i, j, k;
PLAYERp pp; PLAYERp pp;
void getinput(SW_PACKET *, SWBOOL);
extern SWBOOL BotMode; extern SWBOOL BotMode;
#if 0 #if 0