mirror of
https://github.com/FWGS/hlsdk-xash3d
synced 2025-01-26 12:20:10 +01:00
Merge branch 'master' of https://github.com/FWGS/hlsdk-xash3d
This commit is contained in:
commit
611d2b73a5
@ -17,7 +17,9 @@
|
||||
#define ROLL 2
|
||||
|
||||
#ifdef _WIN32
|
||||
#define HSPRITE HSPRITE_win32
|
||||
#include <windows.h>
|
||||
#undef HSPRITE
|
||||
#else
|
||||
typedef struct point_s
|
||||
{
|
||||
|
@ -219,11 +219,12 @@ void IN_Move( float frametime, usercmd_t *cmd )
|
||||
if( ac_movecount )
|
||||
{
|
||||
IN_ToggleButtons( ac_forwardmove / ac_movecount, ac_sidemove / ac_movecount );
|
||||
|
||||
if( ac_forwardmove )
|
||||
cmd->forwardmove = ac_forwardmove * cl_forwardspeed->value / ac_movecount;
|
||||
cmd->forwardmove = ac_forwardmove * cl_forwardspeed->value / ac_movecount;
|
||||
if( ac_sidemove )
|
||||
cmd->sidemove = ac_sidemove * cl_sidespeed->value / ac_movecount;
|
||||
if( in_speed.state & 1 )
|
||||
if( ( in_speed.state & 1 ) && ( ac_sidemove || ac_forwardmove ) )
|
||||
{
|
||||
cmd->forwardmove *= cl_movespeedkey->value;
|
||||
cmd->sidemove *= cl_movespeedkey->value;
|
||||
|
@ -38,7 +38,9 @@
|
||||
#define NOSERVICE
|
||||
#define NOMCX
|
||||
#define NOIME
|
||||
#define HSPRITE HSPRITE_win32
|
||||
#include "windows.h"
|
||||
#undef HSPRITE
|
||||
#else // _WIN32
|
||||
#define FALSE 0
|
||||
#define TRUE (!FALSE)
|
||||
|
@ -37,7 +37,7 @@ extern globalvars_t *gpGlobals;
|
||||
#define STRING(offset) (const char *)(gpGlobals->pStringBase + (int)offset)
|
||||
|
||||
#if !defined __amd64__ || defined(CLIENT_DLL)
|
||||
#define MAKE_STRING(str) ((int)str - (int)STRING(0))
|
||||
#define MAKE_STRING(str) ((int)(size_t)str - (int)(size_t)STRING(0))
|
||||
#else
|
||||
#define MAKE_STRING ALLOC_STRING
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user