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

fix floor hitbox on no floor map

Browse Source
This commit is contained in:
Askou
2021-06-11 19:25:43 +02:00
parent b39e4ad57a
commit 73b8cc5ccd
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Map/Map.cpp
+5 -4
View File
@@ -381,7 +381,7 @@ namespace BBM
return (map);
}
MapGenerator::MapBlock MapGenerator::createMap(int width, int height)
MapGenerator::MapBlock MapGenerator::createMap(int width, int height, bool isHeight)
{
MapBlock map;
@@ -408,7 +408,8 @@ namespace BBM
for (int j = 0; j < height + 1; j++)
if (!((i + 1) % 2) && !((j + 1) % 2))
map[std::make_tuple(i, 0, j)] = UNBREAKABLE;
map = createHeight(map, width, height);
if (isHeight)
map = createHeight(map, width, height);
map = cleanBreakable(map, width, height);
return (map);
}
@@ -426,11 +427,11 @@ namespace BBM
for (int i = width / 2 - width / 4; i < width / 2 + width / 4 + 1; i++) {
for (int j = height / 2 - height / 4; j < height / 2 + height / 4 + 1; j++) {
if (map[std::make_tuple(i, 1, i)] != UPPERFLOOR) {
floor -= -1;
floor -= 1;
break;
}
}
if (floor <= -1)
if (floor <= 0)
break;
}
if (floor >= 1) {
sources/Map/Map.hpp
+1 -1
View File
@@ -181,7 +181,7 @@ namespace BBM
//! @param width Width of the map
//! @param height Height of the map
//! @brief Generate map of block to be loaded
static MapBlock createMap(int width, int height);
static MapBlock createMap(int width, int height, bool isHeight = false);
//! @param width Width of the map
//! @param height Height of the map