r4594 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Oct 3 05:02:56 EDT 2008
Author: div0
Date: 2008-10-03 05:02:49 -0400 (Fri, 03 Oct 2008)
New Revision: 4594
Modified:
trunk/data/qcsrc/server/keyhunt.qc
trunk/data/qcsrc/server/race.qc
Log:
remove unneeded precaches
Modified: trunk/data/qcsrc/server/keyhunt.qc
===================================================================
--- trunk/data/qcsrc/server/keyhunt.qc 2008-10-03 07:35:57 UTC (rev 4593)
+++ trunk/data/qcsrc/server/keyhunt.qc 2008-10-03 09:02:49 UTC (rev 4594)
@@ -64,19 +64,8 @@
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 @@
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 @@
#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);
Modified: trunk/data/qcsrc/server/race.qc
===================================================================
--- trunk/data/qcsrc/server/race.qc 2008-10-03 07:35:57 UTC (rev 4593)
+++ trunk/data/qcsrc/server/race.qc 2008-10-03 09:02:49 UTC (rev 4594)
@@ -436,12 +436,10 @@
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;
More information about the nexuiz-commits
mailing list