devZoGok/PlanetFleet
1
0
Fork 0
mirror of https://github.com/devZoGok/PlanetFleet.git synced 2026-08-26 19:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

implemented central Game class

Browse Source
This commit is contained in:
devZoGok
2023-10-08 15:08:45 +03:00
parent e8432da24e
commit b895a85378
26 changed files with 174 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projectile.cpp
+5 -5
View File
@@ -8,7 +8,7 @@
#include <stateManager.h>
#include "map.h"
#include "game.h"
#include "unit.h"
#include "util.h"
#include "projectile.h"
@@ -103,7 +103,7 @@ namespace battleship{
void Projectile::explode(Node *collNode) {
exploded = true;
for (Player *p : Map::getSingleton()->getPlayers()) {
for (Player *p : Game::getSingleton()->getPlayers()) {
for (Unit *u : p->getUnits())
if (collNode == u->getNode())
u->takeDamage(damage);
@@ -113,11 +113,11 @@ namespace battleship{
InGameAppState *inGameState = ((InGameAppState*)sm->getAppStateByType((int)AppStateType::IN_GAME_STATE));
if(id == 8)
detonateTorpedo(inGameState, pos);
detonateTorpedo();
else if(weaponTypeId == 1 && (id == 2 || id == 3))
detonateDepthCharge(inGameState, pos);
detonateDepthCharge();
else
detonate(inGameState, pos, -dirVec);
detonate(pos, -dirVec);
}
void Projectile::debug(){