rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-23 04:32:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanups, crashbug fix and version bumped to 3.2

Browse source
This commit is contained in:
Richard Allen 2003-09-01 15:09:49 +00:00
parent 961ed47b50
commit d9325db970
9 changed files with 47 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reaction/cgame/cg_local.h
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.151 2003/09/01 15:09:48 jbravo
// Cleanups, crashbug fix and version bumped to 3.2
//
// Revision 1.150 2003/08/31 14:48:33 jbravo
// Code not compiling under linux fixed and a warning silenced.
//
@ -1361,12 +1364,13 @@ typedef struct {
qhandle_t scoreboardTime;
// medals shown during gameplay
qhandle_t medalImpressive;
qhandle_t medalExcellent;
// JBravo: no thanks
//qhandle_t medalImpressive;
//qhandle_t medalExcellent;
qhandle_t medalGauntlet;
qhandle_t medalDefend;
qhandle_t medalAssist;
qhandle_t medalCapture;
//qhandle_t medalDefend;
//qhandle_t medalAssist;
//qhandle_t medalCapture;
// sounds
sfxHandle_t kickSound; //Elder: kick sound

55
reaction/cgame/cg_main.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.139 2003/09/01 15:09:48 jbravo
// Cleanups, crashbug fix and version bumped to 3.2
//
// Revision 1.138 2003/08/10 20:13:26 makro
// no message
//
@ -2151,12 +2154,13 @@ static void CG_RegisterGraphics(void)
cgs.media.teleportEffectShader = trap_R_RegisterShader("teleportEffect");
cgs.media.invulnerabilityPowerupModel = trap_R_RegisterModel("models/powerups/shield/shield.md3");
cgs.media.medalImpressive = trap_R_RegisterShaderNoMip("medal_impressive");
cgs.media.medalExcellent = trap_R_RegisterShaderNoMip("medal_excellent");
//cgs.media.medalImpressive = trap_R_RegisterShaderNoMip("medal_impressive");
//cgs.media.medalExcellent = trap_R_RegisterShaderNoMip("medal_excellent");
cgs.media.medalGauntlet = trap_R_RegisterShaderNoMip("medal_gauntlet");
cgs.media.medalDefend = trap_R_RegisterShaderNoMip("medal_defend");
cgs.media.medalAssist = trap_R_RegisterShaderNoMip("medal_assist");
cgs.media.medalCapture = trap_R_RegisterShaderNoMip("medal_capture");
// JBravo: not needed
//cgs.media.medalDefend = trap_R_RegisterShaderNoMip("medal_defend");
//cgs.media.medalAssist = trap_R_RegisterShaderNoMip("medal_assist");
//cgs.media.medalCapture = trap_R_RegisterShaderNoMip("medal_capture");
//Elder: C3A laser tutorial
cgs.media.laserShader = trap_R_RegisterShader("sprites/laser");
@ -2166,46 +2170,7 @@ static void CG_RegisterGraphics(void)
cgs.media.ssgCrosshair[0] = trap_R_RegisterShaderNoMip(va("gfx/rq3_hud/ssg2x-%i", i));
cgs.media.ssgCrosshair[1] = trap_R_RegisterShaderNoMip(va("gfx/rq3_hud/ssg4x-%i", i));
cgs.media.ssgCrosshair[2] = trap_R_RegisterShaderNoMip(va("gfx/rq3_hud/ssg6x-%i", i));
/*
//Elder: added for sniper crosshairs
switch (cg_RQ3_ssgCrosshair.integer) {
case 0:
cgs.media.ssgCrosshair[0] = trap_R_RegisterShaderNoMip("gfx/rq3_hud/ssg2x");
cgs.media.ssgCrosshair[1] = trap_R_RegisterShaderNoMip("gfx/rq3_hud/ssg4x");
cgs.media.ssgCrosshair[2] = trap_R_RegisterShaderNoMip("gfx/rq3_hud/ssg6x");
break;
case 1:
cgs.media.ssgCrosshair[0] = trap_R_RegisterShaderNoMip("gfx/rq3_hud/ssg2x-1");
cgs.media.ssgCrosshair[1] = trap_R_RegisterShaderNoMip("gfx/rq3_hud/ssg4x-1");
cgs.media.ssgCrosshair[2] = trap_R_RegisterShaderNoMip("gfx/rq3_hud/ssg6x-1");
break;
case 2:
cgs.media.ssgCrosshair[0] = trap_R_RegisterShaderNoMip("gfx/rq3_hud/ssg2x-2");
cgs.media.ssgCrosshair[1] = trap_R_RegisterShaderNoMip("gfx/rq3_hud/ssg4x-2");
cgs.media.ssgCrosshair[2] = trap_R_RegisterShaderNoMip("gfx/rq3_hud/ssg6x-2");
break;
case 3:
cgs.media.ssgCrosshair[0] = trap_R_RegisterShaderNoMip("gfx/rq3_hud/ssg2x-3");
cgs.media.ssgCrosshair[1] = trap_R_RegisterShaderNoMip("gfx/rq3_hud/ssg4x-3");
cgs.media.ssgCrosshair[2] = trap_R_RegisterShaderNoMip("gfx/rq3_hud/ssg6x-3");
break;
case 4:
cgs.media.ssgCrosshair[0] = trap_R_RegisterShaderNoMip("gfx/rq3_hud/ssg2x-4");
cgs.media.ssgCrosshair[1] = trap_R_RegisterShaderNoMip("gfx/rq3_hud/ssg4x-4");
cgs.media.ssgCrosshair[2] = trap_R_RegisterShaderNoMip("gfx/rq3_hud/ssg6x-4");
break;
case 5:
cgs.media.ssgCrosshair[0] = trap_R_RegisterShaderNoMip("gfx/rq3_hud/ssg2x-5");
cgs.media.ssgCrosshair[1] = trap_R_RegisterShaderNoMip("gfx/rq3_hud/ssg4x-5");
cgs.media.ssgCrosshair[2] = trap_R_RegisterShaderNoMip("gfx/rq3_hud/ssg6x-5");
break;
default:
cgs.media.ssgCrosshair[0] = trap_R_RegisterShaderNoMip("gfx/rq3_hud/ssg2x");
cgs.media.ssgCrosshair[1] = trap_R_RegisterShaderNoMip("gfx/rq3_hud/ssg4x");
cgs.media.ssgCrosshair[2] = trap_R_RegisterShaderNoMip("gfx/rq3_hud/ssg6x");
break;
}
*/
//Elder: other hud-related elements
cgs.media.rq3_healthicon = trap_R_RegisterShaderNoMip("gfx/rq3_hud/hud_health");
cgs.media.rq3_healthicon2 = trap_R_RegisterShaderNoMip("gfx/rq3_hud/hud_healthwarning");

12
reaction/cgame/cg_players.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.62 2003/09/01 15:09:48 jbravo
// Cleanups, crashbug fix and version bumped to 3.2
//
// Revision 1.61 2003/07/30 16:05:46 makro
// no message
//
@ -2162,8 +2165,8 @@ static void CG_PlayerSprites(centity_t * cent)
CG_PlayerFloatSprite(cent, cgs.media.balloonShader);
return;
}
if (cent->currentState.eFlags & EF_AWARD_IMPRESSIVE) {
// JBravo: we dont want the Q3 awards
/* if (cent->currentState.eFlags & EF_AWARD_IMPRESSIVE) {
CG_PlayerFloatSprite(cent, cgs.media.medalImpressive);
return;
}
@ -2171,14 +2174,14 @@ static void CG_PlayerSprites(centity_t * cent)
if (cent->currentState.eFlags & EF_AWARD_EXCELLENT) {
CG_PlayerFloatSprite(cent, cgs.media.medalExcellent);
return;
}
} */
if (cent->currentState.eFlags & EF_AWARD_GAUNTLET) {
CG_PlayerFloatSprite(cent, cgs.media.medalGauntlet);
return;
}
if (cent->currentState.eFlags & EF_AWARD_DEFEND) {
/* if (cent->currentState.eFlags & EF_AWARD_DEFEND) {
CG_PlayerFloatSprite(cent, cgs.media.medalDefend);
return;
}
@ -2192,6 +2195,7 @@ static void CG_PlayerSprites(centity_t * cent)
CG_PlayerFloatSprite(cent, cgs.media.medalCapture);
return;
}
*/
// JBravo: no triangles over teammates.
if (cgs.gametype >= GT_TEAM) {
return;

73
reaction/cgame/cg_playerstate.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.28 2003/09/01 15:09:48 jbravo
// Cleanups, crashbug fix and version bumped to 3.2
//
// Revision 1.27 2003/07/30 16:05:46 makro
// no message
//
@ -404,8 +407,6 @@ void CG_CheckLocalSounds(playerState_t * ps, playerState_t * ops)
{
int health, armor, reward;
// sfxHandle_t sfx;
// don't play the sounds if the player just changed teams
if (ps->persistant[PERS_TEAM] != ops->persistant[PERS_TEAM]) {
return;
@ -414,8 +415,6 @@ void CG_CheckLocalSounds(playerState_t * ps, playerState_t * ops)
if (ps->persistant[PERS_HITS] > ops->persistant[PERS_HITS]) {
armor = ps->persistant[PERS_ATTACKEE_ARMOR] & 0xff;
health = ps->persistant[PERS_ATTACKEE_ARMOR] >> 8;
//Elder: completely remove cowbell sound
//if (cg_RQ3_anouncer.integer == 1) trap_S_StartLocalSound( cgs.media.hitSound, CHAN_LOCAL_SOUND );
} else if (ps->persistant[PERS_HITS] < ops->persistant[PERS_HITS]) {
if (cg_RQ3_anouncer.integer == 1)
trap_S_StartLocalSound(cgs.media.hitTeamSound, CHAN_LOCAL_SOUND);
@ -433,40 +432,7 @@ void CG_CheckLocalSounds(playerState_t * ps, playerState_t * ops)
}
// reward sounds
reward = qfalse;
//Blaze: Removed because it uses the persistant stats stuff
/*if (ps->persistant[PERS_CAPTURES] != ops->persistant[PERS_CAPTURES]) {
pushReward(cgs.media.captureAwardSound, cgs.media.medalCapture, ps->persistant[PERS_CAPTURES]);
reward = qtrue;
//Com_Printf("capture\n");
}
if (ps->persistant[PERS_IMPRESSIVE_COUNT] != ops->persistant[PERS_IMPRESSIVE_COUNT]) {
sfx = cgs.media.impressiveSound;
pushReward(sfx, cgs.media.medalImpressive, ps->persistant[PERS_IMPRESSIVE_COUNT]);
reward = qtrue;
//Com_Printf("impressive\n");
}
if (ps->persistant[PERS_EXCELLENT_COUNT] != ops->persistant[PERS_EXCELLENT_COUNT]) {
sfx = cgs.media.excellentSound;
pushReward(sfx, cgs.media.medalExcellent, ps->persistant[PERS_EXCELLENT_COUNT]);
reward = qtrue;
//Com_Printf("excellent\n");
}
if (ps->persistant[PERS_GAUNTLET_FRAG_COUNT] != ops->persistant[PERS_GAUNTLET_FRAG_COUNT]) {
sfx = cgs.media.humiliationSound;
pushReward(sfx, cgs.media.medalGauntlet, ps->persistant[PERS_GAUNTLET_FRAG_COUNT]);
reward = qtrue;
//Com_Printf("guantlet frag\n");
}
if (ps->persistant[PERS_DEFEND_COUNT] != ops->persistant[PERS_DEFEND_COUNT]) {
pushReward(cgs.media.defendSound, cgs.media.medalDefend, ps->persistant[PERS_DEFEND_COUNT]);
reward = qtrue;
//Com_Printf("defend\n");
}
if (ps->persistant[PERS_ASSIST_COUNT] != ops->persistant[PERS_ASSIST_COUNT]) {
pushReward(cgs.media.assistSound, cgs.media.medalAssist, ps->persistant[PERS_ASSIST_COUNT]);
reward = qtrue;
//Com_Printf("assist\n");
} */
// if any of the player event bits changed
if (ps->persistant[PERS_PLAYEREVENTS] != ops->persistant[PERS_PLAYEREVENTS]) {
if ((ps->persistant[PERS_PLAYEREVENTS] & PLAYEREVENT_DENIEDREWARD) !=
@ -516,39 +482,8 @@ void CG_CheckLocalSounds(playerState_t * ps, playerState_t * ops)
// timelimit warnings
if (cgs.timelimit > 0) {
int msec;
msec = cg.time - cgs.levelStartTime;
// JBravo: we dont want the sudden death sound in RQ3
/* if ( !( cg.timelimitWarnings & 4 ) && msec > ( cgs.timelimit * 60 + 2 ) * 1000 ) {
cg.timelimitWarnings |= 1 | 2 | 4;
if (cg_RQ3_anouncer.integer == 1) trap_S_StartLocalSound( cgs.media.suddenDeathSound, CHAN_ANNOUNCER );
} */
// JBravo: we dont want the Q3 X minutes left sounds.
/* if ( !( cg.timelimitWarnings & 2 ) && msec > (cgs.timelimit - 1) * 60 * 1000 ) {
cg.timelimitWarnings |= 1 | 2;
if (cg_RQ3_anouncer.integer == 1) trap_S_StartLocalSound( cgs.media.oneMinuteSound, CHAN_ANNOUNCER );
}
else if ( cgs.timelimit > 5 && !( cg.timelimitWarnings & 1 ) && msec > (cgs.timelimit - 5) * 60 * 1000 ) {
cg.timelimitWarnings |= 1;
if (cg_RQ3_anouncer.integer == 1) trap_S_StartLocalSound( cgs.media.fiveMinuteSound, CHAN_ANNOUNCER );
} */
}
// fraglimit warnings
/* if ( cgs.fraglimit > 0 && cgs.gametype < GT_CTF) {
highScore = cgs.scores1;
if ( !( cg.fraglimitWarnings & 4 ) && highScore == (cgs.fraglimit - 1) ) {
cg.fraglimitWarnings |= 1 | 2 | 4;
if (cg_RQ3_anouncer.integer == 1) CG_AddBufferedSound(cgs.media.oneFragSound);
}
else if ( cgs.fraglimit > 2 && !( cg.fraglimitWarnings & 2 ) && highScore == (cgs.fraglimit - 2) ) {
cg.fraglimitWarnings |= 1 | 2;
if (cg_RQ3_anouncer.integer == 1) CG_AddBufferedSound(cgs.media.twoFragSound);
}
else if ( cgs.fraglimit > 3 && !( cg.fraglimitWarnings & 1 ) && highScore == (cgs.fraglimit - 3) ) {
cg.fraglimitWarnings |= 1;
if (cg_RQ3_anouncer.integer == 1) CG_AddBufferedSound(cgs.media.threeFragSound);
}
} */
}
/*

5
reaction/game/g_main.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.148 2003/09/01 15:09:48 jbravo
// Cleanups, crashbug fix and version bumped to 3.2
//
// Revision 1.147 2003/04/26 22:33:06 jbravo
// Wratted all calls to G_FreeEnt() to avoid crashing and provide debugging
//
@ -710,7 +713,7 @@ static cvarTable_t gameCvarTable[] = {
{&g_RQ3_NextMapID, "g_RQ3_NextMapID", "-1", CVAR_SYSTEMINFO, 0, qfalse},
{&g_RQ3_NextMap, "g_RQ3_NextMap", "", CVAR_SYSTEMINFO, 0, qfalse},
//Makro - for server browsers
{&g_RQ3_version, "g_RQ3_version", "3.1", CVAR_SERVERINFO | CVAR_SYSTEMINFO | CVAR_ROM, 0, qfalse},
{&g_RQ3_version, "g_RQ3_version", "3.2", CVAR_SERVERINFO | CVAR_SYSTEMINFO | CVAR_ROM, 0, qfalse},
//Makro - max votes per client
{&g_RQ3_maxClientVotes, "g_RQ3_maxClientVotes", "3", CVAR_ARCHIVE, 0, qfalse}
};

7
reaction/game/g_weapon.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.91 2003/09/01 15:09:49 jbravo
// Cleanups, crashbug fix and version bumped to 3.2
//
// Revision 1.90 2003/07/30 16:05:47 makro
// no message
//
@ -1851,7 +1854,9 @@ void Laser_Gen(gentity_t * ent, qboolean enabled)
}
//Get rid of you?
if (ent->client->lasersight || enabled == qfalse) {
G_FreeEntity(ent->client->lasersight, __LINE__, __FILE__);
// JBravo: fixing the bad gEnt crashbug
if (ent->client->lasersight)
G_FreeEntity(ent->client->lasersight, __LINE__, __FILE__);
ent->client->lasersight = NULL;
ent->client->ps.powerups[PW_LASERSIGHT] = 0;
return;

5
reaction/ta_ui/ui_main.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.78 2003/09/01 15:09:49 jbravo
// Cleanups, crashbug fix and version bumped to 3.2
//
// Revision 1.77 2003/04/26 15:23:57 jbravo
// grenade replacement fix. Version bumped to 3.1
//
@ -5712,7 +5715,7 @@ static void UI_BuildServerDisplayList(qboolean force)
if (len == 0) {
//Makro - changing from Team Arena to RQ3 beta2
//strcpy(uiInfo.serverStatus.motd, "Welcome to Team Arena!");
strcpy(uiInfo.serverStatus.motd, " *** Welcome to Reaction Quake 3 v3.1 *** ");
strcpy(uiInfo.serverStatus.motd, " *** Welcome to Reaction Quake 3 v3.2 *** ");
len = strlen(uiInfo.serverStatus.motd);
}
if (len != uiInfo.serverStatus.motdLen) {

2
reaction/uifiles/credit.menu
View file

@ -132,7 +132,7 @@
textscale .45
textalignx 220
textaligny 100
text "REACTION QUAKE 3 v3.1"
text "REACTION QUAKE 3 v3.2"
autowrapped
visible 1
decoration

2
reaction/uifiles/main.menu
View file

@ -149,7 +149,7 @@
itemDef {
name copyright
autowrapped
text "Reaction Quake 3 v3.1\n"
text "Reaction Quake 3 v3.2\n"
"Copyright (c) 2000 - 2003 Boomstick Studios\n"
"Quake III Arena (c) 1999 - 2000 id Software Inc."
style 0