From c0b9bb6e760bd88158373c52b36b6d96472bb493 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 4 Jan 2020 14:25:07 +0100 Subject: [PATCH] - bumped ZScript version to 4.3 and silenced the remaining deprecation warnings. --- wadsrc/static/zscript.txt | 2 +- wadsrc/static/zscript/actors/strife/strifestuff.zs | 2 +- wadsrc/static/zscript/base.zs | 2 +- wadsrc/static/zscript/ui/menu/menu.zs | 2 +- wadsrc/static/zscript/ui/statscreen/statscreen.zs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wadsrc/static/zscript.txt b/wadsrc/static/zscript.txt index 00ac93fec..cfd2ff166 100644 --- a/wadsrc/static/zscript.txt +++ b/wadsrc/static/zscript.txt @@ -1,4 +1,4 @@ -version "4.2" +version "4.3" #include "zscript/base.zs" #include "zscript/sounddata.zs" #include "zscript/mapdata.zs" diff --git a/wadsrc/static/zscript/actors/strife/strifestuff.zs b/wadsrc/static/zscript/actors/strife/strifestuff.zs index e760bdbc1..1be3fbc53 100644 --- a/wadsrc/static/zscript/actors/strife/strifestuff.zs +++ b/wadsrc/static/zscript/actors/strife/strifestuff.zs @@ -1863,7 +1863,7 @@ class PowerCoupling : Actor Door_Close(225, 16); Floor_LowerToHighestEE(44, 8); players[i].mo.GiveInventoryType ("QuestItem6"); - S_Sound ("svox/voc13", CHAN_VOICE); + S_StartSound ("svox/voc13", CHAN_VOICE); players[i].SetLogNumber (13); players[i].SetSubtitleNumber (13, "svox/voc13"); A_DropItem ("BrokenPowerCoupling", -1, 256); diff --git a/wadsrc/static/zscript/base.zs b/wadsrc/static/zscript/base.zs index ee233dc1d..cfe5ad9dd 100644 --- a/wadsrc/static/zscript/base.zs +++ b/wadsrc/static/zscript/base.zs @@ -445,7 +445,7 @@ class Object native return level.PickPlayerStart(pnum, flags); } deprecated("4.3") native static void S_Sound (Sound sound_id, int channel, float volume = 1, float attenuation = ATTN_NORM, float pitch = 0.0); - native static void S_StartSound (Sound sound_id, int flags, int channel, float volume = 1, float attenuation = ATTN_NORM, float pitch = 0.0); + native static void S_StartSound (Sound sound_id, int channel, int flags = 0, float volume = 1, float attenuation = ATTN_NORM, float pitch = 0.0); native static void S_PauseSound (bool notmusic, bool notsfx); native static void S_ResumeSound (bool notsfx); native static bool S_ChangeMusic(String music_name, int order = 0, bool looping = true, bool force = false); diff --git a/wadsrc/static/zscript/ui/menu/menu.zs b/wadsrc/static/zscript/ui/menu/menu.zs index 72b51753b..ec9d5e43c 100644 --- a/wadsrc/static/zscript/ui/menu/menu.zs +++ b/wadsrc/static/zscript/ui/menu/menu.zs @@ -284,7 +284,7 @@ class Menu : Object native ui version("2.4") static void MenuSound(Sound snd) { - S_Sound (snd, CHAN_VOICE | CHAN_UI, snd_menuvolume, ATTN_NONE); + S_StartSound (snd, CHAN_VOICE, CHANF_MAYBE_LOCAL, snd_menuvolume, ATTN_NONE); } deprecated("4.0") static void DrawConText (int color, int x, int y, String str) diff --git a/wadsrc/static/zscript/ui/statscreen/statscreen.zs b/wadsrc/static/zscript/ui/statscreen/statscreen.zs index 31b69e19a..8b28b3d4c 100644 --- a/wadsrc/static/zscript/ui/statscreen/statscreen.zs +++ b/wadsrc/static/zscript/ui/statscreen/statscreen.zs @@ -715,7 +715,7 @@ class StatusScreen abstract play version("2.5") static void PlaySound(Sound snd) { - S_Sound(snd, CHAN_VOICE | CHAN_UI, 1, ATTN_NONE); + S_StartSound(snd, CHAN_VOICE, CHANF_MAYBE_LOCAL, 1, ATTN_NONE); }