From 75cc18669f9e14ac43427c84e9e858ed66950fa9 Mon Sep 17 00:00:00 2001 From: cypress Date: Mon, 8 Jan 2024 14:06:29 -0500 Subject: [PATCH] SERVER: Allow to check conversion paths --- source/server/entities/map_entities.qc | 8 +++----- tools/asset_conversion_table.csv | 3 ++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/source/server/entities/map_entities.qc b/source/server/entities/map_entities.qc index 84ae27b..03b4422 100644 --- a/source/server/entities/map_entities.qc +++ b/source/server/entities/map_entities.qc @@ -125,8 +125,9 @@ void() teddy_spawn = precache_model ("models/props/teddy.mdl"); self.movetype = MOVETYPE_NONE; // so it doesn't get pushed by anything - self.solid=SOLID_BBOX; + self.solid = SOLID_BBOX; self.classname = "teddy_spawn"; + self.noise = Compat_ConvertOldAssetPath(self.noise); setmodel (self, "models/props/teddy.mdl"); setsize (self, '-8 -8 -4', '8 8 4'); @@ -134,11 +135,8 @@ void() teddy_spawn = self.health = 0; self.th_die = teddy_react; - if (self.noise) { - // FIXME: make a convert_old_sound_path function like we do for models. - if (self.noise == "misc/buy.wav") self.noise = "sounds/misc/buy.wav"; + if (self.noise) precache_sound (self.noise); - } }; /* ================== diff --git a/tools/asset_conversion_table.csv b/tools/asset_conversion_table.csv index 47b1ea5..46d0058 100644 --- a/tools/asset_conversion_table.csv +++ b/tools/asset_conversion_table.csv @@ -108,4 +108,5 @@ models/machines/power_switch.mdl,models/machines/quake_scale/power_switch.mdl models/machines/hl_scale/packapunch/p_machine.mdl,models/machines/hl_scale/pap/p_machine.mdl models/machines/hl_scale/packapunch/p_roller.mdl,models/machines/hl_scale/pap/p_roller.mdl models/machines/hl_scale/packapunch/p_flag.mdl,models/machines/hl_scale/pap/p_flag.mdl -progs/sprites/lamp_glow2.spr,models/sprites/lamp_glow2.spr \ No newline at end of file +progs/sprites/lamp_glow2.spr,models/sprites/lamp_glow2.spr +misc/buy.wav,sounds/misc/buy.wav \ No newline at end of file