From 5c6970eebf3afef002d62a254343c483042edbf1 Mon Sep 17 00:00:00 2001 From: "Clarence \"Sparr\" Risher" Date: Tue, 9 May 2023 23:04:39 -0400 Subject: [PATCH 1/6] Only declare windows controls on windows builds --- src/Core/Entities/PlayerEntityControls.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Core/Entities/PlayerEntityControls.m b/src/Core/Entities/PlayerEntityControls.m index 512a7b300..e91c93eeb 100644 --- a/src/Core/Entities/PlayerEntityControls.m +++ b/src/Core/Entities/PlayerEntityControls.m @@ -124,8 +124,10 @@ static BOOL gammaControlPressed; #endif static BOOL fovControlPressed; +#if OOLITE_WINDOWS static BOOL hdrMaxBrightnessControlPressed; static BOOL hdrPaperWhiteControlPressed; +#endif static BOOL colorblindModeControlPressed; static BOOL shaderSelectKeyPressed; static BOOL selectPressed; From 991fe2af68df1422b37ad6b4cbcd8a7281b228b2 Mon Sep 17 00:00:00 2001 From: "Clarence \"Sparr\" Risher" Date: Tue, 9 May 2023 23:05:16 -0400 Subject: [PATCH 2/6] Remove assert != null on nonnull function parameters --- src/Core/OOMatrix.h | 2 -- src/Core/OOOpenGLStateManager.m | 3 --- 2 files changed, 5 deletions(-) diff --git a/src/Core/OOMatrix.h b/src/Core/OOMatrix.h index f0901f764..8500e5877 100644 --- a/src/Core/OOMatrix.h +++ b/src/Core/OOMatrix.h @@ -345,8 +345,6 @@ OOINLINE bool OOMatrixIsIdentity(OOMatrix m) OOINLINE void OOMatrixGetBasisVectors(OOMatrix m, Vector *outRight, Vector *outUp, Vector *outForward) { - assert(outRight != NULL && outUp != NULL && outForward != NULL); - *outRight = make_vector(m.m[0][0], m.m[1][0], m.m[2][0]); *outUp = make_vector(m.m[0][1], m.m[1][1], m.m[2][1]); *outForward = make_vector(m.m[0][2], m.m[1][2], m.m[2][2]); diff --git a/src/Core/OOOpenGLStateManager.m b/src/Core/OOOpenGLStateManager.m index 551785ef0..09addf914 100644 --- a/src/Core/OOOpenGLStateManager.m +++ b/src/Core/OOOpenGLStateManager.m @@ -308,8 +308,6 @@ static void GetCurrentOpenGLState(OOOpenGLState *state) static bool StatesEqual(const OOOpenGLState *a, const OOOpenGLState *b) { - NSCParameterAssert(a != NULL && b != NULL); - #define ITEM_STATEFLAG(NAME) do { if (a->NAME != b->NAME && a->NAME != kStateMaybe && b->NAME != kStateMaybe) return false; } while (0) #define ITEM_CLIENTSTATEFLAG(NAME) do { if (a->NAME != b->NAME) return false; } while (0) #define ITEM_SPECIAL(NAME, _, __) do { if (a->NAME != b->NAME) return false; } while (0) @@ -403,7 +401,6 @@ void OOSetOpenGLState(OOOpenGLStateID state) static void SwitchOpenGLStateInternal(const OOOpenGLState *sourceState, const OOOpenGLState *targetState) { - NSCParameterAssert(sourceState != NULL && targetState != NULL); OO_ENTER_OPENGL(); #define ITEM_STATEFLAG(NAME) \ From a6f41703bb6d214111b1605718a750f45646ab94 Mon Sep 17 00:00:00 2001 From: "Clarence \"Sparr\" Risher" Date: Tue, 9 May 2023 23:05:42 -0400 Subject: [PATCH 3/6] Cast _GLUfuncptr to avoid compiler warning --- src/Core/OOPolygonSprite.m | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Core/OOPolygonSprite.m b/src/Core/OOPolygonSprite.m index 5ada443ea..7857166b7 100644 --- a/src/Core/OOPolygonSprite.m +++ b/src/Core/OOPolygonSprite.m @@ -283,11 +283,11 @@ - (BOOL) loadPolygons:(NSArray *)dataArray outlineWidth:(float)outlineWidth dataArray = DataArrayToPoints(&polygonData, dataArray); /*** Tesselate polygon fill ***/ - gluTessCallback(tesselator, GLU_TESS_BEGIN_DATA, TessBeginCallback); - gluTessCallback(tesselator, GLU_TESS_VERTEX_DATA, TessVertexCallback); - gluTessCallback(tesselator, GLU_TESS_END_DATA, TessEndCallback); - gluTessCallback(tesselator, GLU_TESS_ERROR_DATA, ErrorCallback); - gluTessCallback(tesselator, GLU_TESS_COMBINE_DATA, TessCombineCallback); + gluTessCallback(tesselator, GLU_TESS_BEGIN_DATA, (_GLUfuncptr) TessBeginCallback); + gluTessCallback(tesselator, GLU_TESS_VERTEX_DATA, (_GLUfuncptr) TessVertexCallback); + gluTessCallback(tesselator, GLU_TESS_END_DATA, (_GLUfuncptr) TessEndCallback); + gluTessCallback(tesselator, GLU_TESS_ERROR_DATA, (_GLUfuncptr) ErrorCallback); + gluTessCallback(tesselator, GLU_TESS_COMBINE_DATA, (_GLUfuncptr) TessCombineCallback); gluTessBeginPolygon(tesselator, &polygonData); SVGDumpBeginGroup(&polygonData, @"Fill"); @@ -351,11 +351,11 @@ - (BOOL) loadPolygons:(NSArray *)dataArray outlineWidth:(float)outlineWidth polygonData.generatingOutline = YES; #endif - gluTessCallback(tesselator, GLU_TESS_BEGIN_DATA, TessBeginCallback); - gluTessCallback(tesselator, GLU_TESS_VERTEX_DATA, TessVertexCallback); - gluTessCallback(tesselator, GLU_TESS_END_DATA, TessEndCallback); - gluTessCallback(tesselator, GLU_TESS_ERROR_DATA, ErrorCallback); - gluTessCallback(tesselator, GLU_TESS_COMBINE_DATA, TessCombineCallback); + gluTessCallback(tesselator, GLU_TESS_BEGIN_DATA, (_GLUfuncptr) TessBeginCallback); + gluTessCallback(tesselator, GLU_TESS_VERTEX_DATA, (_GLUfuncptr) TessVertexCallback); + gluTessCallback(tesselator, GLU_TESS_END_DATA, (_GLUfuncptr) TessEndCallback); + gluTessCallback(tesselator, GLU_TESS_ERROR_DATA, (_GLUfuncptr) ErrorCallback); + gluTessCallback(tesselator, GLU_TESS_COMBINE_DATA, (_GLUfuncptr) TessCombineCallback); gluTessProperty(tesselator, GLU_TESS_WINDING_RULE, GLU_TESS_WINDING_POSITIVE); gluTessBeginPolygon(tesselator, &polygonData); From fbed3bb79fc36a7dd13bdec83a91b6b22cb63338 Mon Sep 17 00:00:00 2001 From: "Clarence \"Sparr\" Risher" Date: Tue, 9 May 2023 23:10:13 -0400 Subject: [PATCH 4/6] Return result from OpenLogFile to avoid compiler warning --- src/Core/OXPVerifier/OOOXPVerifier.m | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/Core/OXPVerifier/OOOXPVerifier.m b/src/Core/OXPVerifier/OOOXPVerifier.m index 632f7613c..86176ac48 100644 --- a/src/Core/OXPVerifier/OOOXPVerifier.m +++ b/src/Core/OXPVerifier/OOOXPVerifier.m @@ -43,7 +43,7 @@ of this software and associated documentation files (the "Software"), to deal static void SwitchLogFile(NSString *name); static void NoteVerificationStage(NSString *displayName, NSString *stage); -static void OpenLogFile(NSString *name); +static bool OpenLogFile(NSString *name); @interface OOOXPVerifier (OOPrivate) @@ -717,29 +717,23 @@ static void NoteVerificationStage(NSString *displayName, NSString *stage) } -static void OpenLogFile(NSString *name) +static bool OpenLogFile(NSString *name) { // Open log file in appropriate application / provide feedback. if ([[NSUserDefaults standardUserDefaults] oo_boolForKey:@"oxp-verifier-open-log" defaultValue:YES]) { #if OOLITE_MAC_OS_X - [[NSWorkspace sharedWorkspace] openFile:OOLogHandlerGetLogPath()]; + return [[NSWorkspace sharedWorkspace] openFile:OOLogHandlerGetLogPath()]; #elif OOLITE_WINDOWS // start wordpad (for historical reasons wordpad is called write from the command prompt) - system([[NSString stringWithFormat:@"write \"Logs\\%@.log\"", name] UTF8String]); + return system([[NSString stringWithFormat:@"write \"Logs\\%@.log\"", name] UTF8String]); #elif OOLITE_LINUX - // MKW - needed to suppress 'ignoring return value' warning for system() call - // int ret; - // CIM - and now the compiler complains about that too... casting return - // value to void seems to keep it quiet for now - // Nothing to do here, since we dump to stdout instead of to a file. //OOLogOutputHandlerStopLoggingToStdout(); - (void) system([[NSString stringWithFormat:@"cat \"%@\"", OOLogHandlerGetLogPath()] UTF8String]); -#else - do {} while (0); + return system([[NSString stringWithFormat:@"cat \"%@\"", OOLogHandlerGetLogPath()] UTF8String]); #endif } + return true; } From 2967858fe49b5e1e1ccd2d10de9533f70455e908 Mon Sep 17 00:00:00 2001 From: "Clarence \"Sparr\" Risher" Date: Tue, 9 May 2023 23:10:50 -0400 Subject: [PATCH 5/6] Move clang warning suppression to macro to also suppress gcc warning --- src/Core/Octree.m | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Core/Octree.m b/src/Core/Octree.m index 255b7719d..f3f61bc48 100644 --- a/src/Core/Octree.m +++ b/src/Core/Octree.m @@ -966,8 +966,13 @@ these ivars are unused (but may be used by categories, which they are). */ - (BOOL) suppressClangStuff { - return &_stateStack && 0; +/* This define exists purely to suppress gcc warnings that &_stateStack is + always true +*/ +#define RETVAL &_stateStack && 0 + return RETVAL; } +#undef RETVAL #endif @end From 0ebf356eba01ee0527c5e903ce503985581f07dc Mon Sep 17 00:00:00 2001 From: "Clarence \"Sparr\" Risher" Date: Tue, 9 May 2023 23:11:11 -0400 Subject: [PATCH 6/6] Resolve warning about mismatched types --- src/SDL/main.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SDL/main.m b/src/SDL/main.m index ca066a52c..6005a629a 100644 --- a/src/SDL/main.m +++ b/src/SDL/main.m @@ -46,7 +46,7 @@ #ifndef NDEBUG -uint32_t gDebugFlags = 0; +NSUInteger gDebugFlags = 0; #endif