Cleanup

src/config.h

@@ -44,22 +44,22 @@
 #endif
 
 #if !defined(CROWN_SOUND_OPENAL) \
-	&& !defined(CROWN_SOUND_NULL)
+	&& !defined(SOUND_WORLD_NOOP)
 
 	#ifndef CROWN_SOUND_OPENAL
 		#define CROWN_SOUND_OPENAL 1
 	#endif // CROWN_SOUND_OPENAL
 
-	#ifndef CROWN_SOUND_NULL
-		#define CROWN_SOUND_NULL 0
-	#endif // CROWN_SOUND_NULL
+	#ifndef SOUND_WORLD_NOOP
+		#define SOUND_WORLD_NOOP 0
+	#endif // SOUND_WORLD_NOOP
 #else
 	#ifndef CROWN_SOUND_OPENAL
 		#define CROWN_SOUND_OPENAL 0
 	#endif
 
-	#ifndef CROWN_SOUND_NULL
-		#define CROWN_SOUND_NULL 0
+	#ifndef SOUND_WORLD_NOOP
+		#define SOUND_WORLD_NOOP 0
 	#endif
 #endif
 

src/world/sound_world_null.cpp → src/world/sound_world_noop.cpp

@@ -5,7 +5,7 @@
 
 #include "config.h"
 
-#if CROWN_SOUND_NULL
+#if SOUND_WORLD_NOOP
 
 #include "sound_world.h"
 #include "audio.h"
@@ -24,15 +24,15 @@ namespace audio_globals
 	}
 }
 
-class NullSoundWorld : public SoundWorld
+class SoundWorldNoop : public SoundWorld
 {
 public:
 
-	NullSoundWorld()
+	SoundWorldNoop()
 	{
 	}
 
-	virtual ~NullSoundWorld()
+	virtual ~SoundWorldNoop()
 	{
 	}
 
@@ -87,16 +87,18 @@ public:
 	}
 };
 
-SoundWorld* SoundWorld::create(Allocator& a)
+namespace sound_world
 {
-	return CE_NEW(a, NullSoundWorld)();
-}
-
-void SoundWorld::destroy(Allocator& a, SoundWorld* sw)
-{
-	CE_DELETE(a, sw);
-}
+	SoundWorld* create(Allocator& a)
+	{
+		return CE_NEW(a, SoundWorldNoop)();
+	}
 
+	void destroy(Allocator& a, SoundWorld* sw)
+	{
+		CE_DELETE(a, sw);
+	}
+} // namespace sound_world
 } // namespace crown
 
-#endif // CROWN_SOUND_NULL
+#endif // SOUND_WORLD_NOOP