From 431049106c5fe1e49f0c6c122642e93571198d26 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Fri, 19 Mar 2021 18:43:47 +0100 Subject: [PATCH] Fix voodoo dolls being always visible in the minimap. --- language.def_menu | 2 +- language.es_menu | 2 +- language.version | 4 ++-- zscript/handler/swwm_handler_worldtick.zsc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/language.def_menu b/language.def_menu index c4c722261..a34214b44 100644 --- a/language.def_menu +++ b/language.def_menu @@ -381,7 +381,7 @@ SWWM_MISSTAB = "Mission"; SWWM_STATTAB = "Stats"; SWWM_STATTAB0 = "General"; SWWM_STATTAB1 = "Kills"; -SWWM_STATTAB2 = "Mission"; +SWWM_STATTAB2 = "Levels"; SWWM_STATTAB3 = "Achievements"; SWWM_NOSTAT = "(no stats available)"; SWWM_STATUPTIME = "Uptime: "; diff --git a/language.es_menu b/language.es_menu index ebd2cb3a3..596f84b02 100644 --- a/language.es_menu +++ b/language.es_menu @@ -378,7 +378,7 @@ SWWM_MISSTAB = "Misión"; SWWM_STATTAB = "Estadísticas"; SWWM_STATTAB0 = "General"; SWWM_STATTAB1 = "Bajas Enemigas"; -SWWM_STATTAB2 = "Misión"; +SWWM_STATTAB2 = "Niveles"; SWWM_STATTAB3 = "Logros"; SWWM_NOSTAT = "(estadísticas no disponibles)"; SWWM_STATUPTIME = "Tiempo Activo: "; diff --git a/language.version b/language.version index a8b3cf8c7..b3a259a40 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r372 \cu(Fri 19 Mar 17:14:33 CET 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r372 \cu(2021-03-19 17:14:33)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r373 \cu(Fri 19 Mar 18:43:47 CET 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r373 \cu(2021-03-19 18:43:48)\c-"; diff --git a/zscript/handler/swwm_handler_worldtick.zsc b/zscript/handler/swwm_handler_worldtick.zsc index 77aeb0efe..cc925ebda 100644 --- a/zscript/handler/swwm_handler_worldtick.zsc +++ b/zscript/handler/swwm_handler_worldtick.zsc @@ -226,7 +226,7 @@ extend Class SWWMHandler continue; if ( !a.player && !a.bSOLID && !a.bSHOOTABLE && !a.bISMONSTER && !a.bFRIENDLY && !(a is 'Inventory') && !(a is 'Chancebox') ) continue; - if ( !thesight && !a.IsFriend(players[consoleplayer].mo) && !players[consoleplayer].Camera.CheckSight(a,SF_IGNOREVISIBILITY|SF_IGNOREWATERBOUNDARY) ) + if ( !thesight && !(a.IsFriend(players[consoleplayer].mo) && !(a.player && (a.player.mo != a))) && !players[consoleplayer].Camera.CheckSight(a,SF_IGNOREVISIBILITY|SF_IGNOREWATERBOUNDARY) ) continue; if ( a.bKILLED || (a.Health <= 0) ) continue;