More compiler warns

CMakeLists.txt

@@ -9,23 +9,20 @@ set(CMAKE_C_STANDARD 99)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 # Warnings
-add_compile_options(-Wall)
+add_compile_options(-Wall -Wignored-qualifiers -Wvariadic-macros)
+add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wc++11-extensions>)
 if(WERROR)
     add_compile_options(-Werror)
 endif()
+if(APPLE)
+    add_compile_options(-Wno-deprecated-declarations)
+endif()
 
 # Detect Windows
 include(CheckSymbolExists)
 check_symbol_exists("_WIN32" "" REMCPE_WIN32)
 
-# Clang
-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    add_compile_options(-Wno-inconsistent-missing-override)
-endif()
-if(APPLE)
-    add_compile_options(-Wno-deprecated-declarations)
-endif()
-
+# Windows Linking
 if(REMCPE_WIN32)
     # Modern MinGW doesn't support C++98 and will error if you try to use it
     set(CMAKE_CXX_STANDARD 11)

compat/KeyCodes.hpp

@@ -17,8 +17,10 @@
     enum eSDLVirtualKeys
     {
         #define CODE(x) SDLVK_ ## x,
+        #define _CODE(x) SDLVK_ ## x
         #include "SDLKeyCodes.h"
         #undef  CODE
+        #undef  _CODE
     };
 #endif
 

compat/LegacyCPP_Compat.hpp

@@ -4,6 +4,7 @@
 
 #ifdef USE_OLD_CPP
 
+#define CONSTEXPR
 #ifndef constexpr
 #define constexpr const
 #endif
@@ -37,6 +38,8 @@ namespace std
 
 #endif // !defined(_WIN32)*/
 
+#else
+#define CONSTEXPR constexpr
 #endif // USE_OLD_CPP
 
 // https://gcc.gnu.org/legacy-ml/gcc-help/2006-04/msg00062.html

compat/SDLKeyCodes.h

@@ -1,4 +1,3 @@
-CODE(UNKNOWN)
 CODE(RETURN)
 CODE(ESCAPE)
 CODE(BACKSPACE)
@@ -247,4 +246,5 @@ CODE(AUDIOREWIND)
 #endif
 #ifdef SDLK_AUDIOFASTFORWARD
 CODE(AUDIOFASTFORWARD)
-#endif
+#endif
+_CODE(UNKNOWN)

platforms/android/AppPlatform_android.cpp

@@ -117,7 +117,7 @@ std::string AppPlatform_android::getDateString(int time)
 	return std::string(buffer);
 }
 
-SoundSystem* const AppPlatform_android::getSoundSystem() const
+SoundSystem* AppPlatform_android::getSoundSystem() const
 {
 	return m_pSoundSystem;
 }

platforms/android/AppPlatform_android.hpp

@@ -46,7 +46,7 @@ class AppPlatform_android : public AppPlatform
 
 	bool hasFileSystemAccess() override;	
 
-	SoundSystem* const getSoundSystem() const override;
+	SoundSystem* getSoundSystem() const override;
 	void initSoundSystem() override;
 	bool isTouchscreen() const override;
 

platforms/android/android_native_app_glue.h

@@ -206,7 +206,7 @@ enum {
     /**
      * Start of user-defined ALooper identifiers.
      */
-    LOOPER_ID_USER = 3,
+    LOOPER_ID_USER = 3
 };
 
 enum {
@@ -308,7 +308,7 @@ enum {
      * Command from main thread: the app's activity is being destroyed,
      * and waiting for the app thread to clean up and exit before proceeding.
      */
-    APP_CMD_DESTROY,
+    APP_CMD_DESTROY
 };
 
 /**

platforms/ios/AppPlatform_iOS.h

@@ -38,7 +38,7 @@ class AppPlatform_iOS : public AppPlatform
 	bool isTouchscreen() const override;
 	std::string getAssetPath(const std::string& path) const override;
 	std::string getPatchData() override;
-	SoundSystem* const getSoundSystem() const override { return m_pSoundSystem; }
+	SoundSystem* getSoundSystem() const override { return m_pSoundSystem; }
 
 	// Also add these to allow proper text input within the game.
 	bool shiftPressed() override;

platforms/sdl/base/AppPlatform_sdl.cpp

@@ -442,8 +442,10 @@ int AppPlatform_sdl::_TranslateSDLKeyCodeToVirtual(int sdlCode)
 {
 	switch (sdlCode) {
 #define CODE(x) case SDLK_ ## x: return SDLVK_ ## x;
+#define _CODE(x) CODE(x)
 #include "compat/SDLKeyCodes.h"
 #undef  CODE
+#undef  _CODE
 	}
 	return SDLVK_UNKNOWN;
 }

platforms/sdl/base/AppPlatform_sdl.hpp

@@ -38,7 +38,7 @@ class AppPlatform_sdl : public AppPlatform
 	int getUserInputStatus() override;
 	void saveScreenshot(const std::string& fileName, int width, int height) override;
 	bool doesTextureExist(const std::string& path) const override;
-	SoundSystem* const getSoundSystem() const override { return m_pSoundSystem; }
+	SoundSystem* getSoundSystem() const override { return m_pSoundSystem; }
 
 	// Also add these to allow proper turning within the game.
 	void setMouseGrabbed(bool b) override;

platforms/sound/opensl/SoundSystemSL.cpp

@@ -91,7 +91,7 @@ void SoundSystemSL::removeStoppedSounds()
 	toRemove.clear();
 	pthread_mutex_unlock(&toRemoveMutex);
 
-	for (int i = 0; i < m_tempToRemove.size(); i++)
+	for (size_t i = 0; i < m_tempToRemove.size(); i++)
 	{
 
 		for (SLSoundList::iterator it = m_playingSounds.begin();

platforms/windows/AppPlatform_win32.hpp

@@ -63,8 +63,8 @@ class AppPlatform_win32 : public AppPlatform
 	AssetFile readAssetFile(const std::string&, bool) const override;
 
 	void setScreenSize(int width, int height);
-	const char* const getWindowTitle() const { return m_WindowTitle; }
-	SoundSystem* const getSoundSystem() const override { return m_pSoundSystem; }
+	const char* getWindowTitle() const { return m_WindowTitle; }
+	SoundSystem* getSoundSystem() const override { return m_pSoundSystem; }
 
 	HWND createWindow(HINSTANCE hInstance, WNDPROC wndProc, LPVOID lpParam, WORD iconId);
 	void initializeWindow(HWND hWnd, int nCmdShow);

source/client/app/AppPlatform.cpp

@@ -18,7 +18,7 @@
 
 AppPlatform* AppPlatform::m_singleton = nullptr;
 
-AppPlatform* const AppPlatform::singleton()
+AppPlatform* AppPlatform::singleton()
 {
 	return m_singleton;
 }
@@ -377,7 +377,7 @@ void AppPlatform::initSoundSystem()
 {
 }
 
-SoundSystem* const AppPlatform::getSoundSystem() const
+SoundSystem* AppPlatform::getSoundSystem() const
 {
 	return nullptr;
 }

source/client/app/AppPlatform.hpp

@@ -48,13 +48,13 @@ class AppPlatform
 		DLG_CREATE_WORLD,
 		DLG_CHAT,
 		DLG_OPTIONS,
-		DLG_RENAME_MP_WORLD,
+		DLG_RENAME_MP_WORLD
 	};
 
 private:
 	static AppPlatform* m_singleton;
 public:
-	static AppPlatform* const singleton();
+	static AppPlatform* singleton();
 
 public:
 	AppPlatform();
@@ -120,7 +120,7 @@ class AppPlatform
 	// Also add this to allow dynamic patching.
 	virtual std::string getPatchData();
 	virtual void initSoundSystem();
-	virtual SoundSystem* const getSoundSystem() const;
+	virtual SoundSystem* getSoundSystem() const;
 	// Used For Sounds
 	virtual std::string getAssetPath(const std::string& path) const;
 	virtual AssetFile readAssetFile(const std::string& path, bool quiet) const;

source/client/gui/components/OptionList.cpp

@@ -337,7 +337,7 @@ void OptionList::initMultiplayerMenu()
 
 	OPTION(Boolean, m_bServerVisibleDefault, "Local Server Multiplayer");
 
-#ifdef __EMSCRIPTEN
+#ifndef FEATURE_NETWORKING
 	m_items[currentIndex]->setDisabled(true);
 #endif
 	(void)currentIndex; // compiler will warn about an unused variable sometimes if this isn't here

source/client/gui/components/OptionList.hpp

@@ -53,7 +53,7 @@ class DistanceOptionItem : public OptionItem
 		RD_FAR,
 		RD_NORMAL,
 		RD_SHORT,
-		RD_COUNT,
+		RD_COUNT
 	};
 
 public:

source/client/network/ClientSideNetworkHandler.cpp

@@ -21,10 +21,8 @@
 
 #if defined(ORIGINAL_CODE) || defined(VERBOSE_CLIENT)
 #define puts_ignorable(str) LOG_I(str)
-#define printf_ignorable(str, ...) LOG_I(str, __VA_ARGS__)
 #else
 #define puts_ignorable(str)
-#define printf_ignorable(str, ...)
 #endif
 
 ClientSideNetworkHandler::ClientSideNetworkHandler(Minecraft* pMinecraft, RakNetInstance* pRakNetInstance)
@@ -60,7 +58,7 @@ void ClientSideNetworkHandler::onConnect(const RakNet::RakNetGUID& rakGuid) // s
 {
 #ifdef VERBOSE_CLIENT
 	RakNet::RakNetGUID localGuid = ((RakNet::RakPeer*)m_pServerPeer)->GetMyGUID();
-	printf_ignorable("onConnect, server guid: %s, local guid: %s", rakGuid.ToString(), localGuid.ToString());
+	LOG_I("onConnect, server guid: %s, local guid: %s", rakGuid.ToString(), localGuid.ToString());
 #endif
 
 	m_serverGUID = rakGuid;

source/client/options/Options.hpp

@@ -50,7 +50,7 @@ enum eKeyMappingIndex
 	KM_FLY_UP,
 	KM_FLY_DOWN,
 	KM_CHAT_CMD, // called "Open Chat" in Release 1.8
-	KM_COUNT,
+	KM_COUNT
 };
 
 struct KeyMapping

source/client/player/input/IMoveInput.hpp

@@ -21,7 +21,7 @@ enum
 	INPUT_JUMP,
 	INPUT_SNEAK,
 	INPUT_FORWARDLEFT,
-	INPUT_FORWARDRIGHT,
+	INPUT_FORWARDRIGHT
 };
 
 class IMoveInput

source/client/player/input/MouseDevice.hpp

@@ -18,7 +18,7 @@ enum MouseButtonType
 	BUTTON_MIDDLE,
 	BUTTON_COUNT,
 	BUTTON_SCROLLWHEEL,
-	BUTTON_MIN = BUTTON_LEFT,
+	BUTTON_MIN = BUTTON_LEFT
 };
 
 struct MouseAction

source/client/renderer/PatchManager.hpp

@@ -13,13 +13,13 @@ enum ePatchType
 	TYPE_TERRAIN,
 	TYPE_ITEMS,
 	TYPE_FRAME,
-	TYPE_FEATURE,
+	TYPE_FEATURE
 };
 
 enum ePatchOption
 {
 	PO_NONE,
-	PO_GRASS_TINT,
+	PO_GRASS_TINT
 };
 
 struct PatchData

source/client/renderer/TileRenderer.cpp

@@ -2791,7 +2791,7 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusionV2(Tile* tile, cons
 		ETILE_FACE_DNE,// -Y+X-Z
 		ETILE_FACE_DSW,// -Y-X+Z
 		ETILE_FACE_DSE,// -Y+X+Z
-		ETILE_FACE_COUNT,
+		ETILE_FACE_COUNT
 	};
 
 	// for Facing::Name directions

source/client/renderer/texture/ColorSpace.hpp

@@ -3,5 +3,5 @@
 enum ColorSpace
 {
     COLOR_SPACE_RGBA,
-    COLOR_SPACE_RGB,
+    COLOR_SPACE_RGB
 };

source/client/sound/SoundData.cpp

@@ -107,20 +107,26 @@ void SoundDesc::_unload()
 // Load All Sounds
 void SoundDesc::_loadAll(const AppPlatform* platform)
 {
-#define SOUND(category, name, number) SA_##name##number._load(platform, #category, #name#number);
+#define SOUND(category, name) SA_##name._load(platform, #category, #name);
+#define SOUND_NUM(category, name, number) SA_##name##number._load(platform, #category, #name#number);
 #include "sound_list.h"
 #undef SOUND
+#undef SOUND_NUM
 }
 
 // Un-load All Sounds
 void SoundDesc::_unloadAll()
 {
-#define SOUND(category, name, number) SA_##name##number._unload();
+#define SOUND(category, name) SA_##name._unload();
+#define SOUND_NUM(category, name, number) SA_##name##number._unload();
 #include "sound_list.h"
 #undef SOUND
+#undef SOUND_NUM
 }
 
 // Declare Variables
-#define SOUND(category, name, number) SoundDesc SA_##name##number;
+#define SOUND(category, name) SoundDesc SA_##name;
+#define SOUND_NUM(category, name, number) SoundDesc SA_##name##number;
 #include "sound_list.h"
 #undef SOUND
+#undef SOUND_NUM

source/client/sound/SoundData.hpp

@@ -64,6 +64,8 @@ struct SoundDesc : AudioDescriptor
 	static void _unloadAll();
 };
 
-#define SOUND(category, name, number) extern SoundDesc SA_##name##number;
+#define SOUND(category, name) extern SoundDesc SA_##name;
+#define SOUND_NUM(category, name, number) extern SoundDesc SA_##name##number;
 #include "sound_list.h"
 #undef SOUND
+#undef SOUND_NUM

source/client/sound/SoundEngine.cpp

@@ -39,9 +39,11 @@ void SoundEngine::init(Options* options, AppPlatform* platform)
     // Load Sounds
     SoundDesc::_loadAll(platform);
 
-#define SOUND(category, name, number) m_sounds.add(#category "." #name, SA_##name##number);
+#define SOUND(category, name) m_sounds.add(#category "." #name, SA_##name);
+#define SOUND_NUM(category, name, number) m_sounds.add(#category "." #name, SA_##name##number);
 #include "sound_list.h"
 #undef SOUND
+#undef SOUND_NUM
 
 #define MUSIC(name, number) m_songs.add(#name, platform->getAssetPath("music/" #name #number ".ogg"));
 #define NEWMUSIC(name, number) m_songs.add(#name, platform->getAssetPath("newmusic/" #name #number ".ogg"));