From 32ee1708a24836b26cd700eb42ad8264a3ecae83 Mon Sep 17 00:00:00 2001 From: 12xx12 <44411062+12xx12@users.noreply.github.com> Date: Fri, 9 Oct 2020 22:49:25 +0200 Subject: Adding wolf breading and moving breeding functionality to cMonster (#4951) * added wolf breading * mpoved breeding to monster * checkstyle * fixed my IDE "helping" * removed magic number and fixed faster aging * added flooring to age manipulation * fixed copiler error * fixed typo * moved tps to Defines.h * removed the TPS constant from the lua API exposure * added inline constexpr added explanation * fixed broken build * "fixed" build Co-authored-by: 12xx12 <12xx12100@gmail.com> --- src/Defines.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'src/Defines.h') diff --git a/src/Defines.h b/src/Defines.h index a9714c52f..dc2835517 100644 --- a/src/Defines.h +++ b/src/Defines.h @@ -12,6 +12,21 @@ typedef std::vector cSlotNums; +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wmissing-variable-declarations" +#endif +/** Constant to calculate ticks from seconds "ticks per second" */ +constexpr inline const int TPS = 20; +// This is not added to the lua API because it broke the build +#ifdef __clang__ +#pragma clang diagnostic pop +#endif + + + + + // tolua_begin /** Experience Orb setup */ @@ -384,7 +399,6 @@ enum eMessageType - /** Returns a textual representation of the click action. */ const char * ClickActionToString(int a_ClickAction); -- cgit v1.2.3