diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-09-30 19:54:06 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-09-30 19:54:06 -0600 |
| commit | d4f32a38fd498c180d562ced38a9129e0abf2252 (patch) | |
| tree | e655b59ff686ad5fe2bdd11d6e072f5c3a4493b7 /tmw.cbp | |
| parent | 6707d108790ab1fe1d4a3ef52d717966990fdf0a (diff) | |
| download | mana-d4f32a38fd498c180d562ced38a9129e0abf2252.tar.gz mana-d4f32a38fd498c180d562ced38a9129e0abf2252.tar.bz2 mana-d4f32a38fd498c180d562ced38a9129e0abf2252.tar.xz mana-d4f32a38fd498c180d562ced38a9129e0abf2252.zip | |
Merge login state machines for both clients
Also do some cleanup and refactoring of related code.
Diffstat (limited to 'tmw.cbp')
| -rw-r--r-- | tmw.cbp | 61 |
1 files changed, 21 insertions, 40 deletions
@@ -315,8 +315,6 @@ <Option target="TMWServ" /> <Option target="Unix TMWSERV" /> </Unit> - <Unit filename="src/gui/serverselectdialog.cpp" /> - <Unit filename="src/gui/serverselectdialog.h" /> <Unit filename="src/gui/setup.cpp" /> <Unit filename="src/gui/setup.h" /> <Unit filename="src/gui/setup_audio.cpp" /> @@ -448,6 +446,8 @@ <Unit filename="src/gui/widgets/windowcontainer.h" /> <Unit filename="src/gui/windowmenu.cpp" /> <Unit filename="src/gui/windowmenu.h" /> + <Unit filename="src/gui/worldselectdialog.cpp" /> + <Unit filename="src/gui/worldselectdialog.h" /> <Unit filename="src/guichanfwd.h" /> <Unit filename="src/guild.cpp"> <Option target="TMWServ" /> @@ -531,6 +531,14 @@ <Option target="eAthena" /> <Option target="UNIX eAthena" /> </Unit> + <Unit filename="src/net/ea/gamehandler.cpp"> + <Option target="eAthena" /> + <Option target="UNIX eAthena" /> + </Unit> + <Unit filename="src/net/ea/gamehandler.h"> + <Option target="eAthena" /> + <Option target="UNIX eAthena" /> + </Unit> <Unit filename="src/net/ea/generalhandler.cpp"> <Option target="eAthena" /> <Option target="UNIX eAthena" /> @@ -571,24 +579,6 @@ <Option target="eAthena" /> <Option target="UNIX eAthena" /> </Unit> - <Unit filename="src/net/ea/logouthandler.cpp"> - <Option target="eAthena" /> - <Option target="Unix eAthena" /> - <Option target="UNIX eAthena" /> - </Unit> - <Unit filename="src/net/ea/logouthandler.h"> - <Option target="eAthena" /> - <Option target="Unix eAthena" /> - <Option target="UNIX eAthena" /> - </Unit> - <Unit filename="src/net/ea/maphandler.cpp"> - <Option target="eAthena" /> - <Option target="UNIX eAthena" /> - </Unit> - <Unit filename="src/net/ea/maphandler.h"> - <Option target="eAthena" /> - <Option target="UNIX eAthena" /> - </Unit> <Unit filename="src/net/ea/network.cpp"> <Option target="eAthena" /> <Option target="UNIX eAthena" /> @@ -641,12 +631,11 @@ <Option target="eAthena" /> <Option target="UNIX eAthena" /> </Unit> + <Unit filename="src/net/gamehandler.h" /> <Unit filename="src/net/generalhandler.h" /> <Unit filename="src/net/guildhandler.h" /> <Unit filename="src/net/inventoryhandler.h" /> <Unit filename="src/net/loginhandler.h" /> - <Unit filename="src/net/logouthandler.h" /> - <Unit filename="src/net/maphandler.h" /> <Unit filename="src/net/messagehandler.cpp" /> <Unit filename="src/net/messagehandler.h" /> <Unit filename="src/net/messagein.cpp" /> @@ -702,11 +691,11 @@ <Option target="TMWServ" /> <Option target="Unix TMWSERV" /> </Unit> - <Unit filename="src/net/tmwserv/charserverhandler.cpp"> + <Unit filename="src/net/tmwserv/charhandler.cpp"> <Option target="TMWServ" /> <Option target="Unix TMWSERV" /> </Unit> - <Unit filename="src/net/tmwserv/charserverhandler.h"> + <Unit filename="src/net/tmwserv/charhandler.h"> <Option target="TMWServ" /> <Option target="Unix TMWSERV" /> </Unit> @@ -766,6 +755,14 @@ <Option target="TMWServ" /> <Option target="Unix TMWSERV" /> </Unit> + <Unit filename="src/net/tmwserv/gamehandler.cpp"> + <Option target="Unix TMWSERV" /> + <Option target="TMWServ" /> + </Unit> + <Unit filename="src/net/tmwserv/gamehandler.h"> + <Option target="Unix TMWSERV" /> + <Option target="TMWServ" /> + </Unit> <Unit filename="src/net/tmwserv/gameserver/gameserver.cpp"> <Option target="TMWServ" /> <Option target="Unix TMWSERV" /> @@ -838,22 +835,6 @@ <Option target="TMWServ" /> <Option target="Unix TMWSERV" /> </Unit> - <Unit filename="src/net/tmwserv/logouthandler.cpp"> - <Option target="TMWServ" /> - <Option target="Unix TMWSERV" /> - </Unit> - <Unit filename="src/net/tmwserv/logouthandler.h"> - <Option target="TMWServ" /> - <Option target="Unix TMWSERV" /> - </Unit> - <Unit filename="src/net/tmwserv/maphandler.cpp"> - <Option target="Unix TMWSERV" /> - <Option target="TMWServ" /> - </Unit> - <Unit filename="src/net/tmwserv/maphandler.h"> - <Option target="Unix TMWSERV" /> - <Option target="TMWServ" /> - </Unit> <Unit filename="src/net/tmwserv/network.cpp"> <Option target="TMWServ" /> <Option target="Unix TMWSERV" /> |