summaryrefslogtreecommitdiff
path: root/src/enums
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-07-28 16:03:59 +0300
committerAndrei Karas <akaras@inbox.ru>2016-07-28 16:34:59 +0300
commitb96e6eeba6e1511568c8291bd8cb6a6d3706635c (patch)
treed021843c88d856f86f018547c30f1181290ffcbe /src/enums
parent60859a71dd9794b0216cc7a60146d417e06dbbad (diff)
downloadplus-b96e6eeba6e1511568c8291bd8cb6a6d3706635c.tar.gz
plus-b96e6eeba6e1511568c8291bd8cb6a6d3706635c.tar.bz2
plus-b96e6eeba6e1511568c8291bd8cb6a6d3706635c.tar.xz
plus-b96e6eeba6e1511568c8291bd8cb6a6d3706635c.zip
Remove define EATHENA_SUPPORT from all code.
Now eathena like support enabled always.
Diffstat (limited to 'src/enums')
-rw-r--r--src/enums/being/actortype.h4
-rw-r--r--src/enums/being/cookingtype.h2
-rw-r--r--src/enums/being/rank.h2
-rw-r--r--src/enums/cutin.h3
-rw-r--r--src/enums/dragdropsource.h4
-rw-r--r--src/enums/emotetype.h2
-rw-r--r--src/enums/gui/itemamountwindowusage.h4
-rw-r--r--src/enums/inventorytype.h2
-rw-r--r--src/enums/net/auctionsearchtype.h2
-rw-r--r--src/enums/net/battlegroundtype.h2
-rw-r--r--src/enums/net/deleteitemreason.h2
-rw-r--r--src/enums/net/storesearchtype.h2
12 files changed, 0 insertions, 31 deletions
diff --git a/src/enums/being/actortype.h b/src/enums/being/actortype.h
index 8e8eb7851..c742255d9 100644
--- a/src/enums/being/actortype.h
+++ b/src/enums/being/actortype.h
@@ -33,15 +33,11 @@ enumStart(ActorType)
FloorItem,
Portal,
LocalPet,
-#ifdef EATHENA_SUPPORT
Avatar,
Pet,
Mercenary,
Homunculus,
SkillUnit
-#else
- Avatar
-#endif
}
enumEnd(ActorType);
diff --git a/src/enums/being/cookingtype.h b/src/enums/being/cookingtype.h
index 4b27c965a..55aba4776 100644
--- a/src/enums/being/cookingtype.h
+++ b/src/enums/being/cookingtype.h
@@ -20,7 +20,6 @@
#ifndef ENUMS_BEING_COOKINGTYPE_H
#define ENUMS_BEING_COOKINGTYPE_H
-#ifdef EATHENA_SUPPORT
#include "enums/simpletypes/enumdefines.h"
@@ -35,5 +34,4 @@ enumStart(CookingType)
}
enumEnd(CookingType);
-#endif // EATHENA_SUPPORT
#endif // ENUMS_BEING_COOKINGTYPE_H
diff --git a/src/enums/being/rank.h b/src/enums/being/rank.h
index ffb469ed7..6268207bd 100644
--- a/src/enums/being/rank.h
+++ b/src/enums/being/rank.h
@@ -20,7 +20,6 @@
#ifndef ENUMS_BEING_RANK_H
#define ENUMS_BEING_RANK_H
-#ifdef EATHENA_SUPPORT
#include "enums/simpletypes/enumdefines.h"
@@ -33,5 +32,4 @@ enumStart(Rank)
}
enumEnd(Rank);
-#endif // EATHENA_SUPPORT
#endif // ENUMS_BEING_RANK_H
diff --git a/src/enums/cutin.h b/src/enums/cutin.h
index 095832fe9..a24fbe384 100644
--- a/src/enums/cutin.h
+++ b/src/enums/cutin.h
@@ -21,8 +21,6 @@
#ifndef ENUMS_CUTIN_H
#define ENUMS_CUTIN_H
-#ifdef EATHENA_SUPPORT
-
#include "enums/simpletypes/enumdefines.h"
enumStart(CutIn)
@@ -35,5 +33,4 @@ enumStart(CutIn)
}
enumEnd(CutIn);
-#endif // EATHENA_SUPPORT
#endif // ENUMS_CUTIN_H
diff --git a/src/enums/dragdropsource.h b/src/enums/dragdropsource.h
index 9a65b9dcb..e96de703b 100644
--- a/src/enums/dragdropsource.h
+++ b/src/enums/dragdropsource.h
@@ -36,14 +36,10 @@ enumStart(DragDropSource)
Drop,
Shortcuts,
Npc,
-#ifdef EATHENA_SUPPORT
Equipment,
Cart,
Mail,
Craft
-#else
- Equipment
-#endif
}
enumEnd(DragDropSource);
diff --git a/src/enums/emotetype.h b/src/enums/emotetype.h
index a6cde24af..d0a1de652 100644
--- a/src/enums/emotetype.h
+++ b/src/enums/emotetype.h
@@ -26,10 +26,8 @@
enumStart(EmoteType)
{
Player = 0,
-#ifdef EATHENA_SUPPORT
Homunculus,
Mercenary,
-#endif
Pet
}
enumEnd(EmoteType);
diff --git a/src/enums/gui/itemamountwindowusage.h b/src/enums/gui/itemamountwindowusage.h
index 982341a2a..7926c3f77 100644
--- a/src/enums/gui/itemamountwindowusage.h
+++ b/src/enums/gui/itemamountwindowusage.h
@@ -35,13 +35,9 @@ enumStart(ItemAmountWindowUsage)
CartRemove,
ItemSplit,
ShopBuyAdd,
-#ifdef EATHENA_SUPPORT
ShopSellAdd,
CraftAdd,
MailAdd
-#else
- ShopSellAdd
-#endif
}
enumEnd(ItemAmountWindowUsage);
diff --git a/src/enums/inventorytype.h b/src/enums/inventorytype.h
index b15676c2a..47c4aa4e0 100644
--- a/src/enums/inventorytype.h
+++ b/src/enums/inventorytype.h
@@ -31,12 +31,10 @@ enumStart(InventoryType)
Storage,
Trade,
Npc,
-#ifdef EATHENA_SUPPORT
Cart,
Vending,
Mail,
Craft,
-#endif
TypeEnd
}
enumEnd(InventoryType);
diff --git a/src/enums/net/auctionsearchtype.h b/src/enums/net/auctionsearchtype.h
index 45747edc8..da335fc17 100644
--- a/src/enums/net/auctionsearchtype.h
+++ b/src/enums/net/auctionsearchtype.h
@@ -20,7 +20,6 @@
#ifndef ENUMS_NET_AUCTIONSEARCHTYPE_H
#define ENUMS_NET_AUCTIONSEARCHTYPE_H
-#ifdef EATHENA_SUPPORT
#include "enums/simpletypes/enumdefines.h"
@@ -35,5 +34,4 @@ enumStart(AuctionSearchType)
}
enumEnd(AuctionSearchType);
-#endif // EATHENA_SUPPORT
#endif // ENUMS_NET_AUCTIONSEARCHTYPE_H
diff --git a/src/enums/net/battlegroundtype.h b/src/enums/net/battlegroundtype.h
index fc535417f..2b4aaa507 100644
--- a/src/enums/net/battlegroundtype.h
+++ b/src/enums/net/battlegroundtype.h
@@ -20,7 +20,6 @@
#ifndef ENUMS_NET_BATTLEGROUNDTYPE_H
#define ENUMS_NET_BATTLEGROUNDTYPE_H
-#ifdef EATHENA_SUPPORT
#include "enums/simpletypes/enumdefines.h"
@@ -33,5 +32,4 @@ enumStart(BattleGroundType)
}
enumEnd(BattleGroundType);
-#endif // EATHENA_SUPPORT
#endif // ENUMS_NET_BATTLEGROUNDTYPE_H
diff --git a/src/enums/net/deleteitemreason.h b/src/enums/net/deleteitemreason.h
index 69a1ba597..03d3c45f6 100644
--- a/src/enums/net/deleteitemreason.h
+++ b/src/enums/net/deleteitemreason.h
@@ -20,7 +20,6 @@
#ifndef ENUMS_NET_DELETEITEMREASON_H
#define ENUMS_NET_DELETEITEMREASON_H
-#ifdef EATHENA_SUPPORT
#include "enums/simpletypes/enumdefines.h"
@@ -37,5 +36,4 @@ enumStart(DeleteItemReason)
}
enumEnd(DeleteItemReason);
-#endif // EATHENA_SUPPORT
#endif // ENUMS_NET_DELETEITEMREASON_H
diff --git a/src/enums/net/storesearchtype.h b/src/enums/net/storesearchtype.h
index a003ccefc..b0551a7e6 100644
--- a/src/enums/net/storesearchtype.h
+++ b/src/enums/net/storesearchtype.h
@@ -20,7 +20,6 @@
#ifndef ENUMS_NET_STORESEARCHTYPE_H
#define ENUMS_NET_STORESEARCHTYPE_H
-#ifdef EATHENA_SUPPORT
#include "enums/simpletypes/enumdefines.h"
@@ -31,5 +30,4 @@ enumStart(StoreSearchType)
}
enumEnd(StoreSearchType);
-#endif // EATHENA_SUPPORT
#endif // ENUMS_NET_STORESEARCHTYPE_H