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 replacement hiccups after skin cvars where removed

Browse source
This commit is contained in:
Richard Allen 2003-03-29 17:00:11 +00:00
parent e1ae65fe19
commit acb8264a2f
2 changed files with 108 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
reaction/cgame/cg_main.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.130 2003/03/29 17:00:11 jbravo
// More replacement hiccups after skin cvars where removed
//
// Revision 1.129 2003/03/29 16:01:36 jbravo
// _skin cvars now fully removed. dlight code from Makro added. cvar
// defaults fixed.
@ -940,7 +943,7 @@ void CG_RegisterCvars(void)
{
int i;
cvarTable_t *cv;
char var[MAX_TOKEN_CHARS];
char var[MAX_TOKEN_CHARS], str[MAX_TOKEN_CHARS];
char *model;
for (i = 0, cv = cvarTable; i < cvarTableSize; i++, cv++) {
@ -959,64 +962,84 @@ void CG_RegisterCvars(void)
trap_Cvar_Register(NULL, "team_headmodel", DEFAULT_TEAM_HEAD, CVAR_USERINFO | CVAR_ARCHIVE);
// JBravo: for defaults in weaponreplacements
model = modelFromStr(cg_RQ3_mk23.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_mk23", str, sizeof(str));
model = modelFromStr(str);
if (!strcmp(model, "default"))
trap_Cvar_Set("cg_RQ3_mk23", "mk23/default");
model = modelFromStr(cg_RQ3_knife.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_knife", str, sizeof(str));
model = modelFromStr(str);
if (!strcmp(model, "default"))
trap_Cvar_Set("cg_RQ3_knife", "knife/default");
model = modelFromStr(cg_RQ3_m4.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_m4", str, sizeof(str));
model = modelFromStr(str);
if (!strcmp(model, "default"))
trap_Cvar_Set("cg_RQ3_m4", "m4/default");
model = modelFromStr(cg_RQ3_ssg3000.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_ssg3000", str, sizeof(str));
model = modelFromStr(str);
if (!strcmp(model, "default"))
trap_Cvar_Set("cg_RQ3_ssg3000", "ssg3000/default");
model = modelFromStr(cg_RQ3_mp5.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_mp5", str, sizeof(str));
model = modelFromStr(str);
if (!strcmp(model, "default"))
trap_Cvar_Set("cg_RQ3_mp5", "mp5/default");
model = modelFromStr(cg_RQ3_handcannon.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_handcannon", str, sizeof(str));
model = modelFromStr(str);
if (!strcmp(model, "default"))
trap_Cvar_Set("cg_RQ3_handcannon", "handcannon/default");
model = modelFromStr(cg_RQ3_m3.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_m3", str, sizeof(str));
model = modelFromStr(str);
if (!strcmp(model, "default"))
trap_Cvar_Set("cg_RQ3_m3", "m3/default");
model = modelFromStr(cg_RQ3_akimbo.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_akimbo", str, sizeof(str));
model = modelFromStr(str);
if (!strcmp(model, "default"))
trap_Cvar_Set("cg_RQ3_akimbo", "akimbo/default");
model = modelFromStr(cg_RQ3_grenade.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_grenade", str, sizeof(str));
model = modelFromStr(str);
if (!strcmp(model, "default"))
trap_Cvar_Set("cg_RQ3_grenade", "grenade/default");
model = modelFromStr(cg_RQ3_kevlar.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_kevlar", str, sizeof(str));
model = modelFromStr(str);
if (!strcmp(model, "default"))
trap_Cvar_Set("cg_RQ3_kevlar", "kevlar/default");
model = modelFromStr(cg_RQ3_silencer.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_silencer", str, sizeof(str));
model = modelFromStr(str);
if (!strcmp(model, "default"))
trap_Cvar_Set("cg_RQ3_silencer", "silencer/default");
model = modelFromStr(cg_RQ3_laser.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_laser", str, sizeof(str));
model = modelFromStr(str);
if (!strcmp(model, "default"))
trap_Cvar_Set("cg_RQ3_laser", "laser/default");
model = modelFromStr(cg_RQ3_bandolier.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_bandolier", str, sizeof(str));
model = modelFromStr(str);
if (!strcmp(model, "default"))
trap_Cvar_Set("cg_RQ3_bandolier", "bandolier/default");
model = modelFromStr(cg_RQ3_slippers.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_slippers", str, sizeof(str));
model = modelFromStr(str);
if (!strcmp(model, "default"))
trap_Cvar_Set("cg_RQ3_slippers", "slippers/default");
model = modelFromStr(cg_RQ3_helmet.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_helmet", str, sizeof(str));
model = modelFromStr(str);
if (!strcmp(model, "default"))
trap_Cvar_Set("cg_RQ3_helmet", "helmet/default");
model = modelFromStr(cg_RQ3_ammo_mk23.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_ammo_mk23", str, sizeof(str));
model = modelFromStr(str);
if (!strcmp(model, "default"))
trap_Cvar_Set("cg_RQ3_ammo_mk23", "mk23/default");
model = modelFromStr(cg_RQ3_ammo_shells.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_ammo_shells", str, sizeof(str));
model = modelFromStr(str);
if (!strcmp(model, "default"))
trap_Cvar_Set("cg_RQ3_ammo_shells", "shells/default");
model = modelFromStr(cg_RQ3_ammo_ssg3000.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_ammo_ssg3000", str, sizeof(str));
model = modelFromStr(str);
if (!strcmp(model, "default"))
trap_Cvar_Set("cg_RQ3_ammo_ssg3000", "ssg3000/default");
model = modelFromStr(cg_RQ3_ammo_mp5.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_ammo_mp5", str, sizeof(str));
model = modelFromStr(str);
if (!strcmp(model, "default"))
trap_Cvar_Set("cg_RQ3_ammo_mp5", "mp5/default");
model = modelFromStr(cg_RQ3_ammo_m4.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_ammo_m4", str, sizeof(str));
model = modelFromStr(str);
if (!strcmp(model, "default"))
trap_Cvar_Set("cg_RQ3_ammo_m4", "m4/default");
}
@ -1937,7 +1960,7 @@ static void CG_RegisterGraphics(void)
{
int i, num = 0;
char items[MAX_ITEMS + 1];
char *model;
char *model, str[MAX_TOKEN_CHARS];
static char *sb_nums[11] = {
"gfx/2d/numbers/zero_32b",
@ -2119,18 +2142,24 @@ static void CG_RegisterGraphics(void)
cgs.media.akimboHandModel = trap_R_RegisterModel("models/weapons2/akimbo/akimbo_hand.md3");
//Elder: item cache
model = modelFromStr(cg_RQ3_bandolier.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_bandolier", str, sizeof(str));
model = modelFromStr(str);
cgs.media.rq3_bandolierModel = trap_R_RegisterModel(va("models/items/%s.md3", model));
model = modelFromStr(cg_RQ3_kevlar.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_kevlar", str, sizeof(str));
model = modelFromStr(str);
cgs.media.rq3_kevlarModel = trap_R_RegisterModel(va("models/items/%s.md3", model));
model = modelFromStr(cg_RQ3_silencer.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_silencer", str, sizeof(str));
model = modelFromStr(str);
cgs.media.rq3_silencerModel = trap_R_RegisterModel(va("models/items/%s.md3", model));
model = modelFromStr(cg_RQ3_laser.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_laser", str, sizeof(str));
model = modelFromStr(str);
cgs.media.rq3_laserModel = trap_R_RegisterModel(va("models/items/%s.md3", model));
model = modelFromStr(cg_RQ3_slippers.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_slippers", str, sizeof(str));
model = modelFromStr(str);
cgs.media.rq3_slippersModel = trap_R_RegisterModel(va("models/items/%s.md3", model));
// JBravo: adding the helmet
model = modelFromStr(cg_RQ3_helmet.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_helmet", str, sizeof(str));
model = modelFromStr(str);
cgs.media.rq3_helmetModel = trap_R_RegisterModel(va("models/items/%s.md3", model));
cgs.media.smoke2 = trap_R_RegisterModel("models/weapons2/shells/s_shell.md3");
@ -2419,7 +2448,7 @@ Routine by JBravo to replace world_models in bg_itemlist
void CG_ReplaceModels(void)
{
gitem_t *item;
char str[256];
char str[MAX_TOKEN_CHARS];
char *model, *skin;
for (item = bg_itemlist + 1; item->classname; item++) {

82
reaction/cgame/cg_weapons.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.109 2003/03/29 17:00:11 jbravo
// More replacement hiccups after skin cvars where removed
//
// Revision 1.108 2003/03/29 15:04:03 jbravo
// Removing skin replacement cvars
//
@ -623,7 +626,7 @@ void CG_RegisterWeapon(int weaponNum)
{
weaponInfo_t *weaponInfo;
gitem_t *item, *ammo;
char path[MAX_QPATH];
char path[MAX_QPATH], str[MAX_TOKEN_CHARS];
char *model, *skin;
vec3_t mins, maxs;
// QUARANTINE - Weapon Animations - Added Variable
@ -734,8 +737,9 @@ void CG_RegisterWeapon(int weaponNum)
weaponInfo->worldReloadSound[0] = trap_S_RegisterSound("sound/weapons/mk23/mk23reload.wav", qfalse);
// JBravo: skin replacements
// Makro - no longer using skin cvars
model = modelFromStr(cg_RQ3_mk23.string);
skin = skinFromStr(cg_RQ3_mk23.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_mk23", str, sizeof(str));
model = modelFromStr(str);
skin = skinFromStr(str);
if (strcmp(skin, "default")) {
weaponInfo->customSkin = trap_R_RegisterSkin (va("models/weapons2/%s/%s.skin", model, skin));
if (!weaponInfo->customSkin) {
@ -770,8 +774,9 @@ void CG_RegisterWeapon(int weaponNum)
trap_R_RegisterModel(va("models/weapons2/%s/knife.md3", cg_RQ3_knife.string));
// JBravo: skin replacements
// Makro - no longer using skin cvars
model = modelFromStr(cg_RQ3_knife.string);
skin = skinFromStr(cg_RQ3_knife.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_knife", str, sizeof(str));
model = modelFromStr(str);
skin = skinFromStr(str);
if (strcmp(skin, "default")) {
weaponInfo->customSkin = trap_R_RegisterSkin (va("models/weapons2/%s/%s.skin", model, skin));
if (!weaponInfo->customSkin) {
@ -795,8 +800,9 @@ void CG_RegisterWeapon(int weaponNum)
cgs.media.bulletExplosionShader = trap_R_RegisterShader("bulletExplosion");
// JBravo: skin replacements
// Makro - no longer using skin cvars
model = modelFromStr(cg_RQ3_m4.string);
skin = skinFromStr(cg_RQ3_m4.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_m4", str, sizeof(str));
model = modelFromStr(str);
skin = skinFromStr(str);
if (strcmp(skin, "default")) {
weaponInfo->customSkin = trap_R_RegisterSkin (va("models/weapons2/%s/%s.skin", model, skin));
if (!weaponInfo->customSkin) {
@ -831,8 +837,9 @@ void CG_RegisterWeapon(int weaponNum)
cgs.media.bulletExplosionShader = trap_R_RegisterShader("bulletExplosion");
// JBravo: skin replacements
// Makro - no longer using skin cvars
model = modelFromStr(cg_RQ3_ssg3000.string);
skin = skinFromStr(cg_RQ3_ssg3000.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_ssg3000", str, sizeof(str));
model = modelFromStr(str);
skin = skinFromStr(str);
if (strcmp(skin, "default")) {
weaponInfo->customSkin = trap_R_RegisterSkin (va("models/weapons2/%s/%s.skin", model, skin));
if (!weaponInfo->customSkin) {
@ -863,8 +870,9 @@ void CG_RegisterWeapon(int weaponNum)
cgs.media.bulletExplosionShader = trap_R_RegisterShader("bulletExplosion");
// JBravo: skin replacements
// Makro - no longer using skin cvars
model = modelFromStr(cg_RQ3_mp5.string);
skin = skinFromStr(cg_RQ3_mp5.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_mp5", str, sizeof(str));
model = modelFromStr(str);
skin = skinFromStr(str);
if (strcmp(skin, "default")) {
weaponInfo->customSkin = trap_R_RegisterSkin (va("models/weapons2/%s/%s.skin", model, skin));
if (!weaponInfo->customSkin) {
@ -897,8 +905,9 @@ void CG_RegisterWeapon(int weaponNum)
cgs.media.bulletExplosionShader = trap_R_RegisterShader("bulletExplosion");
// JBravo: skin replacements
// Makro - no longer using skin cvars
model = modelFromStr(cg_RQ3_handcannon.string);
skin = skinFromStr(cg_RQ3_handcannon.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_handcannon", str, sizeof(str));
model = modelFromStr(str);
skin = skinFromStr(str);
if (strcmp(skin, "default")) {
weaponInfo->customSkin = trap_R_RegisterSkin (va("models/weapons2/%s/%s.skin", model, skin));
if (!weaponInfo->customSkin) {
@ -929,8 +938,9 @@ void CG_RegisterWeapon(int weaponNum)
weaponInfo->ejectBrassFunc = CG_ShotgunEjectBrass;
// JBravo: skin replacements
// Makro - no longer using skin cvars
model = modelFromStr(cg_RQ3_m3.string);
skin = skinFromStr(cg_RQ3_m3.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_m3", str, sizeof(str));
model = modelFromStr(str);
skin = skinFromStr(str);
if (strcmp(skin, "default")) {
weaponInfo->customSkin = trap_R_RegisterSkin (va("models/weapons2/%s/%s.skin", model, skin));
if (!weaponInfo->customSkin) {
@ -964,8 +974,9 @@ void CG_RegisterWeapon(int weaponNum)
cgs.media.bulletExplosionShader = trap_R_RegisterShader("bulletExplosion");
// JBravo: skin replacements
// Makro - no longer using skin cvars
model = modelFromStr(cg_RQ3_akimbo.string);
skin = skinFromStr(cg_RQ3_akimbo.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_akimbo", str, sizeof(str));
model = modelFromStr(str);
skin = skinFromStr(str);
if (strcmp(skin, "default")) {
weaponInfo->customSkin = trap_R_RegisterSkin (va("models/weapons2/%s/%s.skin", model, skin));
if (!weaponInfo->customSkin) {
@ -999,8 +1010,9 @@ void CG_RegisterWeapon(int weaponNum)
//cgs.media.grenadeExplosionShader = trap_R_RegisterShader( "grenadeExplosion" );
// JBravo: skin replacements
// Makro - no longer using skin cvars
model = modelFromStr(cg_RQ3_grenade.string);
skin = skinFromStr(cg_RQ3_grenade.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_grenade", str, sizeof(str));
model = modelFromStr(str);
skin = skinFromStr(str);
if (strcmp(skin, "default")) {
weaponInfo->customSkin = trap_R_RegisterSkin (va("models/weapons2/%s/%s.skin", model, skin));
if (!weaponInfo->customSkin) {
@ -1040,7 +1052,7 @@ void CG_RegisterItemVisuals(int itemNum)
{
itemInfo_t *itemInfo;
gitem_t *item;
char *model, *skin;
char *model, *skin, str[MAX_TOKEN_CHARS];
itemInfo = &cg_items[itemNum];
if (itemInfo->registered) {
@ -1060,8 +1072,9 @@ void CG_RegisterItemVisuals(int itemNum)
// JBravo: replacement skins for items
if (item->giType == IT_HOLDABLE) {
if (!strcmp(item->classname, "item_kevlar")) {
model = modelFromStr(cg_RQ3_kevlar.string);
skin = skinFromStr(cg_RQ3_kevlar.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_kevlar", str, sizeof(str));
model = modelFromStr(str);
skin = skinFromStr(str);
if (strcmp(skin, "default")) {
itemInfo->customSkin = trap_R_RegisterSkin (va("models/items/%s/%s.skin", model, skin));
if (!itemInfo->customSkin)
@ -1069,8 +1082,9 @@ void CG_RegisterItemVisuals(int itemNum)
}
}
if (!strcmp(item->classname, "item_silencer")) {
model = modelFromStr(cg_RQ3_silencer.string);
skin = skinFromStr(cg_RQ3_silencer.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_silencer", str, sizeof(str));
model = modelFromStr(str);
skin = skinFromStr(str);
if (strcmp(skin, "default")) {
itemInfo->customSkin = trap_R_RegisterSkin (va("models/items/%s/%s.skin", model, skin));
if (!itemInfo->customSkin)
@ -1078,8 +1092,9 @@ void CG_RegisterItemVisuals(int itemNum)
}
}
if (!strcmp(item->classname, "item_laser")) {
model = modelFromStr(cg_RQ3_laser.string);
skin = skinFromStr(cg_RQ3_laser.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_laser", str, sizeof(str));
model = modelFromStr(str);
skin = skinFromStr(str);
if (strcmp(skin, "default")) {
itemInfo->customSkin = trap_R_RegisterSkin (va("models/items/%s/%s.skin", model, skin));
if (!itemInfo->customSkin)
@ -1087,8 +1102,9 @@ void CG_RegisterItemVisuals(int itemNum)
}
}
if (!strcmp(item->classname, "item_bandolier")) {
model = modelFromStr(cg_RQ3_bandolier.string);
skin = skinFromStr(cg_RQ3_bandolier.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_bandolier", str, sizeof(str));
model = modelFromStr(str);
skin = skinFromStr(str);
if (strcmp(skin, "default")) {
itemInfo->customSkin = trap_R_RegisterSkin (va("models/items/%s/%s.skin", model, skin));
if (!itemInfo->customSkin)
@ -1096,8 +1112,9 @@ void CG_RegisterItemVisuals(int itemNum)
}
}
if (!strcmp(item->classname, "item_slippers")) {
model = modelFromStr(cg_RQ3_slippers.string);
skin = skinFromStr(cg_RQ3_slippers.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_slippers", str, sizeof(str));
model = modelFromStr(str);
skin = skinFromStr(str);
if (strcmp(skin, "default")) {
itemInfo->customSkin = trap_R_RegisterSkin (va("models/items/%s/%s.skin", model, skin));
if (!itemInfo->customSkin)
@ -1105,8 +1122,9 @@ void CG_RegisterItemVisuals(int itemNum)
}
}
if (!strcmp(item->classname, "item_helmet")) {
model = modelFromStr(cg_RQ3_helmet.string);
skin = skinFromStr(cg_RQ3_helmet.string);
trap_Cvar_VariableStringBuffer("cg_RQ3_helmet", str, sizeof(str));
model = modelFromStr(str);
skin = skinFromStr(str);
if (strcmp(skin, "default")) {
itemInfo->customSkin = trap_R_RegisterSkin (va("models/items/%s/%s.skin", model, skin));
if (!itemInfo->customSkin)