[since 4.4.0] Global constant has priority over local scope

[m8f]

Steps to reproduce:

1. Load global-shadow.pk3.

   global-shadow.pk3

   (306 Bytes) Downloaded 23 times

2. Start a new game.
3. summon global_shadow.

Expected result: console prints "Teleport 1" (this the result is for GZDoom ... - 4.3.3).
Actual result: console prints "Teleport 70" (this is the result for GZDoom 4.4.0 - 4.4.2).

global-shadow.pk3 contents:

Code: Select all

// zscript.zs
version "3.0"

class global_shadow : DoomImp
{
  enum E
  {
    teleport = 1
  }

  override
  void BeginPlay()
  {
    Console.Printf("Teleport: %d", teleport);
  }
}

Teleport is a global constant defined in playsim/actionspecials.h. Before 4.4.0, the value from enum has priority over that global constant. Starting from 4.4.0, global constant has priority.

Workaround: use only fully qualified enum values, like global_shadow.teleport in this case.

This behavior change caused a bug in at least one mod.

[Graf Zahl]

I wonder when this happened. I cannot remember having changed anything in that part of the engine myself.

[_mental_]

Order of lookup inside FxIdentifier::Resolve() changed in this commit. Test for line special now happens earlier than before.

[Graf Zahl]

fixed