zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-06-04 10:44:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into soundfix

Browse Source
This commit is contained in:
arthur.jamet
2021-06-20 13:33:52 +02:00
parent 3f86d506f7 56f9995431
commit 5d89c20277
11 changed files with 67 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Runner/LobbyScene.cpp
+1 -2
View File
@@ -77,7 +77,7 @@ namespace BBM
return;
LobbySystem::switchToGame(wal);
})
.addComponent<TagComponent<"PlayButton">>();
.addComponent<TagComponent<PlayButton>>();
auto &back = scene->addEntity("back to menu")
.addComponent<PositionComponent>(10, 1080 - 85, 0)
.addComponent<Drawable2DComponent, RAY::Texture>("assets/buttons/button_back.png")
@@ -186,7 +186,6 @@ namespace BBM
.addComponent<Drawable2DComponent, RAY::Texture>("assets/player/icons/none.png");
auto &ready = scene->addEntity("ready")
.addComponent<PositionComponent>(224 * (i + 1) + 200 * i, 1080 / 3 - 50, 0)
// todo check why it does this | hacky way to fix ready texture
.addComponent<Drawable2DComponent, RAY::Texture>();
player.addComponent<LobbyComponent>(i, ready, playerTile);
}