Merge pull request #489 from Ghabry/cleanup

Fix compiler warnings, bump deps etc.
EasyRPG · Jan 6, 2025 · c359e1d · c359e1d
2 parents 5e77d3e + cd22828
commit c359e1d
Show file tree

Hide file tree

Showing 23 changed files with 2,138 additions and 1,569 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -142,7 +142,6 @@ set(LCF_SOURCES
 	src/generated/rpg_encounter.cpp
 	src/generated/rpg_enemy.cpp
 	src/generated/rpg_enemyaction.cpp
-	src/generated/rpg_enums.cpp
 	src/generated/rpg_equipment.cpp
 	src/generated/rpg_event.cpp
 	src/generated/rpg_eventcommand.cpp

diff --git a/Makefile.am b/Makefile.am
@@ -160,7 +160,6 @@ liblcf_la_SOURCES = \
 	src/generated/rpg_encounter.cpp \
 	src/generated/rpg_enemy.cpp \
 	src/generated/rpg_enemyaction.cpp \
-	src/generated/rpg_enums.cpp \
 	src/generated/rpg_equipment.cpp \
 	src/generated/rpg_event.cpp \
 	src/generated/rpg_eventcommand.cpp \

diff --git a/generator/generate.py b/generator/generate.py
@@ -467,11 +467,6 @@ def generate():
                         type=filetype
                     ))
 
-    filepath = os.path.join(tmp_dir, 'rpg_enums.cpp')
-
-    with openToRender(filepath) as f:
-        f.write(enums_tmpl.render())
-
     for dirname, subdirlist, filelist in os.walk(tmp_dir, topdown=False):
         subdir = os.path.relpath(dirname, tmp_dir)
 
@@ -534,7 +529,6 @@ def main(argv):
     rpg_header_tmpl = env.get_template('rpg_header.tmpl', globals=globals)
     rpg_source_tmpl = env.get_template('rpg_source.tmpl', globals=globals)
     flags_tmpl = env.get_template('flag_reader.tmpl', globals=globals)
-    enums_tmpl = env.get_template('rpg_enums.tmpl', globals=globals)
     fwd_tmpl = env.get_template('fwd.tmpl', globals=globals)
     fwd_struct_tmpl = env.get_template('fwd_struct.tmpl', globals=globals)
 

diff --git a/generator/templates/rpg_enums.tmpl b/generator/templates/rpg_enums.tmpl
diff --git a/generator/templates/rpg_source.tmpl b/generator/templates/rpg_source.tmpl
@@ -1,11 +1,7 @@
 {% include "copyright.tmpl" %}
 // Headers
 #include "lcf/rpg/{{ filename }}.h"
-{% if struct_name in constants -%}
-{%- for name, type, value, comment in constants[struct_name] %}
-constexpr {{ type }} lcf::rpg::{{ struct_name }}::{{ name }};
-{%- endfor %}
-{%- endif %}
+
 namespace lcf {
 namespace rpg {
 {%- for field in fields[struct_name]|field_is_used %}

diff --git a/src/dbarray.cpp b/src/dbarray.cpp
@@ -13,7 +13,6 @@
 namespace lcf {
 
 const DBArrayAlloc::size_type DBArrayAlloc::_empty_buf[2] = { 0, 0 };
-constexpr DBString::size_type DBString::npos;
 
 static ptrdiff_t HeaderSize(size_t align) {
 	return std::max(sizeof(DBArrayAlloc::size_type), align);

diff --git a/src/generated/rpg_enums.cpp b/src/generated/rpg_enums.cpp
diff --git a/src/generated/rpg_item.cpp b/src/generated/rpg_item.cpp
@@ -12,7 +12,6 @@
 // Headers
 #include "lcf/rpg/item.h"
 
-constexpr const char* lcf::rpg::Item::kDefaultMessage;
 namespace lcf {
 namespace rpg {
 

diff --git a/src/generated/rpg_saveactor.cpp b/src/generated/rpg_saveactor.cpp
@@ -12,7 +12,6 @@
 // Headers
 #include "lcf/rpg/saveactor.h"
 
-constexpr const char* lcf::rpg::SaveActor::kEmptyName;
 namespace lcf {
 namespace rpg {
 

diff --git a/src/generated/rpg_savepartylocation.cpp b/src/generated/rpg_savepartylocation.cpp
@@ -12,9 +12,6 @@
 // Headers
 #include "lcf/rpg/savepartylocation.h"
 
-constexpr int lcf::rpg::SavePartyLocation::kPanXDefault;
-constexpr int lcf::rpg::SavePartyLocation::kPanYDefault;
-constexpr int lcf::rpg::SavePartyLocation::kPanSpeedDefault;
 namespace lcf {
 namespace rpg {
 

diff --git a/src/generated/rpg_skill.cpp b/src/generated/rpg_skill.cpp
@@ -12,7 +12,6 @@
 // Headers
 #include "lcf/rpg/skill.h"
 
-constexpr const char* lcf::rpg::Skill::kDefaultMessage;
 namespace lcf {
 namespace rpg {
 

diff --git a/src/generated/rpg_state.cpp b/src/generated/rpg_state.cpp
@@ -12,7 +12,6 @@
 // Headers
 #include "lcf/rpg/state.h"
 
-constexpr int lcf::rpg::State::kDeathID;
 namespace lcf {
 namespace rpg {
 

diff --git a/src/generated/rpg_terms.cpp b/src/generated/rpg_terms.cpp
@@ -12,7 +12,6 @@
 // Headers
 #include "lcf/rpg/terms.h"
 
-constexpr const char* lcf::rpg::Terms::kDefaultTerm;
 namespace lcf {
 namespace rpg {
 

diff --git a/src/lcf/dbbitarray.h b/src/lcf/dbbitarray.h
@@ -29,7 +29,6 @@ class DBBitProxy {
 
 		constexpr DBBitProxy() = default;
 
-		DBBitProxy& operator=(const DBBitProxy& x) noexcept = default;
 		DBBitProxy& operator=(bool x) noexcept {
 			auto& byte = _base[_idx / CHAR_BIT];
 			auto bit = _idx % CHAR_BIT;
@@ -92,8 +91,8 @@ class DBBitProxyIterator {
 		DBBitProxyIterator operator--(int) { auto iter = *this; --(*this); return iter; }
 
 		void swap(DBBitProxyIterator& o) {
-			std::swap(_proxy._base, o._base);
-			std::swap(_proxy._idx, o._idx);
+			std::swap(_proxy._base, o._proxy._base);
+			std::swap(_proxy._idx, o._proxy._idx);
 		}
 
 		friend bool operator==(DBBitProxyIterator l, DBBitProxyIterator r) { return l->index() == r->index(); }

diff --git a/src/lcf/enum_tags.h b/src/lcf/enum_tags.h
@@ -122,7 +122,7 @@ inline constexpr const char* EnumTags<E, N>::tag(E etag) const {
 template <typename E, size_t N>
 inline constexpr const char* EnumTags<E, N>::tag(int_type value) const {
 	if (monotonic_from_zero) {
-		if (value < 0 || value >= N) {
+		if (value < 0 || static_cast<size_t>(value) >= N) {
 			return nullptr;
 		} else {
 			return _tags[value].name;