changed namespace

This commit is contained in:
devZoGok
2021-11-01 11:49:56 +02:00
parent 54a5edf7c8
commit 14bf591a27
72 changed files with 5236 additions and 5424 deletions
+22 -26
View File
@@ -6,37 +6,33 @@
#include "torpedo.h"
#include "projectileData.h"
using namespace game::core;
using namespace game::util;
using namespace vb01;
namespace game{
namespace content{
Submarine::Submarine(Player *player, Vector3 pos, int id) : Unit(player,pos, id) {}
namespace battleship{
Submarine::Submarine(Player *player, Vector3 pos, int id) : Unit(player,pos, id) {}
void Submarine::attack(Order order) {
float angle = dirVec.getAngleBetween(*(order.targetPos[0]) - pos);
void Submarine::attack(Order order) {
float angle = dirVec.getAngleBetween(*(order.targetPos[0]) - pos);
if(angle / PI * 180 > 50)
Unit::move(order, range);
if(angle / PI * 180 > 50)
Unit::move(order, range);
if (canFire()) {
Vector3 p = pos + leftVec * projectileData::pos[id][0][0].x + upVec * projectileData::pos[id][0][0].y - dirVec * projectileData::pos[id][0][0].z;
addProjectile(new Torpedo(this, p, dirVec, leftVec, upVec, getId(), 0, 0));
lastShotTime=getTime();
}
}
void Submarine::emerge() {
submerged = false;
pos.y += 5;
node->setPosition(pos);
}
void Submarine::submerge() {
submerged = true;
pos.y -= 5;
node->setPosition(pos);
if (canFire()) {
Vector3 p = pos + leftVec * projectileData::pos[id][0][0].x + upVec * projectileData::pos[id][0][0].y - dirVec * projectileData::pos[id][0][0].z;
addProjectile(new Torpedo(this, p, dirVec, leftVec, upVec, getId(), 0, 0));
lastShotTime=getTime();
}
}
void Submarine::emerge() {
submerged = false;
pos.y += 5;
node->setPosition(pos);
}
void Submarine::submerge() {
submerged = true;
pos.y -= 5;
node->setPosition(pos);
}
}