From b6ed79b708090b81eddf48c1425f31f5f10c7494 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 9 Mar 2013 17:34:31 +0300 Subject: Remove unused code from depricatedevent class. --- src/depricatedevent.h | 61 +++------------------------------------------------ 1 file changed, 3 insertions(+), 58 deletions(-) diff --git a/src/depricatedevent.h b/src/depricatedevent.h index 239969c63..1574983c0 100644 --- a/src/depricatedevent.h +++ b/src/depricatedevent.h @@ -30,79 +30,29 @@ enum Channels { - CHANNEL_ACTORSPRITE = 0, - CHANNEL_ATTRIBUTES, - CHANNEL_BUYSELL, - CHANNEL_CHAT, + CHANNEL_ATTRIBUTES = 0, CHANNEL_CLIENT, CHANNEL_GAME, - CHANNEL_ITEM, CHANNEL_NOTICES, - CHANNEL_NPC, - CHANNEL_STATUS, - CHANNEL_STORAGE + CHANNEL_STATUS }; enum DepricatedEvents { - EVENT_ANNOUNCEMENT = 0, - EVENT_BEING, - EVENT_CLOSE, - EVENT_CLOSEALL, - EVENT_CONSTRUCTED, - EVENT_DBSLOADING, - EVENT_DESTROYED, + EVENT_CONSTRUCTED = 0, EVENT_DESTRUCTED, - EVENT_DESTRUCTING, - EVENT_DOCLOSE, - EVENT_DOCLOSEINVENTORY, - EVENT_DODROP, - EVENT_DOEQUIP, - EVENT_DOINTEGERINPUT, - EVENT_DOMENU, - EVENT_DOMOVE, - EVENT_DONEXT, - EVENT_DOSENDLETTER, - EVENT_DOSPLIT, - EVENT_DOSTRINGINPUT, - EVENT_DOTALK, - EVENT_DOUNEQUIP, - EVENT_DOUSE, - EVENT_END, EVENT_ENGINESINITALIZED, EVENT_ENGINESINITALIZING, EVENT_GUIWINDOWSLOADED, EVENT_GUIWINDOWSLOADING, EVENT_GUIWINDOWSUNLOADED, EVENT_GUIWINDOWSUNLOADING, - EVENT_INTEGERINPUT, EVENT_MAPLOADED, - EVENT_MENU, - EVENT_MESSAGE, - EVENT_NEXT, - EVENT_NPCCOUNT, - EVENT_PLAYER, - EVENT_POST, - EVENT_POSTCOUNT, EVENT_SERVERNOTICE, EVENT_STATECHANGE, - EVENT_STORAGECOUNT, - EVENT_STRINGINPUT, - EVENT_STUN, EVENT_TRADING, EVENT_UPDATEATTRIBUTE, EVENT_UPDATESTAT, - EVENT_UPDATESTATUSEFFECT, - EVENT_WHISPER, - EVENT_WHISPERERROR -}; - -// Possible exception that can be thrown -enum BadDepricatedEvent -{ - BAD_KEY = 0, - BAD_VALUE, - KEY_ALREADY_EXISTS }; class Listener; @@ -112,11 +62,6 @@ typedef std::map VariableMap; typedef std::set ListenerSet; typedef std::map ListenMap; -#define SERVER_NOTICE(message) { \ -DepricatedEvent event(EVENT_SERVERNOTICE); \ -event.setString("message", message); \ -DepricatedEvent::trigger(CHANNEL_NOTICES, event); } - class DepricatedEvent final { public: -- cgit v1.2.3-60-g2f50