diff options
| -rwxr-xr-x | bmake | 4 | ||||
| -rwxr-xr-x | bmake0 | 55 | ||||
| -rw-r--r-- | src/client.cpp | 3 | ||||
| -rw-r--r-- | src/net/loginhandler.h | 2 | ||||
| -rw-r--r-- | src/net/manaserv/loginhandler.cpp | 5 | ||||
| -rw-r--r-- | src/net/manaserv/loginhandler.h | 2 |
6 files changed, 69 insertions, 2 deletions
@@ -39,10 +39,10 @@ autoreconf -i --datadir=$dir/run/share/games \ --bindir=$dir/run/bin \ --mandir=$dir/run/share/man \ ---enable-memdebug=no \ +--enable-memdebug=yes \ --with-internalguichan=yes \ --enable-tcmalloc=no \ ---enable-googleprofiler=yes +--enable-googleprofiler=no #--without-librt @@ -0,0 +1,55 @@ +#!/bin/sh + +#may be +#-Wshadow -Waggregate-return -Winline + +#for feature +#-Wstrict-overflow=4 -Wfloat-equal +#-Wunsafe-loop-optimizations +#-Wnon-virtual-dtor +#-Woverloaded-virtual +#-Wformat=2 +#-Wswitch-enum + +#for better code +# -Weffc++ + +#need fix: -Wold-style-cast -Wconversion +#prof -pg + +dir=`pwd` + +export CC=gcc-4.5 +export CXX=g++-4.5 + +export LANG=C +export CXXFLAGS="-Wunreachable-code -Wmissing-field-initializers \ +-Wabi -Wdisabled-optimization -Wuninitialized \ +-Wvolatile-register-var -Winvalid-pch -Wredundant-decls \ +-Wnormalized=nfkc -Wmissing-format-attribute -Wmissing-noreturn \ +-Wswitch-default -Wsign-promo -Waddress -Wmissing-declarations \ +-Wctor-dtor-privacy -Wstrict-null-sentinel \ +-Wunused-parameter -Wlogical-op \ +-Wempty-body -Wsign-compare -Wclobbered -Wcast-align -Wcast-qual \ +-Wtype-limits -Wpointer-arith -Wundef -Wmissing-include-dirs \ +-Wignored-qualifiers -Winit-self -pedantic -Wall -ggdb3 -O0 -pipe \ +-fno-default-inline -fno-inline" + +autoreconf -i +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=no \ +--with-internalguichan=yes \ +--enable-tcmalloc=no \ +--enable-googleprofiler=yes + +#--without-librt + +cd po +#make -j5 update-po 2>../make1.log +make -j5 update-gmo 2>../make1.log +cd .. +make -j5 2>make2.log + diff --git a/src/client.cpp b/src/client.cpp index 02b4dc3af..5e1fca53b 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -568,6 +568,9 @@ Client::~Client() NPCDB::unload(); StatusEffect::unload(); + if (Net::getLoginHandler()) + Net::getLoginHandler()->clearWorlds(); + delete mumbleManager; mumbleManager = 0; diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h index 5566aa087..5607ca1e2 100644 --- a/src/net/loginhandler.h +++ b/src/net/loginhandler.h @@ -101,6 +101,8 @@ class LoginHandler virtual Worlds getWorlds() const = 0; + virtual void clearWorlds() = 0; + virtual ~LoginHandler () { } diff --git a/src/net/manaserv/loginhandler.cpp b/src/net/manaserv/loginhandler.cpp index 1edfbb6b6..d9b36d461 100644 --- a/src/net/manaserv/loginhandler.cpp +++ b/src/net/manaserv/loginhandler.cpp @@ -481,4 +481,9 @@ void LoginHandler::reconnect() accountServerConnection->send(msg); } +void LoginHandler::clearWorlds() +{ + +} + } // namespace ManaServ diff --git a/src/net/manaserv/loginhandler.h b/src/net/manaserv/loginhandler.h index 289116696..a13bbb33e 100644 --- a/src/net/manaserv/loginhandler.h +++ b/src/net/manaserv/loginhandler.h @@ -84,6 +84,8 @@ class LoginHandler : public MessageHandler, public Net::LoginHandler void reconnect(); + void clearWorlds(); + private: void handleLoginResponse(Net::MessageIn &msg); void handleRegisterResponse(Net::MessageIn &msg); |