From: bones_was_here <bones_was_here@xonotic.au>
Date: Mon, 29 May 2023 17:15:42 +0000 (+1000)
Subject: func_ladder: restore the model string unset in WarpZoneLib_ExactTrigger_Init()
X-Git-Tag: xonotic-v0.8.6~45^2
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=0f843f8c9e7891ba3029ac5a18c6ebebde3a30da;p=xonotic%2Fxonotic-data.pk3dir.git

func_ladder: restore the model string unset in WarpZoneLib_ExactTrigger_Init()

This was previously done by trigger_init() and
should have been included in 2b46f62db61e8ca869fc591d9ebe4053c3e876d7

The only other entities using trigger_init() were trigger_impulse and
trigger_push, but those use touch funcs whereas func_ladder uses a think
func to search.
---

diff --git a/qcsrc/common/mapobjects/func/ladder.qc b/qcsrc/common/mapobjects/func/ladder.qc
index 0d4e253f0..09a2eb881 100644
--- a/qcsrc/common/mapobjects/func/ladder.qc
+++ b/qcsrc/common/mapobjects/func/ladder.qc
@@ -64,7 +64,11 @@ void func_ladder_link(entity this)
 
 void func_ladder_init(entity this)
 {
+	string m = this.model;
 	EXACTTRIGGER_INIT;
+	// restore the model string unset in WarpZoneLib_ExactTrigger_Init()
+	// see: https://gitlab.com/xonotic/xonotic-data.pk3dir/-/issues/2838
+	this.model = m;
 	BITSET_ASSIGN(this.effects, EF_NODEPTHTEST);
 	func_ladder_link(this);
 	setthink(this, func_ladder_think);