diff --git a/pkg/base/adpcm/buld.wav b/pkg/base/adpcm/buld.wav deleted file mode 100644 index 1073937..0000000 Binary files a/pkg/base/adpcm/buld.wav and /dev/null differ diff --git a/pkg/base/adpcm/grif.wav b/pkg/base/adpcm/grif.wav deleted file mode 100644 index 4665dd3..0000000 Binary files a/pkg/base/adpcm/grif.wav and /dev/null differ diff --git a/pkg/base/adpcm/hammer.wav b/pkg/base/adpcm/hammer.wav deleted file mode 100644 index 2cfeb95..0000000 Binary files a/pkg/base/adpcm/hammer.wav and /dev/null differ diff --git a/pkg/base/adpcm/jump-down.wav b/pkg/base/adpcm/jump-down.wav deleted file mode 100644 index b41a997..0000000 Binary files a/pkg/base/adpcm/jump-down.wav and /dev/null differ diff --git a/pkg/base/adpcm/jump-up.wav b/pkg/base/adpcm/jump-up.wav deleted file mode 100644 index 1a6be89..0000000 Binary files a/pkg/base/adpcm/jump-up.wav and /dev/null differ diff --git a/pkg/base/adpcm/ouch1.wav b/pkg/base/adpcm/ouch1.wav deleted file mode 100644 index 28816cf..0000000 Binary files a/pkg/base/adpcm/ouch1.wav and /dev/null differ diff --git a/pkg/base/adpcm/ouch2.wav b/pkg/base/adpcm/ouch2.wav deleted file mode 100644 index e9b30b5..0000000 Binary files a/pkg/base/adpcm/ouch2.wav and /dev/null differ diff --git a/pkg/base/adpcm/ouch3.wav b/pkg/base/adpcm/ouch3.wav deleted file mode 100644 index c6d02ab..0000000 Binary files a/pkg/base/adpcm/ouch3.wav and /dev/null differ diff --git a/pkg/base/adpcm/pin.wav b/pkg/base/adpcm/pin.wav deleted file mode 100644 index f379f87..0000000 Binary files a/pkg/base/adpcm/pin.wav and /dev/null differ diff --git a/pkg/base/adpcm/rifle-reload.wav b/pkg/base/adpcm/rifle-reload.wav deleted file mode 100644 index cfa59af..0000000 Binary files a/pkg/base/adpcm/rifle-reload.wav and /dev/null differ diff --git a/pkg/base/adpcm/rifle-shot.wav b/pkg/base/adpcm/rifle-shot.wav deleted file mode 100644 index af1571b..0000000 Binary files a/pkg/base/adpcm/rifle-shot.wav and /dev/null differ diff --git a/pkg/base/adpcm/smg-dead.wav b/pkg/base/adpcm/smg-dead.wav deleted file mode 100644 index 430078b..0000000 Binary files a/pkg/base/adpcm/smg-dead.wav and /dev/null differ diff --git a/pkg/base/adpcm/smg-reload.wav b/pkg/base/adpcm/smg-reload.wav deleted file mode 100644 index 5695ef1..0000000 Binary files a/pkg/base/adpcm/smg-reload.wav and /dev/null differ diff --git a/pkg/base/adpcm/smg-shot.wav b/pkg/base/adpcm/smg-shot.wav deleted file mode 100644 index 19440f7..0000000 Binary files a/pkg/base/adpcm/smg-shot.wav and /dev/null differ diff --git a/pkg/base/adpcm/splat1.wav b/pkg/base/adpcm/splat1.wav deleted file mode 100644 index 0d08457..0000000 Binary files a/pkg/base/adpcm/splat1.wav and /dev/null differ diff --git a/pkg/base/adpcm/step1.wav b/pkg/base/adpcm/step1.wav deleted file mode 100644 index daf1abf..0000000 Binary files a/pkg/base/adpcm/step1.wav and /dev/null differ diff --git a/pkg/base/adpcm/step2.wav b/pkg/base/adpcm/step2.wav deleted file mode 100644 index 14b239e..0000000 Binary files a/pkg/base/adpcm/step2.wav and /dev/null differ diff --git a/pkg/base/adpcm/step3.wav b/pkg/base/adpcm/step3.wav deleted file mode 100644 index 119b9c7..0000000 Binary files a/pkg/base/adpcm/step3.wav and /dev/null differ diff --git a/pkg/base/adpcm/step4.wav b/pkg/base/adpcm/step4.wav deleted file mode 100644 index 9d2dfa9..0000000 Binary files a/pkg/base/adpcm/step4.wav and /dev/null differ diff --git a/pkg/base/adpcm/step5.wav b/pkg/base/adpcm/step5.wav deleted file mode 100644 index e202fbb..0000000 Binary files a/pkg/base/adpcm/step5.wav and /dev/null differ diff --git a/pkg/base/adpcm/step6.wav b/pkg/base/adpcm/step6.wav deleted file mode 100644 index 99a4669..0000000 Binary files a/pkg/base/adpcm/step6.wav and /dev/null differ diff --git a/pkg/base/adpcm/step7.wav b/pkg/base/adpcm/step7.wav deleted file mode 100644 index 5249a7f..0000000 Binary files a/pkg/base/adpcm/step7.wav and /dev/null differ diff --git a/pkg/base/adpcm/step8.wav b/pkg/base/adpcm/step8.wav deleted file mode 100644 index 66bada0..0000000 Binary files a/pkg/base/adpcm/step8.wav and /dev/null differ diff --git a/pkg/base/adpcm/tracehit.wav b/pkg/base/adpcm/tracehit.wav deleted file mode 100644 index 35d5ec6..0000000 Binary files a/pkg/base/adpcm/tracehit.wav and /dev/null differ diff --git a/pkg/base/adpcm/whoosh.wav b/pkg/base/adpcm/whoosh.wav deleted file mode 100644 index 0e34478..0000000 Binary files a/pkg/base/adpcm/whoosh.wav and /dev/null differ diff --git a/pkg/base/preconf.lua b/pkg/base/preconf.lua index 01c40ed..b182c8b 100644 --- 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 diff --git a/pkg/base/wav/buld.wav b/pkg/base/wav/buld.wav index d6129cf..1073937 100644 Binary files a/pkg/base/wav/buld.wav and b/pkg/base/wav/buld.wav differ diff --git a/pkg/base/wav/grif.wav b/pkg/base/wav/grif.wav index 0b65281..4665dd3 100644 Binary files a/pkg/base/wav/grif.wav and b/pkg/base/wav/grif.wav differ diff --git a/pkg/base/wav/hammer.wav b/pkg/base/wav/hammer.wav index 06007ab..2cfeb95 100644 Binary files a/pkg/base/wav/hammer.wav and b/pkg/base/wav/hammer.wav differ diff --git a/pkg/base/wav/jump-down.wav b/pkg/base/wav/jump-down.wav index 97ff800..b41a997 100644 Binary files a/pkg/base/wav/jump-down.wav and b/pkg/base/wav/jump-down.wav differ diff --git a/pkg/base/wav/jump-up.wav b/pkg/base/wav/jump-up.wav index 418b1bd..1a6be89 100644 Binary files a/pkg/base/wav/jump-up.wav and b/pkg/base/wav/jump-up.wav differ diff --git a/pkg/base/wav/ouch1.wav b/pkg/base/wav/ouch1.wav index 9892b13..28816cf 100644 Binary files a/pkg/base/wav/ouch1.wav and b/pkg/base/wav/ouch1.wav differ diff --git a/pkg/base/wav/ouch2.wav b/pkg/base/wav/ouch2.wav index d78c2c5..e9b30b5 100644 Binary files a/pkg/base/wav/ouch2.wav and b/pkg/base/wav/ouch2.wav differ diff --git a/pkg/base/wav/ouch3.wav b/pkg/base/wav/ouch3.wav index ed15029..c6d02ab 100644 Binary files a/pkg/base/wav/ouch3.wav and b/pkg/base/wav/ouch3.wav differ diff --git a/pkg/base/wav/pin.wav b/pkg/base/wav/pin.wav index ff18813..f379f87 100644 Binary files a/pkg/base/wav/pin.wav and b/pkg/base/wav/pin.wav differ diff --git a/pkg/base/wav/rifle-reload.wav b/pkg/base/wav/rifle-reload.wav index 4ac0211..cfa59af 100644 Binary files a/pkg/base/wav/rifle-reload.wav and b/pkg/base/wav/rifle-reload.wav differ diff --git a/pkg/base/wav/rifle-shot.wav b/pkg/base/wav/rifle-shot.wav index 78cfcef..af1571b 100644 Binary files a/pkg/base/wav/rifle-shot.wav and b/pkg/base/wav/rifle-shot.wav differ diff --git a/pkg/base/wav/splat1.wav b/pkg/base/wav/splat1.wav index 0c684d1..0d08457 100644 Binary files a/pkg/base/wav/splat1.wav and b/pkg/base/wav/splat1.wav differ diff --git a/pkg/base/wav/step1.wav b/pkg/base/wav/step1.wav index 6f83984..daf1abf 100644 Binary files a/pkg/base/wav/step1.wav and b/pkg/base/wav/step1.wav differ diff --git a/pkg/base/wav/step2.wav b/pkg/base/wav/step2.wav index 215256a..14b239e 100644 Binary files a/pkg/base/wav/step2.wav and b/pkg/base/wav/step2.wav differ diff --git a/pkg/base/wav/step3.wav b/pkg/base/wav/step3.wav index 7e851fb..119b9c7 100644 Binary files a/pkg/base/wav/step3.wav and b/pkg/base/wav/step3.wav differ diff --git a/pkg/base/wav/step4.wav b/pkg/base/wav/step4.wav index 6ac3cee..9d2dfa9 100644 Binary files a/pkg/base/wav/step4.wav and b/pkg/base/wav/step4.wav differ diff --git a/pkg/base/wav/tracehit.wav b/pkg/base/wav/tracehit.wav index 2beba68..35d5ec6 100644 Binary files a/pkg/base/wav/tracehit.wav and b/pkg/base/wav/tracehit.wav differ diff --git a/pkg/base/wav/whoosh.wav b/pkg/base/wav/whoosh.wav index 5a505b1..0e34478 100644 Binary files a/pkg/base/wav/whoosh.wav and b/pkg/base/wav/whoosh.wav differ