Prevent a potential crash with vehicles and bloodloss

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator_overkill.qc

diff --git a/qcsrc/server/mutators/mutator_overkill.qc b/qcsrc/server/mutators/mutator_overkill.qc
index c975cda155a09ae5b75bc913d17b8ebf7a1ccbe0..9247dffacaf1317ab1fbccb4157fdaa9de7fbf89 100644 (file)
--- a/qcsrc/server/mutators/mutator_overkill.qc
+++ b/qcsrc/server/mutators/mutator_overkill.qc
@@ -175,7 +175,7 @@ MUTATOR_HOOKFUNCTION(ok_PlayerPreThink)
                {
                        //Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_OVERKILL_CHARGE);
                        self.ok_notice_time = time + 2;
-                       play2(self, "weapons/dryfire.wav");
+                       play2(self, W_Sound("dryfire"));
                }
                if(self.weaponentity.state != WS_CLEAR)
                        w_ready();
@@ -215,7 +215,7 @@ MUTATOR_HOOKFUNCTION(ok_OnEntityPreSpawn)
                {
                        entity wep = spawn();
                        setorigin(wep, self.origin);
-                       setmodel(wep, "models/weapons/g_ok_hmg.md3");
+                       setmodel(wep, W_Model("g_ok_hmg.md3"));
                        wep.classname = "weapon_hmg";
                        wep.ok_item = true;
                        wep.noalign = self.noalign;
@@ -232,7 +232,7 @@ MUTATOR_HOOKFUNCTION(ok_OnEntityPreSpawn)
                {
                        entity wep = spawn();
                        setorigin(wep, self.origin);
-                       setmodel(wep, "models/weapons/g_ok_rl.md3");
+                       setmodel(wep, W_Model("g_ok_rl.md3"));
                        wep.classname = "weapon_rpc";
                        wep.ok_item = true;
                        wep.noalign = self.noalign;
@@ -317,19 +317,19 @@ void ok_Initialize()
 
        precache_all_playermodels("models/ok_player/*.dpm");
 
-       precache_model("models/weapons/h_ok_mg.iqm");
-       precache_model("models/weapons/v_ok_mg.md3");
-       precache_model("models/weapons/g_ok_mg.md3");
+       precache_model(W_Model("h_ok_mg.iqm"));
+       precache_model(W_Model("v_ok_mg.md3"));
+       precache_model(W_Model("g_ok_mg.md3"));
 
-       precache_model("models/weapons/h_ok_shotgun.iqm");
-       precache_model("models/weapons/v_ok_shotgun.md3");
-       precache_model("models/weapons/g_ok_shotgun.md3");
+       precache_model(W_Model("h_ok_shotgun.iqm"));
+       precache_model(W_Model("v_ok_shotgun.md3"));
+       precache_model(W_Model("g_ok_shotgun.md3"));
 
-       precache_model("models/weapons/h_ok_sniper.iqm");
-       precache_model("models/weapons/v_ok_sniper.md3");
-       precache_model("models/weapons/g_ok_sniper.md3");
+       precache_model(W_Model("h_ok_sniper.iqm"));
+       precache_model(W_Model("v_ok_sniper.md3"));
+       precache_model(W_Model("g_ok_sniper.md3"));
 
-       precache_sound("weapons/dryfire.wav");
+       precache_sound(W_Sound("dryfire"));
 
        addstat(STAT_OK_AMMO_CHARGE, AS_FLOAT, ok_use_ammocharge);
        addstat(STAT_OK_AMMO_CHARGEPOOL, AS_FLOAT, ok_ammo_charge);