Droog71
/
pioneer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clang formatting

master
mike-f1 2019-02-04 21:27:17 +01:00
parent ae1e52d1ab
commit 3c097a555b
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Body.cpp
View File

@ -118,14 +118,14 @@ Body *Body::FromJson(const Json &jsonObj, Space *space)
Ship *s = new Ship(jsonObj, space);
// Here because of comments in Ship.cpp on following function
s->UpdateLuaStats();
return static_cast<Body*>(s);
}
return static_cast<Body *>(s);
}
case Object::PLAYER: {
Player *p = new Player(jsonObj, space);
// Read comments in Ship.cpp on following function
p->UpdateLuaStats();
return static_cast<Body*>(p);
}
return static_cast<Body *>(p);
}
case Object::MISSILE:
return new Missile(jsonObj, space);
case Object::PROJECTILE:

3
src/CargoBody.h
View File

@ -25,7 +25,8 @@ public:
virtual bool OnCollision(Object *o, Uint32 flags, double relVel) override;
virtual bool OnDamage(Object *attacker, float kgDamage, const CollisionContact &contactData) override;
~CargoBody() {};
~CargoBody(){};
protected:
virtual void SaveToJson(Json &jsonObj, Space *space) override;

1
src/DynamicBody.cpp
View File

@ -76,7 +76,6 @@ DynamicBody::DynamicBody(const Json &jsonObj, Space *space) :
m_decelerating = false;
for (int i = 0; i < Feature::MAX_FEATURE; i++)
m_features[i] = false;
}
void DynamicBody::SaveToJson(Json &jsonObj, Space *space)

1
src/Planet.h
View File

@ -30,7 +30,6 @@ public:
friend class ObjectViewerView;
protected:
private:
void InitParams(const SystemBody *);
void GenerateRings(Graphics::Renderer *renderer);

6
src/Projectile.cpp
View File

@ -108,7 +108,8 @@ void Projectile::FreeModel()
s_glowVerts.reset();
}
Projectile::Projectile(Body *parent, const ProjectileData &prData, const vector3d &pos, const vector3d &baseVel, const vector3d &dirVel) : Body()
Projectile::Projectile(Body *parent, const ProjectileData &prData, const vector3d &pos, const vector3d &baseVel, const vector3d &dirVel) :
Body()
{
if (!s_sideMat) BuildModel();
m_flags |= FLAG_DRAW_LAST;
@ -356,7 +357,8 @@ void Projectile::Render(Graphics::Renderer *renderer, const Camera *camera, cons
}
}
void Projectile::Add(Body *parent, float lifespan, float dam, float length, float width, bool mining, const Color &color, const vector3d &pos, const vector3d &baseVel, const vector3d &dirVel) {
void Projectile::Add(Body *parent, float lifespan, float dam, float length, float width, bool mining, const Color &color, const vector3d &pos, const vector3d &baseVel, const vector3d &dirVel)
{
ProjectileData prData;
prData.lifespan = lifespan;
prData.damage = dam;

2
src/Ship.cpp
View File

@ -568,7 +568,7 @@ void Ship::UpdateLuaStats()
int hyperclass = 0;
p.Get<int>("hyperclass_cap", hyperclass);
if (hyperclass) {
std::tie(m_stats.hyperspace_range_max, m_stats.hyperspace_range) = \
std::tie(m_stats.hyperspace_range_max, m_stats.hyperspace_range) =
LuaObject<Ship>::CallMethod<double, double>(this, "GetHyperspaceRange");
}

1
src/ShipCockpit.h
View File

@ -19,7 +19,6 @@ class InternalCameraController;
class ShipCockpit : public ModelBody {
public:
explicit ShipCockpit(const std::string &modelName);
virtual ~ShipCockpit();