zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-06-05 02:49:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

little fix

Browse Source
This commit is contained in:
HENRY Benjamin
2021-05-31 17:35:42 +02:00
parent 38cbfa022e
commit dd0d1e6fa2
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bomberman
Executable
BIN
View File
Binary file not shown.
sources/Map/Map.cpp
+2 -2
View File
@@ -142,7 +142,7 @@ namespace BBM
map[std::make_tuple(i, j)] = NOTHING; map[std::make_tuple(i, j)] = NOTHING;
map[std::make_tuple(1, 1)] = SPAWNER; map[std::make_tuple(1, 1)] = SPAWNER;
map[std::make_tuple(width - 1, 1)] = SPAWNER; map[std::make_tuple(width - 1, 1)] = SPAWNER;
map[std::make_tuple(1, height - 2)] = SPAWNER; map[std::make_tuple(1, height - 1)] = SPAWNER;
map[std::make_tuple(width - 1, height - 1)] = SPAWNER; map[std::make_tuple(width - 1, height - 1)] = SPAWNER;
for (int i = 1; i < width - 1; i++) { for (int i = 1; i < width - 1; i++) {
for (int j = 1; j < height - 1; j++) { for (int j = 1; j < height - 1; j++) {
@@ -151,7 +151,7 @@ namespace BBM
} else { } else {
map[std::make_tuple(i, j)] = getRandomBlockType(seed, i * width + j); map[std::make_tuple(i, j)] = getRandomBlockType(seed, i * width + j);
} }
if (isBlockCloseToBlockType(map, i , j, UNBREAKABLE) && !isBlockCloseToBlockType(map, i , j, SPAWNER)) { if (map[std::make_tuple(i, j)] != NOTHING && isBlockCloseToBlockType(map, i , j, UNBREAKABLE) && !isBlockCloseToBlockType(map, i , j, SPAWNER)) {
map[std::make_tuple(i, j)] = BREAKABLE; map[std::make_tuple(i, j)] = BREAKABLE;
} }
} }
sources/Runner/Runner.cpp
+1 -1
View File
@@ -55,7 +55,7 @@ namespace BBM
.addComponent<PositionComponent>() .addComponent<PositionComponent>()
.addComponent<Drawable3DComponent<RAY3D::Model>>("assets/player/player.iqm", std::make_pair(MAP_DIFFUSE, "assets/player/blue.png")); .addComponent<Drawable3DComponent<RAY3D::Model>>("assets/player/player.iqm", std::make_pair(MAP_DIFFUSE, "assets/player/blue.png"));
scene->addEntity("camera") scene->addEntity("camera")
.addComponent<PositionComponent>(10, 10, 10) .addComponent<PositionComponent>(25, 25, 25)
.addComponent<CameraComponent>(); .addComponent<CameraComponent>();
Map::generateMap(15, 15, rand(), scene); Map::generateMap(15, 15, rand(), scene);
return scene; return scene;