YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-03-11 04:51:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
mittorn 2016-09-30 12:03:49 +07:00
parent c85cfad1dd
commit 4952358665
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/Android.mk
View File

@ -14,7 +14,7 @@ LOCAL_MODULE_FILENAME = libserver_hardfp
endif
LOCAL_CFLAGS += -D_LINUX -DCLIENT_WEAPONS -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf \
-fno-exceptions -DNO_VOICEGAMEMGR
-fno-exceptions -DNO_VOICEGAMEMGR -Wno-conversion-null -Wno-write-strings -std=gnu++98 -Wno-invalid-offsetof
LOCAL_CPPFLAGS := $(LOCAL_CFLAGS) -frtti

1
dlls/player.cpp
View File

@ -2787,6 +2787,7 @@ void CBasePlayer::Spawn( void )
m_lastx = m_lasty = 0;
m_flNextChatTime = gpGlobals->time;
m_flSpawnTime = gpGlobals->time;
g_pGameRules->PlayerSpawn( this );
}

1
dlls/player.h
View File

@ -310,6 +310,7 @@ public:
float m_flNextChatTime;
virtual float TouchGravGun( CBaseEntity *attacker, int stage );
float m_flSpawnTime;
};
#define AUTOAIM_2DEGREES 0.0348994967025

15
dlls/triggers.cpp
View File

@ -1559,14 +1559,16 @@ void CChangeLevel::ChangeLevelNow( CBaseEntity *pActivator )
{
CBaseEntity *plr = UTIL_PlayerByIndex( i );
// count only players in the transition volume
if( plr && InTransitionVolume( plr, m_szLandmarkName ) )
// count only players spawned more 90 seconds ago
if( plr && plr->IsPlayer() && (gpGlobals->time -((CBasePlayer*)plr)->m_flSpawnTime ) > 90 )
{
count2++;
char *ip = g_engfuncs.pfnInfoKeyValue( g_engfuncs.pfnGetInfoKeyBuffer( plr->edict() ), "ip" );
// player touched trigger, save it's coordinates
if( m_uTouchCount & (i - 1) )
{
if( InTransitionVolume( plr, m_szLandmarkName ))
{
count1++;
strcpy(l_SavedCoords.ip[l_SavedCoords.iCount], ip );
@ -1574,6 +1576,7 @@ void CChangeLevel::ChangeLevelNow( CBaseEntity *pActivator )
l_SavedCoords.angles[l_SavedCoords.iCount] = plr->pev->angles;
l_SavedCoords.iCount++;
}
}
}
}
@ -1647,10 +1650,10 @@ void CChangeLevel::ChangeLevelNow( CBaseEntity *pActivator )
}
}
// shedule remove first info_player_start
CBaseEntity *playerstart = FIND_ENTITY_BY_CLASSNAME( NULL, "info_player_start" );
if( playerstart )
playerstart->pev->flags |= FL_KILLME;
// shedule remove ke^w on first info_player_start
edict_t *playerstart = FIND_ENTITY_BY_CLASSNAME( NULL, "info_player_start" );
if( !FNullEnt(playerstart) )
playerstart->v.flags |= FL_KILLME;
// This object will get removed in the call to CHANGE_LEVEL, copy the params into "safe" memory
strcpy( st_szNextMap, m_szMapName );