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

Fix stupid errors, color triggers

Browse Source
This commit is contained in:
mittorn 2016-10-02 15:07:02 +00:00
parent eac22b56c2
commit 60a307d059
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/triggers.cpp
View File

@ -1402,6 +1402,15 @@ void CChangeLevel::Spawn( void )
InitTrigger(); InitTrigger();
if( !( pev->spawnflags & SF_CHANGELEVEL_USEONLY ) ) if( !( pev->spawnflags & SF_CHANGELEVEL_USEONLY ) )
SetTouch( &CChangeLevel::TouchChangeLevel ); SetTouch( &CChangeLevel::TouchChangeLevel );
if( mp_coop_changelevel.value )
{
// set color (got from XDM)
pev->effects &= ~EF_NODRAW;
pev->rendermode = kRenderTransColor;
pev->rendercolor.y = 255;
pev->renderamt = 127;
pev->renderfx = kRenderFxPulseFast;
}
//ALERT( at_console, "TRANSITION: %s (%s)\n", m_szMapName, m_szLandmarkName ); //ALERT( at_console, "TRANSITION: %s (%s)\n", m_szMapName, m_szLandmarkName );
} }
@ -1500,7 +1509,7 @@ bool CoopRestorePlayerCoords(CBaseEntity *player, Vector *origin, Vector *angles
UTIL_TraceHull( point, point, missile, human_hull, NULL, &tr ); UTIL_TraceHull( point, point, missile, human_hull, NULL, &tr );
g_SavedCoords.ip[i][0] = 0; g_SavedCoords.ip[i][0] = 0;
if( tr.fStartSolid ) if( tr.fStartSolid || tr.fAllSolid )
return false; return false;
*origin = point; *origin = point;
*angles = g_SavedCoords.angles[i]; *angles = g_SavedCoords.angles[i];
@ -1514,14 +1523,18 @@ bool CoopGetSpawnPoint( Vector *origin, Vector *angles)
{ {
if(!g_SavedCoords.valid) if(!g_SavedCoords.valid)
return false; return false;
validateoffset();
Vector point = g_SavedCoords.triggerorigin + g_SavedCoords.offset; Vector point = g_SavedCoords.triggerorigin;
*angles = g_SavedCoords.triggerangles; *angles = g_SavedCoords.triggerangles;
if( !g_SavedCoords.validspawnpoint ) if( !g_SavedCoords.validspawnpoint )
{ {
TraceResult tr; TraceResult tr;
Vector angle; Vector angle;
UTIL_MakeVectorsPrivate( *angles, (float*)&angle, NULL, NULL ); UTIL_MakeVectorsPrivate( *angles, (float*)&angle, NULL, NULL );
validateoffset();
point = point + g_SavedCoords.offset;
//UTIL_TraceHull( point, point, ignore_monsters, human_hull, NULL, &tr );
UTIL_TraceHull( point, point + angle * 100, missile, human_hull, NULL, &tr ); UTIL_TraceHull( point, point + angle * 100, missile, human_hull, NULL, &tr );
if( !tr.fStartSolid && !tr.fAllSolid ) if( !tr.fStartSolid && !tr.fAllSolid )
{ {
@ -1531,6 +1544,7 @@ bool CoopGetSpawnPoint( Vector *origin, Vector *angles)
else else
{ {
g_SavedCoords.valid = false; g_SavedCoords.valid = false;
ALERT( at_console, "CoopGetSpawnPoint: trace failed");
return false; return false;
} }
} }
@ -1616,13 +1630,18 @@ void CChangeLevel::ChangeLevelNow( CBaseEntity *pActivator )
UTIL_HudMessageAll( params, UTIL_VarArgs( "%s touched end of map, next is %s %s, %d to go\n", UTIL_HudMessageAll( params, UTIL_VarArgs( "%s touched end of map, next is %s %s, %d to go\n",
( pActivator->pev->netname && STRING( pActivator->pev->netname )[0] != 0 ) ? STRING( pActivator->pev->netname ) : "unconnected", ( pActivator->pev->netname && STRING( pActivator->pev->netname )[0] != 0 ) ? STRING( pActivator->pev->netname ) : "unconnected",
st_szNextMap, st_szNextSpot, i ) ); st_szNextMap, st_szNextSpot, i ) );
if( count2 )
{
pev->rendercolor.x = count1 * 255 / count2;
pev->rendercolor.y = 255 - pev->rendercolor.x;
}
ALERT( at_console, "^3CHANGELEVEL:^7 %d %d\n", count2, count1 ); ALERT( at_console, "^3CHANGELEVEL:^7 %d %d\n", count2, count1 );
if( count1 > 1 && count1 < count2 / 3 ) if( count1 > 1 && count1 < count2 / 3 )
return; return;
if( count1 == 1 && count2 == 2 ) if( count1 <= 1 && count2 == 2 )
return; return;
// check if it is near spawn point // check if it is near spawn point
@ -1689,9 +1708,9 @@ void CChangeLevel::ChangeLevelNow( CBaseEntity *pActivator )
} }
// shedule remove ke^w on first info_player_start // shedule remove ke^w on first info_player_start
edict_t *playerstart = FIND_ENTITY_BY_CLASSNAME( NULL, "info_player_start" ); /*edict_t *playerstart = FIND_ENTITY_BY_CLASSNAME( NULL, "info_player_start" );
if( !FNullEnt(playerstart) ) if( !FNullEnt(playerstart) )
playerstart->v.flags |= FL_KILLME; 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 );