Update to latest version of CreatureLib, apply new ENUM macro.
continuous-integration/drone/push Build is failing

This commit is contained in:
Deukhoofd committed 2020-02-12 20:30:22 +01:00
1 parent 9974adb5ad
commit b8d7e5624c
3 files changed
+10 -24

No files matched your search

+1 -1
View File
@@ -44,7 +44,7 @@ class PkmnLibConan(ConanFile):
self.options["AngelScript"].link_std_statically = True
def requirements(self):
self.requires("CreatureLib/3f57051219232f42bacf3475d231cfe693e1e101@creaturelib/master")
self.requires("CreatureLib/1969f59a9ca1408b6c107d679a83f6b73aeb2af9@creaturelib/master")
if self.options.script_handler == "angelscript":
self.requires("AngelScript/2.34@AngelScript/Deukhoofd")
else:
+5 -16
View File
@@ -2,22 +2,11 @@
#define PKMNLIB_EVOLUTIONMETHOD_HPP
#include <cstdint>
namespace PkmnLib::Library{
enum class EvolutionMethod : uint8_t{
Level,
HighFriendship,
KnownMove,
LocationBased,
TimeBased,
HoldsItem,
IsGenderAndLevel,
EvolutionItemUse,
EvolutionItemUseWithGender,
Trade,
TradeWithHeldItem,
TradeWithSpecificPokemon,
Custom
};
namespace PkmnLib::Library {
ENUM(EvolutionMethod, uint8_t, Level, HighFriendship, KnownMove, LocationBased, TimeBased, HoldsItem,
IsGenderAndLevel, EvolutionItemUse, EvolutionItemUseWithGender, Trade, TradeWithHeldItem,
TradeWithSpecificPokemon, Custom
)
}
#endif // PKMNLIB_EVOLUTIONMETHOD_HPP
+4 -7
View File
@@ -1,14 +1,11 @@
#ifndef PKMNLIB_TIMEOFDAY_HPP
#define PKMNLIB_TIMEOFDAY_HPP
#include <CreatureLib/Core/Enum.hpp>
#include <cstdint>
namespace PkmnLib::Library{
enum class TimeOfDay : uint8_t {
Night,
Morning,
Afternoon,
Evening
};
namespace PkmnLib::Library {
ENUM(TimeOfDay, uint8_t, Night, Morning, Afternoon, Evening)
}
#endif // PKMNLIB_TIMEOFDAY_HPP