zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed merge errors.

Browse source
This commit is contained in:
Christoph Oelckers 2019-11-26 19:10:24 +01:00
parent 348ccdfd5b
commit abdd807e7f
3 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/rr/src/screens.cpp
View file

@ -753,7 +753,6 @@ FString GameInterface::statFPS()
GameStats GameInterface::getStats() GameStats GameInterface::getStats()
{ {
GameStats stats;
DukePlayer_t* p = g_player[myconnectindex].ps; DukePlayer_t* p = g_player[myconnectindex].ps;
return { p->actors_killed, p->max_actors_killed, p->secret_rooms, p->max_secret_rooms, p->player_par / REALGAMETICSPERSEC }; return { p->actors_killed, p->max_actors_killed, p->secret_rooms, p->max_secret_rooms, p->player_par / REALGAMETICSPERSEC };
} }

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

@ -24,9 +24,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
*/ */
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
#include "ns.h" #include "ns.h"
// Added improved crosshair accuracy
// Added UsingMenus for fragbar
//
#include "build.h" #include "build.h"

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

@ -105,13 +105,6 @@ signed char MNU_InputString(char*, short);
SWBOOL IsCommand(const char* str); SWBOOL IsCommand(const char* str);
SWBOOL MNU_StartNetGame(void); SWBOOL MNU_StartNetGame(void);
#ifdef _WIN32
# include "winbits.h"
#endif
const char* AppProperName = "VoidSW";
const char* AppTechnicalName = "voidsw";
#if DEBUG #if DEBUG
#define BETA 0 #define BETA 0
@ -4072,9 +4065,6 @@ void getinput(SW_PACKET *loc)
int32_t keymove; int32_t keymove;
constexpr int const analogExtent = 32767; // KEEPINSYNC sdlayer.cpp constexpr int const analogExtent = 32767; // KEEPINSYNC sdlayer.cpp
svel -= info.dx * keyMove / analogExtent;
vel -= info.dz * keyMove / analogExtent;
if (running) if (running)
{ {
if (pp->sop_control) if (pp->sop_control)
@ -4110,12 +4100,12 @@ void getinput(SW_PACKET *loc)
angvel += info.dyaw * (turnamount << 1) / analogExtent; angvel += info.dyaw * (turnamount << 1) / analogExtent;
} }
if (aimMode) if (true)//aimMode)
aimvel = -info.mousey / 64; aimvel = -info.mousey / 64;
else else
vel = -(info.mousey >> 6); vel = -(info.mousey >> 6);
if (!in_mouseflip) if (in_mouseflip)
aimvel = -aimvel; aimvel = -aimvel;
aimvel -= info.dpitch * turnamount / analogExtent; aimvel -= info.dpitch * turnamount / analogExtent;