From da3fe95b71c653c78212ff324e9bd5f423570a5f Mon Sep 17 00:00:00 2001 From: P3rlE <97919909+P3rlE@users.noreply.github.com> Date: Tue, 1 Mar 2022 22:38:28 +0100 Subject: [PATCH] Changes --- engine/code/cgame/cg_main.c | 20 ++++++++------------ q3rallycode.ppr | 6 +++--- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/engine/code/cgame/cg_main.c b/engine/code/cgame/cg_main.c index fb22efe5..21dcf673 100644 --- a/engine/code/cgame/cg_main.c +++ b/engine/code/cgame/cg_main.c @@ -336,7 +336,6 @@ static cvarTable_t cvarTable[] = { { &cg_thirdPersonHeight, "cg_thirdPersonHeight", "40", CVAR_ARCHIVE }, { &cg_thirdPersonAngle, "cg_thirdPersonAngle", "0", 0 }, { &cg_thirdPerson, "cg_thirdPerson", "1", CVAR_ROM }, - { &cg_metricUnits, "cg_metricUnits", "0", CVAR_ARCHIVE }, { &cg_minSkidLength, "cg_minSkidLength", "12", CVAR_ARCHIVE }, { &cg_drawRearView, "cg_drawRearView", "0", CVAR_ARCHIVE }, @@ -767,7 +766,6 @@ static void CG_RegisterSounds( void ) { cgs.media.gibBounce1Sound = trap_S_RegisterSound( "sound/player/gibimp1.wav", qfalse ); cgs.media.gibBounce2Sound = trap_S_RegisterSound( "sound/player/gibimp2.wav", qfalse ); cgs.media.gibBounce3Sound = trap_S_RegisterSound( "sound/player/gibimp3.wav", qfalse ); - #ifdef MISSIONPACK cgs.media.useInvulnerabilitySound = trap_S_RegisterSound( "sound/items/invul_activate.wav", qfalse ); cgs.media.invulnerabilityImpactSound1 = trap_S_RegisterSound( "sound/items/invul_impact_01.wav", qfalse ); @@ -778,13 +776,11 @@ static void CG_RegisterSounds( void ) { cgs.media.obeliskHitSound2 = trap_S_RegisterSound( "sound/items/obelisk_hit_02.wav", qfalse ); cgs.media.obeliskHitSound3 = trap_S_RegisterSound( "sound/items/obelisk_hit_03.wav", qfalse ); cgs.media.obeliskRespawnSound = trap_S_RegisterSound( "sound/items/obelisk_respawn.wav", qfalse ); - cgs.media.ammoregenSound = trap_S_RegisterSound("sound/items/cl_ammoregen.wav", qfalse); cgs.media.doublerSound = trap_S_RegisterSound("sound/items/cl_doubler.wav", qfalse); cgs.media.guardSound = trap_S_RegisterSound("sound/items/cl_guard.wav", qfalse); cgs.media.scoutSound = trap_S_RegisterSound("sound/items/cl_scout.wav", qfalse); #endif - cgs.media.teleInSound = trap_S_RegisterSound( "sound/world/telein.wav", qfalse ); cgs.media.teleOutSound = trap_S_RegisterSound( "sound/world/teleout.wav", qfalse ); cgs.media.respawnSound = trap_S_RegisterSound( "sound/items/respawn1.wav", qfalse ); @@ -799,8 +795,8 @@ static void CG_RegisterSounds( void ) { cgs.media.hitSoundHighArmor = trap_S_RegisterSound( "sound/feedback/hithi.wav", qfalse ); cgs.media.hitSoundLowArmor = trap_S_RegisterSound( "sound/feedback/hitlo.wav", qfalse ); #endif - - cgs.media.impressiveSound = trap_S_RegisterSound( "sound/feedback/impressive.wav", qtrue ); + cgs.media.impressiveSound = trap_S_RegisterSound( "sound/feedback/impressive.ogg", qtrue ); + cgs.media.impressiveTelefragSound = trap_S_RegisterSound( "sound/feedback/telefragged.ogg", qtrue ); cgs.media.excellentSound = trap_S_RegisterSound( "sound/feedback/excellent.wav", qtrue ); cgs.media.deniedSound = trap_S_RegisterSound( "sound/feedback/denied.wav", qtrue ); cgs.media.humiliationSound = trap_S_RegisterSound( "sound/feedback/humiliation.wav", qtrue ); @@ -811,17 +807,14 @@ static void CG_RegisterSounds( void ) { cgs.media.firstExcellentSound = trap_S_RegisterSound( "sound/feedback/first_excellent.wav", qtrue ); cgs.media.firstHumiliationSound = trap_S_RegisterSound( "sound/feedback/first_gauntlet.wav", qtrue ); #endif - cgs.media.takenLeadSound = trap_S_RegisterSound( "sound/feedback/takenlead.wav", qtrue); cgs.media.tiedLeadSound = trap_S_RegisterSound( "sound/feedback/tiedlead.wav", qtrue); cgs.media.lostLeadSound = trap_S_RegisterSound( "sound/feedback/lostlead.wav", qtrue); - #ifdef MISSIONPACK cgs.media.voteNow = trap_S_RegisterSound( "sound/feedback/vote_now.wav", qtrue); cgs.media.votePassed = trap_S_RegisterSound( "sound/feedback/vote_passed.wav", qtrue); cgs.media.voteFailed = trap_S_RegisterSound( "sound/feedback/vote_failed.wav", qtrue); #endif - cgs.media.watrInSound = trap_S_RegisterSound( "sound/player/watr_in.wav", qfalse); cgs.media.watrOutSound = trap_S_RegisterSound( "sound/player/watr_out.wav", qfalse); cgs.media.watrUnSound = trap_S_RegisterSound( "sound/player/watr_un.wav", qfalse); @@ -1298,6 +1291,7 @@ static void CG_RegisterGraphics( void ) { #endif cgs.media.medalImpressive = trap_R_RegisterShaderNoMip( "medal_impressive" ); + cgs.media.medalImpressiveTelefrag = trap_R_RegisterShaderNoMip ( "medal_telefragged" ); cgs.media.medalExcellent = trap_R_RegisterShaderNoMip( "medal_excellent" ); cgs.media.medalGauntlet = trap_R_RegisterShaderNoMip( "medal_gauntlet" ); cgs.media.medalDefend = trap_R_RegisterShaderNoMip( "medal_defend" ); @@ -2148,7 +2142,7 @@ Will perform callbacks to make the loading info screen update. void CG_Init( int serverMessageNum, int serverCommandSequence, int clientNum ) { const char *s; // Q3Rally Code Start - int size; + int i, size; // Q3Rally Code END // clear everything @@ -2179,10 +2173,12 @@ void CG_Init( int serverMessageNum, int serverCommandSequence, int clientNum ) { cgs.redflag = cgs.blueflag = -1; // For compatibily, default to unset for cgs.flagStatus = -1; // Q3Rally Code Start - cgs.sigil[0] = cgs.sigil[1] = cgs.sigil[2] = cgs.sigil[3] = cgs.sigil[4] = -1; // Sigil Reset + for ( i = 0; i < MAX_SIGILS; i++ ) { + cgs.sigil[i] = SIGIL_NONE; // Sigil Reset + } // Q3Rally Code END - // old servers + // old servers // get the rendering configuration from the client system trap_GetGlconfig( &cgs.glconfig ); cgs.screenXScale = cgs.glconfig.vidWidth / 640.0; diff --git a/q3rallycode.ppr b/q3rallycode.ppr index 13664997..84319af7 100644 --- a/q3rallycode.ppr +++ b/q3rallycode.ppr @@ -895,7 +895,7 @@ q3rallycode 7=engine\code\cgame\cg_main.c [Selected Project Files] Main= -Selected=engine\code\qcommon\q_shared.h +Selected=engine\code\cgame\cg_main.c [engine\code\qcommon\q_shared.h] TopLine=58 Caret=35,70 @@ -918,5 +918,5 @@ Caret=33,422 TopLine=3052 Caret=3,3095 [engine\code\cgame\cg_main.c] -TopLine=1 -Caret=7,41 +TopLine=2166 +Caret=22,2174