diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-03-13 17:12:06 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-03-13 17:12:06 +0300 |
| commit | adb67cb947885af8f74eb8ad943d2862a198805d (patch) | |
| tree | 13aac08184c59cae8b48a59293b64875b3f09ae5 /src/net/eathena/maptypeproperty2.h | |
| parent | 357560f6a8a0b61d94b6a70a519a2d3ece6f364d (diff) | |
| download | plus-adb67cb947885af8f74eb8ad943d2862a198805d.tar.gz plus-adb67cb947885af8f74eb8ad943d2862a198805d.tar.bz2 plus-adb67cb947885af8f74eb8ad943d2862a198805d.tar.xz plus-adb67cb947885af8f74eb8ad943d2862a198805d.zip | |
fix code style.
Diffstat (limited to 'src/net/eathena/maptypeproperty2.h')
| -rw-r--r-- | src/net/eathena/maptypeproperty2.h | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/src/net/eathena/maptypeproperty2.h b/src/net/eathena/maptypeproperty2.h index a7d2b4c41..dc7ca5a0d 100644 --- a/src/net/eathena/maptypeproperty2.h +++ b/src/net/eathena/maptypeproperty2.h @@ -21,22 +21,29 @@ #ifndef NET_EATHENA_MAPTYPEPROPERTY2_H #define NET_EATHENA_MAPTYPEPROPERTY2_H +#if defined(__GXX_EXPERIMENTAL_CXX0X__) +#include <cstdint> +#else +#include <stdint.h> +#endif + namespace EAthena { struct MapTypeProperty2Bits final { - unsigned int party : 1; // allow attack party members (PvP) - unsigned int guild : 1; // allow attack guild members (GvG) - unsigned int siege : 1; // show emblem in GvG (WoE castle) - unsigned int mineffect : 1; // mine effect? - unsigned int nolockon : 1; // unknown - unsigned int countpk : 1; // show PvP counter - unsigned int nopartyformation : 1; // prevent party creation/modification - unsigned int bg : 1; // is on battle ground - unsigned int noitemconsumption : 1; // unused - unsigned int usecart : 1; // unused - unsigned int summonstarmiracle : 1; // unused - unsigned int SpareBits : 15; // unused bits + uint32_t party : 1; // allow attack party members (PvP) + uint32_t guild : 1; // allow attack guild members (GvG) + uint32_t siege : 1; // show emblem in GvG (WoE castle) + uint32_t mineffect : 1; // mine effect? + uint32_t nolockon : 1; // unknown + uint32_t countpk : 1; // show PvP counter + uint32_t nopartyformation : 1; // prevent party creation/ + // modification + uint32_t bg : 1; // is on battle ground + uint32_t noitemconsumption : 1; // unused + uint32_t usecart : 1; // unused + uint32_t summonstarmiracle : 1; // unused + uint32_t SpareBits : 15; // unused bits } __attribute__((packed)); union MapTypeProperty2 final |