zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-14 00:20:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- bumped ZScript version to 4.3 and silenced the remaining deprecation warnings.

Browse source
This commit is contained in:
Christoph Oelckers 2020-01-04 14:25:07 +01:00
parent 4a67bfcddb
commit c0b9bb6e76
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wadsrc/static/zscript.txt
View file

@ -1,4 +1,4 @@
version "4.2" version "4.3"
#include "zscript/base.zs" #include "zscript/base.zs"
#include "zscript/sounddata.zs" #include "zscript/sounddata.zs"
#include "zscript/mapdata.zs" #include "zscript/mapdata.zs"

2
wadsrc/static/zscript/actors/strife/strifestuff.zs
View file

@ -1863,7 +1863,7 @@ class PowerCoupling : Actor
Door_Close(225, 16); Door_Close(225, 16);
Floor_LowerToHighestEE(44, 8); Floor_LowerToHighestEE(44, 8);
players[i].mo.GiveInventoryType ("QuestItem6"); players[i].mo.GiveInventoryType ("QuestItem6");
S_Sound ("svox/voc13", CHAN_VOICE); S_StartSound ("svox/voc13", CHAN_VOICE);
players[i].SetLogNumber (13); players[i].SetLogNumber (13);
players[i].SetSubtitleNumber (13, "svox/voc13"); players[i].SetSubtitleNumber (13, "svox/voc13");
A_DropItem ("BrokenPowerCoupling", -1, 256); A_DropItem ("BrokenPowerCoupling", -1, 256);

2
wadsrc/static/zscript/base.zs
View file

@ -445,7 +445,7 @@ class Object native
return level.PickPlayerStart(pnum, flags); 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); 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_PauseSound (bool notmusic, bool notsfx);
native static void S_ResumeSound (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); native static bool S_ChangeMusic(String music_name, int order = 0, bool looping = true, bool force = false);

2
wadsrc/static/zscript/ui/menu/menu.zs
View file

@ -284,7 +284,7 @@ class Menu : Object native ui version("2.4")
static void MenuSound(Sound snd) 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) deprecated("4.0") static void DrawConText (int color, int x, int y, String str)

2
wadsrc/static/zscript/ui/statscreen/statscreen.zs
View file

@ -715,7 +715,7 @@ class StatusScreen abstract play version("2.5")
static void PlaySound(Sound snd) 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);
} }