libcommon: Updated DMU lib terminology wrt changes to the DMU API

skyjake · Apr 30, 2013 · 90adb6a · 90adb6a
1 parent 2f4b630
commit 90adb6a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/doomsday/plugins/common/include/dmu_lib.h b/doomsday/plugins/common/include/dmu_lib.h
@@ -54,7 +54,7 @@
 #define DMU_TOP_COLOR_RED       (DMU_TOP_OF_SIDE | DMU_COLOR_RED)
 #define DMU_TOP_COLOR_GREEN     (DMU_TOP_OF_SIDE | DMU_COLOR_GREEN)
 #define DMU_TOP_COLOR_BLUE      (DMU_TOP_OF_SIDE | DMU_COLOR_BLUE)
-#define DMU_TOP_BASE            (DMU_TOP_OF_SIDE | DMU_EMITTER)
+#define DMU_TOP_EMITTER         (DMU_TOP_OF_SIDE | DMU_EMITTER)
 
 #define DMU_MIDDLE_MATERIAL     (DMU_MIDDLE_OF_SIDE | DMU_MATERIAL)
 #define DMU_MIDDLE_MATERIAL_OFFSET_X (DMU_MIDDLE_OF_SIDE | DMU_OFFSET_X)
@@ -67,7 +67,7 @@
 #define DMU_MIDDLE_COLOR_BLUE   (DMU_MIDDLE_OF_SIDE | DMU_COLOR_BLUE)
 #define DMU_MIDDLE_ALPHA        (DMU_MIDDLE_OF_SIDE | DMU_ALPHA)
 #define DMU_MIDDLE_BLENDMODE    (DMU_MIDDLE_OF_SIDE | DMU_BLENDMODE)
-#define DMU_MIDDLE_BASE         (DMU_MIDDLE_OF_SIDE | DMU_EMITTER)
+#define DMU_MIDDLE_EMITTER      (DMU_MIDDLE_OF_SIDE | DMU_EMITTER)
 
 #define DMU_BOTTOM_MATERIAL     (DMU_BOTTOM_OF_SIDE | DMU_MATERIAL)
 #define DMU_BOTTOM_MATERIAL_OFFSET_X (DMU_BOTTOM_OF_SIDE | DMU_OFFSET_X)
@@ -78,13 +78,13 @@
 #define DMU_BOTTOM_COLOR_RED    (DMU_BOTTOM_OF_SIDE | DMU_COLOR_RED)
 #define DMU_BOTTOM_COLOR_GREEN  (DMU_BOTTOM_OF_SIDE | DMU_COLOR_GREEN)
 #define DMU_BOTTOM_COLOR_BLUE   (DMU_BOTTOM_OF_SIDE | DMU_COLOR_BLUE)
-#define DMU_BOTTOM_BASE         (DMU_BOTTOM_OF_SIDE | DMU_EMITTER)
+#define DMU_BOTTOM_EMITTER      (DMU_BOTTOM_OF_SIDE | DMU_EMITTER)
 
 #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_BASE          (DMU_FLOOR_OF_SECTOR | DMU_EMITTER)
+#define DMU_FLOOR_EMITTER       (DMU_FLOOR_OF_SECTOR | DMU_EMITTER)
 #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)
@@ -110,7 +110,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_BASE        (DMU_CEILING_OF_SECTOR | DMU_EMITTER)
+#define DMU_CEILING_EMITTER     (DMU_CEILING_OF_SECTOR | DMU_EMITTER)
 #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
@@ -304,7 +304,7 @@ void T_Door(void *doorThinkerPtr)
 #endif
                 Thinker_Remove(&door->thinker); // Unlink and free.
 #if __JHERETIC__
-                S_StopSound(0, (mobj_t*) P_GetPtrp(door->sector, DMU_CEILING_BASE));
+                S_StopSound(0, (mobj_t*) P_GetPtrp(door->sector, DMU_CEILING_EMITTER));
 #endif
                 break;