diff options
| -rw-r--r-- | src/crepe/api/Script.cpp | 5 | ||||
| -rw-r--r-- | src/crepe/api/Script.h | 2 | ||||
| -rw-r--r-- | src/test/SaveManagerTest.cpp | 5 | ||||
| -rw-r--r-- | src/test/ScriptSaveManagerTest.cpp | 3 | 
4 files changed, 5 insertions, 10 deletions
diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp index 961e6e7..753a9e3 100644 --- a/src/crepe/api/Script.cpp +++ b/src/crepe/api/Script.cpp @@ -24,7 +24,4 @@ void Script::set_next_scene(const string & name) {  	mgr.set_next_scene(name);  } -SaveManager & Script::get_save_manager() const { -	return this->mediator->save_manager; -} - +SaveManager & Script::get_save_manager() const { return this->mediator->save_manager; } diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h index 024f1d7..0d59ab6 100644 --- a/src/crepe/api/Script.h +++ b/src/crepe/api/Script.h @@ -2,12 +2,12 @@  #include <vector> +#include "../ValueBroker.h"  #include "../manager/EventManager.h"  #include "../manager/Mediator.h"  #include "../system/CollisionSystem.h"  #include "../types.h"  #include "../util/OptionalRef.h" -#include "../ValueBroker.h"  namespace crepe { diff --git a/src/test/SaveManagerTest.cpp b/src/test/SaveManagerTest.cpp index a1efc33..e9b0c29 100644 --- a/src/test/SaveManagerTest.cpp +++ b/src/test/SaveManagerTest.cpp @@ -1,8 +1,8 @@  #include <gtest/gtest.h> -#include <crepe/manager/SaveManager.h> -#include <crepe/facade/DB.h>  #include <crepe/ValueBroker.h> +#include <crepe/facade/DB.h> +#include <crepe/manager/SaveManager.h>  using namespace std;  using namespace crepe; @@ -38,4 +38,3 @@ TEST_F(SaveManagerTest, DefaultValue) {  	value.set(5);  	ASSERT_EQ(value.get(), 5);  } - diff --git a/src/test/ScriptSaveManagerTest.cpp b/src/test/ScriptSaveManagerTest.cpp index 098afa0..64403c4 100644 --- a/src/test/ScriptSaveManagerTest.cpp +++ b/src/test/ScriptSaveManagerTest.cpp @@ -4,8 +4,8 @@  #define private public  #define protected public -#include <crepe/manager/SaveManager.h>  #include <crepe/facade/DB.h> +#include <crepe/manager/SaveManager.h>  #include "ScriptTest.h" @@ -33,4 +33,3 @@ TEST_F(ScriptSaveManagerTest, GetSaveManager) {  	EXPECT_EQ(&mgr, &save_mgr);  } -  |