mirror of
https://github.com/zoriya/Bomberman.git
synced 2026-06-04 10:44:42 +00:00
Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into parser
# Conflicts: # sources/Component/BombHolder/BombHolderComponent.cpp # sources/Map/Map.cpp
This commit is contained in:
@@ -63,7 +63,6 @@ namespace BBM
|
||||
|
||||
void Runner::updateState(WAL::Wal &engine, GameState &state)
|
||||
{
|
||||
auto &view = engine.getScene()->view<ControllableComponent>();
|
||||
if (RAY::Window::getInstance().shouldClose())
|
||||
engine.shouldClose = true;
|
||||
if (gameState.currentScene == GameState::SceneID::GameScene) {
|
||||
@@ -118,7 +117,11 @@ namespace BBM
|
||||
|
||||
void Runner::enableRaylib(WAL::Wal &wal)
|
||||
{
|
||||
#ifdef RELEASE
|
||||
RAY::TraceLog::setLevel(LOG_NONE);
|
||||
#else
|
||||
RAY::TraceLog::setLevel(LOG_WARNING);
|
||||
#endif
|
||||
RAY::Window &window = RAY::Window::getInstance(1280, 720, "Bomberman", FLAG_WINDOW_RESIZABLE);
|
||||
wal.addSystem<AnimationsSystem>()
|
||||
.addSystem<AnimatorSystem>()
|
||||
|
||||
Reference in New Issue
Block a user