From 1b83100b330164ebd2d4c8443e3353d4b2bec2ed Mon Sep 17 00:00:00 2001 From: Jakob MG Date: Wed, 23 May 2012 21:28:45 +0200 Subject: [PATCH] cl_vehicles_hudscale & cl_vehicles_hudalpha to defualtXonotic.cfg, remove pointless csqc precache_model for wakizashi --- defaultXonotic.cfg | 2 ++ qcsrc/client/Main.qc | 2 +- qcsrc/client/vehicles/vehicles.qc | 10 ++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 0c399bb183..0c5f1819c2 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1645,6 +1645,8 @@ seta cl_casings_maxcount 100 "maximum amount of shell casings (must be at least seta cl_gibs_maxcount 100 "maximum amount of gibs (must be at least 1)" seta cl_vehicle_spiderbot_cross_alpha 0.6 seta cl_vehicle_spiderbot_cross_size 1 +seta cl_vehicles_hudscale 0.5 +seta cl_vehicles_hudalpha 0.75 //cl_gunalign calculator seta menu_cl_gunalign 3 "Gun alignment; 1 = center (if allowed by g_shootfromclient) or right, 2 = center (if allowed by g_shootfromclient) or left, 3 = right only, 4 = left only" diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc index 6072652cd9..ec258e27d7 100644 --- a/qcsrc/client/Main.qc +++ b/qcsrc/client/Main.qc @@ -178,7 +178,7 @@ void CSQC_Init(void) DamageInfo_Precache(); Vehicles_Precache(); turrets_precache(); - Announcer_Precache(); + Announcer_Precache(); Tuba_Precache(); if(autocvar_cl_reticle) diff --git a/qcsrc/client/vehicles/vehicles.qc b/qcsrc/client/vehicles/vehicles.qc index ccb9cff583..6081f5a66e 100644 --- a/qcsrc/client/vehicles/vehicles.qc +++ b/qcsrc/client/vehicles/vehicles.qc @@ -661,11 +661,13 @@ void CSQC_WAKIZASHI_HUD() void Vehicles_Precache() { // fixme: HAAAAKKKZZZ!!!!!!!!!!!! (this belongs as a setting in default.cfg) - autocvar_cl_vehicles_hudscale = 0.5; - autocvar_cl_vehicles_hudalpha = 0.75; - + if(!autocvar_cl_vehicles_hudscale ) + autocvar_cl_vehicles_hudscale = 0.5; + + if(!autocvar_cl_vehicles_hudalpha) + autocvar_cl_vehicles_hudalpha = 0.75; - precache_model("models/vehicles/wakizashi.dpm"); + //precache_model("models/vehicles/wakizashi.dpm"); precache_model("models/vehicles/bomblet.md3"); precache_model("models/vehicles/clusterbomb.md3"); -- 2.39.2