YGGverse
/
hlsdk-portable
mirror of https://github.com/YGGverse/hlsdk-portable.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

tabs, comments, code style

gravgun
mittorn 8 years ago
parent
2f4f8090a7
commit
dbf9a357f2
2 changed files with 117 additions and 120 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      dlls/coop.cpp
  2. 195
      dlls/triggers.cpp

42
dlls/coop.cpp
Unescape View File

@ -4,6 +4,13 @@
#include "player.h" #include "player.h"
#include "coop_util.h" #include "coop_util.h"
GlobalMenu g_GlobalMenu;
struct SavedCoords g_SavedCoords, s_SavedCoords;
void UTIL_CleanSpawnPoint( Vector origin, float dist ) void UTIL_CleanSpawnPoint( Vector origin, float dist )
{ {
CBaseEntity *ent = NULL; CBaseEntity *ent = NULL;
@ -129,13 +136,19 @@ char *badlist[256] = {
void UTIL_CoopKickPlayer(CBaseEntity *pPlayer) void UTIL_CoopKickPlayer(CBaseEntity *pPlayer)
{ {
int i; int i;
if( !pPlayer ) if( !pPlayer )
return; return;
char *name = UTIL_CoopPlayerName( pPlayer ); char *name = UTIL_CoopPlayerName( pPlayer );
SERVER_COMMAND( UTIL_VarArgs( "kick %d\n", ENTINDEX(pPlayer->pev->pContainingEntity) - 1 ) ); SERVER_COMMAND( UTIL_VarArgs( "kick %d\n", ENTINDEX(pPlayer->pev->pContainingEntity) - 1 ) );
if( strlen( name ) < 5 ) if( strlen( name ) < 5 )
return; return;
// find last slot
for( i = 0; badlist[i]; i++ ); for( i = 0; badlist[i]; i++ );
badlist[i] = strdup( name ); badlist[i] = strdup( name );
} }
@ -143,9 +156,11 @@ bool UTIL_CoopIsBadPlayer( CBaseEntity *plr )
{ {
if( !plr ) if( !plr )
return false; return false;
for( int i = 0; badlist[i];i++ ) for( int i = 0; badlist[i];i++ )
if( strcasestr( (char*)UTIL_CoopPlayerName( plr ), badlist[i] ) ) if( strcasestr( (char*)UTIL_CoopPlayerName( plr ), badlist[i] ) )
return true; return true;
return false; return false;
} }
@ -218,16 +233,17 @@ void GlobalMenu::Process( CBasePlayer *pPlayer, int imenu )
if( imenu == 1 ) // confirm if( imenu == 1 ) // confirm
{ {
if( m_iBanCount >= 2 ) if( m_iBanCount >= 2 )
{ {
UTIL_CoopKickPlayer( pPlayer ); UTIL_CoopKickPlayer( pPlayer );
m_iConfirm-= 5; m_iConfirm-= 5;
return; return;
} m_iConfirm++; }
MESSAGE_BEGIN( MSG_ALL, 8, NULL ); // svc_print m_iConfirm++;
WRITE_BYTE( 3 ); // PRINT_CHAT MESSAGE_BEGIN( MSG_ALL, 8, NULL ); // svc_print
WRITE_STRING( UTIL_VarArgs( "%s^7 confirmed map change\n", ( pPlayer->pev->netname && STRING( pPlayer->pev->netname )[0] != 0 ) ? STRING( pPlayer->pev->netname ) : "unconnected")); WRITE_BYTE( 3 ); // PRINT_CHAT
MESSAGE_END(); WRITE_STRING( UTIL_VarArgs( "%s^7 confirmed map change\n", ( pPlayer->pev->netname && STRING( pPlayer->pev->netname )[0] != 0 ) ? STRING( pPlayer->pev->netname ) : "unconnected"));
MESSAGE_END();
} }
if( imenu == 2 ) // cancel if( imenu == 2 ) // cancel
@ -481,6 +497,7 @@ void UTIL_CoopProcessMenu( CBasePlayer *pPlayer, int imenu )
pPlayer->RemoveAllItems( TRUE ); pPlayer->RemoveAllItems( TRUE );
UTIL_SpawnPlayer( pPlayer ); UTIL_SpawnPlayer( pPlayer );
pPlayer->pev->origin = g_checkpoints[imenu-2].origin; pPlayer->pev->origin = g_checkpoints[imenu-2].origin;
pPlayer->pev->angles = g_checkpoints[imenu-2].angles;
} }
break; break;
case MENUSTATE_LOCAL_CONFIRM: case MENUSTATE_LOCAL_CONFIRM:
@ -610,8 +627,3 @@ CBaseEntity *UTIL_CoopGetPlayerTrain( CBaseEntity *pPlayer)
return NULL; return NULL;
return train; return train;
} }
GlobalMenu g_GlobalMenu;
struct SavedCoords g_SavedCoords, s_SavedCoords;

195
dlls/triggers.cpp
Unescape View File

@ -1529,6 +1529,8 @@ void GlobalMenu::VoteMenu( CBasePlayer *pPlayer )
ShowGlobalMenu(UTIL_VarArgs("%s requested to force change map", UTIL_CoopPlayerName( pPlayer ) ), i, maps); ShowGlobalMenu(UTIL_VarArgs("%s requested to force change map", UTIL_CoopPlayerName( pPlayer ) ), i, maps);
} }
void UTIL_CoopValidateOffset( void ) void UTIL_CoopValidateOffset( void )
{ {
if( !g_SavedCoords.validoffset) if( !g_SavedCoords.validoffset)
@ -1674,73 +1676,74 @@ void CChangeLevel::ChangeLevelNow( CBaseEntity *pActivator )
i = 0; i = 0;
if( !l_SavedCoords.trainsaved ) if( !l_SavedCoords.trainsaved )
{ {
if( !count2 ) if( !count2 )
{ {
if( pActivator && pActivator->IsPlayer() && m_flRepeatTimer - gpGlobals->time < -1 ){ if( pActivator && pActivator->IsPlayer() && m_flRepeatTimer - gpGlobals->time < -1 )
CBasePlayer *pPlayer = (CBasePlayer*)pActivator; {
MESSAGE_BEGIN( MSG_ALL, 8, NULL ); // svc_print CBasePlayer *pPlayer = (CBasePlayer*)pActivator;
WRITE_BYTE( 3 ); // PRINT_CHAT MESSAGE_BEGIN( MSG_ALL, 8, NULL ); // svc_print
WRITE_STRING( UTIL_VarArgs( "%s^7 trying activate changelevel too soon\n", ( pPlayer->pev->netname && STRING( pPlayer->pev->netname )[0] != 0 ) ? STRING( pPlayer->pev->netname ) : "unconnected")); WRITE_BYTE( 3 ); // PRINT_CHAT
MESSAGE_END(); WRITE_STRING( UTIL_VarArgs( "%s^7 trying activate changelevel too soon\n", ( pPlayer->pev->netname && STRING( pPlayer->pev->netname )[0] != 0 ) ? STRING( pPlayer->pev->netname ) : "unconnected"));
UTIL_CleanSpawnPoint( pPlayer->pev->origin, 50 ); MESSAGE_END();
m_flRepeatTimer = gpGlobals->time; UTIL_CleanSpawnPoint( pPlayer->pev->origin, 50 );
pPlayer->m_iLocalConfirm = -2; m_flRepeatTimer = gpGlobals->time;
} pPlayer->m_iLocalConfirm = -2;
}
UTIL_HudMessageAll( params, "Cannot change level: Not enough players!\nWait 30 sec before you may changelevel!" );
return;
}
if( count1 > 1 && count1 < count2 / 3 ) UTIL_HudMessageAll( params, "Cannot change level: Not enough players!\nWait 30 sec before you may changelevel!" );
i = count1 - count1 < count2 / 3; return;
if( count1 > 1 && count1 < count2 / 3 ) }
i = 1;
if( i ) if( count1 > 1 && count1 < count2 / 3 )
UTIL_HudMessageAll( params, UTIL_VarArgs( "%s touched end of map\nnext is %s %s, %d to go\n", i = count1 - count1 < count2 / 3;
( pActivator->pev->netname && STRING( pActivator->pev->netname )[0] != 0 ) ? STRING( pActivator->pev->netname ) : "unconnected", if( count1 > 1 && count1 < count2 / 3 )
st_szNextMap, st_szNextSpot, i ) ); i = 1;
if( count2 )
{
pev->rendercolor.x = count1 * 255 / count2;
if( m_fIsBack )
pev->rendercolor.z = 255 - pev->rendercolor.x;
else
pev->rendercolor.y = 255 - pev->rendercolor.x;
}
ALERT( at_console, "^3CHANGELEVEL:^7 %d %d\n", count2, count1 ); if( i )
UTIL_HudMessageAll( params, UTIL_VarArgs( "%s touched end of map\nnext is %s %s, %d to go\n",
( pActivator->pev->netname && STRING( pActivator->pev->netname )[0] != 0 ) ? STRING( pActivator->pev->netname ) : "unconnected",
st_szNextMap, st_szNextSpot, i ) );
if( count2 )
{
pev->rendercolor.x = count1 * 255 / count2;
if( m_fIsBack )
pev->rendercolor.z = 255 - pev->rendercolor.x;
else
pev->rendercolor.y = 255 - pev->rendercolor.x;
}
if( count1 > 1 && count1 < count2 / 3 ) ALERT( at_console, "^3CHANGELEVEL:^7 %d %d\n", count2, count1 );
return;
//if( count1 <= 1 && count2 == 2 ) if( count1 > 1 && count1 < count2 / 3 )
// return; return;
if( m_fIsBack ) //if( count1 <= 1 && count2 == 2 )
{ // return;
if( gpGlobals->time - g_GlobalMenu.m_flTime > 30 )
{ if( m_fIsBack )
g_iMenu = 0;
g_GlobalMenu.m_iConfirm = 0;
}
if( g_iMenu != 1 )
{ {
if( !UTIL_CoopIsBadPlayer( pActivator ) ) if( gpGlobals->time - g_GlobalMenu.m_flTime > 30 )
g_GlobalMenu.ConfirmMenu( (CBasePlayer*)pActivator, this, m_szMapName ); {
return; g_iMenu = 0;
} g_GlobalMenu.m_iConfirm = 0;
if( g_GlobalMenu.m_iConfirm < count2 ) }
return; if( g_iMenu != 1 )
//if( mp_coop_strongpolicy.value ) {
/*{ if( !UTIL_CoopIsBadPlayer( pActivator ) )
// do not allow go back if there are checkpoints, but not near changelevel g_GlobalMenu.ConfirmMenu( (CBasePlayer*)pActivator, this, m_szMapName );
if( g_checkpoints[0].time && (g_checkpoints[0].origin - VecBModelOrigin(pev)).Length() > 150 )
return; return;
if( count2 < 2 ) }
if( g_GlobalMenu.m_iConfirm < count2 )
return; return;
}*/ //if( mp_coop_strongpolicy.value )
} /*{
// do not allow go back if there are checkpoints, but not near changelevel
if( g_checkpoints[0].time && (g_checkpoints[0].origin - VecBModelOrigin(pev)).Length() > 150 )
return;
if( count2 < 2 )
return;
}*/
}
} }
if( m_fSpawnSaved ) if( m_fSpawnSaved )
@ -1790,18 +1793,18 @@ void CChangeLevel::ChangeLevelNow( CBaseEntity *pActivator )
{ {
int count = 0; int count = 0;
for( int i = 1; i <= gpGlobals->maxClients; i++ ) for( int i = 1; i <= gpGlobals->maxClients; i++ )
{ {
CBaseEntity *plr = UTIL_PlayerByIndex( i ); CBaseEntity *plr = UTIL_PlayerByIndex( i );
if( plr && plr->IsPlayer() && ( !FindTriggerTransition( m_szLandmarkName ) || (gpGlobals->time -((CBasePlayer*)plr)->m_flSpawnTime ) > 30 || m_fSkipSpawnCheck ) ) if( plr && plr->IsPlayer() && ( !FindTriggerTransition( m_szLandmarkName ) || (gpGlobals->time -((CBasePlayer*)plr)->m_flSpawnTime ) > 30 || m_fSkipSpawnCheck ) )
{ {
if( InTransitionVolume( plr, m_szLandmarkName )) if( InTransitionVolume( plr, m_szLandmarkName ))
{ {
count++; count++;
} }
}
} }
}
if( !count ) if( !count )
{ {
ALERT( at_console, "There are no players in transition volume %s, aborting\n", m_szLandmarkName ); ALERT( at_console, "There are no players in transition volume %s, aborting\n", m_szLandmarkName );
@ -1815,23 +1818,11 @@ void CChangeLevel::ChangeLevelNow( CBaseEntity *pActivator )
ALERT( at_console, "Player isn't in the transition volume %s, aborting\n", m_szLandmarkName ); ALERT( at_console, "Player isn't in the transition volume %s, aborting\n", m_szLandmarkName );
return; return;
} }
//else
/* if !pPlayer
{
ALERT( at_console, ", aborting\n" );
return;
}*/ MESSAGE_BEGIN( MSG_ALL, 8, NULL ); // svc_print
WRITE_BYTE( 3 ); // PRINT_CHAT
MESSAGE_BEGIN( MSG_ALL, 8, NULL ); // svc_print WRITE_STRING( UTIL_VarArgs( "%s^7 activated changelevel\n", ( pPlayer->pev->netname && STRING( pPlayer->pev->netname )[0] != 0 ) ? STRING( pPlayer->pev->netname ) : "unconnected"));
WRITE_BYTE( 3 ); // PRINT_CHAT MESSAGE_END();
WRITE_STRING( UTIL_VarArgs( "%s^7 activated changelevel\n", ( pPlayer->pev->netname && STRING( pPlayer->pev->netname )[0] != 0 ) ? STRING( pPlayer->pev->netname ) : "unconnected"));
MESSAGE_END();
// 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 // This object will get removed in the call to CHANGE_LEVEL, copy the params into "safe" memory
strcpy( st_szNextMap, m_szMapName ); strcpy( st_szNextMap, m_szMapName );
@ -1875,33 +1866,27 @@ void CChangeLevel::ChangeLevelNow( CBaseEntity *pActivator )
// loop through all clients, reset state // loop through all clients, reset state
if( mp_coop_changelevel.value ) if( mp_coop_changelevel.value )
{ {
for( int i = 1; i <= gpGlobals->maxClients; i++ ) for( int i = 1; i <= gpGlobals->maxClients; i++ )
{
CBasePlayer *plr = (CBasePlayer*)UTIL_PlayerByIndex( i );
// reset all players state
if( plr )
{ {
plr->m_state = STATE_UNINITIALIZED; CBasePlayer *plr = (CBasePlayer*)UTIL_PlayerByIndex( i );
plr->RemoveAllItems( TRUE );
UTIL_BecomeSpectator( plr ); // reset all players state to make it spawn again after restart
//plr->SetThink( &CBasePlayer::Spawn ); if( plr )
//plr->pev->nextthink = gpGlobals->time + 1; {
// HACK: force perform reconnection plr->m_state = STATE_UNINITIALIZED;
if( mp_coop_reconnect_hack.value ) plr->RemoveAllItems( TRUE );
CLIENT_COMMAND( plr->edict(), "reconnect\n" ); UTIL_BecomeSpectator( plr );
// HACK: force perform reconnection
//CLIENT_COMMAND( plr->edict(), "alias cmd \"reconnect;unalias cmd\"\n" ); if( mp_coop_reconnect_hack.value )
//MESSAGE_BEGIN( MSG_ONE, 2, NULL, plr->pev ); // svc_disconnect after stufftext CLIENT_COMMAND( plr->edict(), "reconnect\n" );
//MESSAGE_END(); }
//SERVER_COMMAND( UTIL_VarArgs( "kick %d\n", i-1 ) );
//SERVER_EXECUTE();
} }
} g_fPause = true;
g_fPause = true;
} }
s_SavedCoords.fUsed = m_bUsed; s_SavedCoords.fUsed = m_bUsed;
s_SavedCoords.valid = valid; s_SavedCoords.valid = valid;
// wait 5 frames to make sure all players are in reconnected state
if( mp_coop_reconnect_hack.value ) if( mp_coop_reconnect_hack.value )
SERVER_COMMAND( UTIL_VarArgs( "wait;wait;wait;wait;wait;changelevel %s %s\n", st_szNextMap, st_szNextSpot ) ); SERVER_COMMAND( UTIL_VarArgs( "wait;wait;wait;wait;wait;changelevel %s %s\n", st_szNextMap, st_szNextSpot ) );
else else

Write Preview
Loading…
Cancel
Save