YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-01-27 07:04:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/FWGS/hlsdk-xash3d

Browse Source
This commit is contained in:
Night Owl 2016-08-04 22:48:49 +05:00
commit 611d2b73a5
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cl_dll/in_defs.h
View File

@ -17,7 +17,9 @@
#define ROLL 2 #define ROLL 2
#ifdef _WIN32 #ifdef _WIN32
#define HSPRITE HSPRITE_win32
#include <windows.h> #include <windows.h>
#undef HSPRITE
#else #else
typedef struct point_s typedef struct point_s
{ {

5
cl_dll/input_xash3d.cpp
View File

@ -219,11 +219,12 @@ void IN_Move( float frametime, usercmd_t *cmd )
if( ac_movecount ) if( ac_movecount )
{ {
IN_ToggleButtons( ac_forwardmove / ac_movecount, ac_sidemove / ac_movecount ); IN_ToggleButtons( ac_forwardmove / ac_movecount, ac_sidemove / ac_movecount );
if( ac_forwardmove ) if( ac_forwardmove )
cmd->forwardmove = ac_forwardmove * cl_forwardspeed->value / ac_movecount; cmd->forwardmove = ac_forwardmove * cl_forwardspeed->value / ac_movecount;
if( ac_sidemove ) if( ac_sidemove )
cmd->sidemove = ac_sidemove * cl_sidespeed->value / ac_movecount; 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->forwardmove *= cl_movespeedkey->value;
cmd->sidemove *= cl_movespeedkey->value; cmd->sidemove *= cl_movespeedkey->value;

2
dlls/extdll.h
View File

@ -38,7 +38,9 @@
#define NOSERVICE #define NOSERVICE
#define NOMCX #define NOMCX
#define NOIME #define NOIME
#define HSPRITE HSPRITE_win32
#include "windows.h" #include "windows.h"
#undef HSPRITE
#else // _WIN32 #else // _WIN32
#define FALSE 0 #define FALSE 0
#define TRUE (!FALSE) #define TRUE (!FALSE)

2
dlls/util.h
View File

@ -37,7 +37,7 @@ extern globalvars_t *gpGlobals;
#define STRING(offset) (const char *)(gpGlobals->pStringBase + (int)offset) #define STRING(offset) (const char *)(gpGlobals->pStringBase + (int)offset)
#if !defined __amd64__ || defined(CLIENT_DLL) #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 #else
#define MAKE_STRING ALLOC_STRING #define MAKE_STRING ALLOC_STRING
#endif #endif