mirror of
https://github.com/ReactionQuake3/reaction.git
synced 2025-03-27 12:51:13 +00:00
Renamed RQ3 to Reaction, Dropped loading of various baseq3 media, disabled the follow command, fixed grenades killing teammates and some cleanups
This commit is contained in:
Richard Allen
parent
182f963b8d
commit
91ddafebba
13 changed files with 97 additions and 59 deletions
|
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.58 2007/02/03 15:02:21 jbravo
|
||||
// Renamed RQ3 to Reaction, Dropped loading of various baseq3 media, disabled the follow command, fixed grenades killing teammates and some cleanups
|
||||
//
|
||||
// Revision 1.57 2004/01/26 21:26:08 makro
|
||||
// no message
|
||||
//
|
||||
|
|
@ -723,7 +726,8 @@ void CG_InitConsoleCommands(void)
|
|||
trap_AddCommand("notarget");
|
||||
trap_AddCommand("noclip");
|
||||
trap_AddCommand("team");
|
||||
trap_AddCommand("follow");
|
||||
// JBravo: no thanks.
|
||||
// trap_AddCommand("follow");
|
||||
trap_AddCommand("levelshot");
|
||||
trap_AddCommand("addbot");
|
||||
trap_AddCommand("setviewpos");
|
||||
|
|
|
|||
|
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.50 2007/02/03 15:02:21 jbravo
|
||||
// Renamed RQ3 to Reaction, Dropped loading of various baseq3 media, disabled the follow command, fixed grenades killing teammates and some cleanups
|
||||
//
|
||||
// Revision 1.49 2005/02/15 16:33:38 makro
|
||||
// Tons of updates (entity tree attachment system, UI vectors)
|
||||
//
|
||||
|
|
@ -862,8 +865,8 @@ void CG_AdjustPositionForMover(const vec3_t in, int moverNum, int fromTime, int
|
|||
cent = &cg_entities[moverNum];
|
||||
//if (cent->currentState.eType != ET_MOVER) {
|
||||
//Makro - adjust for movers and attached entities
|
||||
if ( (cent->currentState.eType != ET_PLAYER && cent->currentState.eFlags & EF_ATTACHED == 0) //if not attached
|
||||
&& cent->currentState.eType != ET_MOVER ) //and not a mover, either
|
||||
if ((cent->currentState.eType != ET_PLAYER && ((cent->currentState.eFlags & EF_ATTACHED) == 0)) //if not attached
|
||||
&& cent->currentState.eType != ET_MOVER) //and not a mover, either
|
||||
{
|
||||
VectorCopy(in, out);
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.76 2007/02/03 15:02:21 jbravo
|
||||
// Renamed RQ3 to Reaction, Dropped loading of various baseq3 media, disabled the follow command, fixed grenades killing teammates and some cleanups
|
||||
//
|
||||
// Revision 1.75 2005/02/15 16:33:38 makro
|
||||
// Tons of updates (entity tree attachment system, UI vectors)
|
||||
//
|
||||
|
|
@ -236,7 +239,7 @@ static void CG_UseItem(centity_t * cent)
|
|||
switch (itemNum) {
|
||||
default:
|
||||
case HI_NONE:
|
||||
trap_S_StartSound(NULL, es->number, CHAN_BODY, cgs.media.useNothingSound);
|
||||
//trap_S_StartSound(NULL, es->number, CHAN_BODY, cgs.media.useNothingSound);
|
||||
break;
|
||||
|
||||
// JBravo: getting rid of NON RQ3 items.
|
||||
|
|
|
|||
|
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.163 2007/02/03 15:02:21 jbravo
|
||||
// Renamed RQ3 to Reaction, Dropped loading of various baseq3 media, disabled the follow command, fixed grenades killing teammates and some cleanups
|
||||
//
|
||||
// Revision 1.162 2006/04/14 18:16:31 makro
|
||||
// no message
|
||||
//
|
||||
|
|
@ -1233,7 +1236,7 @@ typedef struct {
|
|||
qhandle_t neutralFlagBaseModel;
|
||||
|
||||
qhandle_t armorModel;
|
||||
qhandle_t armorIcon;
|
||||
//qhandle_t armorIcon;
|
||||
|
||||
qhandle_t teamStatusBar;
|
||||
|
||||
|
|
@ -1323,7 +1326,7 @@ typedef struct {
|
|||
qhandle_t smokePuffAnimShader;
|
||||
qhandle_t smokePuffRageProShader;
|
||||
qhandle_t shotgunSmokePuffShader;
|
||||
qhandle_t plasmaBallShader;
|
||||
//qhandle_t plasmaBallShader;
|
||||
qhandle_t waterBubbleShader;
|
||||
|
||||
// Pressure:
|
||||
|
|
@ -1345,7 +1348,7 @@ typedef struct {
|
|||
qhandle_t ctbOMarkBlack;
|
||||
qhandle_t bulletMarkShader;
|
||||
qhandle_t burnMarkShader;
|
||||
qhandle_t holeMarkShader;
|
||||
//qhandle_t holeMarkShader;
|
||||
qhandle_t energyMarkShader;
|
||||
|
||||
// Elder: rq3 marks
|
||||
|
|
@ -1356,13 +1359,13 @@ typedef struct {
|
|||
qhandle_t snowMarkShader;
|
||||
|
||||
// powerup shaders
|
||||
qhandle_t quadShader;
|
||||
//qhandle_t quadShader;
|
||||
qhandle_t redQuadShader;
|
||||
qhandle_t quadWeaponShader;
|
||||
qhandle_t invisShader;
|
||||
qhandle_t regenShader;
|
||||
qhandle_t battleSuitShader;
|
||||
qhandle_t battleWeaponShader;
|
||||
//qhandle_t quadWeaponShader;
|
||||
//qhandle_t invisShader;
|
||||
//qhandle_t regenShader;
|
||||
//qhandle_t battleSuitShader;
|
||||
//qhandle_t battleWeaponShader;
|
||||
qhandle_t hastePuffShader;
|
||||
qhandle_t redKamikazeShader;
|
||||
qhandle_t blueKamikazeShader;
|
||||
|
|
@ -1440,9 +1443,9 @@ typedef struct {
|
|||
|
||||
sfxHandle_t quadSound;
|
||||
sfxHandle_t tracerSound;
|
||||
sfxHandle_t selectSound;
|
||||
sfxHandle_t useNothingSound;
|
||||
sfxHandle_t wearOffSound;
|
||||
// sfxHandle_t selectSound;
|
||||
// sfxHandle_t useNothingSound;
|
||||
// sfxHandle_t wearOffSound;
|
||||
sfxHandle_t footsteps[FOOTSTEP_TOTAL][4];
|
||||
sfxHandle_t sfx_lghit1;
|
||||
sfxHandle_t sfx_lghit2;
|
||||
|
|
@ -1474,9 +1477,9 @@ typedef struct {
|
|||
// Elder: Shell tumble sound
|
||||
sfxHandle_t sfx_shelltumble;
|
||||
|
||||
sfxHandle_t sfx_railg;
|
||||
// sfxHandle_t sfx_railg;
|
||||
sfxHandle_t sfx_rockexp;
|
||||
sfxHandle_t sfx_plasmaexp;
|
||||
// sfxHandle_t sfx_plasmaexp;
|
||||
sfxHandle_t gibSound;
|
||||
//Blaze: Dont need this any more
|
||||
// sfxHandle_t glassSound; //Blaze: Reaction breakable glass
|
||||
|
|
@ -1509,8 +1512,8 @@ typedef struct {
|
|||
sfxHandle_t excellentSound;
|
||||
sfxHandle_t deniedSound;
|
||||
sfxHandle_t humiliationSound;
|
||||
sfxHandle_t assistSound;
|
||||
sfxHandle_t defendSound;
|
||||
//sfxHandle_t assistSound;
|
||||
//sfxHandle_t defendSound;
|
||||
sfxHandle_t firstImpressiveSound;
|
||||
sfxHandle_t firstExcellentSound;
|
||||
sfxHandle_t firstHumiliationSound;
|
||||
|
|
@ -1527,8 +1530,8 @@ typedef struct {
|
|||
sfxHandle_t watrOutSound;
|
||||
sfxHandle_t watrUnSound;
|
||||
|
||||
sfxHandle_t flightSound;
|
||||
sfxHandle_t medkitSound;
|
||||
// sfxHandle_t flightSound;
|
||||
// sfxHandle_t medkitSound;
|
||||
|
||||
sfxHandle_t weaponHoverSound;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.149 2007/02/03 15:02:21 jbravo
|
||||
// Renamed RQ3 to Reaction, Dropped loading of various baseq3 media, disabled the follow command, fixed grenades killing teammates and some cleanups
|
||||
//
|
||||
// Revision 1.148 2006/04/14 18:16:31 makro
|
||||
// no message
|
||||
//
|
||||
|
|
@ -1718,9 +1721,9 @@ static void CG_RegisterSounds(void)
|
|||
}
|
||||
|
||||
cgs.media.tracerSound = trap_S_RegisterSound("sound/weapons/machinegun/buletby1.wav", qfalse);
|
||||
cgs.media.selectSound = trap_S_RegisterSound("sound/weapons/change.wav", qfalse);
|
||||
cgs.media.wearOffSound = trap_S_RegisterSound("sound/items/wearoff.wav", qfalse);
|
||||
cgs.media.useNothingSound = trap_S_RegisterSound("sound/items/use_nothing.wav", qfalse);
|
||||
// cgs.media.selectSound = trap_S_RegisterSound("sound/weapons/change.wav", qfalse);
|
||||
// cgs.media.wearOffSound = trap_S_RegisterSound("sound/items/wearoff.wav", qfalse);
|
||||
// cgs.media.useNothingSound = trap_S_RegisterSound("sound/items/use_nothing.wav", qfalse);
|
||||
cgs.media.gibSound = trap_S_RegisterSound("sound/player/gibsplt1.wav", qfalse);
|
||||
//Blaze: Reaction breakable glass
|
||||
/*cgs.media.glassSound = trap_S_RegisterSound( "sound/world/glassbk.wav", qfalse );
|
||||
|
|
@ -1756,8 +1759,8 @@ static void CG_RegisterSounds(void)
|
|||
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);
|
||||
// cgs.media.assistSound = trap_S_RegisterSound("sound/feedback/assist.wav", qtrue);
|
||||
// cgs.media.defendSound = trap_S_RegisterSound("sound/feedback/defense.wav", qtrue);
|
||||
|
||||
cgs.media.takenLeadSound = trap_S_RegisterSound("sound/feedback/takenlead.wav", qtrue);
|
||||
cgs.media.tiedLeadSound = trap_S_RegisterSound("sound/feedback/tiedlead.wav", qtrue);
|
||||
|
|
@ -1861,8 +1864,8 @@ static void CG_RegisterSounds(void)
|
|||
}
|
||||
|
||||
// FIXME: only needed with item
|
||||
cgs.media.flightSound = trap_S_RegisterSound("sound/items/flight.wav", qfalse);
|
||||
cgs.media.medkitSound = trap_S_RegisterSound("sound/items/use_medkit.wav", qfalse);
|
||||
// cgs.media.flightSound = trap_S_RegisterSound("sound/items/flight.wav", qfalse);
|
||||
// cgs.media.medkitSound = trap_S_RegisterSound("sound/items/use_medkit.wav", qfalse);
|
||||
cgs.media.quadSound = trap_S_RegisterSound("sound/items/damage3.wav", qfalse);
|
||||
cgs.media.sfx_ric1 = trap_S_RegisterSound("sound/weapons/machinegun/ric1.wav", qfalse);
|
||||
cgs.media.sfx_ric2 = trap_S_RegisterSound("sound/weapons/machinegun/ric2.wav", qfalse);
|
||||
|
|
@ -1887,9 +1890,9 @@ static void CG_RegisterSounds(void)
|
|||
|
||||
cgs.media.sfx_shelltumble = trap_S_RegisterSound("sound/misc/shell.wav", qfalse);
|
||||
|
||||
cgs.media.sfx_railg = trap_S_RegisterSound("sound/weapons/railgun/railgf1a.wav", qfalse);
|
||||
// cgs.media.sfx_railg = trap_S_RegisterSound("sound/weapons/railgun/railgf1a.wav", qfalse);
|
||||
cgs.media.sfx_rockexp = trap_S_RegisterSound("sound/weapons/rocket/rocklx1a.wav", qfalse);
|
||||
cgs.media.sfx_plasmaexp = trap_S_RegisterSound("sound/weapons/plasma/plasmx1a.wav", qfalse);
|
||||
// cgs.media.sfx_plasmaexp = trap_S_RegisterSound("sound/weapons/plasma/plasmx1a.wav", qfalse);
|
||||
|
||||
cgs.media.regenSound = trap_S_RegisterSound("sound/items/regen.wav", qfalse);
|
||||
cgs.media.protectSound = trap_S_RegisterSound("sound/items/protect3.wav", qfalse);
|
||||
|
|
@ -2069,7 +2072,7 @@ static void CG_RegisterGraphics(void)
|
|||
cgs.media.smokePuffAnimShader = trap_R_RegisterShader("smokePuff-rq3");
|
||||
cgs.media.smokePuffRageProShader = trap_R_RegisterShader("smokePuffRagePro");
|
||||
cgs.media.shotgunSmokePuffShader = trap_R_RegisterShader("shotgunSmokePuff");
|
||||
cgs.media.plasmaBallShader = trap_R_RegisterShader("sprites/plasma1");
|
||||
//cgs.media.plasmaBallShader = trap_R_RegisterShader("sprites/plasma1");
|
||||
cgs.media.bloodTrailShader = trap_R_RegisterShader("bloodTrail");
|
||||
cgs.media.lagometerShader = trap_R_RegisterShader("lagometer");
|
||||
cgs.media.connectionShader = trap_R_RegisterShader("disconnected");
|
||||
|
|
@ -2093,12 +2096,12 @@ static void CG_RegisterGraphics(void)
|
|||
cgs.media.noammoShader = trap_R_RegisterShader("icons/noammo");
|
||||
|
||||
// powerup shaders
|
||||
cgs.media.quadShader = trap_R_RegisterShader("powerups/quad");
|
||||
cgs.media.quadWeaponShader = trap_R_RegisterShader("powerups/quadWeapon");
|
||||
cgs.media.battleSuitShader = trap_R_RegisterShader("powerups/battleSuit");
|
||||
cgs.media.battleWeaponShader = trap_R_RegisterShader("powerups/battleWeapon");
|
||||
cgs.media.invisShader = trap_R_RegisterShader("powerups/invisibility");
|
||||
cgs.media.regenShader = trap_R_RegisterShader("powerups/regen");
|
||||
//cgs.media.quadShader = trap_R_RegisterShader("powerups/quad");
|
||||
//cgs.media.quadWeaponShader = trap_R_RegisterShader("powerups/quadWeapon");
|
||||
//cgs.media.battleSuitShader = trap_R_RegisterShader("powerups/battleSuit");
|
||||
//cgs.media.battleWeaponShader = trap_R_RegisterShader("powerups/battleWeapon");
|
||||
//cgs.media.invisShader = trap_R_RegisterShader("powerups/invisibility");
|
||||
//cgs.media.regenShader = trap_R_RegisterShader("powerups/regen");
|
||||
cgs.media.hastePuffShader = trap_R_RegisterShader("hasteSmokePuff");
|
||||
|
||||
// Elder: RQ3 misc. shaders
|
||||
|
|
@ -2141,7 +2144,7 @@ static void CG_RegisterGraphics(void)
|
|||
}
|
||||
|
||||
cgs.media.armorModel = trap_R_RegisterModel("models/powerups/armor/armor_yel.md3");
|
||||
cgs.media.armorIcon = trap_R_RegisterShaderNoMip("icons/iconr_yellow");
|
||||
//cgs.media.armorIcon = trap_R_RegisterShaderNoMip("icons/iconr_yellow");
|
||||
|
||||
cgs.media.machinegunBrassModel = trap_R_RegisterModel("models/weapons2/shells/m_shell.md3");
|
||||
cgs.media.largeBrassModel = trap_R_RegisterModel("models/weapons2/shells/l_shell.md3");
|
||||
|
|
@ -2289,7 +2292,7 @@ static void CG_RegisterGraphics(void)
|
|||
// wall marks
|
||||
cgs.media.bulletMarkShader = trap_R_RegisterShader("gfx/damage/bullet_mrk");
|
||||
cgs.media.burnMarkShader = trap_R_RegisterShader("gfx/damage/burn_med_mrk");
|
||||
cgs.media.holeMarkShader = trap_R_RegisterShader("gfx/damage/hole_lg_mrk");
|
||||
//cgs.media.holeMarkShader = trap_R_RegisterShader("gfx/damage/hole_lg_mrk");
|
||||
cgs.media.energyMarkShader = trap_R_RegisterShader("gfx/damage/plasma_mrk");
|
||||
cgs.media.shadowMarkShader = trap_R_RegisterShader("markShadow");
|
||||
cgs.media.wakeMarkShader = trap_R_RegisterShader("wake");
|
||||
|
|
|
|||
|
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.51 2007/02/03 15:02:21 jbravo
|
||||
// Renamed RQ3 to Reaction, Dropped loading of various baseq3 media, disabled the follow command, fixed grenades killing teammates and some cleanups
|
||||
//
|
||||
// Revision 1.50 2005/09/07 22:19:15 makro
|
||||
// Dead player view offset tweaks
|
||||
//
|
||||
|
|
@ -1036,6 +1039,7 @@ static int CG_CalcViewValues(void)
|
|||
CG_PowerupTimerSounds
|
||||
=====================
|
||||
*/
|
||||
/* JBravo: Nope
|
||||
static void CG_PowerupTimerSounds(void)
|
||||
{
|
||||
int i;
|
||||
|
|
@ -1055,6 +1059,7 @@ static void CG_PowerupTimerSounds(void)
|
|||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
/*
|
||||
=====================
|
||||
|
|
@ -1352,7 +1357,7 @@ void CG_DrawActiveFrame(int serverTime, stereoFrame_t stereoView, qboolean demoP
|
|||
//memcpy(cg.refdef.areamask, cg.snap->areamask, sizeof(cg.refdef.areamask));
|
||||
|
||||
// warning sounds when powerup is wearing off
|
||||
CG_PowerupTimerSounds();
|
||||
// CG_PowerupTimerSounds(); // JBravo: we dont use this ?
|
||||
|
||||
// update audio positions
|
||||
trap_S_Respatialize(cg.snap->ps.clientNum, cg.refdef.vieworg, cg.refdef.viewaxis, inwater);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Reaction Quake III Changelog
|
||||
Reaction Changelog
|
||||
|
||||
Mention features added, removed, changed, and bugs squashed. Also, make sure major
|
||||
milestones are mentioned here. (features can be visible to users or not. This is for us
|
||||
|
|
@ -7,4 +7,4 @@ mainly. like, changing the implimentation of something)
|
|||
e.g.
|
||||
2001-05-21 01:00 hawkins: Added Bipolar Rifle and Point Singularity Grenades.
|
||||
2001-05-21 02:30 hawkins: Removed unrealistic slippers and added antigravity boots
|
||||
6/16/2002 10:00PM Blaze: fixed breakables so cgame supports <= 64 breakables(before game accepted <= 64)
|
||||
6/16/2002 10:00PM Blaze: fixed breakables so cgame supports <= 64 breakables(before game accepted <= 64)
|
||||
|
|
|
|||
|
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.196 2007/02/03 15:02:21 jbravo
|
||||
// Renamed RQ3 to Reaction, Dropped loading of various baseq3 media, disabled the follow command, fixed grenades killing teammates and some cleanups
|
||||
//
|
||||
// Revision 1.195 2005/09/13 03:32:03 jbravo
|
||||
// added a Youve started bandaging message at the right time.
|
||||
//
|
||||
|
|
@ -1396,7 +1399,9 @@ void Cmd_Team_f(gentity_t * ent)
|
|||
=================
|
||||
Cmd_Follow_f
|
||||
=================
|
||||
*/
|
||||
|
||||
// JBravo: This cmd is only used for limchasecam cheating
|
||||
|
||||
void Cmd_Follow_f(gentity_t * ent)
|
||||
{
|
||||
int i;
|
||||
|
|
@ -1436,6 +1441,8 @@ void Cmd_Follow_f(gentity_t * ent)
|
|||
ent->client->specMode = SPECTATOR_FOLLOW;
|
||||
ent->client->sess.spectatorClient = i;
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
=================
|
||||
|
|
@ -3024,8 +3031,9 @@ void ClientCommand(int clientNum)
|
|||
Cmd_TeamTask_f(ent);
|
||||
else if (Q_stricmp(cmd, "levelshot") == 0)
|
||||
Cmd_LevelShot_f(ent);
|
||||
else if (Q_stricmp(cmd, "follow") == 0)
|
||||
Cmd_Follow_f(ent);
|
||||
// JBravo: no limchasecam cheating...
|
||||
// else if (Q_stricmp(cmd, "follow") == 0)
|
||||
// Cmd_Follow_f(ent);
|
||||
else if (Q_stricmp(cmd, "follownext") == 0)
|
||||
Cmd_FollowCycle_f(ent, 1);
|
||||
else if (Q_stricmp(cmd, "followprev") == 0)
|
||||
|
|
|
|||
|
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.142 2007/02/03 15:02:21 jbravo
|
||||
// Renamed RQ3 to Reaction, Dropped loading of various baseq3 media, disabled the follow command, fixed grenades killing teammates and some cleanups
|
||||
//
|
||||
// Revision 1.141 2005/02/15 16:33:39 makro
|
||||
// Tons of updates (entity tree attachment system, UI vectors)
|
||||
//
|
||||
|
|
@ -1781,7 +1784,7 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
|
|||
// NiceAss: Fixed pointer bug causing DLLs to crash
|
||||
// JBravo: FF control
|
||||
if (attacker && targ && targ->client && attacker->client && targ != attacker) {
|
||||
if (g_gametype.integer >= GT_TEAM && targ->client->sess.sessionTeam == attacker->client->sess.sessionTeam) {
|
||||
if (g_gametype.integer >= GT_TEAM && targ->client->sess.savedTeam == attacker->client->sess.savedTeam) {
|
||||
if (g_gametype.integer == GT_TEAMPLAY) {
|
||||
if (level.team_round_going && g_friendlyFire.integer == 0)
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.154 2007/02/03 15:02:21 jbravo
|
||||
// Renamed RQ3 to Reaction, Dropped loading of various baseq3 media, disabled the follow command, fixed grenades killing teammates and some cleanups
|
||||
//
|
||||
// Revision 1.153 2006/04/14 18:15:45 makro
|
||||
// no message
|
||||
//
|
||||
|
|
@ -442,7 +445,6 @@
|
|||
#include "g_local.h"
|
||||
#include "zcam.h"
|
||||
#include "q_shared.h"
|
||||
|
||||
#include "g_scripts.h"
|
||||
|
||||
int trap_RealTime(qtime_t * qtime);
|
||||
|
|
@ -988,7 +990,7 @@ void G_RegisterCvars(void)
|
|||
// JBravo: lets disable the untested modes.
|
||||
if (g_gametype.integer != GT_FFA && g_gametype.integer != GT_TEAMPLAY && g_gametype.integer != GT_CTF &&
|
||||
g_gametype.integer != GT_TEAM) {
|
||||
G_Printf("g_gametype %i is currently not supported by ReactionQuake3. Defaulting to 0\n",
|
||||
G_Printf("g_gametype %i is currently not supported by Reaction. Defaulting to 0\n",
|
||||
g_gametype.integer);
|
||||
trap_Cvar_Set("g_gametype", "0");
|
||||
}
|
||||
|
|
@ -1105,7 +1107,7 @@ void RQ3_loadmodels(void)
|
|||
if (!strcmp(dirptr, ".") || !strcmp(dirptr, ".."))
|
||||
continue;
|
||||
len = trap_FS_FOpenFile(va("models/players/%s/rq3model.cfg", dirptr), &file, FS_READ);
|
||||
if (file) {
|
||||
if (file && len > 0) {
|
||||
trap_FS_Read(buf, len, file);
|
||||
buf[len] = 0;
|
||||
text_p = buf;
|
||||
|
|
@ -2207,7 +2209,7 @@ void LogExit(const char *string)
|
|||
if (g_RQ3_statLog.integer && !(g_entities[cl - level.clients].r.svFlags & SVF_BOT)) {
|
||||
// Elder: Statistics tracking for server
|
||||
G_LogPrintf("-----------------------------------\n");
|
||||
G_LogPrintf("Reaction Quake 3 Statistics Results for client %i %s\n", level.sortedClients[i],
|
||||
G_LogPrintf("Reaction Statistics Results for client %i %s\n", level.sortedClients[i],
|
||||
cl->pers.netname);
|
||||
G_LogPrintf("Kicks: %i kills %i deaths %i\n", cl->pers.records[REC_KICKHITS],
|
||||
cl->pers.records[REC_KICKKILLS], cl->pers.records[REC_KICKDEATHS]);
|
||||
|
|
@ -3083,7 +3085,7 @@ void RQ3_ReadInitFile()
|
|||
len = trap_FS_FOpenFile(g_RQ3_IniFile.string, &file, FS_READ);
|
||||
|
||||
if (!file)
|
||||
len = trap_FS_FOpenFile("rq3.ini", &file, FS_READ);
|
||||
len = trap_FS_FOpenFile("server.ini", &file, FS_READ);
|
||||
|
||||
if (!file) {
|
||||
G_Printf("Could not open INI file\n");
|
||||
|
|
|
|||
|
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.86 2007/02/03 15:02:21 jbravo
|
||||
// Renamed RQ3 to Reaction, Dropped loading of various baseq3 media, disabled the follow command, fixed grenades killing teammates and some cleanups
|
||||
//
|
||||
// Revision 1.85 2006/07/24 17:15:56 makro
|
||||
// Got rid of the warnings lcc liked to share with the world
|
||||
//
|
||||
|
|
@ -1022,7 +1025,7 @@ Type is the value set in the type key. No more, no less than three break sounds
|
|||
Explosion graphic: breakables/type/explosion/texture
|
||||
Type is the value set in the type key. Texture is any texture(s) referenced by the explosion shader. The shader script should be added to yourmap.shader.
|
||||
|
||||
If you wish to add a custom breakable to your map, please include your mapname (or perhaps 3 letters of it) in the type name to prevent conflicts (i.e. don't use 'brick', use 'tequila_brick' or just 'teq_brick'). See the breakables folder included in Reaction Quake 3 for the proper format.
|
||||
If you wish to add a custom breakable to your map, please include your mapname (or perhaps 3 letters of it) in the type name to prevent conflicts (i.e. don't use 'brick', use 'tequila_brick' or just 'teq_brick'). See the breakables folder included in Reaction for the proper format.
|
||||
*/
|
||||
|
||||
void reset_breakable(gentity_t *ent)
|
||||
|
|
|
|||
|
|
@ -1,3 +1 @@
|
|||
|
||||
void G_ParseScript(const char *fname);
|
||||
|
||||
void G_ParseScript(const char * fname);
|
||||
|
|
|
|||
|
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.84 2007/02/03 15:02:21 jbravo
|
||||
// Renamed RQ3 to Reaction, Dropped loading of various baseq3 media, disabled the follow command, fixed grenades killing teammates and some cleanups
|
||||
//
|
||||
// Revision 1.83 2006/04/14 18:02:06 makro
|
||||
// no message
|
||||
//
|
||||
|
|
@ -5873,7 +5876,7 @@ static void UI_RunMenuScript(char **args)
|
|||
}
|
||||
//trap_Cmd_ExecuteText( EXEC_NOW, "quit");
|
||||
//Makro - saved config file before exiting
|
||||
trap_Cmd_ExecuteText(EXEC_APPEND, "writeconfig q3config.cfg ; quit\n");
|
||||
trap_Cmd_ExecuteText(EXEC_APPEND, "writeconfig rq3config.cfg ; quit\n");
|
||||
//Makro - weapon menu after joining a team
|
||||
} else if (Q_stricmp(name, "weapAfterJoin") == 0) {
|
||||
//only in teamplay
|
||||
|
|
@ -8306,9 +8309,9 @@ void _UI_SetActiveMenu(uiMenuCommand_t menu)
|
|||
}
|
||||
//Makro - check com_hunkmegs
|
||||
} else {
|
||||
if ((int)trap_Cvar_VariableValue("com_hunkMegs") < 96)
|
||||
if ((int)trap_Cvar_VariableValue("com_hunkMegs") < 256)
|
||||
{
|
||||
trap_Cvar_SetValue("com_hunkMegs", 96);
|
||||
trap_Cvar_SetValue("com_hunkMegs", 256);
|
||||
Menus_ActivateByName("memory_popmenu", qfalse);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue