FWGS
/
hlsdk-xash3d
mirror of https://github.com/FWGS/hlsdk-xash3d
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactoring

This commit is contained in:
mittorn 2018-11-05 22:42:05 +07:00
parent 2ddd855690
commit b8d5f9fc39
6 changed files with 183 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/client.cpp
View File

@ -869,12 +869,7 @@ void ParmsNewLevel( void )
{ {
pSaveData->connectionCount = BuildChangeList( pSaveData->levelList, MAX_LEVEL_CONNECTIONS ); pSaveData->connectionCount = BuildChangeList( pSaveData->levelList, MAX_LEVEL_CONNECTIONS );
} }
else
if( mp_coop.value )
{
COOP_ClearData();
g_WeaponList.Clear();
}
} }
@ -888,13 +883,6 @@ void ParmsChangeLevel( void )
{ {
pSaveData->connectionCount = BuildChangeList( pSaveData->levelList, MAX_LEVEL_CONNECTIONS ); pSaveData->connectionCount = BuildChangeList( pSaveData->levelList, MAX_LEVEL_CONNECTIONS );
} }
else
if( mp_coop.value )
{
COOP_ClearData();
g_WeaponList.Clear();
}
} }

333
dlls/coop.cpp
View File

@ -5,22 +5,66 @@
#include "coop_util.h" #include "coop_util.h"
#include "gravgunmod.h" #include "gravgunmod.h"
static float msglimittime1, msglimittime2; bool g_fPause;
// offset for all maps relative to current map
struct GGMMapState
{
struct GGMMapState *pNext;
char szMapName[32];
Vector vecOffset;
struct GGMCheckpoint {
char szDisplayName[32];
float flTime;
struct GGMPosition pos;
} rgCheckpoints[5];
};
struct GGMLandmarkTransition {
char szSourceMap[32];
char szTargetMap[32];
char szLandmarkName[32];
Vector vecLandmark;
bool fTriggerUsed;
bool fSavedPos;
struct GGMPosition pos;
};
struct COOPState
{
// will be saved
struct COOPPersist
{
// weapon list
char rgszWeapons[64][256];
int iWeaponCount;
// data for spawnpoint
struct GGMPosition savedPos;
bool fSaved;
} p;
struct GGMMapState *pMapStates;
struct GGMMapState *pCurrentMap;
// translate GGMMapState during changelevel
struct GGMLandmarkTransition landmarkTransition;
int iVote;
float flMsgLimit1, flMsgLimit2;
} g_CoopState;
cvar_t mp_coop = { "mp_coop", "0", FCVAR_SERVER }; cvar_t mp_coop = { "mp_coop", "0", FCVAR_SERVER };
cvar_t mp_coop_nofriendlyfire = { "mp_coop_nofriendlyfire", "0", FCVAR_SERVER }; cvar_t mp_coop_nofriendlyfire = { "mp_coop_nofriendlyfire", "0", FCVAR_SERVER };
cvar_t mp_coop_reconnect_hack = { "mp_coop_reconnect_hack", "0", FCVAR_SERVER }; cvar_t mp_coop_reconnect_hack = { "mp_coop_reconnect_hack", "0", FCVAR_SERVER };
cvar_t mp_coop_noangry = { "mp_coop_noangry", "0", FCVAR_SERVER }; cvar_t mp_coop_noangry = { "mp_coop_noangry", "0", FCVAR_SERVER };
cvar_t mp_coop_checkpoints = { "mp_coop_checkpoints", "1", FCVAR_SERVER }; cvar_t mp_coop_checkpoints = { "mp_coop_checkpoints", "1", FCVAR_SERVER };
cvar_t mp_skipdefaults = { "mp_skipdefaults", "0", FCVAR_SERVER };
cvar_t mp_coop_strongcheckpoints = { "mp_coop_strongcheckpoints", "0", FCVAR_SERVER }; cvar_t mp_coop_strongcheckpoints = { "mp_coop_strongcheckpoints", "0", FCVAR_SERVER };
cvar_t mp_unduck = { "mp_unduck", "0", FCVAR_SERVER };
cvar_t mp_semclip = { "mp_semclip", "0", FCVAR_SERVER }; cvar_t mp_semclip = { "mp_semclip", "0", FCVAR_SERVER };
cvar_t mp_spectator = { "mp_spectator", "0", FCVAR_SERVER };
cvar_t materials_txt = { "materials_txt", "sound/materials.txt", FCVAR_SERVER }; cvar_t materials_txt = { "materials_txt", "sound/materials.txt", FCVAR_SERVER };
cvar_t sentences_txt = { "sentences_txt", "sound/sentences.txt", FCVAR_SERVER }; cvar_t sentences_txt = { "sentences_txt", "sound/sentences.txt", FCVAR_SERVER };
void COOP_CheckpointMenu( CBasePlayer *pPlayer );
edict_t *COOP_FindLandmark( const char *pLandmarkName ) edict_t *COOP_FindLandmark( const char *pLandmarkName )
{ {
@ -74,9 +118,9 @@ void UTIL_CoopPlayerMessage( CBaseEntity *pPlayer, int channel, float time, unsi
void UTIL_CoopHudMessage( int channel, float time, unsigned int color1, unsigned int color2, float x, float y, const char *format, ... ) void UTIL_CoopHudMessage( int channel, float time, unsigned int color1, unsigned int color2, float x, float y, const char *format, ... )
{ {
if( gpGlobals->time < msglimittime1 ) if( gpGlobals->time < g_CoopState.flMsgLimit1 )
return; return;
msglimittime1 = gpGlobals->time + 0.4; g_CoopState.flMsgLimit1 = gpGlobals->time + 0.4;
hudtextparms_t params; hudtextparms_t params;
params.x = x, params.y = y; params.x = x, params.y = y;
@ -108,9 +152,9 @@ void UTIL_CoopHudMessage( int channel, float time, unsigned int color1, unsigned
void UTIL_CoopPrintMessage( const char *format, ... ) void UTIL_CoopPrintMessage( const char *format, ... )
{ {
if( gpGlobals->time < msglimittime2 ) if( gpGlobals->time < g_CoopState.flMsgLimit2 )
return; return;
msglimittime2 = gpGlobals->time + 0.4; g_CoopState.flMsgLimit2 = gpGlobals->time + 0.4;
va_list argptr; va_list argptr;
char string[256] = "^2"; char string[256] = "^2";
@ -265,59 +309,43 @@ bool UTIL_CoopIsBadPlayer( CBaseEntity *plr )
return false; return false;
} }
bool g_fPause;
void COOP_ClearData( void )
// Collect all weapons tat player touchet in coop ant give to all players at spawn
void COOP_ClearWeaponList( void )
{ {
g_fPause = false; g_CoopState.p.iWeaponCount = 0;
msglimittime1 = msglimittime2 = 0;
} }
void COOP_GiveDefaultWeapons(CBasePlayer *pPlayer)
void COOP_ApplyData( void )
{ {
ALERT( at_console, "^2CoopApplyData()\n" ); for(int i = 0; i < g_CoopState.p.iWeaponCount;i++)
msglimittime1 = msglimittime2 = 0; pPlayer->GiveNamedItem(g_CoopState.p.rgszWeapons[i]);
g_fPause = false;
} }
void COOP_AddDefaultWeapon( const char *classname )
// use this to translate GGMMapOffset during changelevel
struct GGMLandmarkTransition
{ {
char szSourceMap[32]; int i;
char szTargetMap[32];
char szLandmarkName[32];
Vector vecLandmark;
bool fTriggerUsed;
bool fSavedPos;
struct GGMPosition pos;
};
//if( !strcmp( classname, "item_suit") )
//return;
struct GGMCheckpoint if( !strcmp( classname, "item_healthkit") )
{ return;
char szDisplayName[32];
float flTime;
struct GGMPosition pos;
};
// offset for all maps relative to current map for(i = 0; i < g_CoopState.p.iWeaponCount;i++)
struct GGMMapState if(!strcmp(g_CoopState.p.rgszWeapons[i], classname))
{ return;
struct GGMMapState *pNext; strcpy(g_CoopState.p.rgszWeapons[g_CoopState.p.iWeaponCount++], classname);
char szMapName[32]; for( int i = 1; i <= gpGlobals->maxClients; i++ )
Vector vecOffset; {
struct GGMCheckpoint rgCheckpoints[5]; CBasePlayer *plr = (CBasePlayer*)UTIL_PlayerByIndex( i );
};
GGMMapState *g_pMapStates; // broadcast to active players
GGMMapState *g_pCurrentMap; if( plr && plr->pev->modelindex )
GGMLandmarkTransition g_landmarkTransition; plr->GiveNamedItem( classname );
struct GGMCoopState }
{
struct GGMPosition savedPos; }
bool fSaved;
} g_CoopState;
edict_t *COOP_FindLandmark( const char *pLandmarkName );
void COOP_MarkTriggers( void ) void COOP_MarkTriggers( void )
{ {
@ -326,9 +354,10 @@ void COOP_MarkTriggers( void )
while( pTrigger = UTIL_FindEntityByClassname( pTrigger, "trigger_changelevel" ) ) while( pTrigger = UTIL_FindEntityByClassname( pTrigger, "trigger_changelevel" ) )
{ {
struct COOPChangelevelData *pData = COOP_GetTriggerData( pTrigger ); struct COOPChangelevelData *pData = COOP_GetTriggerData( pTrigger );
pData->fIsBack = !strcmp( pData->pszMapName, g_landmarkTransition.szSourceMap ); pData->fIsBack = !strcmp( pData->pszMapName, g_CoopState.landmarkTransition.szSourceMap );
// if( gpGlobals->startspot && STRING(gpGlobals->startspot) && !strcmp(STRING(gpGlobals->startspot), m_szLandmarkName) ) //pData->fIsBack = false;
// m_coopData.fIsBack = true; //if( gpGlobals->startspot && STRING(gpGlobals->startspot) && !strcmp(STRING(gpGlobals->startspot), g_CoopState.landmarkTransition.szLandmarkName) )
//pData->fIsBack = true;
pTrigger->pev->renderamt = 127; pTrigger->pev->renderamt = 127;
pTrigger->pev->effects &= ~EF_NODRAW; pTrigger->pev->effects &= ~EF_NODRAW;
@ -341,120 +370,132 @@ void COOP_MarkTriggers( void )
} }
} }
bool COOP_ProcessTransition( void ) bool COOP_ProcessTransition( void )
{ {
bool fAddCurrent = true; bool fAddCurrent = true;
edict_t *landmark; edict_t *landmark;
g_CoopState.savedPos = g_landmarkTransition.pos; g_CoopState.p.savedPos = g_CoopState.landmarkTransition.pos;
g_CoopState.fSaved = g_landmarkTransition.fSavedPos; g_CoopState.p.fSaved = g_CoopState.landmarkTransition.fSavedPos;
if( !mp_coop.value ) if( !mp_coop.value )
return false; return false;
if( !g_landmarkTransition.szLandmarkName[0] ) if( !g_CoopState.landmarkTransition.szLandmarkName[0] )
return false; return false;
if( strcmp( g_landmarkTransition.szTargetMap, STRING(gpGlobals->mapname) ) ) if( strcmp( g_CoopState.landmarkTransition.szTargetMap, STRING(gpGlobals->mapname) ) )
return false; return false;
landmark = COOP_FindLandmark( g_landmarkTransition.szLandmarkName ); landmark = COOP_FindLandmark( g_CoopState.landmarkTransition.szLandmarkName );
if( !landmark ) if( !landmark )
return false; return false;
Vector &lm = landmark->v.origin; Vector &lm = landmark->v.origin;
for( struct GGMMapState *pMapState = g_pMapStates; pMapState; pMapState = pMapState->pNext ) for( struct GGMMapState *pMapState = g_CoopState.pMapStates; pMapState; pMapState = pMapState->pNext )
{ {
if( !strcmp( pMapState->szMapName, STRING(gpGlobals->mapname) ) ) if( !strcmp( pMapState->szMapName, STRING(gpGlobals->mapname) ) )
{ {
pMapState->vecOffset = Vector( 0, 0, 0 ); pMapState->vecOffset = Vector( 0, 0, 0 );
fAddCurrent = false; fAddCurrent = false;
g_pCurrentMap = pMapState; g_CoopState.pCurrentMap = pMapState;
continue; continue;
} }
pMapState->vecOffset = pMapState->vecOffset - g_landmarkTransition.vecLandmark + lm; pMapState->vecOffset = pMapState->vecOffset - g_CoopState.landmarkTransition.vecLandmark + lm;
} }
if( fAddCurrent ) if( fAddCurrent )
{ {
GGMMapState *pNewState = (GGMMapState *)calloc(1, sizeof( struct GGMMapState ) ); GGMMapState *pNewState = (GGMMapState *)calloc(1, sizeof( struct GGMMapState ) );
pNewState->pNext = g_pMapStates; pNewState->pNext = g_CoopState.pMapStates;
pNewState->vecOffset = Vector(0, 0, 0); pNewState->vecOffset = Vector(0, 0, 0);
strncpy(pNewState->szMapName, STRING(gpGlobals->mapname), 31); strncpy(pNewState->szMapName, STRING(gpGlobals->mapname), 31);
g_pMapStates = g_pCurrentMap = pNewState; g_CoopState.pMapStates = g_CoopState.pCurrentMap = pNewState;
} }
return true; return true;
} }
void COOP_SetupLandmarkTransition( const char *szNextMap, const char *szNextSpot, Vector vecLandmarkOffset, struct GGMPosition *pPos ) void COOP_SetupLandmarkTransition( const char *szNextMap, const char *szNextSpot, Vector vecLandmarkOffset, struct GGMPosition *pPos )
{ {
strncpy(g_landmarkTransition.szSourceMap, STRING(gpGlobals->mapname), 31 ); strncpy(g_CoopState.landmarkTransition.szSourceMap, STRING(gpGlobals->mapname), 31 );
strncpy(g_landmarkTransition.szTargetMap, szNextMap, 31 ); strncpy(g_CoopState.landmarkTransition.szTargetMap, szNextMap, 31 );
strncpy(g_landmarkTransition.szLandmarkName, szNextSpot, 31 ); strncpy(g_CoopState.landmarkTransition.szLandmarkName, szNextSpot, 31 );
g_landmarkTransition.vecLandmark = vecLandmarkOffset; g_CoopState.landmarkTransition.vecLandmark = vecLandmarkOffset;
if( pPos ) if( pPos )
{ {
g_landmarkTransition.pos = *pPos; g_CoopState.landmarkTransition.pos = *pPos;
g_landmarkTransition.fSavedPos = true; g_CoopState.landmarkTransition.fSavedPos = true;
} }
} }
void COOP_ServerActivate( void ) void COOP_ServerActivate( void )
{ {
memset( &g_CoopState, 0, sizeof( g_CoopState ) ); memset( &g_CoopState.p.savedPos, 0, sizeof( struct GGMPosition ) );
g_CoopState.p.fSaved = false;
if( !mp_coop.value )
return;
COOP_MarkTriggers(); COOP_MarkTriggers();
if( !COOP_ProcessTransition() ) if( !COOP_ProcessTransition() )
{ {
ALERT( at_console, "Transition failed, new game started\n"); ALERT( at_console, "Transition failed, new game started\n");
while( g_pMapStates ) while( g_CoopState.pMapStates )
{ {
GGMMapState *pMapState = g_pMapStates; GGMMapState *pMapState = g_CoopState.pMapStates;
g_pMapStates = pMapState->pNext; g_CoopState.pMapStates = pMapState->pNext;
free( pMapState ); free( pMapState );
} }
GGMMapState *pNewState = (GGMMapState *)calloc(1, sizeof( struct GGMMapState ) ); GGMMapState *pNewState = (GGMMapState *)calloc(1, sizeof( struct GGMMapState ) );
pNewState->pNext = g_pMapStates; pNewState->pNext = g_CoopState.pMapStates;
pNewState->vecOffset = Vector(0, 0, 0); pNewState->vecOffset = Vector(0, 0, 0);
strncpy(pNewState->szMapName, STRING(gpGlobals->mapname), 31); strncpy(pNewState->szMapName, STRING(gpGlobals->mapname), 31);
g_pMapStates = g_pCurrentMap = pNewState; g_CoopState.pMapStates = g_CoopState.pCurrentMap = pNewState;
if( mp_coop.value )
COOP_ClearData();
GGM_ClearLists(); GGM_ClearLists();
g_WeaponList.Clear(); COOP_ClearWeaponList();
} }
else if( mp_coop.value ) COOP_ApplyData();
g_fPause = false;
g_CoopState.flMsgLimit1 = g_CoopState.flMsgLimit2 = 0;
if( mp_coop.value ) for( int i = 1; i <= gpGlobals->maxClients; i++ )
{ {
for( int i = 1; i <= gpGlobals->maxClients; i++ ) CBasePlayer *plr = (CBasePlayer*)UTIL_PlayerByIndex( i );
{
CBasePlayer *plr = (CBasePlayer*)UTIL_PlayerByIndex( i );
// reset all players state // reset all players state
if( plr ) if( plr )
{
plr->m_ggm.iState = STATE_UNINITIALIZED;
plr->RemoveAllItems( TRUE );
UTIL_BecomeSpectator( plr );
//plr->Spawn();
}
}
if( g_CoopState.fSaved && mp_coop_checkpoints.value )
{ {
memmove( &g_pCurrentMap->rgCheckpoints[1], &g_pCurrentMap->rgCheckpoints[0], sizeof ( g_pCurrentMap->rgCheckpoints[0] ) * 3 ); plr->m_ggm.iState = STATE_UNINITIALIZED;
g_pCurrentMap->rgCheckpoints[0].flTime = gpGlobals->time; plr->RemoveAllItems( TRUE );
snprintf( g_pCurrentMap->rgCheckpoints[0].szDisplayName, 31, "From %s", g_landmarkTransition.szSourceMap ); UTIL_BecomeSpectator( plr );
g_pCurrentMap->rgCheckpoints[0].pos = g_CoopState.savedPos; //plr->Spawn();
} }
} }
memset( &g_landmarkTransition, 0, sizeof( GGMLandmarkTransition ) ); if( g_CoopState.p.fSaved && mp_coop_checkpoints.value )
{
memmove( &g_CoopState.pCurrentMap->rgCheckpoints[1], &g_CoopState.pCurrentMap->rgCheckpoints[0], sizeof ( g_CoopState.pCurrentMap->rgCheckpoints[0] ) * 3 );
g_CoopState.pCurrentMap->rgCheckpoints[0].flTime = gpGlobals->time;
snprintf( g_CoopState.pCurrentMap->rgCheckpoints[0].szDisplayName, 31, "From %s", g_CoopState.landmarkTransition.szSourceMap );
g_CoopState.pCurrentMap->rgCheckpoints[0].pos = g_CoopState.p.savedPos;
}
memset( &g_CoopState.landmarkTransition, 0, sizeof( struct GGMLandmarkTransition ) );
} }
bool COOP_GetOrigin( Vector *pvecNewOrigin, const Vector &vecOrigin, const char *pszMapName ) bool COOP_GetOrigin( Vector *pvecNewOrigin, const Vector &vecOrigin, const char *pszMapName )
{ {
for( GGMMapState *pOffset = g_pMapStates; pOffset; pOffset = pOffset->pNext ) if( !mp_coop.value )
{
if( !strcmp( STRING( gpGlobals->mapname ), pszMapName ) )
{
*pvecNewOrigin = vecOrigin;
return true;
}
return false;
}
for( GGMMapState *pOffset = g_CoopState.pMapStates; pOffset; pOffset = pOffset->pNext )
{ {
if( !strcmp( pOffset->szMapName, pszMapName ) ) if( !strcmp( pOffset->szMapName, pszMapName ) )
{ {
@ -466,8 +507,6 @@ bool COOP_GetOrigin( Vector *pvecNewOrigin, const Vector &vecOrigin, const char
return false; return false;
} }
int g_iVote;
// Show to all spawned players: voting, etc.. // Show to all spawned players: voting, etc..
class GlobalVote class GlobalVote
{ {
@ -501,7 +540,7 @@ void GlobalVote::Process( CBasePlayer *pPlayer, int imenu )
//g_GlobalVote.m_flTime = gpGlobals->time; //g_GlobalVote.m_flTime = gpGlobals->time;
switch( g_iVote ) switch( g_CoopState.iVote )
{ {
case 1: // touch blue trigger case 1: // touch blue trigger
m_iVoteCount++; m_iVoteCount++;
@ -524,16 +563,16 @@ void GlobalVote::Process( CBasePlayer *pPlayer, int imenu )
m_iConfirm--; m_iConfirm--;
if( pPlayer == m_pPlayer ) if( pPlayer == m_pPlayer )
{ {
m_iConfirm -= 100; // player mistake m_iConfirm = -10; // player mistake
g_iVote = 0; g_CoopState.iVote = 0;
} }
} }
if( imenu == 2 ) if( imenu == 2 )
{ {
m_iBanCount++; m_iBanCount++;
if( m_iBanCount >= 2 && m_iConfirm > -50 ) if( m_iBanCount >= 2 && m_iConfirm > -9 )
UTIL_CoopKickPlayer( m_pPlayer ); UTIL_CoopKickPlayer( m_pPlayer );
g_iVote = 0; g_CoopState.iVote = 0;
} }
break; break;
} }
@ -567,7 +606,7 @@ void GlobalVote::ShowGlobalMenu( const char *title, int count, const char **menu
void GlobalVote::ConfirmMenu( CBasePlayer *pPlayer, CBaseEntity *trigger, const char *mapname ) void GlobalVote::ConfirmMenu( CBasePlayer *pPlayer, CBaseEntity *trigger, const char *mapname )
{ {
g_iVote = 1; g_CoopState.iVote = 1;
m_flTime = gpGlobals->time; m_flTime = gpGlobals->time;
m_pTrigger = trigger; m_pTrigger = trigger;
m_pPlayer = pPlayer; m_pPlayer = pPlayer;
@ -587,10 +626,10 @@ void COOP_NewCheckpoint( entvars_t *pevPlayer )
{ {
if( !pevPlayer->netname || pevPlayer->health <= 0 ) if( !pevPlayer->netname || pevPlayer->health <= 0 )
return; return;
memmove( &g_pCurrentMap->rgCheckpoints[1], &g_pCurrentMap->rgCheckpoints[0], sizeof ( g_pCurrentMap->rgCheckpoints[0] ) * 3 ); memmove( &g_CoopState.pCurrentMap->rgCheckpoints[1], &g_CoopState.pCurrentMap->rgCheckpoints[0], sizeof ( g_CoopState.pCurrentMap->rgCheckpoints[0] ) * 3 );
g_pCurrentMap->rgCheckpoints[0].flTime = gpGlobals->time; g_CoopState.pCurrentMap->rgCheckpoints[0].flTime = gpGlobals->time;
snprintf( g_pCurrentMap->rgCheckpoints[0].szDisplayName, 31, "%5s %d", STRING( pevPlayer->netname ), (int)( gpGlobals->time / 60 ) ); snprintf( g_CoopState.pCurrentMap->rgCheckpoints[0].szDisplayName, 31, "%5s %d", STRING( pevPlayer->netname ), (int)( gpGlobals->time / 60 ) );
GGM_SavePosition( (CBasePlayer*)CBaseEntity::Instance( pevPlayer ), &g_pCurrentMap->rgCheckpoints[0].pos ); GGM_SavePosition( (CBasePlayer*)CBaseEntity::Instance( pevPlayer ), &g_CoopState.pCurrentMap->rgCheckpoints[0].pos );
UTIL_CoopPrintMessage("New checkpoint by %s!\n", STRING( pevPlayer->netname ) ); UTIL_CoopPrintMessage("New checkpoint by %s!\n", STRING( pevPlayer->netname ) );
} }
@ -608,7 +647,7 @@ bool COOP_PlayerDeath( CBasePlayer *pPlayer )
// if( pPlayer->gravgunmod_data.m_iMenuState == MENUSTATE_CHECKPOINT ) // if( pPlayer->gravgunmod_data.m_iMenuState == MENUSTATE_CHECKPOINT )
// return true; // return true;
if( g_pCurrentMap->rgCheckpoints[0].flTime ) if( g_CoopState.pCurrentMap->rgCheckpoints[0].flTime )
{ {
COOP_CheckpointMenu( pPlayer ); COOP_CheckpointMenu( pPlayer );
st_fSkipNext = true; st_fSkipNext = true;
@ -620,9 +659,9 @@ bool COOP_PlayerDeath( CBasePlayer *pPlayer )
bool COOP_SetDefaultSpawnPosition( CBasePlayer *pPlayer ) bool COOP_SetDefaultSpawnPosition( CBasePlayer *pPlayer )
{ {
if( !g_CoopState.fSaved ) if( !g_CoopState.p.fSaved )
return false; return false;
return GGM_RestorePosition( pPlayer, &g_CoopState.savedPos ); return GGM_RestorePosition( pPlayer, &g_CoopState.p.savedPos );
} }
CBaseEntity *UTIL_CoopGetPlayerTrain( CBaseEntity *pPlayer) CBaseEntity *UTIL_CoopGetPlayerTrain( CBaseEntity *pPlayer)
@ -657,47 +696,9 @@ CBaseEntity *UTIL_CoopGetPlayerTrain( CBaseEntity *pPlayer)
// Collect all weapons tat player touchet in coop ant give to all players at spawn
CWeaponList g_WeaponList;
void CWeaponList::Clear()
{
m_iWeapons = 0;
}
void CWeaponList::GiveToPlayer(CBasePlayer *pPlayer)
{
for(int i = 0; i < m_iWeapons;i++)
pPlayer->GiveNamedItem(weapons[i]);
}
void CWeaponList::AddWeapon( const char *classname )
{
int i;
//if( !strcmp( classname, "item_suit") )
//return;
if( !strcmp( classname, "item_healthkit") )
return;
for(i = 0; i < m_iWeapons;i++)
if(!strcmp(weapons[i], classname))
return;
strcpy(weapons[m_iWeapons++], classname);
for( int i = 1; i <= gpGlobals->maxClients; i++ )
{
CBasePlayer *plr = (CBasePlayer*)UTIL_PlayerByIndex( i );
// broadcast to active players
if( plr && plr->pev->modelindex )
plr->GiveNamedItem( classname );
}
}
void COOP_ResetVote( void ) void COOP_ResetVote( void )
{ {
g_iVote = 0; g_CoopState.iVote = 0;
g_GlobalVote.m_iConfirm = 0; g_GlobalVote.m_iConfirm = 0;
g_GlobalVote.m_iBanCount = 0; g_GlobalVote.m_iBanCount = 0;
g_GlobalVote.m_flTime = gpGlobals->time; g_GlobalVote.m_flTime = gpGlobals->time;
@ -712,7 +713,7 @@ bool COOP_ConfirmMenu(CBaseEntity *pTrigger, CBaseEntity *pActivator, int count2
if( mp_coop_strongcheckpoints.value ) if( mp_coop_strongcheckpoints.value )
{ {
// do not allow go back if there are checkpoints, but not near changelevel // do not allow go back if there are checkpoints, but not near changelevel
if( g_pCurrentMap->rgCheckpoints[0].flTime && (g_pCurrentMap->rgCheckpoints[0].pos.vecOrigin - VecBModelOrigin(pTrigger->pev)).Length() > 150 ) if( g_CoopState.pCurrentMap->rgCheckpoints[0].flTime && (g_CoopState.pCurrentMap->rgCheckpoints[0].pos.vecOrigin - VecBModelOrigin(pTrigger->pev)).Length() > 150 )
{ {
COOP_ResetVote(); COOP_ResetVote();
//UTIL_CoopPlayerMessage( pActivator, 1, 5, 0xFF0000FF, 0xFF0000FF, 0, 0.7, "Changelevel back locked by checkpoint\nCheckpoint here to activate trigger!"); //UTIL_CoopPlayerMessage( pActivator, 1, 5, 0xFF0000FF, 0xFF0000FF, 0, 0.7, "Changelevel back locked by checkpoint\nCheckpoint here to activate trigger!");
@ -723,7 +724,7 @@ bool COOP_ConfirmMenu(CBaseEntity *pTrigger, CBaseEntity *pActivator, int count2
//return; //return;
} }
if( g_iVote != 1 ) if( g_CoopState.iVote != 1 )
{ {
if( !UTIL_CoopIsBadPlayer( pActivator ) ) if( !UTIL_CoopIsBadPlayer( pActivator ) )
{ {
@ -758,7 +759,7 @@ void COOP_CheckpointMenu( CBasePlayer *pPlayer )
if( !mp_coop_checkpoints.value ) if( !mp_coop_checkpoints.value )
return; return;
if( !g_pCurrentMap ) if( !g_CoopState.pCurrentMap )
return; return;
GGM_PlayerMenu &m = pPlayer->m_ggm.menu.New("Select checkpoint", false); GGM_PlayerMenu &m = pPlayer->m_ggm.menu.New("Select checkpoint", false);
@ -768,11 +769,11 @@ void COOP_CheckpointMenu( CBasePlayer *pPlayer )
else else
m.Add("New checkpoint", "newcheckpoint"); m.Add("New checkpoint", "newcheckpoint");
for( i = 1; g_pCurrentMap->rgCheckpoints[i-1].flTime; i++ ) for( i = 1; g_CoopState.pCurrentMap->rgCheckpoints[i-1].flTime; i++ )
{ {
char cmd[32]; char cmd[32];
sprintf(cmd, "loadcheckpoint %d", i-1 ); sprintf(cmd, "loadcheckpoint %d", i-1 );
m.Add(g_pCurrentMap->rgCheckpoints[i-1].szDisplayName, cmd); m.Add(g_CoopState.pCurrentMap->rgCheckpoints[i-1].szDisplayName, cmd);
} }
m.Show(); m.Show();
@ -797,7 +798,7 @@ bool COOP_ClientCommand( edict_t *pEntity )
{ {
if( pPlayer->m_ggm.iState == STATE_SPAWNED ) if( pPlayer->m_ggm.iState == STATE_SPAWNED )
return false; return false;
if( mp_coop_checkpoints.value && g_pCurrentMap && g_pCurrentMap->rgCheckpoints[0].szDisplayName[0] ) if( mp_coop_checkpoints.value && g_CoopState.pCurrentMap && g_CoopState.pCurrentMap->rgCheckpoints[0].szDisplayName[0] )
COOP_CheckpointMenu( pPlayer ); COOP_CheckpointMenu( pPlayer );
else else
{ {
@ -852,7 +853,7 @@ bool COOP_ClientCommand( edict_t *pEntity )
return false; return false;
if( pPlayer->m_ggm.iState != STATE_SPAWNED || pPlayer->pev->health < 1 ) if( pPlayer->m_ggm.iState != STATE_SPAWNED || pPlayer->pev->health < 1 )
UTIL_SpawnPlayer( pPlayer ); UTIL_SpawnPlayer( pPlayer );
GGM_RestorePosition( pPlayer, &g_pCurrentMap->rgCheckpoints[i].pos ); GGM_RestorePosition( pPlayer, &g_CoopState.pCurrentMap->rgCheckpoints[i].pos );
return true; return true;
} }
else if( FStrEq( pcmd, "newcheckpoint") ) else if( FStrEq( pcmd, "newcheckpoint") )
@ -888,13 +889,11 @@ void COOP_RegisterCVars()
{ {
CVAR_REGISTER( &mp_coop ); CVAR_REGISTER( &mp_coop );
CVAR_REGISTER( &mp_coop_nofriendlyfire ); CVAR_REGISTER( &mp_coop_nofriendlyfire );
CVAR_REGISTER( &mp_unduck );
CVAR_REGISTER( &mp_semclip ); CVAR_REGISTER( &mp_semclip );
CVAR_REGISTER( &mp_coop_reconnect_hack ); CVAR_REGISTER( &mp_coop_reconnect_hack );
CVAR_REGISTER( &mp_coop_noangry ); CVAR_REGISTER( &mp_coop_noangry );
CVAR_REGISTER( &mp_spectator );
CVAR_REGISTER( &mp_coop_checkpoints ); CVAR_REGISTER( &mp_coop_checkpoints );
CVAR_REGISTER( &mp_skipdefaults );
CVAR_REGISTER( &mp_coop_strongcheckpoints ); CVAR_REGISTER( &mp_coop_strongcheckpoints );
CVAR_REGISTER( &sentences_txt ); CVAR_REGISTER( &sentences_txt );

24
dlls/coop_util.h
View File

@ -1,15 +1,12 @@
#ifndef COOP_UTIL_H #ifndef COOP_UTIL_H
#define COOP_UTIL_H #define COOP_UTIL_H
#include "gravgunmod.h" #include "gravgunmod.h"
extern cvar_t mp_gravgun_players;
extern cvar_t mp_coop; extern cvar_t mp_coop;
extern cvar_t mp_coop_nofriendlyfire; extern cvar_t mp_coop_nofriendlyfire;
extern cvar_t mp_coop_checkpoints; extern cvar_t mp_coop_checkpoints;
extern cvar_t mp_skipdefaults;
extern cvar_t mp_coop_strongcheckpoints; extern cvar_t mp_coop_strongcheckpoints;
extern cvar_t mp_unduck;
extern cvar_t mp_semclip; extern cvar_t mp_semclip;
extern cvar_t mp_coop_reconnect_hack; extern cvar_t mp_coop_reconnect_hack;
extern cvar_t mp_coop_noangry; extern cvar_t mp_coop_noangry;
@ -21,6 +18,7 @@ extern cvar_t materials_txt;
extern bool g_fSavedDuck; extern bool g_fSavedDuck;
extern bool g_fPause; extern bool g_fPause;
// triggers.cpp, CChangeLevel
struct COOPChangelevelData struct COOPChangelevelData
{ {
bool fIsBack; bool fIsBack;
@ -38,9 +36,6 @@ void UTIL_CleanSpawnPoint( Vector origin, float radius );
char *UTIL_CoopPlayerName( CBaseEntity *pPlayer ); char *UTIL_CoopPlayerName( CBaseEntity *pPlayer );
bool COOP_SetDefaultSpawnPosition( CBasePlayer *pPlayer ); bool COOP_SetDefaultSpawnPosition( CBasePlayer *pPlayer );
Vector COOP_FixupSpawnPoint( Vector vecOrigin, bool fDuck );
void COOP_ClearData( void );
void COOP_ApplyData( void );
void UTIL_CoopPrintMessage( const char *format, ... ); void UTIL_CoopPrintMessage( const char *format, ... );
void UTIL_CoopHudMessage( int channel, float time, unsigned int color1, unsigned int color2, float x, float y, const char *format, ... ); void UTIL_CoopHudMessage( int channel, float time, unsigned int color1, unsigned int color2, float x, float y, const char *format, ... );
void UTIL_CoopPlayerMessage( CBaseEntity *pPlayer, int channel, float time, unsigned int color1, unsigned int color2, float x, float y, const char *format, ... ); void UTIL_CoopPlayerMessage( CBaseEntity *pPlayer, int channel, float time, unsigned int color1, unsigned int color2, float x, float y, const char *format, ... );
@ -53,25 +48,12 @@ void COOP_ResetVote( void );
void COOP_ServerActivate( void ); void COOP_ServerActivate( void );
bool COOP_GetOrigin( Vector *pvecNewOrigin, const Vector &vecOrigin, const char *pszMapName ); bool COOP_GetOrigin( Vector *pvecNewOrigin, const Vector &vecOrigin, const char *pszMapName );
class CBasePlayer; class CBasePlayer;
void UTIL_CoopKickPlayer(CBaseEntity *pPlayer);
bool UTIL_CoopIsBadPlayer( CBaseEntity *plr ); bool UTIL_CoopIsBadPlayer( CBaseEntity *plr );
void COOP_NewCheckpoint( entvars_t *pevPlayer );
CBaseEntity *UTIL_CoopGetPlayerTrain( CBaseEntity *pPlayer); CBaseEntity *UTIL_CoopGetPlayerTrain( CBaseEntity *pPlayer);
void UTIL_SpawnPlayer( CBasePlayer *pPlayer ); void UTIL_SpawnPlayer( CBasePlayer *pPlayer );
void UTIL_BecomeSpectator( CBasePlayer *pPlayer ); void UTIL_BecomeSpectator( CBasePlayer *pPlayer );
void COOP_CheckpointMenu( CBasePlayer *pPlayer ); void COOP_GiveDefaultWeapons( CBasePlayer *pPlayer );
extern int g_iVote; void COOP_AddDefaultWeapon( const char *pszClassName );
class CWeaponList
{
char weapons[64][256];
int m_iWeapons;
public:
void AddWeapon( const char *classname );
void GiveToPlayer(CBasePlayer *pPlayer);
void Clear();
};
extern CWeaponList g_WeaponList;
struct COOPChangelevelData *COOP_GetTriggerData( CBaseEntity *pTrigger ); struct COOPChangelevelData *COOP_GetTriggerData( CBaseEntity *pTrigger );
#endif // COOP_UTIL_H #endif // COOP_UTIL_H

6
dlls/gravgunmod.cpp
View File

@ -22,6 +22,9 @@ cvar_t cvar_gibtime = { "mp_gibtime","250", FCVAR_SERVER };
cvar_t cvar_hgibcount = { "mp_hgibcount","12", FCVAR_SERVER }; cvar_t cvar_hgibcount = { "mp_hgibcount","12", FCVAR_SERVER };
cvar_t cvar_agibcount = { "mp_agibcount","8", FCVAR_SERVER }; cvar_t cvar_agibcount = { "mp_agibcount","8", FCVAR_SERVER };
cvar_t mp_gravgun_players = { "mp_gravgun_players", "0", FCVAR_SERVER }; cvar_t mp_gravgun_players = { "mp_gravgun_players", "0", FCVAR_SERVER };
cvar_t mp_skipdefaults = { "mp_skipdefaults", "0", FCVAR_SERVER };
cvar_t mp_spectator = { "mp_spectator", "0", FCVAR_SERVER };
cvar_t mp_unduck = { "mp_unduck", "0", FCVAR_SERVER };
cvar_t mp_fixhornetbug = { "mp_fixhornetbug", "0", FCVAR_SERVER }; cvar_t mp_fixhornetbug = { "mp_fixhornetbug", "0", FCVAR_SERVER };
cvar_t mp_fixsavetime = { "mp_fixsavetime", "0", FCVAR_SERVER }; cvar_t mp_fixsavetime = { "mp_fixsavetime", "0", FCVAR_SERVER };
@ -2230,6 +2233,9 @@ void GGM_RegisterCVars( void )
CVAR_REGISTER( &mp_enttools_checkmodels ); CVAR_REGISTER( &mp_enttools_checkmodels );
CVAR_REGISTER( &mp_errormdl ); CVAR_REGISTER( &mp_errormdl );
CVAR_REGISTER( &mp_errormdlpath ); CVAR_REGISTER( &mp_errormdlpath );
CVAR_REGISTER( &mp_unduck );
CVAR_REGISTER( &mp_skipdefaults );
CVAR_REGISTER( &mp_spectator );
g_engfuncs.pfnAddServerCommand( "ent_rungc", Ent_RunGC_f ); g_engfuncs.pfnAddServerCommand( "ent_rungc", Ent_RunGC_f );
g_engfuncs.pfnAddServerCommand( "mp_lightstyle", GGM_LightStyle_f ); g_engfuncs.pfnAddServerCommand( "mp_lightstyle", GGM_LightStyle_f );

3
dlls/gravgunmod.h
View File

@ -11,6 +11,9 @@ extern cvar_t cvar_allow_bigcock;
extern cvar_t cvar_allow_gateofbabylon; extern cvar_t cvar_allow_gateofbabylon;
extern cvar_t cvar_wresptime; extern cvar_t cvar_wresptime;
extern cvar_t cvar_iresptime; extern cvar_t cvar_iresptime;
extern cvar_t mp_gravgun_players;
extern cvar_t mp_skipdefaults;
extern cvar_t mp_unduck;
extern cvar_t cvar_gibtime; extern cvar_t cvar_gibtime;
extern cvar_t cvar_hgibcount; extern cvar_t cvar_hgibcount;

8
dlls/multiplay_gamerules.cpp
View File

@ -638,7 +638,7 @@ void CHalfLifeMultiplay::PlayerSpawn( CBasePlayer *pPlayer )
} }
else else
{ {
g_WeaponList.GiveToPlayer(pPlayer); COOP_GiveDefaultWeapons( pPlayer );
} }
} }
@ -950,7 +950,7 @@ void CHalfLifeMultiplay::DeathNotice( CBasePlayer *pVictim, entvars_t *pKiller,
void CHalfLifeMultiplay::PlayerGotWeapon( CBasePlayer *pPlayer, CBasePlayerItem *pWeapon ) void CHalfLifeMultiplay::PlayerGotWeapon( CBasePlayer *pPlayer, CBasePlayerItem *pWeapon )
{ {
if(mp_coop.value) if(mp_coop.value)
g_WeaponList.AddWeapon(STRING(pWeapon->pev->classname)); COOP_AddDefaultWeapon(STRING(pWeapon->pev->classname));
} }
//========================================================= //=========================================================
@ -1060,7 +1060,7 @@ BOOL CHalfLifeMultiplay::CanHaveItem( CBasePlayer *pPlayer, CItem *pItem )
void CHalfLifeMultiplay::PlayerGotItem( CBasePlayer *pPlayer, CItem *pItem ) void CHalfLifeMultiplay::PlayerGotItem( CBasePlayer *pPlayer, CItem *pItem )
{ {
if(mp_coop.value) if(mp_coop.value)
g_WeaponList.AddWeapon(STRING(pItem->pev->classname)); COOP_AddDefaultWeapon(STRING(pItem->pev->classname));
} }
//========================================================= //=========================================================
@ -1098,7 +1098,7 @@ void CHalfLifeMultiplay::PlayerGotAmmo( CBasePlayer *pPlayer, char *szName, int
{ {
if(mp_coop.value) if(mp_coop.value)
g_WeaponList.AddWeapon(szName); COOP_AddDefaultWeapon(szName);
} }
//========================================================= //=========================================================