diff options
| author |   George L. Albany <Megacake1234@gmail.com> | 2023-04-14 18:31:58 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-04-14 18:31:58 +0200 |
| commit | 436b038c1806e326ff6458f1692e9009d3a54346 (patch) | |
| tree | b5a33a733398b511eb0aa7781860c8accbadd2a0 /extension/src/Simulation.hpp | |
| parent | 1f04a7827ae377372cb491ff0257a47d0d4c2967 (diff) | |
| parent | 7241811bd8c9493b7b6c6480e8d63a5fb7f38e4e (diff) | |
Merge pull request #84 from OpenVic2Project/terrain-map
Diffstat (limited to 'extension/src/Simulation.hpp')
| -rw-r--r-- | extension/src/Simulation.hpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/extension/src/Simulation.hpp b/extension/src/Simulation.hpp index 8959310..b84016b 100644 --- a/extension/src/Simulation.hpp +++ b/extension/src/Simulation.hpp @@ -1,8 +1,6 @@ #pragma once -#include <godot_cpp/classes/object.hpp> #include <godot_cpp/core/class_db.hpp> -#include <godot_cpp/variant/utility_functions.hpp> #include <vector> namespace OpenVic2 { @@ -11,7 +9,7 @@ namespace OpenVic2 { std::vector<uint64_t> exampleProvinces; //BEGIN BOILERPLATE - static Simulation* _simulation; + inline static Simulation* _simulation = nullptr; protected: static void _bind_methods() { @@ -47,6 +45,4 @@ namespace OpenVic2 { return exampleProvinces[provinceID]; } }; - - Simulation* Simulation::_simulation = nullptr; } |