Used ClangFormat style guide I'm happy with.
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
@@ -2,14 +2,14 @@
|
||||
#define CREATURELIB_BATTLE_HPP
|
||||
|
||||
#include <vector>
|
||||
#include "BattleSide.hpp"
|
||||
#include "../Flow/ChoiceQueue.hpp"
|
||||
#include "../Library/BattleLibrary.hpp"
|
||||
#include "../TurnChoices/BaseTurnChoice.hpp"
|
||||
#include "../Flow/ChoiceQueue.hpp"
|
||||
#include "BattleSide.hpp"
|
||||
#include "Target.hpp"
|
||||
|
||||
namespace CreatureLib::Battling {
|
||||
class Battle : public ScriptSource{
|
||||
class Battle : public ScriptSource {
|
||||
const BattleLibrary* _library;
|
||||
uint8_t _numberOfSides;
|
||||
uint8_t _creaturesPerSide;
|
||||
@@ -19,6 +19,7 @@ namespace CreatureLib::Battling {
|
||||
|
||||
uint8_t _numberOfRecalledSlots = 0;
|
||||
ScriptSet _volatile;
|
||||
|
||||
public:
|
||||
[[nodiscard]] const BattleLibrary* GetLibrary() const;
|
||||
|
||||
@@ -32,7 +33,7 @@ namespace CreatureLib::Battling {
|
||||
|
||||
bool CreatureInField(const Creature* creature) const;
|
||||
|
||||
Creature* GetTarget(const Target& target){
|
||||
Creature* GetTarget(const Target& target) {
|
||||
return _sides[target.GetSideIndex()]->GetCreature(target.GetCreatureIndex());
|
||||
}
|
||||
|
||||
@@ -42,9 +43,8 @@ namespace CreatureLib::Battling {
|
||||
|
||||
void FillRecall(uint8_t side, uint8_t, Creature* c);
|
||||
|
||||
void GetActiveScripts(std::vector<ScriptWrapper> &scripts) override;
|
||||
void GetActiveScripts(std::vector<ScriptWrapper>& scripts) override;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
#endif //CREATURELIB_BATTLE_HPP
|
||||
#endif // CREATURELIB_BATTLE_HPP
|
||||
|
||||
Reference in New Issue
Block a user