]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
func_ladder: restore the model string unset in WarpZoneLib_ExactTrigger_Init()
authorbones_was_here <bones_was_here@xonotic.au>
Mon, 29 May 2023 17:15:42 +0000 (03:15 +1000)
committerbones_was_here <bones_was_here@xonotic.au>
Mon, 29 May 2023 17:15:42 +0000 (03:15 +1000)
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.

qcsrc/common/mapobjects/func/ladder.qc

index 0d4e253f091ce3cb83788bb39cf95b78171dd45d..09a2eb88145b32a7bc1e9ac93dacc92fb29f900d 100644 (file)
@@ -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);