diff options
| -rw-r--r-- | src/main.cpp | 4 | ||||
| -rw-r--r-- | tmwserv.dev | 218 |
2 files changed, 110 insertions, 112 deletions
diff --git a/src/main.cpp b/src/main.cpp index b26be9ad..10357c76 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,8 +21,6 @@ */ -#include <../config.h> - #include <iostream> #include <SDL.h> @@ -201,7 +199,7 @@ int main(int argc, char *argv[]) // Register message handlers connectionHandler->registerHandler(MSG_LOGIN, accountHandler); - LOG_INFO("The Mana World Server v" << PACKAGE_VERSION) + //LOG_INFO("The Mana World Server v" << PACKAGE_VERSION) PACKAGE_VERSION undeclared session->startListen(connectionHandler.get(), SERVER_PORT); LOG_INFO("Listening on port " << SERVER_PORT << "...") diff --git a/tmwserv.dev b/tmwserv.dev index 198bcdae..6460c4d4 100644 --- a/tmwserv.dev +++ b/tmwserv.dev @@ -5,19 +5,19 @@ Name=tmwserv UnitCount=17 ======= Name=tmwserv -UnitCount=51 +UnitCount=57 >>>>>>> 1.2 Type=1 Ver=1 ObjFiles= Includes= Libs= -PrivateResource= +PrivateResource=tmwserv_private.rc ResourceIncludes= MakeIncludes= -Compiler= +Compiler=_@@_ CppCompiler=-DSQLITE_SUPPORT_@@_ -Linker=-lmingw32_@@_-lSDL_@@_-lSDL_net_@@_-lsqlite3_@@_-lcrypto_@@_-mconsole_@@_-mwindows_@@__@@_ +Linker=-lSDL_@@_-lSDL_net_@@_-lsqlite3_@@_-lcrypto_@@_-llibxml2_@@_-mconsole_@@_-mwindows_@@_ IsCpp=1 Icon= ExeOutput= @@ -29,7 +29,7 @@ Folders=dal,utils CommandLine= UseCustomMakefile=0 CustomMakefile= -IncludeVersionInfo=0 +IncludeVersionInfo=1 SupportXPThemes=0 CompilerSet=0 CompilerSettings=0000000000000000000100 @@ -66,24 +66,24 @@ BuildCmd= [VersionInfo] Major=0 -Minor=1 +Minor=0 Release=1 -Build=1 -LanguageID=1033 +Build=0 +LanguageID=2057 CharsetID=1252 -CompanyName= +CompanyName=The Mana World Development Team FileVersion= -FileDescription=Developed using the Dev-C++ IDE -InternalName= -LegalCopyright= +FileDescription=The Mana World Server +InternalName=tmwserv +LegalCopyright=(C) 2004-2005 LegalTrademarks= -OriginalFilename= -ProductName= +OriginalFilename=tmwserv.exe +ProductName=tmwserv ProductVersion= AutoIncBuildNr=0 [Unit24] -FileName=src\main.cpp +FileName=src\messagehandler.h CompileCpp=1 Folder= Compile=1 @@ -93,7 +93,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit26] -FileName=src\messagehandler.h +FileName=src\messagein.h CompileCpp=1 Folder= Compile=1 @@ -103,7 +103,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit27] -FileName=src\messagein.cpp +FileName=src\messageout.cpp CompileCpp=1 Folder= Compile=1 @@ -113,7 +113,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit28] -FileName=src\messagein.h +FileName=src\messageout.h CompileCpp=1 Folder= Compile=1 @@ -123,7 +123,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit29] -FileName=src\messageout.cpp +FileName=src\netcomputer.cpp CompileCpp=1 Folder= Compile=1 @@ -133,7 +133,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit31] -FileName=src\netcomputer.cpp +FileName=src\netsession.cpp CompileCpp=1 Folder= Compile=1 @@ -143,7 +143,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit30] -FileName=src\messageout.h +FileName=src\netcomputer.h CompileCpp=1 Folder= Compile=1 @@ -153,7 +153,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit34] -FileName=src\netsession.h +FileName=src\object.h CompileCpp=1 Folder= Compile=1 @@ -163,7 +163,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit36] -FileName=src\object.h +FileName=src\packet.h CompileCpp=1 Folder= Compile=1 @@ -173,7 +173,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit32] -FileName=src\netcomputer.h +FileName=src\netsession.h CompileCpp=1 Folder= Compile=1 @@ -183,7 +183,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit33] -FileName=src\netsession.cpp +FileName=src\object.cpp CompileCpp=1 Folder= Compile=1 @@ -193,7 +193,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit37] -FileName=src\packet.cpp +FileName=src\script.cpp CompileCpp=1 Folder= Compile=1 @@ -203,7 +203,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit38] -FileName=src\packet.h +FileName=src\script.h CompileCpp=1 Folder= Compile=1 @@ -213,7 +213,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit39] -FileName=src\script.cpp +FileName=src\script-squirrel.cpp CompileCpp=1 Folder= Compile=1 @@ -223,7 +223,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit40] -FileName=src\script.h +FileName=src\script-squirrel.h CompileCpp=1 Folder= Compile=1 @@ -233,7 +233,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit41] -FileName=src\script-squirrel.cpp +FileName=src\skill.cpp CompileCpp=1 Folder= Compile=1 @@ -363,7 +363,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit35] -FileName=src\object.cpp +FileName=src\packet.cpp CompileCpp=1 Folder= Compile=1 @@ -373,7 +373,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit42] -FileName=src\script-squirrel.h +FileName=src\skill.h CompileCpp=1 Folder= Compile=1 @@ -383,7 +383,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit43] -FileName=src\skill.cpp +FileName=src\storage.cpp CompileCpp=1 Folder= Compile=1 @@ -393,7 +393,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit44] -FileName=src\skill.h +FileName=src\storage.h CompileCpp=1 Folder= Compile=1 @@ -403,9 +403,9 @@ OverrideBuildCmd=0 BuildCmd= [Unit45] -FileName=src\storage.cpp +FileName=src\dalstorage.h CompileCpp=1 -Folder= +Folder=tmwserv Compile=1 Link=1 Priority=1000 @@ -413,7 +413,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit47] -FileName=src\dalstorage.h +FileName=src\account.cpp CompileCpp=1 Folder=tmwserv Compile=1 @@ -422,18 +422,18 @@ Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit48] -FileName=src\account.h +[Unit49] +FileName=src\utils\countedptr.h CompileCpp=1 -Folder=tmwserv +Folder=utils Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit49] -FileName=src\account.cpp +[Unit54] +FileName=src\configuration.h CompileCpp=1 Folder=tmwserv Compile=1 @@ -442,8 +442,8 @@ Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit50] -FileName=src\SDL_win32_main.c +[Unit55] +FileName=src\dalstoragesql.h CompileCpp=1 Folder=tmwserv Compile=1 @@ -452,18 +452,18 @@ Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit51] -FileName=src\utils\cipher.cpp +[Unit56] +FileName=src\items.h CompileCpp=1 -Folder=utils +Folder=tmwserv Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit52] -FileName=src\skill.h +[Unit57] +FileName=src\SDL_win32_main.c CompileCpp=1 Folder=tmwserv Compile=1 @@ -472,8 +472,8 @@ Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit53] -FileName=src\sqlitestorage.cpp +[Unit58] +FileName=src\SDL_win32_main.c CompileCpp=1 Folder=tmwserv Compile=1 @@ -482,8 +482,8 @@ Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit54] -FileName=src\sqlitestorage.h +[Unit59] +FileName=src\items.h CompileCpp=1 Folder=tmwserv Compile=1 @@ -492,8 +492,8 @@ Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit55] -FileName=src\storage.cpp +[Unit61] +FileName=src\configuration.h CompileCpp=1 Folder=tmwserv Compile=1 @@ -502,8 +502,8 @@ Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit56] -FileName=src\storage.h +[Unit62] +FileName=src\dalstoragesql.h CompileCpp=1 Folder=tmwserv Compile=1 @@ -512,8 +512,8 @@ Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit57] -FileName=src\storage.cpp +[Unit64] +FileName=src\sqlitestorage.cpp CompileCpp=1 Folder=tmwserv Compile=1 @@ -522,8 +522,8 @@ Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit58] -FileName=src\storage.h +[Unit65] +FileName=src\testsmain.cpp CompileCpp=1 Folder=tmwserv Compile=1 @@ -532,160 +532,160 @@ Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit59] -FileName=src\sqlitestorage.cpp +[Unit7] +FileName=src\dal\recordset.h CompileCpp=1 -Folder=tmwserv +Folder=dal Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit60] -FileName=src\sqlitestorage.h +[Unit1] +FileName=src\dal\dalexcept.h CompileCpp=1 -Folder=tmwserv +Folder=dal Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit61] -FileName=src\storage.cpp +[Unit11] +FileName=src\utils\logger.cpp CompileCpp=1 -Folder=tmwserv +Folder=utils Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit62] -FileName=src\storage.h +[Unit10] +FileName=src\utils\cipher.h CompileCpp=1 -Folder=tmwserv +Folder=utils Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit64] -FileName=src\storage.h +[Unit17] +FileName=src\connectionhandler.h CompileCpp=1 -Folder=tmwserv +Folder= Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit65] -FileName=src\testsmain.cpp +[Unit22] +FileName=src\main.cpp CompileCpp=1 -Folder=tmwserv +Folder= Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit7] -FileName=src\dal\recordset.h +[Unit23] +FileName=src\messagehandler.cpp CompileCpp=1 -Folder=dal +Folder= Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit1] -FileName=src\dal\dalexcept.h +[Unit25] +FileName=src\messagein.cpp CompileCpp=1 -Folder=dal +Folder= Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit11] -FileName=src\utils\logger.cpp +[Unit46] +FileName=src\account.h CompileCpp=1 -Folder=utils +Folder=tmwserv Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit10] -FileName=src\utils\cipher.h +[Unit16] +FileName=src\connectionhandler.cpp CompileCpp=1 -Folder=utils +Folder= Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit17] -FileName=src\connectionhandler.h +[Unit63] +FileName=src\items.h CompileCpp=1 -Folder= +Folder=tmwserv Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit22] -FileName=src\log.cpp +[Unit50] +FileName=src\utils\functors.h CompileCpp=1 -Folder= +Folder=utils Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit23] -FileName=src\log.h +[Unit51] +FileName=src\being.cpp CompileCpp=1 -Folder= +Folder=tmwserv Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit25] -FileName=src\messagehandler.cpp +[Unit52] +FileName=src\being.h CompileCpp=1 -Folder= +Folder=tmwserv Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit46] -FileName=src\storage.h +[Unit48] +FileName=src\utils\cipher.cpp CompileCpp=1 -Folder= +Folder=utils Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 BuildCmd= -[Unit16] -FileName=src\connectionhandler.cpp +[Unit53] +FileName=src\configuration.cpp CompileCpp=1 -Folder= +Folder=tmwserv Compile=1 Link=1 Priority=1000 |