Skip to content

Commit

Permalink
More refactoring and duplicate code removal
Browse files Browse the repository at this point in the history
  • Loading branch information
Hop311 committed Sep 8, 2023
1 parent e54f408 commit dfe2fca
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion extension/deps/openvic-simulation
Submodule openvic-simulation updated 46 files
+1 −1 SConstruct
+4 −7 src/headless/main.cpp
+0 −0 src/openvic-simulation/GameAdvancementHook.cpp
+0 −0 src/openvic-simulation/GameAdvancementHook.hpp
+1 −1 src/openvic-simulation/GameManager.cpp
+3 −3 src/openvic-simulation/GameManager.hpp
+2 −2 src/openvic-simulation/dataloader/Dataloader.cpp
+0 −0 src/openvic-simulation/dataloader/Dataloader.hpp
+13 −13 src/openvic-simulation/dataloader/NodeTools.cpp
+21 −18 src/openvic-simulation/dataloader/NodeTools.hpp
+0 −36 src/openvic-simulation/economy/Good.cpp
+6 −13 src/openvic-simulation/economy/Good.hpp
+2 −10 src/openvic-simulation/map/Building.cpp
+3 −4 src/openvic-simulation/map/Building.hpp
+2 −22 src/openvic-simulation/map/Map.cpp
+2 −6 src/openvic-simulation/map/Map.hpp
+1 −17 src/openvic-simulation/map/Province.cpp
+3 −6 src/openvic-simulation/map/Province.hpp
+0 −0 src/openvic-simulation/map/Region.cpp
+1 −1 src/openvic-simulation/map/Region.hpp
+55 −89 src/openvic-simulation/pop/Culture.cpp
+8 −14 src/openvic-simulation/pop/Culture.hpp
+5 −37 src/openvic-simulation/pop/Pop.cpp
+3 −6 src/openvic-simulation/pop/Pop.hpp
+0 −32 src/openvic-simulation/pop/Religion.cpp
+4 −10 src/openvic-simulation/pop/Religion.hpp
+0 −0 src/openvic-simulation/types/Colour.hpp
+2 −2 src/openvic-simulation/types/Date.cpp
+0 −0 src/openvic-simulation/types/Date.hpp
+0 −0 src/openvic-simulation/types/IdentifierRegistry.cpp
+50 −5 src/openvic-simulation/types/IdentifierRegistry.hpp
+584 −0 src/openvic-simulation/types/fixed_point/FixedPoint.hpp
+5 −8 src/openvic-simulation/types/fixed_point/FixedPointLUT.hpp
+42 −0 src/openvic-simulation/types/fixed_point/FixedPointLUT_sin.hpp
+11 −0 src/openvic-simulation/types/fixed_point/FixedPointMath.hpp
+63 −0 src/openvic-simulation/types/fixed_point/lut_generator/lut_generator.py
+1 −1 src/openvic-simulation/utility/BMP.cpp
+1 −1 src/openvic-simulation/utility/BMP.hpp
+0 −0 src/openvic-simulation/utility/Logger.cpp
+0 −0 src/openvic-simulation/utility/Logger.hpp
+0 −0 src/openvic-simulation/utility/NumberUtils.hpp
+0 −0 src/openvic-simulation/utility/StringUtils.hpp
+0 −581 src/openvic/types/fixed_point/FP.hpp
+0 −58 src/openvic/types/fixed_point/FPLUT_sin_512.hpp
+0 −11 src/openvic/types/fixed_point/FPMath.hpp
+0 −39 src/openvic/types/fixed_point/lut_generator/lut_generator.py
2 changes: 1 addition & 1 deletion extension/src/GameSingleton.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <godot_cpp/variant/utility_functions.hpp>

#include "openvic/utility/Logger.hpp"
#include "openvic-simulation/utility/Logger.hpp"

#include "Utilities.hpp"

Expand Down
4 changes: 2 additions & 2 deletions extension/src/GameSingleton.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include <godot_cpp/classes/image_texture.hpp>
#include <godot_cpp/classes/texture2d_array.hpp>

#include "openvic/GameManager.hpp"
#include "openvic/dataloader/Dataloader.hpp"
#include "openvic-simulation/GameManager.hpp"
#include "openvic-simulation/dataloader/Dataloader.hpp"

namespace OpenVic {

Expand Down
2 changes: 1 addition & 1 deletion extension/src/LoadGameCompatibility.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <godot_cpp/classes/file_access.hpp>
#include <godot_cpp/variant/utility_functions.hpp>

#include "openvic/utility/BMP.hpp"
#include "openvic-simulation/utility/BMP.hpp"

#include "Utilities.hpp"

Expand Down
2 changes: 1 addition & 1 deletion extension/src/Utilities.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <godot_cpp/classes/image.hpp>

#include "openvic/types/Colour.hpp"
#include "openvic-simulation/types/Colour.hpp"

#define ERR(x) ((x) ? OK : FAILED)

Expand Down

0 comments on commit dfe2fca

Please sign in to comment.