From 133f6240345f1b574257e6faef69b3507c5c261c Mon Sep 17 00:00:00 2001 From: div0 Date: Fri, 3 Oct 2008 09:02:49 +0000 Subject: [PATCH] remove unneeded precaches git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4594 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/keyhunt.qc | 33 --------------------------------- data/qcsrc/server/race.qc | 2 -- 2 files changed, 35 deletions(-) diff --git a/data/qcsrc/server/keyhunt.qc b/data/qcsrc/server/keyhunt.qc index 6eee0c1ec..b7a802086 100644 --- a/data/qcsrc/server/keyhunt.qc +++ b/data/qcsrc/server/keyhunt.qc @@ -64,19 +64,8 @@ string kh_sound_drop = "sound/kh/drop.wav"; string kh_sound_collect = "sound/kh/collect.wav"; string kh_sound_alarm = "sound/kh/alarm.wav"; // the new siren/alarm -float kh_sprite_dropped, kh_sprite_finish, kh_sprite_red, kh_sprite_blue, kh_sprite_pink, kh_sprite_yellow, kh_sprite_friend; float kh_key_dropped, kh_key_carried; -float kh_GetCarrierSprite(float t, float e) // runs all the time -{ - if(t == e) return kh_sprite_friend; - if(t == COLOR_TEAM1) return kh_sprite_red; - if(t == COLOR_TEAM2) return kh_sprite_blue; - if(t == COLOR_TEAM3) return kh_sprite_yellow; - if(t == COLOR_TEAM4) return kh_sprite_pink; - return 0; -} - void kh_Controller_SetThink(float t, string msg, kh_Think_t func) // runs occasionaly { kh_Controller_Thinkfunc = func; @@ -953,13 +942,6 @@ void kh_init() // sets up th KH environment precache_sound(kh_sound_collect); precache_sound(kh_sound_alarm); // the new siren - precache_model("models/sprites/key-dropped.sp2"); - precache_model("models/sprites/keycarrier-finish.sp2"); - precache_model("models/sprites/keycarrier-friend.sp2"); - precache_model("models/sprites/keycarrier-red.sp2"); - precache_model("models/sprites/keycarrier-blue.sp2"); - precache_model("models/sprites/keycarrier-yellow.sp2"); - precache_model("models/sprites/keycarrier-pink.sp2"); #ifdef KH_PLAYER_USE_CARRIEDMODEL precache_model("models/keyhunt/key-carried.md3"); #endif @@ -989,21 +971,6 @@ void kh_init() // sets up th KH environment #else kh_key_carried = kh_key_dropped; #endif - setmodel(kh_controller, "models/sprites/key-dropped.sp2"); - kh_sprite_dropped = kh_controller.modelindex; - setmodel(kh_controller, "models/sprites/keycarrier-finish.sp2"); - kh_sprite_finish = kh_controller.modelindex; - setmodel(kh_controller, "models/sprites/keycarrier-friend.sp2"); - kh_sprite_friend = kh_controller.modelindex; - setmodel(kh_controller, "models/sprites/keycarrier-red.sp2"); - kh_sprite_red = kh_controller.modelindex; - setmodel(kh_controller, "models/sprites/keycarrier-blue.sp2"); - kh_sprite_blue = kh_controller.modelindex; - setmodel(kh_controller, "models/sprites/keycarrier-pink.sp2"); - kh_sprite_pink = kh_controller.modelindex; - setmodel(kh_controller, "models/sprites/keycarrier-yellow.sp2"); - kh_sprite_yellow = kh_controller.modelindex; - setmodel(kh_controller, ""); addstat(STAT_KH_KEYS, AS_INT, kh_state); diff --git a/data/qcsrc/server/race.qc b/data/qcsrc/server/race.qc index 05f226249..37e055c5a 100644 --- a/data/qcsrc/server/race.qc +++ b/data/qcsrc/server/race.qc @@ -436,12 +436,10 @@ void spawnfunc_trigger_race_checkpoint() if(self.race_checkpoint) { - precache_model("models/sprites/race-checkpoint.sp2"); WaypointSprite_SpawnFixed("race-checkpoint", o, self, sprite); } else { - precache_model("models/sprites/race-finish.sp2"); WaypointSprite_SpawnFixed("race-finish", o, self, sprite); } self.sprite.waypointsprite_visible_for_player = race_waypointsprite_visible_for_player; -- 2.39.2