From 678b1c9fd26cc961497c0cf7aa6d0dfc7c1de9f4 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Thu, 17 Feb 2022 10:32:26 +0100 Subject: [PATCH] Fix sprite conflict with Pandemonia. --- language.version | 4 ++-- sprites/{SGIBA0.png => MEATA0.png} | Bin sprites/{SGIBB0.png => MEATB0.png} | Bin sprites/{SGIBC0.png => MEATC0.png} | Bin sprites/{SGIBD0.png => MEATD0.png} | Bin sprites/{SGIBE0.png => MEATE0.png} | Bin sprites/{SGIBF0.png => MEATF0.png} | Bin zscript/swwm_blod.zsc | 8 ++++---- 8 files changed, 6 insertions(+), 6 deletions(-) rename sprites/{SGIBA0.png => MEATA0.png} (100%) rename sprites/{SGIBB0.png => MEATB0.png} (100%) rename sprites/{SGIBC0.png => MEATC0.png} (100%) rename sprites/{SGIBD0.png => MEATD0.png} (100%) rename sprites/{SGIBE0.png => MEATE0.png} (100%) rename sprites/{SGIBF0.png => MEATF0.png} (100%) diff --git a/language.version b/language.version index e062f92cf..46c9f31b7 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.2pre r163 \cu(Thu 17 Feb 10:07:43 CET 2022)\c-"; -SWWM_SHORTVER="\cw1.2pre r163 \cu(2022-02-17 10:07:43)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.2pre r164 \cu(Thu 17 Feb 10:32:26 CET 2022)\c-"; +SWWM_SHORTVER="\cw1.2pre r164 \cu(2022-02-17 10:32:26)\c-"; diff --git a/sprites/SGIBA0.png b/sprites/MEATA0.png similarity index 100% rename from sprites/SGIBA0.png rename to sprites/MEATA0.png diff --git a/sprites/SGIBB0.png b/sprites/MEATB0.png similarity index 100% rename from sprites/SGIBB0.png rename to sprites/MEATB0.png diff --git a/sprites/SGIBC0.png b/sprites/MEATC0.png similarity index 100% rename from sprites/SGIBC0.png rename to sprites/MEATC0.png diff --git a/sprites/SGIBD0.png b/sprites/MEATD0.png similarity index 100% rename from sprites/SGIBD0.png rename to sprites/MEATD0.png diff --git a/sprites/SGIBE0.png b/sprites/MEATE0.png similarity index 100% rename from sprites/SGIBE0.png rename to sprites/MEATE0.png diff --git a/sprites/SGIBF0.png b/sprites/MEATF0.png similarity index 100% rename from sprites/SGIBF0.png rename to sprites/MEATF0.png diff --git a/zscript/swwm_blod.zsc b/zscript/swwm_blod.zsc index bdbd5871b..f26b80b02 100644 --- a/zscript/swwm_blod.zsc +++ b/zscript/swwm_blod.zsc @@ -585,10 +585,10 @@ Class mkFlyingGib : Actor States { Spawn: - SGIB # 1; + MEAT # 1; Wait; Bounce: - SGIB # 0 + MEAT # 0 { A_Bleed(); A_StartSound("misc/gibhit",CHAN_BODY,CHANF_OVERLAP); @@ -598,10 +598,10 @@ Class mkFlyingGib : Actor } Goto Spawn; Death: - SGIB # 1 A_JumpIf(pos.z<=floorz,"Death2"); + MEAT # 1 A_JumpIf(pos.z<=floorz,"Death2"); Wait; Death2: - SGIB # -1 + MEAT # -1 { A_StartSound("misc/gibhit",CHAN_BODY,CHANF_OVERLAP); pitch = Random[Gibs](-5,5);