Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
Since we'll have three "InventoryHandler" classes, etc. this shows an
example of how we can compile with all of them at the same time using
namespaces. We'll have:
Net::InventoryHandler - the interface
EAthena::InventoryHandler - the eAthena implementation
TmwServ::InventoryHandler - the tmwserv implementation
Maybe we'll find a better way later, but for now this works. I'm not
convinced yet that using namespaces is better than just using longer
class names like EAthenaInventoryHandler.
|
|
* Removed superfluous 'virtual' keyword in *Handler implementations
* Renamed NPCHandler to NpcHandler
* Renamed InvyHandler to InventoryHandler
* Made all *Handler interface methods pure virtual
* Used forward declarations in net.h
* Renamed {start,end}Shoping to {start,end}Shopping
|
|
When confirming item add for trade, the inventory offset was not
substracted from the item index.
|
|
Also cleanup some related #ifdefs in LocalPlayer.
|
|
No need to complicate the item containers and inventory classes with a
silly offset used by the eAthena server.
Also fixed the logToStandardOut option by reading it from the config
after the configuration has been initialized.
|
|
|
|
|
|
ChatTabs now manage their own adding/removal from the chat window, which
lost most of it's chat related messages. Whisper handling is stil done
by the ChatWindow, but it no longer manages any other tabs. ChannelTab
handling is now the sole responsability of the Channels they are
attached to. The general tab is handled by Game.
|
|
Conflicts:
A lot of files.
|
|
This merge involved major changes on both sides, and as such took
several weeks. Lots of things are expected to be broken now, however, we
now have a single code base to improve and extend, which can be compiled
to support either eAthena or tmwserv.
In the coming months, the plan is to work towards a client that supports
both eAthena and tmwserv, without needing to be recompiled.
Conflicts:
Everywhere!
|