Remove various unused macros

src/Cocoa/OOErrorDescription.m

@@ -18,7 +18,9 @@ This file is hereby placed in the public domain.
 #import <Carbon/Carbon.h>
 
 
+#ifndef NDEBUG
 #define CASE(foo) case foo: return @#foo
+#endif
 
 
 #ifndef NDEBUG

src/Cocoa/OOMacSystemStandardFullScreenController.m

@@ -39,11 +39,6 @@ MA 02110-1301, USA.
 #endif
 
 
-#define kFullScreenPresentationMode	  ( NSApplicationPresentationFullScreen | \
-										NSApplicationPresentationAutoHideDock | \
-										NSApplicationPresentationAutoHideMenuBar )
-
-
 @implementation OOMacSystemStandardFullScreenController
 
 + (BOOL) shouldUseSystemStandardFullScreenController

src/Cocoa/VirtualRingBuffer.m

@@ -22,7 +22,9 @@
 #include <mach/mach_error.h>
 
 
+#if DEBUG
 #define kOOLogUnconvertedNSLog @"unclassified.VirtualRingBuffer"
+#endif
 
 
 @implementation VirtualRingBuffer

src/Core/AI.m

@@ -31,8 +31,6 @@ MA 02110-1301, USA.
 
 #import "ShipEntity.h"
 
-#define kOOLogUnconvertedNSLog @"unclassified.AI"
-
 
 enum
 {

src/Core/Entities/Entity.m

@@ -39,8 +39,6 @@ MA 02110-1301, USA.
 #import "OODebugFlags.h"
 #import "NSObjectOOExtensions.h"
 
-#define kOOLogUnconvertedNSLog @"unclassified.Entity"
-
 #ifndef NDEBUG
 uint32_t gLiveEntityCount = 0;
 size_t gTotalEntityMemory = 0;

src/Core/Entities/OOSunEntity.m

@@ -37,8 +37,6 @@ MA 02110-1301, USA.
 #import "OOCollectionExtractors.h"
 #import "OODebugFlags.h"
 
-#define kOOLogUnconvertedNSLog @"unclassified.SunEntity"
-
 
 @interface OOSunEntity (Private)
 

src/Core/Entities/PlanetEntity.m

@@ -44,8 +44,6 @@ MA 02110-1301, USA.
 #import "OODebugFlags.h"
 #import "OOGraphicsResetManager.h"
 
-#define kOOLogUnconvertedNSLog @"unclassified.PlanetEntity"
-
 
 #if !OOLITE_MAC_OS_X
 #define NSIntegerMapKeyCallBacks	NSIntMapKeyCallBacks

src/Core/Entities/PlayerEntity.m

@@ -80,10 +80,6 @@ MA 02110-1301, USA.
 #import "PlayerEntityStickMapper.h"
 
 
-#define kOOLogUnconvertedNSLog @"unclassified.PlayerEntity"
-
-// 10m/s forward drift
-#define	OG_ELITE_FORWARD_DRIFT			10.0f
 #define PLAYER_DEFAULT_NAME				@"Jameson"
 
 enum

src/Core/Entities/PlayerEntityLoadSave.m

@@ -46,7 +46,9 @@
 
 
 // Name of modifier key used to issue commands. See also -isCommandModifierKeyDown.
+#if OO_USE_CUSTOM_LOAD_SAVE
 #define COMMAND_MODIFIER_KEY		"Ctrl"
+#endif
 
 
 static uint16_t PersonalityForCommanderDict(NSDictionary *dict);

src/Core/Entities/ShipEntity.m

@@ -91,8 +91,6 @@ MA 02110-1301, USA.
 #import "OOJSEngineTimeManagement.h"
 
 
-#define kOOLogUnconvertedNSLog @"unclassified.ShipEntity"
-
 #define USEMASC 1
 
 

src/Core/Entities/ShipEntityAI.m

@@ -44,8 +44,6 @@
 #import "OOConstToJSString.h"
 #import "OOCollectionExtractors.h"
 
-#define kOOLogUnconvertedNSLog @"unclassified.ShipEntityAI"
-
 
 @interface ShipEntity (OOAIPrivate)
 

src/Core/GameController.m

@@ -39,8 +39,6 @@ MA 02110-1301, USA.
 #import "OOJSFrameCallbacks.h"
 #import "OOOpenGLExtensionManager.h"
 
-#define kOOLogUnconvertedNSLog @"unclassified.GameController"
-
 #if OOLITE_MAC_OS_X
 #import "JAPersistentFileReference.h"
 #import <Sparkle/Sparkle.h>

src/Core/HeadUpDisplay.m

@@ -46,9 +46,6 @@ MA 02110-1301, USA.
 #import "OOJavaScriptEngine.h"
 
 
-#define kOOLogUnconvertedNSLog @"unclassified.HeadUpDisplay"
-
-
 #define ONE_SIXTEENTH				0.0625
 #define ONE_SIXTYFOURTH				0.015625
 #define DEFAULT_OVERALL_ALPHA		0.75

src/Core/NSFileManagerOOExtensions.m

@@ -32,8 +32,6 @@ MA 02110-1301, USA.
 #import "GameController.h"
 #import "NSFileManagerOOExtensions.h"
 
-#define kOOLogUnconvertedNSLog @"unclassified.NSFileManagerOOExtensions"
-
 
 @implementation NSFileManager (OOExtensions)
 

src/Core/OOJoystickManager.m

@@ -29,9 +29,6 @@ MA 02110-1301, USA.
 #import "OOCollectionExtractors.h"
 
 
-#define kOOLogUnconvertedNSLog @"unclassified.JoystickHandler"
-
-
 static Class sStickHandlerClass = Nil;
 static id sSharedStickHandler = nil;
 

src/Core/OOLogOutputHandler.m

@@ -28,7 +28,6 @@ SOFTWARE.
 
 
 #define OOLOG_POISON_NSLOG 0
-#define DLOPEN_NO_WARN
 
 #import "OOLogOutputHandler.h"
 #import "OOLogging.h"

src/Core/OOLogging.m

@@ -41,9 +41,6 @@ SOFTWARE.
 
 
 #define PER_THREAD_INDENTATION		1
-#ifndef APPNAME
-#define APPNAME						@"Oolite"
-#endif
 
 
 #if PER_THREAD_INDENTATION
@@ -65,7 +62,6 @@ SOFTWARE.
 #define OOLOG_NOT_INITED			1
 #define OOLOG_SETTING_SET			0
 #define OOLOG_SETTING_RETRIEVE		0
-#define OOLOG_METACLASS_LOOP		1
 #define OOLOG_UNDEFINED_METACLASS	1
 #define OOLOG_BAD_SETTING			1
 #define OOLOG_BAD_DEFAULT_SETTING	1

src/Core/OOPListParsing.m

@@ -39,9 +39,6 @@ static NSString * const kOOLogPListFoundationParseError		= @"plist.parse.failed"
 static NSString * const kOOLogPListWrongType				= @"plist.wrongType";
 
 
-#define OOLITE_EXCEPTION_XML_PARSING_FAILURE	@"OOXMLException"
-
-
 #ifndef NO_DYNAMIC_PLIST_DTD_CHANGE
 static NSData *ChangeDTDIfApplicable(NSData *data);
 #endif

src/Core/OOPolygonSprite.m

@@ -98,7 +98,6 @@ static void SVGDumpBeginPrimitive(TessPolygonData *data);
 static void SVGDumpEndPrimitive(TessPolygonData *data);
 static void SVGDumpAppendTriangle(TessPolygonData *data, NSPoint v0, NSPoint v1, NSPoint v2);
 #else
-#define SVGDumpBegin(data) do {} while (0)
 #define SVGDumpEnd(data) do {} while (0)
 #define SVGDumpBeginGroup(data, name) do {} while (0)
 #define SVGDumpEndGroup(data) do {} while (0)

src/Core/OOStringParsing.m

@@ -37,7 +37,9 @@ MA 02110-1301, USA.
 #import "OOJSEngineTimeManagement.h"
 
 
+#if DEBUG_GRAPHVIZ
 #define NSMakeRange(loc, len) ((NSRange){loc, len})
+#endif
 
 
 static NSString * const kOOLogStringVectorConversion			= @"strings.conversion.vector";

src/Core/Octree.m

@@ -37,7 +37,6 @@ MA 02110-1301, USA.
 #define OctreeDebugLog(format, ...) do { if (EXPECT_NOT(gDebugFlags & DEBUG_OCTREE_LOGGING))  OOLog(@"octree.debug", format, ## __VA_ARGS__); } while (0)
 #else
 #define OctreeDebugLog(...) do {} while (0)
-#define OctreeDebugLog(...) do {} while (0)
 #endif
 
 

src/Core/ResourceManager.m

@@ -40,8 +40,6 @@ MA 02110-1301, USA.
 #import "OOJSScript.h"
 #import "OOPListScript.h"
 
-#define kOOLogUnconvertedNSLog @"unclassified.ResourceManager"
-
 
 static NSString * const kOOLogCacheUpToDate				= @"dataCache.upToDate";
 static NSString * const kOOLogCacheExplicitFlush		= @"dataCache.rebuild.explicitFlush";

src/Core/Scripting/OOJSWormhole.m

@@ -203,11 +203,3 @@ static JSBool WormholeSetProperty(JSContext *context, JSObject *this, jsid propI
 
 
 // *** Methods ***
-
-#define GET_THIS_WORMHOLE(THISENT) do { \
-	if (EXPECT_NOT(!JSWormholeGetWormholeEntity(context, OOJS_THIS, &THISENT)))  return NO; /* Exception */ \
-	if (OOIsStaleEntity(THISENT))  OOJS_RETURN_VOID; \
-} while (0)
-
-
-

src/Core/Universe.m

@@ -102,7 +102,6 @@ enum
 
 
 #define MAX_NUMBER_OF_ENTITIES				200
-#define MAX_NUMBER_OF_SOLAR_SYSTEM_ENTITIES 20
 #define STANDARD_STATION_ROLL				0.4
 #define WOLFPACK_SHIPS_DISTANCE				0.1
 #define FIXED_ASTEROID_FIELDS				0