diff options
author | est31 <MTest31@outlook.com> | 2015-06-20 03:20:06 +0200 |
---|---|---|
committer | est31 <MTest31@outlook.com> | 2015-06-20 03:37:30 +0200 |
commit | dd91b3d6fbc3a0b4b18b36b14864d703213dd622 (patch) | |
tree | 0c73f02ef3357f9557694d489a42df424fab51fc /src/genericobject.h | |
parent | 40226e52747156cbdc5128a416480b226e498fff (diff) | |
download | minetest-dd91b3d6fbc3a0b4b18b36b14864d703213dd622.tar.gz minetest-dd91b3d6fbc3a0b4b18b36b14864d703213dd622.tar.bz2 minetest-dd91b3d6fbc3a0b4b18b36b14864d703213dd622.zip |
Generic CAO cleanups and renames for clarification
* Use enum for GENERIC_CMD_*
* Rename m_attachements to attachement_parent_ids (public member and clearer name)
* Rename GENERIC_CMD_SET_ATTACHMENT to GENERIC_CMD_ATTACH_TO
* USHRT_MAX + 1 buffer sizes to prevent overflows as @kahrl suggested
* Remove unneccessary m_id from GenericCAO (shadowing protected superclass member for no reason) as @kahrl suggested
Diffstat (limited to 'src/genericobject.h')
-rw-r--r-- | src/genericobject.h | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/genericobject.h b/src/genericobject.h index 2233e4ea0..b36a3830d 100644 --- a/src/genericobject.h +++ b/src/genericobject.h @@ -24,17 +24,19 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "irrlichttypes_bloated.h" #include <iostream> -#define GENERIC_CMD_SET_PROPERTIES 0 -#define GENERIC_CMD_UPDATE_POSITION 1 -#define GENERIC_CMD_SET_TEXTURE_MOD 2 -#define GENERIC_CMD_SET_SPRITE 3 -#define GENERIC_CMD_PUNCHED 4 -#define GENERIC_CMD_UPDATE_ARMOR_GROUPS 5 -#define GENERIC_CMD_SET_ANIMATION 6 -#define GENERIC_CMD_SET_BONE_POSITION 7 -#define GENERIC_CMD_SET_ATTACHMENT 8 -#define GENERIC_CMD_SET_PHYSICS_OVERRIDE 9 -#define GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES 10 +enum GenericCMD { + GENERIC_CMD_SET_PROPERTIES, + GENERIC_CMD_UPDATE_POSITION, + GENERIC_CMD_SET_TEXTURE_MOD, + GENERIC_CMD_SET_SPRITE, + GENERIC_CMD_PUNCHED, + GENERIC_CMD_UPDATE_ARMOR_GROUPS, + GENERIC_CMD_SET_ANIMATION, + GENERIC_CMD_SET_BONE_POSITION, + GENERIC_CMD_ATTACH_TO, + GENERIC_CMD_SET_PHYSICS_OVERRIDE, + GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES +}; #include "object_properties.h" std::string gob_cmd_set_properties(const ObjectProperties &prop); |