Browse Source

Apply fixes from gravgun branch

pull/1/head
mittorn 8 years ago
parent
commit
80593d29bd
  1. 2
      cl_dll/MOTD.cpp
  2. 2
      cl_dll/hl/hl_weapons.cpp
  3. 2
      cl_dll/message.cpp
  4. 2
      dlls/mpstubb.cpp
  5. 2
      dlls/stats.cpp
  6. 8
      engine/cdll_int.h

2
cl_dll/MOTD.cpp

@ -130,7 +130,7 @@ int CHudMOTD::MsgFunc_MOTD( const char *pszName, int iSize, void *pbuf )
BEGIN_READ( pbuf, iSize ); BEGIN_READ( pbuf, iSize );
int is_finished = READ_BYTE(); int is_finished = READ_BYTE();
strncat( m_szMOTD, READ_STRING(), sizeof(m_szMOTD) ); strncat( m_szMOTD, READ_STRING(), sizeof(m_szMOTD) - 1 );
if( is_finished ) if( is_finished )
{ {

2
cl_dll/hl/hl_weapons.cpp

@ -288,7 +288,7 @@ Only produces random numbers to match the server ones.
*/ */
Vector CBaseEntity::FireBulletsPlayer ( ULONG cShots, Vector vecSrc, Vector vecDirShooting, Vector vecSpread, float flDistance, int iBulletType, int iTracerFreq, int iDamage, entvars_t *pevAttacker, int shared_rand ) Vector CBaseEntity::FireBulletsPlayer ( ULONG cShots, Vector vecSrc, Vector vecDirShooting, Vector vecSpread, float flDistance, int iBulletType, int iTracerFreq, int iDamage, entvars_t *pevAttacker, int shared_rand )
{ {
float x, y, z; float x = 0, y = 0, z;
for( ULONG iShot = 1; iShot <= cShots; iShot++ ) for( ULONG iShot = 1; iShot <= cShots; iShot++ )
{ {

2
cl_dll/message.cpp

@ -310,7 +310,7 @@ int CHudMessage::Draw( float fTime )
{ {
int i, drawn; int i, drawn;
client_textmessage_t *pMessage; client_textmessage_t *pMessage;
float endTime; float endTime = 0;
drawn = 0; drawn = 0;

2
dlls/mpstubb.cpp

@ -74,7 +74,7 @@ void CBaseMonster::MonsterInitDead( void )
// Setup health counters, etc. // Setup health counters, etc.
BecomeDead(); BecomeDead();
SetThink( &CorpseFallThink ); SetThink( &CBaseMonster::CorpseFallThink );
pev->nextthink = gpGlobals->time + 0.5; pev->nextthink = gpGlobals->time + 0.5;
} }

2
dlls/stats.cpp

@ -15,7 +15,7 @@
#include "weapons.h" #include "weapons.h"
#include "soundent.h" #include "soundent.h"
#include "monsters.h" #include "monsters.h"
#include "..\engine\shake.h" #include "../engine/shake.h"
#include "decals.h" #include "decals.h"
#include "gamerules.h" #include "gamerules.h"

8
engine/cdll_int.h

@ -93,6 +93,12 @@ typedef struct client_textmessage_s
const char *pMessage; const char *pMessage;
} client_textmessage_t; } client_textmessage_t;
#if __MSC_VER == 1200
#define ulonglong_t __int64
#else
#define ulonglong_t unsigned long long
#endif
typedef struct hud_player_info_s typedef struct hud_player_info_s
{ {
char *name; char *name;
@ -106,7 +112,7 @@ typedef struct hud_player_info_s
short topcolor; short topcolor;
short bottomcolor; short bottomcolor;
unsigned long long m_nSteamID; ulonglong_t m_nSteamID;
} hud_player_info_t; } hud_player_info_t;
typedef struct cl_enginefuncs_s typedef struct cl_enginefuncs_s

Loading…
Cancel
Save