zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-05-28 16:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix print and useless operation

Browse Source
This commit is contained in:
Askou
2021-06-18 15:30:18 +02:00
parent b57be1f22b
commit 4acac815fd
5 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Items/Bonus.cpp
-1
View File
@@ -76,7 +76,6 @@ namespace BBM {
float value = (distribution(generator) / 10);
BonusType bonus = NOTHING;
std::cout << value << std::endl;
for (auto &chance : chanceValue)
if (chance.second > value)
bonus = chance.first;
sources/Map/Map.cpp
-1
View File
@@ -261,7 +261,6 @@ namespace BBM
scene->addEntity("Floor")
.addComponent<PositionComponent>(Vector3f(coords))
//.addComponent<CollisionComponent>(1)
.addComponent<Drawable3DComponent, RAY3D::Model>(floorObj, false, std::make_pair(MAP_DIFFUSE, floorPng));
}
sources/System/Bonus/PlayerBonusSystem.cpp
+3 -5
View File
@@ -28,11 +28,9 @@ namespace BBM
auto playerHealth = entity->tryGetComponent<HealthComponent>();
if (!playerHealth || !playerPos)
return;
for (auto &[other, pos, _] : this->_wal.getScene()->view<PositionComponent, CollisionComponent>()) {
if (other.hasComponent<TagComponent<Player>>())
continue;
auto vec = playerPos->position.abs() - pos.position.abs();
if (vec.abs().x < 0.65 && vec.abs().z < 0.65 && playerPos->position.distance(pos.position) < 1)
for (auto &[other, pos, _] : this->_wal.getScene()->view<PositionComponent, TagComponent<Blowable>>()) {
auto vec = (playerPos->position - pos.position).abs();
if (vec.x < 0.65 && vec.z < 0.65 && playerPos->position.distance(pos.position) < 1)
playerHealth->takeDmg(playerHealth->getHealthPoint());
}
}
sources/System/Controllable/ControllableSystem.cpp
-1
View File
@@ -18,7 +18,6 @@ namespace BBM
{
auto &controllable = entity.get<ControllableComponent>();
auto &movable = entity.get<MovableComponent>();
auto health = entity->tryGetComponent<HealthComponent>();
Vector2f move = controllable.move.normalized() * controllable.speed;
movable.addForce(Vector3f(move.x, 0, move.y));
sources/System/Renderer/CameraSystem.cpp
-2
View File
@@ -60,8 +60,6 @@ namespace BBM
float lowerZDist = 0;
for (auto &[player, position, _] : this->_wal.getScene()->view<PositionComponent, TagComponent<Player>>()) {
if (!player.hasComponent<MovableComponent>())
player.addComponent<MovableComponent>();
playerPos.emplace_back(position.position);
}
if (playerPos.size() == 1)