From ffcce790de3b93a37fa603072586ecdb804db94e Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Mon, 14 Oct 2024 17:30:59 -0400 Subject: [PATCH] - Actor.GetSpecies() is a non-destructive function --- src/rendering/hwrenderer/hw_entrypoint.cpp | 2 +- wadsrc/static/zscript/actors/actor.zs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rendering/hwrenderer/hw_entrypoint.cpp b/src/rendering/hwrenderer/hw_entrypoint.cpp index bfa0d8b1c..e55c041a6 100644 --- a/src/rendering/hwrenderer/hw_entrypoint.cpp +++ b/src/rendering/hwrenderer/hw_entrypoint.cpp @@ -362,7 +362,7 @@ sector_t* RenderView(player_t* player) // Draw all canvases that changed for (FCanvas* canvas : AllCanvases) { - if (canvas->Tex->CheckNeedsUpdate()) + if (canvas->Tex && canvas->Tex->CheckNeedsUpdate()) { screen->RenderTextureView(canvas->Tex, [=](IntRect& bounds) { diff --git a/wadsrc/static/zscript/actors/actor.zs b/wadsrc/static/zscript/actors/actor.zs index 5c4dc376e..93a9b7da6 100644 --- a/wadsrc/static/zscript/actors/actor.zs +++ b/wadsrc/static/zscript/actors/actor.zs @@ -853,7 +853,7 @@ class Actor : Thinker native native bool LookForPlayers(bool allaround, LookExParams params = null); native bool TeleportMove(Vector3 pos, bool telefrag, bool modifyactor = true); native clearscope double DistanceBySpeed(Actor other, double speed) const; - native name GetSpecies(); + native clearscope name GetSpecies(); native void PlayActiveSound(); native void Howl(); native void DrawSplash (int count, double angle, int kind);