diff options
Diffstat (limited to 'src/enums/simpletypes')
-rw-r--r-- | src/enums/simpletypes/simpledefines.h | 50 | ||||
-rw-r--r-- | src/enums/simpletypes/simpletypes.h | 27 |
2 files changed, 52 insertions, 25 deletions
diff --git a/src/enums/simpletypes/simpledefines.h b/src/enums/simpletypes/simpledefines.h new file mode 100644 index 000000000..ea5592b0e --- /dev/null +++ b/src/enums/simpletypes/simpledefines.h @@ -0,0 +1,50 @@ +/* + * The ManaPlus Client + * Copyright (C) 2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef ENUMS_SIMPLETYPES_SIMPLDEFINES_H +#define ENUMS_SIMPLETYPES_SIMPLDEFINES_H + +#include "localconsts.h" + +#ifdef ADVGCC + +#define defBoolEnum(name) \ + enum class name : bool \ + { \ + MFalse = false, \ + MTrue = true \ + }; \ + const name name##_true = name::MTrue; \ + const name name##_false = name::MFalse +#define fromBool(val, name) \ + (val) ? name::MTrue : name::MFalse + +#else // ADVGCC + +#define defBoolEnum(name) \ + const bool name##_true = true; \ + const bool name##_false = false; \ + typedef bool name +#define fromBool(val, name) \ + (val) ? true : false + +#endif // ADVGCC + +#endif // ENUMS_SIMPLETYPES_SIMPLDEFINES_H diff --git a/src/enums/simpletypes/simpletypes.h b/src/enums/simpletypes/simpletypes.h index 2d5514d11..9fb0a553c 100644 --- a/src/enums/simpletypes/simpletypes.h +++ b/src/enums/simpletypes/simpletypes.h @@ -21,32 +21,9 @@ #ifndef ENUMS_SIMPLETYPES_SIMPLETYPES_H #define ENUMS_SIMPLETYPES_SIMPLETYPES_H -#include "localconsts.h" - -#ifdef ADVGCC - -#define defBoolEnum(name) \ - enum class name : bool \ - { \ - MFalse = false, \ - MTrue = true \ - }; \ - const name name##_true = name::MTrue; \ - const name name##_false = name::MFalse -#define fromBool(val, name) \ - (val) ? name::MTrue : name::MFalse - -#else // ADVGCC - -#define defBoolEnum(name) \ - const bool name##_true = true; \ - const bool name##_false = false; \ - typedef bool name -#define fromBool(val, name) \ - (val) ? true : false - -#endif // ADVGCC +#include "enums/simpletypes/simpledefines.h" +#include "localconsts.h" defBoolEnum(Identified); defBoolEnum(Damaged); |