From 35f8aab6bfe4ed9b93509edbd9c2ba86cbe5f662 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Thu, 30 Jun 2022 21:45:59 +0200
Subject: [PATCH] - fixed names for A_PlaySoundEx

These need to be contiguous because the implementation depends on it.
---
 src/common/engine/namedef.h | 9 +++++++++
 src/namedef_custom.h        | 9 ---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/common/engine/namedef.h b/src/common/engine/namedef.h
index 7f9024538..af8e2bca0 100644
--- a/src/common/engine/namedef.h
+++ b/src/common/engine/namedef.h
@@ -75,8 +75,17 @@ xx(ACS_NamedExecuteWithResult)
 xx(__decorate_internal_int__)
 xx(__decorate_internal_bool__)
 xx(__decorate_internal_float__)
+
+// Per-actor sound channels (for deprecated PlaySoundEx function) Do not separate this block!!!
+xx(Auto)
 xx(Weapon)
+xx(Voice)
 xx(Item)
+xx(Body)
+xx(SoundSlot5)
+xx(SoundSlot6)
+xx(SoundSlot7)
+
 xx(LevelLocals)
 xx(Level)
 
diff --git a/src/namedef_custom.h b/src/namedef_custom.h
index b24bf4a5f..65bb6119f 100644
--- a/src/namedef_custom.h
+++ b/src/namedef_custom.h
@@ -30,15 +30,6 @@ xx(AddStencil)
 xx(Mana)
 xx(Armor)
 
-// Per-actor sound channels (for deprecated PlaySoundEx function)
-xx(Auto)
-xx(Voice)
-xx(Body)
-xx(SoundSlot5)
-xx(SoundSlot6)
-xx(SoundSlot7)
-
-
 // Hexen sound sequence names
 xx(Platform)
 xx(PlatformMetal)