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

More replacements tweaks. Added zcam_stfu

Browse source
This commit is contained in:
Richard Allen 2003-04-02 22:23:51 +00:00
parent 0f8deb9eeb
commit 0bad034567
8 changed files with 69 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reaction/ChangeLog
View file

@ -1,5 +1,6 @@
# List fixes here for the 3.0 release
* Added cg_RQ3_zcam_stfu to stop zcam printing who its following or tracking.
* Fixed bug where dropping the bandolier would not reduce amount of ammo
* Its now impossible to change nicks to avoide votekicks.
* Reactionmale is now the default model

36
reaction/cgame/cg_local.h
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.141 2003/04/02 22:23:51 jbravo
// More replacements tweaks. Added zcam_stfu
//
// Revision 1.140 2003/03/29 16:01:36 jbravo
// _skin cvars now fully removed. dlight code from Makro added. cvar
// defaults fixed.
@ -1737,19 +1740,6 @@ extern vmCvar_t cg_RQ3_handcannon;
extern vmCvar_t cg_RQ3_m3;
extern vmCvar_t cg_RQ3_akimbo;
extern vmCvar_t cg_RQ3_grenade;
// JBravo: replacement skins
//Makro - commented out
/*
extern vmCvar_t cg_RQ3_knife_skin;
extern vmCvar_t cg_RQ3_mk23_skin;
extern vmCvar_t cg_RQ3_m4_skin;
extern vmCvar_t cg_RQ3_ssg3000_skin;
extern vmCvar_t cg_RQ3_mp5_skin;
extern vmCvar_t cg_RQ3_handcannon_skin;
extern vmCvar_t cg_RQ3_m3_skin;
extern vmCvar_t cg_RQ3_akimbo_skin;
extern vmCvar_t cg_RQ3_grenade_skin;
*/
//Blaze: replacement items
extern vmCvar_t cg_RQ3_bandolier;
extern vmCvar_t cg_RQ3_kevlar;
@ -1757,28 +1747,14 @@ extern vmCvar_t cg_RQ3_silencer;
extern vmCvar_t cg_RQ3_laser;
extern vmCvar_t cg_RQ3_slippers;
extern vmCvar_t cg_RQ3_helmet;
// JBravo: replacement skins
//Makro - commented out
/*
extern vmCvar_t cg_RQ3_bandolier_skin;
extern vmCvar_t cg_RQ3_kevlar_skin;
extern vmCvar_t cg_RQ3_silencer_skin;
extern vmCvar_t cg_RQ3_laser_skin;
extern vmCvar_t cg_RQ3_slippers_skin;
extern vmCvar_t cg_RQ3_helmet_skin;
*/
// JBravo: replacement ammo
extern vmCvar_t cg_RQ3_ammo_mk23;
extern vmCvar_t cg_RQ3_ammo_shells;
extern vmCvar_t cg_RQ3_ammo_m3;
extern vmCvar_t cg_RQ3_ammo_ssg3000;
extern vmCvar_t cg_RQ3_ammo_mp5;
extern vmCvar_t cg_RQ3_ammo_m4;
// JBravo: replacement skins
extern vmCvar_t cg_RQ3_ammo_mk23_skin;
extern vmCvar_t cg_RQ3_ammo_shells_skin;
extern vmCvar_t cg_RQ3_ammo_ssg3000_skin;
extern vmCvar_t cg_RQ3_ammo_mp5_skin;
extern vmCvar_t cg_RQ3_ammo_m4_skin;
extern vmCvar_t cg_RQ3_zcam_stfu;
//Blaze: Reaction weapon positions
//extern vmCvar_t cg_RQ3_drawWeapon;

87
reaction/cgame/cg_main.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.131 2003/04/02 22:23:51 jbravo
// More replacements tweaks. Added zcam_stfu
//
// Revision 1.130 2003/03/29 17:00:11 jbravo
// More replacement hiccups after skin cvars where removed
//
@ -335,7 +338,7 @@ char RQ3_bandolier_model[MAX_MODEL_LEN], RQ3_bandolier_icon[MAX_MODEL_LEN];
char RQ3_slippers_model[MAX_MODEL_LEN], RQ3_slippers_icon[MAX_MODEL_LEN];
char RQ3_helmet_model[MAX_MODEL_LEN], RQ3_helmet_icon[MAX_MODEL_LEN];
char RQ3_ammo_mk23_model[MAX_MODEL_LEN], RQ3_ammo_mk23_icon[MAX_MODEL_LEN];
char RQ3_ammo_shells_model[MAX_MODEL_LEN], RQ3_ammo_shells_icon[MAX_MODEL_LEN];
char RQ3_ammo_m3_model[MAX_MODEL_LEN], RQ3_ammo_m3_icon[MAX_MODEL_LEN];
char RQ3_ammo_ssg3000_model[MAX_MODEL_LEN], RQ3_ammo_ssg3000_icon[MAX_MODEL_LEN];
char RQ3_ammo_mp5_model[MAX_MODEL_LEN], RQ3_ammo_mp5_icon[MAX_MODEL_LEN];
char RQ3_ammo_m4_model[MAX_MODEL_LEN], RQ3_ammo_m4_icon[MAX_MODEL_LEN];
@ -467,7 +470,7 @@ vmCvar_t cg_RQ3_glasstime;
//Blaze: Anti OGC code
vmCvar_t ogc_islame;
//Blaze: replacement weapons
// JBravo: replacement weapons
vmCvar_t cg_RQ3_knife;
vmCvar_t cg_RQ3_mk23;
vmCvar_t cg_RQ3_m4;
@ -477,42 +480,21 @@ vmCvar_t cg_RQ3_handcannon;
vmCvar_t cg_RQ3_m3;
vmCvar_t cg_RQ3_akimbo;
vmCvar_t cg_RQ3_grenade;
// JBravo: replacement skin cvars
/* vmCvar_t cg_RQ3_knife_skin;
vmCvar_t cg_RQ3_mk23_skin;
vmCvar_t cg_RQ3_m4_skin;
vmCvar_t cg_RQ3_ssg3000_skin;
vmCvar_t cg_RQ3_mp5_skin;
vmCvar_t cg_RQ3_handcannon_skin;
vmCvar_t cg_RQ3_m3_skin;
vmCvar_t cg_RQ3_akimbo_skin;
vmCvar_t cg_RQ3_grenade_skin; */
//Blaze: replacement items
// JBravo: replacement items
vmCvar_t cg_RQ3_bandolier;
vmCvar_t cg_RQ3_kevlar;
vmCvar_t cg_RQ3_silencer;
vmCvar_t cg_RQ3_laser;
vmCvar_t cg_RQ3_slippers;
vmCvar_t cg_RQ3_helmet;
// JBravo: replacement skin cvars
/* vmCvar_t cg_RQ3_bandolier_skin;
vmCvar_t cg_RQ3_kevlar_skin;
vmCvar_t cg_RQ3_silencer_skin;
vmCvar_t cg_RQ3_laser_skin;
vmCvar_t cg_RQ3_slippers_skin;
vmCvar_t cg_RQ3_helmet_skin; */
// JBravo replacement ammo models
// JBravo: replacement ammo models
vmCvar_t cg_RQ3_ammo_mk23;
vmCvar_t cg_RQ3_ammo_shells;
vmCvar_t cg_RQ3_ammo_m3;
vmCvar_t cg_RQ3_ammo_ssg3000;
vmCvar_t cg_RQ3_ammo_mp5;
vmCvar_t cg_RQ3_ammo_m4;
// JBravo: replacement skin cvars
/* vmCvar_t cg_RQ3_ammo_mk23_skin;
vmCvar_t cg_RQ3_ammo_shells_skin;
vmCvar_t cg_RQ3_ammo_ssg3000_skin;
vmCvar_t cg_RQ3_ammo_mp5_skin;
vmCvar_t cg_RQ3_ammo_m4_skin; */
vmCvar_t cg_RQ3_zcam_stfu;
//Elder: muzzle flash toggle
vmCvar_t cg_RQ3_flash;
@ -764,16 +746,6 @@ static cvarTable_t cvarTable[] = { // bk001129
{&cg_RQ3_m3, "cg_RQ3_m3", "m3/default", CVAR_ARCHIVE},
{&cg_RQ3_akimbo, "cg_RQ3_akimbo", "akimbo/default", CVAR_ARCHIVE},
{&cg_RQ3_grenade, "cg_RQ3_grenade", "grenade/default", CVAR_ARCHIVE},
// JBravo: replacement skins
/* {&cg_RQ3_knife_skin, "cg_RQ3_knife_skin", "default", CVAR_ARCHIVE},
{&cg_RQ3_mk23_skin, "cg_RQ3_mk23_skin", "default", CVAR_ARCHIVE},
{&cg_RQ3_m4_skin, "cg_RQ3_m4_skin", "default", CVAR_ARCHIVE},
{&cg_RQ3_ssg3000_skin, "cg_RQ3_ssg3000_skin", "default", CVAR_ARCHIVE},
{&cg_RQ3_mp5_skin, "cg_RQ3_mp5_skin", "default", CVAR_ARCHIVE},
{&cg_RQ3_handcannon_skin, "cg_RQ3_handcannon_skin", "default", CVAR_ARCHIVE},
{&cg_RQ3_m3_skin, "cg_RQ3_m3_skin", "default", CVAR_ARCHIVE},
{&cg_RQ3_akimbo_skin, "cg_RQ3_akimbo_skin", "default", CVAR_ARCHIVE},
{&cg_RQ3_grenade_skin, "cg_RQ3_grenade_skin", "default", CVAR_ARCHIVE}, */
//Blaze: replacement items
{&cg_RQ3_bandolier, "cg_RQ3_bandolier", "bandolier/default", CVAR_ARCHIVE},
{&cg_RQ3_kevlar, "cg_RQ3_kevlar", "kevlar/default", CVAR_ARCHIVE},
@ -781,25 +753,14 @@ static cvarTable_t cvarTable[] = { // bk001129
{&cg_RQ3_laser, "cg_RQ3_laser", "laser/default", CVAR_ARCHIVE},
{&cg_RQ3_slippers, "cg_RQ3_slippers", "slippers/default", CVAR_ARCHIVE},
{&cg_RQ3_helmet, "cg_RQ3_helmet", "helmet/default", CVAR_ARCHIVE},
// JBravo: replacement skins
/* {&cg_RQ3_bandolier_skin, "cg_RQ3_bandolier_skin", "default", CVAR_ARCHIVE},
{&cg_RQ3_kevlar_skin, "cg_RQ3_kevlar_skin", "default", CVAR_ARCHIVE},
{&cg_RQ3_silencer_skin, "cg_RQ3_silencer_skin", "default", CVAR_ARCHIVE},
{&cg_RQ3_laser_skin, "cg_RQ3_laser_skin", "default", CVAR_ARCHIVE},
{&cg_RQ3_slippers_skin, "cg_RQ3_slippers_skin", "default", CVAR_ARCHIVE},
{&cg_RQ3_helmet_skin, "cg_RQ3_helmet_skin", "default", CVAR_ARCHIVE}, */
// JBravo: replacement ammo
{&cg_RQ3_ammo_mk23, "cg_RQ3_ammo_mk23", "mk23/default", CVAR_ARCHIVE},
{&cg_RQ3_ammo_shells, "cg_RQ3_ammo_shells", "shells/default", CVAR_ARCHIVE},
{&cg_RQ3_ammo_m3, "cg_RQ3_ammo_m3", "shells/default", CVAR_ARCHIVE},
{&cg_RQ3_ammo_ssg3000, "cg_RQ3_ammo_ssg3000", "ssg3000/default", CVAR_ARCHIVE},
{&cg_RQ3_ammo_mp5, "cg_RQ3_ammo_mp5", "mp5/default", CVAR_ARCHIVE},
{&cg_RQ3_ammo_m4, "cg_RQ3_ammo_m4", "m4/default", CVAR_ARCHIVE},
// JBravo: replacement skins
/* {&cg_RQ3_ammo_mk23_skin, "cg_RQ3_ammo_mk23_skin", "default", CVAR_ARCHIVE},
{&cg_RQ3_ammo_shells_skin, "cg_RQ3_ammo_shells_skin", "default", CVAR_ARCHIVE},
{&cg_RQ3_ammo_ssg3000_skin, "cg_RQ3_ammo_ssg3000_skin", "default", CVAR_ARCHIVE},
{&cg_RQ3_ammo_mp5_skin, "cg_RQ3_ammo_mp5_skin", "default", CVAR_ARCHIVE},
{&cg_RQ3_ammo_m4_skin, "cg_RQ3_ammo_m4_skin", "default", CVAR_ARCHIVE}, */
{&cg_RQ3_zcam_stfu, "cg_RQ3_zcam_stfu", "0", CVAR_USERINFO | CVAR_ARCHIVE},
// the following variables are created in other parts of the system,
// but we also reference them here
@ -1026,10 +987,10 @@ void CG_RegisterCvars(void)
model = modelFromStr(str);
if (!strcmp(model, "default"))
trap_Cvar_Set("cg_RQ3_ammo_mk23", "mk23/default");
trap_Cvar_VariableStringBuffer("cg_RQ3_ammo_shells", str, sizeof(str));
trap_Cvar_VariableStringBuffer("cg_RQ3_ammo_m3", str, sizeof(str));
model = modelFromStr(str);
if (!strcmp(model, "default"))
trap_Cvar_Set("cg_RQ3_ammo_shells", "shells/default");
trap_Cvar_Set("cg_RQ3_ammo_m3", "shells/default");
trap_Cvar_VariableStringBuffer("cg_RQ3_ammo_ssg3000", str, sizeof(str));
model = modelFromStr(str);
if (!strcmp(model, "default"))
@ -2789,22 +2750,22 @@ void CG_ReplaceModels(void)
}
}
if (!strcmp(item->classname, "ammo_shells")) {
trap_Cvar_VariableStringBuffer("cg_RQ3_ammo_shells", str, sizeof(str));
trap_Cvar_VariableStringBuffer("cg_RQ3_ammo_m3", str, sizeof(str));
model = modelFromStr(str);
skin = skinFromStr(str);
if (strcmp(model, "shells")) {
Com_sprintf(RQ3_ammo_shells_model, MAX_MODEL_LEN, "models/ammo/%s.md3", model);
Com_sprintf(RQ3_ammo_shells_icon, MAX_MODEL_LEN, "icons/icona_%s", model);
if (JB_FileExists(RQ3_ammo_shells_model) && (strlen(RQ3_ammo_shells_model) < MAX_MODEL_LEN)) {
bg_itemlist[item - bg_itemlist].world_model[0] = (char *)&RQ3_ammo_shells_model;
bg_itemlist[item - bg_itemlist].icon = (char *)&RQ3_ammo_shells_icon;
Com_sprintf(RQ3_ammo_m3_model, MAX_MODEL_LEN, "models/ammo/%s.md3", model);
Com_sprintf(RQ3_ammo_m3_icon, MAX_MODEL_LEN, "icons/icona_%s", model);
if (JB_FileExists(RQ3_ammo_m3_model) && (strlen(RQ3_ammo_m3_model) < MAX_MODEL_LEN)) {
bg_itemlist[item - bg_itemlist].world_model[0] = (char *)&RQ3_ammo_m3_model;
bg_itemlist[item - bg_itemlist].icon = (char *)&RQ3_ammo_m3_icon;
} else
CG_Printf("^1Error loading shells ammo replacement model %s\n", model);
}
if (strcmp(skin, "default")) {
Com_sprintf(RQ3_ammo_shells_icon, MAX_MODEL_LEN, "icons/icona_%s", skin);
if (JB_FileExists(RQ3_ammo_shells_icon))
bg_itemlist[item - bg_itemlist].icon = (char *)&RQ3_ammo_shells_icon;
Com_sprintf(RQ3_ammo_m3_icon, MAX_MODEL_LEN, "icons/icona_%s", skin);
if (JB_FileExists(RQ3_ammo_m3_icon))
bg_itemlist[item - bg_itemlist].icon = (char *)&RQ3_ammo_m3_icon;
else
CG_Printf("^1Error loading shells ammo replacement icon %s\n", skin);
}

5
reaction/cgame/cg_weapons.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.113 2003/04/02 22:23:51 jbravo
// More replacements tweaks. Added zcam_stfu
//
// Revision 1.112 2003/04/02 17:58:03 jbravo
// Ammo skin only replacements now work.
//
@ -1156,7 +1159,7 @@ void CG_RegisterItemVisuals(int itemNum)
}
}
if (!strcmp(item->classname, "ammo_shells")) {
trap_Cvar_VariableStringBuffer("cg_RQ3_ammo_shells", str, sizeof(str));
trap_Cvar_VariableStringBuffer("cg_RQ3_ammo_m3", str, sizeof(str));
model = modelFromStr(str);
skin = skinFromStr(str);
if (strcmp(skin, "default")) {

13
reaction/game/bg_misc.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.54 2003/04/02 22:23:51 jbravo
// More replacements tweaks. Added zcam_stfu
//
// Revision 1.53 2003/03/31 21:04:24 makro
// no message
//
@ -457,7 +460,7 @@ gitem_t bg_itemlist[] = {
{"models/ammo/mk23.md3",
0, 0, 0}
,
/* icon */ "icons/icona_mk23clip",
/* icon */ "icons/icona_mk23",
/* pickup */ "MK23 Clip",
1,
IT_AMMO,
@ -476,7 +479,7 @@ gitem_t bg_itemlist[] = {
{"models/ammo/m3.md3",
0, 0, 0}
,
/* icon */ "icons/icona_shells",
/* icon */ "icons/icona_m3",
/* pickup */ "Shotgun Shells",
7,
IT_AMMO,
@ -495,7 +498,7 @@ gitem_t bg_itemlist[] = {
{"models/ammo/ssg3000.md3",
0, 0, 0}
,
/* icon */ "icons/icona_ssgammo",
/* icon */ "icons/icona_ssg3000",
/* pickup */ "AP Sniper Ammo",
10,
IT_AMMO,
@ -514,7 +517,7 @@ gitem_t bg_itemlist[] = {
{"models/ammo/mp5.md3",
0, 0, 0}
,
/* icon */ "icons/icona_mp5clip",
/* icon */ "icons/icona_mp5",
/* pickup */ "MP5 Clip",
1,
IT_AMMO,
@ -551,7 +554,7 @@ gitem_t bg_itemlist[] = {
{"models/ammo/m4.md3",
0, 0, 0}
,
/* icon */ "icons/icona_m4clip",
/* icon */ "icons/icona_m4",
/* pickup */ "M4 Clip",
1,
IT_AMMO,

10
reaction/game/g_client.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.129 2003/04/02 22:23:51 jbravo
// More replacements tweaks. Added zcam_stfu
//
// Revision 1.128 2003/03/28 10:36:02 jbravo
// Tweaking the replacement system a bit. Reactionmale now the default model
//
@ -1105,6 +1108,13 @@ void ClientUserinfoChanged(int clientNum)
} else {
client->SuicideLikeARealMan = atoi(s);
}
// JBravo: to silence zcam messages
s = Info_ValueForKey(userinfo, "cg_RQ3_zcam_stfu");
if (!atoi(s)) {
client->zcam_stfu = 0;
} else {
client->zcam_stfu = atoi(s);
}
if (g_gametype.integer >= GT_TEAM) {
if (client->sess.savedTeam == TEAM_RED) {

4
reaction/game/g_local.h
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.138 2003/04/02 22:23:51 jbravo
// More replacements tweaks. Added zcam_stfu
//
// Revision 1.137 2003/03/22 20:29:26 jbravo
// wrapping linkent and unlinkent calls
//
@ -781,6 +784,7 @@ struct gclient_s {
int radioSetMale;
int radioSetFemale;
int SuicideLikeARealMan;
int zcam_stfu;
qboolean radioOff;
int team_wounds;
int team_wounds_before;

30
reaction/game/zcam.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.21 2003/04/02 22:23:51 jbravo
// More replacements tweaks. Added zcam_stfu
//
// Revision 1.20 2002/08/18 15:10:32 makro
// Temporarily disabled the call to specPrint
//
@ -716,13 +719,15 @@ static gentity_t *CameraSwingTarget(gentity_t * ent)
// JBravo: take teamnames into account
// JBravo: added who you are following to the zcam swing output.
trap_SendServerCommand(ent->client->ps.clientNum,
va("cp \"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n%sFollowing " S_COLOR_WHITE "%s" S_COLOR_RED "/"
S_COLOR_MAGENTA "%s\n%sTracking " S_COLOR_WHITE "%s" S_COLOR_RED "/"
S_COLOR_MAGENTA "%s\n", color, target1st->client->pers.netname,
(target1st->client->sess.sessionTeam == TEAM_RED) ? g_RQ3_team1name.string : g_RQ3_team2name.string,
color, target2nd->client->pers.netname,
(target2nd->client->sess.sessionTeam == TEAM_RED) ? g_RQ3_team1name.string : g_RQ3_team2name.string));
// JBravo: that is if the client wants to see it
if (!ent->client->zcam_stfu)
trap_SendServerCommand(ent->client->ps.clientNum,
va("cp \"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n%sFollowing " S_COLOR_WHITE "%s" S_COLOR_RED "/"
S_COLOR_MAGENTA "%s\n%sTracking " S_COLOR_WHITE "%s" S_COLOR_RED "/"
S_COLOR_MAGENTA "%s\n", color, target1st->client->pers.netname,
(target1st->client->sess.sessionTeam == TEAM_RED) ? g_RQ3_team1name.string : g_RQ3_team2name.string,
color, target2nd->client->pers.netname,
(target2nd->client->sess.sessionTeam == TEAM_RED) ? g_RQ3_team1name.string : g_RQ3_team2name.string));
//Makro - new code; disabled till everything is in place (cgame)
/*
trap_SendServerCommand(ent->client->ps.clientNum,
@ -731,17 +736,6 @@ static gentity_t *CameraSwingTarget(gentity_t * ent)
target2nd->client->pers.netname,
(target2nd->client->sess.sessionTeam == TEAM_RED) ? g_RQ3_team1name.string : g_RQ3_team2name.string));
*/
/* if (target2nd->client->sess.sessionTeam == TEAM_RED)
trap_SendServerCommand(ent->client->ps.clientNum,
va("cp \"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n%sTracking " S_COLOR_WHITE "%s"
S_COLOR_RED "/" S_COLOR_MAGENTA "%s\n%sFollowing " S_COLOR_WHITE "%s", color,
target2nd->client->pers.netname, g_RQ3_team1name.string, color, target1st->client->pers.netname));
else if (target2nd->client->sess.sessionTeam == TEAM_BLUE)
trap_SendServerCommand(ent->client->ps.clientNum,
va("cp \"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n%sTracking " S_COLOR_WHITE "%s"
S_COLOR_RED "/" S_COLOR_MAGENTA "%s\n%sFollowing " S_COLOR_WHITE "%s", color,
target2nd->client->pers.netname, g_RQ3_team2name.string, color, target1st->client->pers.netname)); */
}
return target2nd;