Commit 672284fc authored by Ilya Prokhorov's avatar Ilya Prokhorov

astyle ident

parent 529c6676
......@@ -192,12 +192,12 @@ void MainGameController::gameLoop()
void MainGameController::step()
{
if (currentController.get() != nullptr) {
this->currentController->step();
}
else {
throwRuntimeException(string(" FlameSteelEngine::GameToolkit::MainGameController exception - current controller is null, state machine is not initialized?"));
}
if (currentController.get() != nullptr) {
this->currentController->step();
}
else {
throwRuntimeException(string(" FlameSteelEngine::GameToolkit::MainGameController exception - current controller is null, state machine is not initialized?"));
}
}
......@@ -242,9 +242,9 @@ void MainGameController::setCurrentController(shared_ptr<GameController> newCurr
}
currentController = newCurrentController;
if (this->ioSystem.get() == nullptr) {
throwRuntimeException(string("FlameSteelEngineGameToolkit::MainGameController can't set current controller ioSystem is nullptr"));
}
if (this->ioSystem.get() == nullptr) {
throwRuntimeException(string("FlameSteelEngineGameToolkit::MainGameController can't set current controller ioSystem is nullptr"));
}
currentController->setIOSystem(this->ioSystem);
currentController->setGameData(this->getGameData());
currentController->objectsContext = objectsContext;
......
#include "IOSystem.h"
shared_ptr<IOSystem> IOSystem::initialize() {
auto ioSystem = make_shared<IOSystem>();
return ioSystem;
auto ioSystem = make_shared<IOSystem>();
return ioSystem;
};
shared_ptr<Window> IOSystem::getWindow() {
return window;
return window;
};
......@@ -14,11 +14,11 @@ namespace GameToolkit {
class IOSystem {
public:
shared_ptr<IOSystem> initialize();
shared_ptr<Window> getWindow();
shared_ptr<IOSystem> initialize();
shared_ptr<Window> getWindow();
private:
shared_ptr<Window> window;
shared_ptr<Window> window;
};
};
......
......@@ -45,7 +45,7 @@ public:
virtual void cleanRenderIDs();
virtual shared_ptr<Screenshot> takeScreenshot() = 0;
virtual shared_ptr<Screenshot> takeScreenshot() = 0;
};
#endif /* FSEGTRENDERER_H_ */
......@@ -7,7 +7,7 @@ using namespace FlameSteelEngine::GameToolkit;
bool Window::getInitialized() {
cout << "FlameSteelEngine::GameToolkit getInitialized() [INCORRECT]" << endl;
cout << "FlameSteelEngine::GameToolkit getInitialized() [INCORRECT]" << endl;
return initialized;
return initialized;
};
\ No newline at end of file
......@@ -7,10 +7,10 @@ namespace GameToolkit {
class Window {
public:
bool getInitialized();
bool getInitialized();
private:
bool initialized = false;
bool initialized = false;
};
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment