|
From: Correa <thi...@us...> - 2004-09-19 16:25:50
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10727 Modified Files: accounts.cpp action.cpp action.h console.cpp items.cpp server.cpp serverconfig.cpp typedefs.h Log Message: - Added missing copyright headers to some new files - Console will show if Python is UCS2 or UCS4 - Removed few lines of dead code - Some internationalization fixes Index: typedefs.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/typedefs.h,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** typedefs.h 10 Aug 2004 03:15:57 -0000 1.38 --- typedefs.h 19 Sep 2004 16:25:36 -0000 1.39 *************** *** 43,59 **** // Typedefs - typedef int GUILDID; - typedef unsigned int TIMERVAL; - typedef unsigned char LIGHTLEVEL; - typedef unsigned char SECONDS; typedef unsigned int SERIAL; typedef cItem* P_ITEM; - typedef const cItem* PC_ITEM; typedef cBaseChar* P_CHAR; - typedef const cBaseChar* PC_CHAR; typedef cNPC* P_NPC; - typedef const cNPC* PC_NPC; typedef cPlayer* P_PLAYER; - typedef const cPlayer* PC_PLAYER; typedef cUObject* P_OBJECT; --- 43,51 ---- Index: serverconfig.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/serverconfig.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** serverconfig.cpp 18 Sep 2004 21:10:40 -0000 1.9 --- serverconfig.cpp 19 Sep 2004 16:25:36 -0000 1.10 *************** *** 86,90 **** cConfig::cConfig() : Preferences( "wolfpack.xml", "Wolfpack", "1.0" ) { - readData(); } --- 86,89 ---- Index: server.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/server.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** server.cpp 18 Sep 2004 21:10:40 -0000 1.23 --- server.cpp 19 Sep 2004 16:25:36 -0000 1.24 *************** *** 259,262 **** --- 259,274 ---- QTranslator translator( 0 ); + // Load wolfpack.xml + Config::instance()->load(); + if ( !Config::instance()->fileState() ) + { + Console::instance()->log( LOG_WARNING, "Your configuration file [wolfpack.xml] have just been created with default settings.\n"); + #if !defined(Q_OS_WIN32) + // We can only detect mul path under Windows. + Console::instance()->log( LOG_ERROR, "Please setup the path to the *.mul files before continuing\n"); + return false; + #endif + } + // Start Python PythonEngine::instance()->load(); *************** *** 292,296 **** if ( Config::instance()->databaseDriver() != "binary" && !PersistentBroker::instance()->openDriver( Config::instance()->databaseDriver() ) ) { ! Console::instance()->log( LOG_ERROR, QString( "Unknown Worldsave Database Driver '%1', check your wolfpack.xml" ).arg( Config::instance()->databaseDriver() ) ); return 1; } --- 304,308 ---- if ( Config::instance()->databaseDriver() != "binary" && !PersistentBroker::instance()->openDriver( Config::instance()->databaseDriver() ) ) { ! Console::instance()->log( LOG_ERROR, tr( "Unknown Worldsave Database Driver '%1', check your wolfpack.xml" ).arg( Config::instance()->databaseDriver() ) ); return 1; } *************** *** 298,302 **** if ( !PersistentBroker::instance()->openDriver( Config::instance()->accountsDriver() ) ) { ! Console::instance()->log( LOG_ERROR, QString( "Unknown Account Database Driver '%1', check your wolfpack.xml" ).arg( Config::instance()->accountsDriver() ) ); return 1; } --- 310,314 ---- if ( !PersistentBroker::instance()->openDriver( Config::instance()->accountsDriver() ) ) { ! Console::instance()->log( LOG_ERROR, tr( "Unknown Account Database Driver '%1', check your wolfpack.xml" ).arg( Config::instance()->accountsDriver() ) ); return 1; } *************** *** 400,407 **** Console::instance()->send( "By using this software you agree to the license accompanying this release.\n" ); Console::instance()->send( "Compiled on " __DATE__ " " __TIME__ "\n" ); ! Console::instance()->send( "Compiled for QT " QT_VERSION_STR " (Using: " ); ! Console::instance()->send( qVersion() ); ! Console::instance()->send( qSharedBuild() ? " Shared" : " Static" ); ! Console::instance()->send( ")\n" ); QString pythonBuild = Py_GetVersion(); pythonBuild = pythonBuild.left( pythonBuild.find( ' ' ) ); --- 412,416 ---- Console::instance()->send( "By using this software you agree to the license accompanying this release.\n" ); Console::instance()->send( "Compiled on " __DATE__ " " __TIME__ "\n" ); ! Console::instance()->send( tr("Compiled for Qt %1 (Using: %2 %3)\n").arg(QT_VERSION_STR, qVersion(), qSharedBuild() ? " Shared" : " Static" ) ); QString pythonBuild = Py_GetVersion(); pythonBuild = pythonBuild.left( pythonBuild.find( ' ' ) ); *************** *** 413,421 **** #endif ! Console::instance()->send( "Compiled for Python " PY_VERSION " (Using: " ); ! Console::instance()->send( pythonBuild + ")\n" ); Console::instance()->send( "Compiled with SQLite " SQLITE_VERSION "\n" ); #if defined (MYSQL_DRIVER) ! Console::instance()->send( QString( "Compiled for MySQL " MYSQL_SERVER_VERSION " (Using: %1)\n" ).arg( mysql_get_client_info() ) ); #else Console::instance()->send( "MySQL Support: disabled\n" ); --- 422,434 ---- #endif ! #if defined(Py_UNICODE_WIDE) ! QString UnicodeType("UCS-4"); ! #else ! QString UnicodeType("UCS-2"); ! #endif ! Console::instance()->send( tr("Compiled for Python %1 %2 (Using: %3 )\n").arg(PY_VERSION, UnicodeType, pythonBuild) ); Console::instance()->send( "Compiled with SQLite " SQLITE_VERSION "\n" ); #if defined (MYSQL_DRIVER) ! Console::instance()->send( tr( "Compiled for MySQL %1 (Using: %2)\n" ).arg( MYSQL_SERVER_VERSION, mysql_get_client_info() ) ); #else Console::instance()->send( "MySQL Support: disabled\n" ); *************** *** 522,526 **** if ( !component->isSilent() ) { ! Console::instance()->sendProgress( QString( "Loading %1" ).arg( component->getName() ) ); } --- 535,539 ---- if ( !component->isSilent() ) { ! Console::instance()->sendProgress( tr( "Loading %1" ).arg( component->getName() ) ); } *************** *** 571,575 **** if ( !component->isSilent() ) { ! Console::instance()->sendProgress( QString( "Unloading %1" ).arg( component->getName() ) ); } --- 584,588 ---- if ( !component->isSilent() ) { ! Console::instance()->sendProgress( tr( "Unloading %1" ).arg( component->getName() ) ); } *************** *** 597,601 **** if ( !component->isSilent() ) { ! Console::instance()->sendProgress( QString( "Reloading %1" ).arg( component->getName() ) ); } --- 610,614 ---- if ( !component->isSilent() ) { ! Console::instance()->sendProgress( tr( "Reloading %1" ).arg( component->getName() ) ); } Index: accounts.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/accounts.cpp,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -d -r1.104 -r1.105 *** accounts.cpp 17 Sep 2004 23:32:58 -0000 1.104 --- accounts.cpp 19 Sep 2004 16:25:35 -0000 1.105 *************** *** 29,41 **** #include "accounts.h" #include "serverconfig.h" - #include "network/uosocket.h" #include "dbdriver.h" #include "console.h" #include "commands.h" #include "player.h" - #include "network/network.h" #include "persistentbroker.h" #include "world.h" #include "md5.h" // DB AutoCreation --- 29,41 ---- #include "accounts.h" #include "serverconfig.h" #include "dbdriver.h" #include "console.h" #include "commands.h" #include "player.h" #include "persistentbroker.h" #include "world.h" #include "md5.h" + #include "network/network.h" + #include "network/uosocket.h" // DB AutoCreation Index: action.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/action.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** action.h 31 Aug 2004 17:44:37 -0000 1.1 --- action.h 19 Sep 2004 16:25:35 -0000 1.2 *************** *** 1,2 **** --- 1,28 ---- + /* + * Wolfpack Emu (WP) + * UO Server Emulation Program + * + * Copyright 2001-2004 by holders identified in AUTHORS.txt + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Palace - Suite 330, Boston, MA 02111-1307, USA. + * + * In addition to that license, if you are running this program or modified + * versions of it on a public system you HAVE TO make the complete source of + * the version used by you available or provide people with a location to + * download it. + * + * Wolfpack Homepage: http://wpdev.sf.net/ + */ #if !defined(__ACTION_H__) Index: items.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v retrieving revision 1.449 retrieving revision 1.450 diff -C2 -d -r1.449 -r1.450 *** items.cpp 18 Sep 2004 18:30:05 -0000 1.449 --- items.cpp 19 Sep 2004 16:25:36 -0000 1.450 *************** *** 1933,1937 **** if ( tile.weight == 255 && !isAllMovable() ) { ! if ( tile.flag3 & 0x20 == 0 ) return; } --- 1933,1937 ---- if ( tile.weight == 255 && !isAllMovable() ) { ! if ( ( tile.flag3 & 0x20 ) == 0 ) return; } Index: console.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/console.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** console.cpp 18 Sep 2004 21:10:40 -0000 1.25 --- console.cpp 19 Sep 2004 16:25:36 -0000 1.26 *************** *** 34,37 **** --- 34,38 ---- #include "world.h" #include "network/network.h" + #include "network/uosocket.h" #include "serverconfig.h" #include "player.h" *************** *** 148,152 **** case 'W': ! Console::instance()->send( "Current Users in the World:\n" ); mSock = Network::instance()->first(); --- 149,153 ---- case 'W': ! Console::instance()->send( tr("Current Users in the World:\n") ); mSock = Network::instance()->first(); Index: action.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/action.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** action.cpp 31 Aug 2004 17:44:37 -0000 1.1 --- action.cpp 19 Sep 2004 16:25:35 -0000 1.2 *************** *** 1,2 **** --- 1,28 ---- + /* + * Wolfpack Emu (WP) + * UO Server Emulation Program + * + * Copyright 2001-2004 by holders identified in AUTHORS.txt + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Palace - Suite 330, Boston, MA 02111-1307, USA. + * + * In addition to that license, if you are running this program or modified + * versions of it on a public system you HAVE TO make the complete source of + * the version used by you available or provide people with a location to + * download it. + * + * Wolfpack Homepage: http://wpdev.sf.net/ + */ #include "action.h" |
