Delete Soldier class
Make Infantry as structure
This commit is contained in:
@@ -1,14 +1,5 @@
|
||||
#pragma once
|
||||
#include "Soldier.h"
|
||||
class Infantry : public Soldier {
|
||||
public:
|
||||
Infantry() : Soldier() {};
|
||||
int step() override
|
||||
{
|
||||
return 10;
|
||||
}
|
||||
void fire() override
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
struct Infantry {
|
||||
void attack();
|
||||
};
|
||||
@@ -6,7 +6,7 @@
|
||||
class Player {
|
||||
private:
|
||||
char name;
|
||||
std::vector<std::unique_ptr<Soldier>> army;
|
||||
std::vector<std::unique_ptr<Infantry>> army;
|
||||
double score;
|
||||
public:
|
||||
Player() {
|
||||
@@ -15,7 +15,7 @@ public:
|
||||
army.push_back(std::make_unique<Infantry>());
|
||||
}
|
||||
}
|
||||
std::vector<std::unique_ptr<Soldier>>& get_army() {
|
||||
std::vector<std::unique_ptr<Infantry>>& get_army() {
|
||||
return army;
|
||||
}
|
||||
};
|
||||
@@ -1,14 +0,0 @@
|
||||
#pragma once
|
||||
class Soldier {
|
||||
private:
|
||||
double HP;
|
||||
double attack;
|
||||
double defence;
|
||||
char type;
|
||||
protected:
|
||||
Soldier() : HP(100), attack(1), defence(1) {};
|
||||
Soldier(double _HP, double _attack, double _defence) : HP(_HP), attack(_attack), defence(_defence) {};
|
||||
public:
|
||||
virtual int step() = 0;
|
||||
virtual void fire() = 0;
|
||||
};
|
||||
@@ -8,7 +8,6 @@
|
||||
#include "curses.h"
|
||||
#endif // WINDOWS
|
||||
|
||||
#include "Soldier.h"
|
||||
#include "Infantry.h"
|
||||
#include "Game.h"
|
||||
#include "Player.h"
|
||||
|
||||
Reference in New Issue
Block a user