mirror of
https://github.com/Q3Rally-Team/q3rally.git
synced 2024-11-24 21:01:34 +00:00
Reverted widescreen changes
This commit is contained in:
P3rlE
parent
3ec62383a8
commit
2c70b4498b
2 changed files with 42 additions and 10 deletions
|
|
@ -768,6 +768,23 @@ static void CG_RegisterSounds( void ) {
|
|||
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 );
|
||||
cgs.media.invulnerabilityImpactSound2 = trap_S_RegisterSound( "sound/items/invul_impact_02.wav", qfalse );
|
||||
cgs.media.invulnerabilityImpactSound3 = trap_S_RegisterSound( "sound/items/invul_impact_03.wav", qfalse );
|
||||
cgs.media.invulnerabilityJuicedSound = trap_S_RegisterSound( "sound/items/invul_juiced.wav", qfalse );
|
||||
cgs.media.obeliskHitSound1 = trap_S_RegisterSound( "sound/items/obelisk_hit_01.wav", qfalse );
|
||||
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 );
|
||||
|
|
@ -778,19 +795,33 @@ static void CG_RegisterSounds( void ) {
|
|||
cgs.media.landSound = trap_S_RegisterSound( "sound/player/land1.wav", qfalse);
|
||||
|
||||
cgs.media.hitSound = trap_S_RegisterSound( "sound/feedback/hit.wav", qfalse );
|
||||
#ifdef MISSIONPACK
|
||||
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.ogg", qtrue );
|
||||
cgs.media.impressiveTelefragSound = trap_S_RegisterSound( "sound/feedback/telefragged.ogg", qtrue );
|
||||
cgs.media.impressiveSound = trap_S_RegisterSound( "sound/feedback/impressive.wav", 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 );
|
||||
cgs.media.assistSound = trap_S_RegisterSound( "sound/feedback/assist.wav", qtrue );
|
||||
cgs.media.defendSound = trap_S_RegisterSound( "sound/feedback/defense.wav", qtrue );
|
||||
#ifdef MISSIONPACK
|
||||
cgs.media.firstImpressiveSound = trap_S_RegisterSound( "sound/feedback/first_impressive.wav", qtrue );
|
||||
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);
|
||||
|
|
@ -1267,7 +1298,6 @@ 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" );
|
||||
|
|
@ -2118,7 +2148,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 i, size;
|
||||
int size;
|
||||
// Q3Rally Code END
|
||||
|
||||
// clear everything
|
||||
|
|
@ -2148,12 +2178,10 @@ void CG_Init( int serverMessageNum, int serverCommandSequence, int clientNum ) {
|
|||
|
||||
cgs.redflag = cgs.blueflag = -1; // For compatibily, default to unset for
|
||||
cgs.flagStatus = -1;
|
||||
// old servers
|
||||
// Q3Rally Code Start
|
||||
for ( i = 0; i < MAX_SIGILS; i++ ) {
|
||||
cgs.sigil[i] = SIGIL_NONE; // Sigil Reset
|
||||
}
|
||||
cgs.sigil[0] = cgs.sigil[1] = cgs.sigil[2] = cgs.sigil[3] = cgs.sigil[4] = -1; // Sigil Reset
|
||||
// Q3Rally Code END
|
||||
// old servers
|
||||
|
||||
// get the rendering configuration from the client system
|
||||
trap_GetGlconfig( &cgs.glconfig );
|
||||
|
|
|
|||
|
|
@ -892,9 +892,10 @@ q3rallycode
|
|||
4=engine\code\cgame\cg_rally_hud.c
|
||||
5=engine\code\cgame\cg_rally_hud2.c
|
||||
6=engine\code\cgame\cg_draw.c
|
||||
7=engine\code\cgame\cg_main.c
|
||||
[Selected Project Files]
|
||||
Main=
|
||||
Selected=engine\code\cgame\cg_rally_hud.c
|
||||
Selected=engine\code\qcommon\q_shared.h
|
||||
[engine\code\qcommon\q_shared.h]
|
||||
TopLine=58
|
||||
Caret=35,70
|
||||
|
|
@ -908,7 +909,7 @@ Caret=77,440
|
|||
TopLine=90
|
||||
Caret=79,106
|
||||
[engine\code\cgame\cg_rally_hud.c]
|
||||
TopLine=525
|
||||
TopLine=609
|
||||
Caret=14,550
|
||||
[engine\code\cgame\cg_rally_hud2.c]
|
||||
TopLine=378
|
||||
|
|
@ -916,3 +917,6 @@ Caret=33,422
|
|||
[engine\code\cgame\cg_draw.c]
|
||||
TopLine=3052
|
||||
Caret=3,3095
|
||||
[engine\code\cgame\cg_main.c]
|
||||
TopLine=1
|
||||
Caret=7,41
|
||||
|
|
|
|||
Loading…
Reference in a new issue