wav+adpcm directories merged

2016-07-01 13:25:08 +12:00 · 2016-07-01 13:25:08 +12:00 · be19cfcdbe
commit be19cfcdbe
parent 7f956f74a1
44 changed files with 0 additions and 4 deletions
--- a/pkg/base/adpcm/buld.wav
+++ b/pkg/base/adpcm/buld.wav
--- a/pkg/base/adpcm/grif.wav
+++ b/pkg/base/adpcm/grif.wav
--- a/pkg/base/adpcm/hammer.wav
+++ b/pkg/base/adpcm/hammer.wav
--- a/pkg/base/adpcm/jump-down.wav
+++ b/pkg/base/adpcm/jump-down.wav
--- a/pkg/base/adpcm/jump-up.wav
+++ b/pkg/base/adpcm/jump-up.wav
--- a/pkg/base/adpcm/ouch1.wav
+++ b/pkg/base/adpcm/ouch1.wav
--- a/pkg/base/adpcm/ouch2.wav
+++ b/pkg/base/adpcm/ouch2.wav
--- a/pkg/base/adpcm/ouch3.wav
+++ b/pkg/base/adpcm/ouch3.wav
--- a/pkg/base/adpcm/pin.wav
+++ b/pkg/base/adpcm/pin.wav
--- a/pkg/base/adpcm/rifle-reload.wav
+++ b/pkg/base/adpcm/rifle-reload.wav
--- a/pkg/base/adpcm/rifle-shot.wav
+++ b/pkg/base/adpcm/rifle-shot.wav
--- a/pkg/base/adpcm/smg-dead.wav
+++ b/pkg/base/adpcm/smg-dead.wav
--- a/pkg/base/adpcm/smg-reload.wav
+++ b/pkg/base/adpcm/smg-reload.wav
--- a/pkg/base/adpcm/smg-shot.wav
+++ b/pkg/base/adpcm/smg-shot.wav
--- a/pkg/base/adpcm/splat1.wav
+++ b/pkg/base/adpcm/splat1.wav
--- a/pkg/base/adpcm/step1.wav
+++ b/pkg/base/adpcm/step1.wav
--- a/pkg/base/adpcm/step2.wav
+++ b/pkg/base/adpcm/step2.wav
--- a/pkg/base/adpcm/step3.wav
+++ b/pkg/base/adpcm/step3.wav
--- a/pkg/base/adpcm/step4.wav
+++ b/pkg/base/adpcm/step4.wav
--- a/pkg/base/adpcm/step5.wav
+++ b/pkg/base/adpcm/step5.wav
--- a/pkg/base/adpcm/step6.wav
+++ b/pkg/base/adpcm/step6.wav
--- a/pkg/base/adpcm/step7.wav
+++ b/pkg/base/adpcm/step7.wav
--- a/pkg/base/adpcm/step8.wav
+++ b/pkg/base/adpcm/step8.wav
--- a/pkg/base/adpcm/tracehit.wav
+++ b/pkg/base/adpcm/tracehit.wav
--- a/pkg/base/adpcm/whoosh.wav
+++ b/pkg/base/adpcm/whoosh.wav
--- a/pkg/base/preconf.lua
+++ b/pkg/base/preconf.lua
@ -41,7 +41,6 @@ DIR_PKG_PMF = DIR_PKG_PMF or DIR_PKG_ROOT.."/pmf"
 DIR_PKG_KV6 = DIR_PKG_KV6 or DIR_PKG_ROOT.."/kv6"
 DIR_PKG_GFX = DIR_PKG_GFX or DIR_PKG_ROOT.."/gfx"
 DIR_PKG_WAV = DIR_PKG_WAV or DIR_PKG_ROOT.."/wav"
-DIR_PKG_WAV_ADPCM = DIR_PKG_WAV_ADPCM or DIR_PKG_ROOT.."/adpcm"
 DIR_PKG_IT = DIR_PKG_IT or DIR_PKG_ROOT.."/it"
 DIR_PKG_MAP = DIR_PKG_MAP or "pkg/maps"
 DIR_SKIN = DIR_SKIN or "clsave/pub/skin"
@ -52,9 +51,6 @@ function skin_load(ftype, name, bdir, sdir)
 	sdir = sdir or DIR_SKIN
 	local hdl = SKIN_ENABLE[ftype] and common.fetch_block(ftype, sdir.."/"..name)
 	print(hdl, bdir.."/"..name)
-	if ftype == "wav" and bdir == DIR_PKG_WAV then
-		hdl = hdl or common.fetch_block(ftype, DIR_PKG_WAV_ADPCM.."/"..name)
-	end
 	hdl = hdl or common.fetch_block(ftype, bdir.."/"..name)
 	print(hdl)
 	return hdl
--- a/pkg/base/wav/buld.wav
+++ b/pkg/base/wav/buld.wav
--- a/pkg/base/wav/grif.wav
+++ b/pkg/base/wav/grif.wav
--- a/pkg/base/wav/hammer.wav
+++ b/pkg/base/wav/hammer.wav
--- a/pkg/base/wav/jump-down.wav
+++ b/pkg/base/wav/jump-down.wav
--- a/pkg/base/wav/jump-up.wav
+++ b/pkg/base/wav/jump-up.wav
--- a/pkg/base/wav/ouch1.wav
+++ b/pkg/base/wav/ouch1.wav
--- a/pkg/base/wav/ouch2.wav
+++ b/pkg/base/wav/ouch2.wav
--- a/pkg/base/wav/ouch3.wav
+++ b/pkg/base/wav/ouch3.wav
--- a/pkg/base/wav/pin.wav
+++ b/pkg/base/wav/pin.wav
--- a/pkg/base/wav/rifle-reload.wav
+++ b/pkg/base/wav/rifle-reload.wav
--- a/pkg/base/wav/rifle-shot.wav
+++ b/pkg/base/wav/rifle-shot.wav
--- a/pkg/base/wav/splat1.wav
+++ b/pkg/base/wav/splat1.wav
--- a/pkg/base/wav/step1.wav
+++ b/pkg/base/wav/step1.wav
--- a/pkg/base/wav/step2.wav
+++ b/pkg/base/wav/step2.wav
--- a/pkg/base/wav/step3.wav
+++ b/pkg/base/wav/step3.wav
--- a/pkg/base/wav/step4.wav
+++ b/pkg/base/wav/step4.wav
--- a/pkg/base/wav/tracehit.wav
+++ b/pkg/base/wav/tracehit.wav
--- a/pkg/base/wav/whoosh.wav
+++ b/pkg/base/wav/whoosh.wav