fix fix

schombert · Apr 29, 2024 · 83f3a33 · 83f3a33
1 parent b6cf56a
commit 83f3a33
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/gamestate/serialization.hpp b/src/gamestate/serialization.hpp
@@ -129,7 +129,7 @@ inline uint8_t const* deserialize(uint8_t const* ptr_in, ankerl::unordered_dense
 }
 
 constexpr inline uint32_t save_file_version = 37;
-constexpr inline uint32_t scenario_file_version = 124 + save_file_version;
+constexpr inline uint32_t scenario_file_version = 125 + save_file_version;
 
 struct scenario_header {
 	uint32_t version = scenario_file_version;

diff --git a/src/graphics/texture.cpp b/src/graphics/texture.cpp
@@ -248,7 +248,7 @@ GLuint SOIL_direct_load_DDS_from_memory(unsigned char const* const buffer, uint3
 			case 4:
 			{
 				for(uint32_t i = 0; i < dds_full_size; i += block_size) {
-					uint32_t data = *(uint32_t*)(buffer + buffer_index + i);
+					uint32_t data = *(uint32_t const*)(buffer + buffer_index + i);
 					uint32_t r = (data & header.sPixelFormat.dwRBitMask) >> std::countr_zero(header.sPixelFormat.dwRBitMask);
 					uint32_t g = (data & header.sPixelFormat.dwGBitMask) >> std::countr_zero(header.sPixelFormat.dwGBitMask);
 					uint32_t b = (data & header.sPixelFormat.dwBBitMask) >> std::countr_zero(header.sPixelFormat.dwBBitMask);
@@ -273,7 +273,7 @@ GLuint SOIL_direct_load_DDS_from_memory(unsigned char const* const buffer, uint3
 				uint16_t ma1 = uint16_t(header.sPixelFormat.dwAlphaBitMask >> std::countr_zero(header.sPixelFormat.dwAlphaBitMask));
 				float ma2 = ma1 == 0 ? 0.f : 255.f / float(ma1);
 				for(uint32_t i = 0; i < dds_full_size; i += block_size) {
-					uint16_t data = *(uint16_t*)(buffer + buffer_index + i);
+					uint16_t data = *(uint16_t const*)(buffer + buffer_index + i);
 					uint16_t r = (data & header.sPixelFormat.dwRBitMask) >> std::countr_zero(header.sPixelFormat.dwRBitMask);
 					uint16_t g = (data & header.sPixelFormat.dwGBitMask) >> std::countr_zero(header.sPixelFormat.dwGBitMask);
 					uint16_t b = (data & header.sPixelFormat.dwBBitMask) >> std::countr_zero(header.sPixelFormat.dwBBitMask);

diff --git a/src/gui/gui_element_types.hpp b/src/gui/gui_element_types.hpp
@@ -304,7 +304,7 @@ class tinted_button_element_base : public button_element_base {
 
 class right_click_button_element_base : public button_element_base {
 public:
-	virtual void button_right_action(sys::state& state) noexcept { }
+	virtual void button_right_action(sys::state& state) noexcept override { }
 	message_result on_rbutton_down(sys::state& state, int32_t x, int32_t y, sys::key_modifiers mods) noexcept final {
 		if(!disabled) {
 			sound::play_interface_sound(state, get_click_sound(state), state.user_settings.interface_volume * state.user_settings.master_volume);
@@ -316,7 +316,7 @@ class right_click_button_element_base : public button_element_base {
 
 class tinted_right_click_button_element_base : public tinted_button_element_base {
 public:
-	virtual void button_right_action(sys::state& state) noexcept { }
+	virtual void button_right_action(sys::state& state) noexcept override { }
 	message_result on_rbutton_down(sys::state& state, int32_t x, int32_t y, sys::key_modifiers mods) noexcept final {
 		if(!disabled) {
 			sound::play_interface_sound(state, get_click_sound(state), state.user_settings.interface_volume * state.user_settings.master_volume);

diff --git a/src/zstd/common/xxhash.h b/src/zstd/common/xxhash.h
@@ -2328,14 +2328,14 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size)
 
 #if XXH_NO_INLINE_HINTS  /* disable inlining hints */
 #  if defined(__GNUC__) || defined(__clang__)
-#    define XXH_FORCE_INLINE static __attribute__((unused))
+#    define XXH_FORCE_INLINE static
 #  else
 #    define XXH_FORCE_INLINE static
 #  endif
 #  define XXH_NO_INLINE static
 /* enable inlining hints */
 #elif defined(__GNUC__) || defined(__clang__)
-#  define XXH_FORCE_INLINE static __inline__ __attribute__((always_inline, unused))
+#  define XXH_FORCE_INLINE static __inline__ __attribute__((always_inline))
 #  define XXH_NO_INLINE static __attribute__((noinline))
 #elif defined(_MSC_VER)  /* Visual Studio */
 #  define XXH_FORCE_INLINE static __forceinline