libcommon: Added dmu_lib macro aliases for SideDef surface sound origins

Also renamed the existing aliases in line with current conventions.
skyjake · Apr 22, 2012 · 2e2b3dc · 2e2b3dc
1 parent b4c8a74
commit 2e2b3dc
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/doomsday/plugins/common/include/dmu_lib.h b/doomsday/plugins/common/include/dmu_lib.h
@@ -42,6 +42,7 @@
 #define DMU_TOP_COLOR_RED       (DMU_TOP_OF_SIDEDEF | DMU_COLOR_RED)
 #define DMU_TOP_COLOR_GREEN     (DMU_TOP_OF_SIDEDEF | DMU_COLOR_GREEN)
 #define DMU_TOP_COLOR_BLUE      (DMU_TOP_OF_SIDEDEF | DMU_COLOR_BLUE)
+#define DMU_TOP_BASE            (DMU_TOP_OF_SIDEDEF | DMU_BASE)
 
 #define DMU_MIDDLE_MATERIAL     (DMU_MIDDLE_OF_SIDEDEF | DMU_MATERIAL)
 #define DMU_MIDDLE_MATERIAL_OFFSET_X (DMU_MIDDLE_OF_SIDEDEF | DMU_OFFSET_X)
@@ -54,6 +55,7 @@
 #define DMU_MIDDLE_COLOR_BLUE   (DMU_MIDDLE_OF_SIDEDEF | DMU_COLOR_BLUE)
 #define DMU_MIDDLE_ALPHA        (DMU_MIDDLE_OF_SIDEDEF | DMU_ALPHA)
 #define DMU_MIDDLE_BLENDMODE    (DMU_MIDDLE_OF_SIDEDEF | DMU_BLENDMODE)
+#define DMU_MIDDLE_BASE         (DMU_MIDDLE_OF_SIDEDEF | DMU_BASE)
 
 #define DMU_BOTTOM_MATERIAL     (DMU_BOTTOM_OF_SIDEDEF | DMU_MATERIAL)
 #define DMU_BOTTOM_MATERIAL_OFFSET_X (DMU_BOTTOM_OF_SIDEDEF | DMU_OFFSET_X)
@@ -64,12 +66,13 @@
 #define DMU_BOTTOM_COLOR_RED    (DMU_BOTTOM_OF_SIDEDEF | DMU_COLOR_RED)
 #define DMU_BOTTOM_COLOR_GREEN  (DMU_BOTTOM_OF_SIDEDEF | DMU_COLOR_GREEN)
 #define DMU_BOTTOM_COLOR_BLUE   (DMU_BOTTOM_OF_SIDEDEF | DMU_COLOR_BLUE)
+#define DMU_BOTTOM_BASE         (DMU_BOTTOM_OF_SIDEDEF | DMU_BASE)
 
 #define DMU_FLOOR_HEIGHT        (DMU_FLOOR_OF_SECTOR | DMU_HEIGHT)
 #define DMU_FLOOR_TARGET_HEIGHT (DMU_FLOOR_OF_SECTOR | DMU_TARGET_HEIGHT)
 #define DMU_FLOOR_SPEED         (DMU_FLOOR_OF_SECTOR | DMU_SPEED)
 #define DMU_FLOOR_MATERIAL      (DMU_FLOOR_OF_SECTOR | DMU_MATERIAL)
-#define DMU_FLOOR_ORIGIN        (DMU_FLOOR_OF_SECTOR | DMU_BASE)
+#define DMU_FLOOR_BASE          (DMU_FLOOR_OF_SECTOR | DMU_BASE)
 #define DMU_FLOOR_FLAGS         (DMU_FLOOR_OF_SECTOR | DMU_FLAGS)
 #define DMU_FLOOR_COLOR         (DMU_FLOOR_OF_SECTOR | DMU_COLOR)
 #define DMU_FLOOR_COLOR_RED     (DMU_FLOOR_OF_SECTOR | DMU_COLOR_RED)
@@ -95,7 +98,7 @@
 #define DMU_CEILING_TARGET_HEIGHT (DMU_CEILING_OF_SECTOR | DMU_TARGET_HEIGHT)
 #define DMU_CEILING_SPEED       (DMU_CEILING_OF_SECTOR | DMU_SPEED)
 #define DMU_CEILING_MATERIAL    (DMU_CEILING_OF_SECTOR | DMU_MATERIAL)
-#define DMU_CEILING_ORIGIN      (DMU_CEILING_OF_SECTOR | DMU_BASE)
+#define DMU_CEILING_BASE        (DMU_CEILING_OF_SECTOR | DMU_BASE)
 #define DMU_CEILING_FLAGS       (DMU_CEILING_OF_SECTOR | DMU_FLAGS)
 #define DMU_CEILING_COLOR       (DMU_CEILING_OF_SECTOR | DMU_COLOR)
 #define DMU_CEILING_COLOR_RED   (DMU_CEILING_OF_SECTOR | DMU_COLOR_RED)

diff --git a/doomsday/plugins/common/src/p_door.c b/doomsday/plugins/common/src/p_door.c
@@ -298,7 +298,7 @@ void T_Door(door_t* door)
 #endif
                 DD_ThinkerRemove(&door->thinker); // Unlink and free.
 #if __JHERETIC__
-                S_StopSound(0, (mobj_t*) P_GetPtrp(door->sector, DMU_CEILING_ORIGIN));
+                S_StopSound(0, (mobj_t*) P_GetPtrp(door->sector, DMU_CEILING_BASE));
 #endif
                 break;
 

diff --git a/doomsday/plugins/jdoom/src/p_sound.c b/doomsday/plugins/jdoom/src/p_sound.c
@@ -84,8 +84,8 @@ void S_SectorSound(Sector* sec, sectorsoundorigin_t origin, int id)
     mobj_t* centerOrigin, *floorOrigin, *ceilingOrigin;
 
     centerOrigin  = (mobj_t*) P_GetPtrp(sec, DMU_BASE);
-    floorOrigin   = (mobj_t*) P_GetPtrp(sec, DMU_FLOOR_ORIGIN);
-    ceilingOrigin = (mobj_t*) P_GetPtrp(sec, DMU_CEILING_ORIGIN);
+    floorOrigin   = (mobj_t*) P_GetPtrp(sec, DMU_FLOOR_BASE);
+    ceilingOrigin = (mobj_t*) P_GetPtrp(sec, DMU_CEILING_BASE);
 
     S_StopSound(0, centerOrigin);
     S_StopSound(0, floorOrigin);

diff --git a/doomsday/plugins/jdoom64/src/p_sound.c b/doomsday/plugins/jdoom64/src/p_sound.c
@@ -80,8 +80,8 @@ void S_SectorSound(Sector* sec, int origin, int id)
     mobj_t* centerOrigin, *floorOrigin, *ceilingOrigin;
 
     centerOrigin  = (mobj_t*) P_GetPtrp(sec, DMU_BASE);
-    floorOrigin   = (mobj_t*) P_GetPtrp(sec, DMU_FLOOR_ORIGIN);
-    ceilingOrigin = (mobj_t*) P_GetPtrp(sec, DMU_CEILING_ORIGIN);
+    floorOrigin   = (mobj_t*) P_GetPtrp(sec, DMU_FLOOR_BASE);
+    ceilingOrigin = (mobj_t*) P_GetPtrp(sec, DMU_CEILING_BASE);
 
     S_StopSound(0, centerOrigin);
     S_StopSound(0, floorOrigin);

diff --git a/doomsday/plugins/jheretic/src/p_sound.c b/doomsday/plugins/jheretic/src/p_sound.c
@@ -83,8 +83,8 @@ void S_SectorSound(Sector *sec, int origin, int id)
     mobj_t* centerorigin, *floororigin, *ceilingorigin;
 
     centerorigin  = (mobj_t*) P_GetPtrp(sec, DMU_BASE);
-    floororigin   = (mobj_t*) P_GetPtrp(sec, DMU_FLOOR_ORIGIN);
-    ceilingorigin = (mobj_t*) P_GetPtrp(sec, DMU_CEILING_ORIGIN);
+    floororigin   = (mobj_t*) P_GetPtrp(sec, DMU_FLOOR_BASE);
+    ceilingorigin = (mobj_t*) P_GetPtrp(sec, DMU_CEILING_BASE);
 
     S_StopSound(0, centerorigin);
     S_StopSound(0, floororigin);