diff options
| author | archshift <admin@archshift.com> | 2014-08-03 07:56:08 +0200 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2014-08-11 00:06:59 +0200 |
| commit | 92f67789fc24572092a70d582aef22d7ef1dd272 (patch) | |
| tree | cd3aa17e2823fea0376c8513324f244b328c86d8 /src | |
| parent | Player.cpp: change unnamed enum to constant integers (diff) | |
| download | cuberite-92f67789fc24572092a70d582aef22d7ef1dd272.tar cuberite-92f67789fc24572092a70d582aef22d7ef1dd272.tar.gz cuberite-92f67789fc24572092a70d582aef22d7ef1dd272.tar.bz2 cuberite-92f67789fc24572092a70d582aef22d7ef1dd272.tar.lz cuberite-92f67789fc24572092a70d582aef22d7ef1dd272.tar.xz cuberite-92f67789fc24572092a70d582aef22d7ef1dd272.tar.zst cuberite-92f67789fc24572092a70d582aef22d7ef1dd272.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/Enchantments.h | 2 | ||||
| -rw-r--r-- | src/HTTPServer/HTTPMessage.h | 2 | ||||
| -rw-r--r-- | src/Inventory.h | 4 | ||||
| -rw-r--r-- | src/Protocol/Protocol125.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/Enchantments.h b/src/Enchantments.h index 98d7c0d36..824f6aa55 100644 --- a/src/Enchantments.h +++ b/src/Enchantments.h @@ -43,7 +43,7 @@ public: /** Individual enchantment IDs, corresponding to their NBT IDs: http://www.minecraftwiki.net/wiki/Data_Values#Enchantment_IDs */ - enum + enum eEnchantment { enchProtection = 0, enchFireProtection = 1, diff --git a/src/HTTPServer/HTTPMessage.h b/src/HTTPServer/HTTPMessage.h index e402c8ad6..c0667030f 100644 --- a/src/HTTPServer/HTTPMessage.h +++ b/src/HTTPServer/HTTPMessage.h @@ -18,7 +18,7 @@ class cHTTPMessage { public: - enum + enum eStatus { HTTP_OK = 200, HTTP_BAD_REQUEST = 400, diff --git a/src/Inventory.h b/src/Inventory.h index ed134aee4..5628fb0da 100644 --- a/src/Inventory.h +++ b/src/Inventory.h @@ -39,8 +39,8 @@ public: enum { invArmorCount = 4, - invInventoryCount = 9 * 3, - invHotbarCount = 9, + invInventoryCount = 9 * 3, + invHotbarCount = 9, invArmorOffset = 0, invInventoryOffset = invArmorOffset + invArmorCount, diff --git a/src/Protocol/Protocol125.h b/src/Protocol/Protocol125.h index 18efeb079..3adac3055 100644 --- a/src/Protocol/Protocol125.h +++ b/src/Protocol/Protocol125.h @@ -103,7 +103,7 @@ public: protected: /// Results of packet-parsing: - enum + enum eParseResult { PARSE_OK = 1, PARSE_ERROR = -1, |