rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-11 07:42:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small UI replacements fixes.

Browse source
This commit is contained in:
Richard Allen 2003-03-31 04:55:58 +00:00
parent ed6a3b7a39
commit cc5bb0b7e3
1 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
reaction/ta_ui/ui_main.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.67 2003/03/31 04:55:58 jbravo
// Small UI replacements fixes.
//
// Revision 1.66 2003/03/31 01:23:54 jbravo // Revision 1.66 2003/03/31 01:23:54 jbravo
// Fixing 2 compiler warnings // Fixing 2 compiler warnings
// //
@ -268,7 +271,7 @@ static replacementSubtype_t replacementWeapons[] =
{"Mk23", "mk23"}, {"Mk23", "mk23"},
{"M3", "m3"}, {"M3", "m3"},
{"MP5", "mp5"}, {"MP5", "mp5"},
{"Handcannon", "handcannon"}, {"Handcannon", "handcannon"},
{"SSG3000", "ssg3000"}, {"SSG3000", "ssg3000"},
{"M4", "m4"}, {"M4", "m4"},
{"Grenade", "grenade"}, {"Grenade", "grenade"},
@ -281,10 +284,10 @@ static const int replacementWeapCount = sizeof(replacementWeapons) / sizeof(repl
static replacementSubtype_t replacementItems[] = static replacementSubtype_t replacementItems[] =
{ {
{"Kevlar", "kevlar"}, {"Kevlar", "kevlar"},
{"Bandolier", "bandolier"}, {"Bandolier", "bandolier"},
{"Silencer", "silencer"}, {"Silencer", "silencer"},
{"Laser", "laser"}, {"Laser", "laser"},
{"Slippers", "slippers"}, {"Slippers", "slippers"},
{"Helmet", "helmet"} {"Helmet", "helmet"}
}; };
static const int replacementItemCount = sizeof(replacementItems) / sizeof(replacementSubtype_t); static const int replacementItemCount = sizeof(replacementItems) / sizeof(replacementSubtype_t);
@ -2625,7 +2628,7 @@ void UI_LoadReplacement(int index)
{ {
int len; int len;
fileHandle_t f; fileHandle_t f;
char buf[4096], *p, *text, skin[MAX_QPATH], model[MAX_QPATH]; char buf[4096], *p, *h, *text, skin[MAX_QPATH], model[MAX_QPATH], ammofix[MAX_QPATH];
const char *typeDir = replacementTypes[uiInfo.replacements.TypeIndex % replacementTypeCount].cvarName; const char *typeDir = replacementTypes[uiInfo.replacements.TypeIndex % replacementTypeCount].cvarName;
uiInfo.replacements.Info[0]=0; uiInfo.replacements.Info[0]=0;
@ -2662,11 +2665,26 @@ void UI_LoadReplacement(int index)
sscanf(p, "%f %f %f %f %f %f %i %i %i", &uiInfo.replacements.origin[0], &uiInfo.replacements.origin[1], &uiInfo.replacements.origin[2], sscanf(p, "%f %f %f %f %f %f %i %i %i", &uiInfo.replacements.origin[0], &uiInfo.replacements.origin[1], &uiInfo.replacements.origin[2],
&uiInfo.replacements.angles[0], &uiInfo.replacements.angles[1], &uiInfo.replacements.angles[2], &uiInfo.replacements.angles[0], &uiInfo.replacements.angles[1], &uiInfo.replacements.angles[2],
&uiInfo.replacements.fovx, &uiInfo.replacements.fovy, &uiInfo.replacements.speed); &uiInfo.replacements.fovx, &uiInfo.replacements.fovy, &uiInfo.replacements.speed);
//Com_Printf("Model: %s\n", va("models/%s/%s/%s.md3", p, model, uiInfo.replacementType)); //Com_Printf("Model: %s\n", va("models/%s/%s/%s.md3", typeDir, model, uiInfo.replacements.Type));
//Com_Printf("Skin : %s\n", va("models/%s/%s/%s.skin", p, model, skin)); //Com_Printf("Skin : %s\n", va("models/%s/%s/%s.skin", typeDir, model, skin));
uiInfo.replacements.Model = trap_R_RegisterModel(va("models/%s/%s/%s.md3", typeDir, model, uiInfo.replacements.Type)); if (!Q_stricmp(typeDir, "ammo")) {
uiInfo.replacements.Skin = trap_R_RegisterSkin(va("models/%s/%s/%s.skin", typeDir, model, skin)); Q_strncpyz(ammofix, uiInfo.replacements.Type, sizeof(uiInfo.replacements.Type));
h = ammofix + 5;
uiInfo.replacements.Model = trap_R_RegisterModel(va("models/%s/%s.md3", typeDir, h));
uiInfo.replacements.Skin = trap_R_RegisterSkin(va("models/%s/%s.skin", typeDir, skin));
Com_Printf("AmmoModel: %s\n", va("models/%s/%s.md3", typeDir, h));
Com_Printf("AmmoSkin : %s\n", va("models/%s/%s.skin", typeDir, skin));
} else if (!Q_stricmp(typeDir, "items")) {
uiInfo.replacements.Model = trap_R_RegisterModel(va("models/%s/%s.md3", typeDir, uiInfo.replacements.Type));
uiInfo.replacements.Skin = trap_R_RegisterSkin(va("models/%s/%s/%s.skin", typeDir, typeDir, skin));
Com_Printf("ItemModel: %s\n", va("models/%s/%s.md3", typeDir, uiInfo.replacements.Type));
Com_Printf("ItemSkin : %s\n", va("models/%s/%s/%s.skin", typeDir, typeDir, skin));
} else {
uiInfo.replacements.Model = trap_R_RegisterModel(va("models/%s/%s/%s.md3", typeDir, model, uiInfo.replacements.Type));
uiInfo.replacements.Skin = trap_R_RegisterSkin(va("models/%s/%s/%s.skin", typeDir, model, skin));
Com_Printf("WeaponModel: %s\n", va("models/%s/%s/%s.md3", typeDir, model, uiInfo.replacements.Type));
Com_Printf("WeaponSkin : %s\n", va("models/%s/%s/%s.skin", typeDir, model, skin));
}
//...replacement info //...replacement info
Q_strncpyz(uiInfo.replacements.Info, text, sizeof(uiInfo.replacements.Info)); Q_strncpyz(uiInfo.replacements.Info, text, sizeof(uiInfo.replacements.Info));
} }
@ -3046,6 +3064,8 @@ static void UI_DrawReplacementModel(rectDef_t *rect)
VectorAdd(origin, uiInfo.replacements.origin, origin); VectorAdd(origin, uiInfo.replacements.origin, origin);
ent.hModel = uiInfo.replacements.Model; ent.hModel = uiInfo.replacements.Model;
// JBravo: Added so replacements work
ent.customSkin = uiInfo.replacements.Skin;
VectorCopy(origin, ent.origin); VectorCopy(origin, ent.origin);
VectorCopy(origin, ent.lightingOrigin); VectorCopy(origin, ent.lightingOrigin);
ent.renderfx = RF_LIGHTING_ORIGIN | RF_NOSHADOW; ent.renderfx = RF_LIGHTING_ORIGIN | RF_NOSHADOW;