diff --git a/environment.cpp b/environment.cpp index 33c478f..81bc22e 100644 --- a/environment.cpp +++ b/environment.cpp @@ -24,7 +24,7 @@ namespace battleship{ return environment; } - static void explode(Vector3 pos, int damage, float radius, sf::Sound *explosionSfx){ + void Environment::explode(Vector3 pos, int damage, float radius, sf::Sound *explosionSfx){ if(!(damage == 0 || radius == 0)) for(Player *pl : Game::getSingleton()->getPlayers()){ for(Unit *un : pl->getUnits()){ diff --git a/projectile.cpp b/projectile.cpp index 5f7750c..20e7ad1 100755 --- a/projectile.cpp +++ b/projectile.cpp @@ -97,7 +97,7 @@ namespace battleship{ for(int i = 0; i < targetNodes.size(); i++) if(targetNodes[i]->getMesh(0) == results[0].mesh){ targetUnits[i]->takeDamage(directHitDamage); - Environment::getSingleton()->explode(pos, explosionDamage, explosionRadius, explosionSfx); + Environment::explode(pos, explosionDamage, explosionRadius, explosionSfx); remove = true; } } @@ -108,7 +108,7 @@ namespace battleship{ int cellId = map->getCellId(pos, false); if((pos + dirVec * rayLength).y <= map->getCells()[cellId].pos.y){ - Environment::getSingleton()->explode(pos, explosionDamage, explosionRadius, explosionSfx); + Environment::explode(pos, explosionDamage, explosionRadius, explosionSfx); remove = true; } } diff --git a/unit.cpp b/unit.cpp index f03d39b..7c43130 100755 --- a/unit.cpp +++ b/unit.cpp @@ -325,7 +325,7 @@ namespace battleship{ displayUnitStats(slot.foreground, slot.background, (int)((bool)slot.vehicle), (int)true, renderSelectables, slot.offset); if (health <= DEATH_HP){ - Environment::getSingleton()->explode(pos, 0, 0, deathSfx); + Environment::explode(pos, 0, 0, deathSfx); remove = true; }