wpdev-commits Mailing List for Wolfpack Emu (Page 63)
Brought to you by:
rip,
thiagocorrea
Menu
▾
▴
wpdev-commits — Wolfpack CVS commit info
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(121) |
Sep
(256) |
Oct
(59) |
Nov
(73) |
Dec
(120) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(259) |
Feb
(381) |
Mar
(501) |
Apr
(355) |
May
(427) |
Jun
(270) |
Jul
(394) |
Aug
(412) |
Sep
(724) |
Oct
(578) |
Nov
(65) |
Dec
|
|
From: Sebastian H. <dar...@us...> - 2004-08-22 15:15:20
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22424 Modified Files: ChangeLog Log Message: Updated changelog Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ChangeLog 19 Aug 2004 19:17:25 -0000 1.10 --- ChangeLog 22 Aug 2004 15:15:07 -0000 1.11 *************** *** 2,6 **** Wolfpack 12.9.9 Beta (CVS) ! Wolfpack 12.9.8 Beta (19. August 2004) --- 2,15 ---- Wolfpack 12.9.9 Beta (CVS) ! - Allowed viewing and setting account properties via .set and .show. ! Replace <property> with the name of the account property and <value> ! with the value you want to set: ! .set account.<property> <value> ! .show account.<property> ! - Moved the account property getters and setters into the cAccount class. ! - Added an e-mail field to the account database. ! - Added the "email" property for accounts to the python interface. ! - .exportdefinitions now exports data about NPCS and their equipment to the ! categories.db database. Wolfpack 12.9.8 Beta (19. August 2004) |
|
From: Sebastian H. <dar...@us...> - 2004-08-22 15:13:14
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21686 Modified Files: accounts.cpp accounts.h player.cpp Log Message: Now possible to view and set account properties of characters ingame. We possibly need a new security feature here to prevent lowly gms from viewing and setting user passwords. Index: player.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v retrieving revision 1.121 retrieving revision 1.122 diff -C2 -d -r1.121 -r1.122 *** player.cpp 19 Aug 2004 01:55:56 -0000 1.121 --- player.cpp 22 Aug 2004 15:12:34 -0000 1.122 *************** *** 1225,1228 **** --- 1225,1230 ---- return 0; } + } else if ( name.startsWith( "account." ) && account_ ) { + return account_->setProperty( name.right( name.length() - 8 ), value ); } else *************** *** 1259,1262 **** --- 1261,1270 ---- PY_PROPERTY( "dexteritylock", dexterityLock_ ) PY_PROPERTY( "intelligencelock", intelligenceLock_ ) + + // Forward the property to the account + if (name.startsWith("account.") && account_) { + return account_->getProperty(name.right(name.length() - 8)); + } + return cBaseChar::getProperty( name ); } Index: accounts.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/accounts.cpp,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** accounts.cpp 22 Aug 2004 12:37:31 -0000 1.99 --- accounts.cpp 22 Aug 2004 15:12:34 -0000 1.100 *************** *** 581,582 **** --- 581,686 ---- } } + + const char* cAccount::className() const { + return "account"; + } + + bool cAccount::implements( const QString& name ) const { + if (name == "account") { + return true; + } else { + return cPythonScriptable::implements(name); + } + } + + PyObject* cAccount::getPyObject() { + return createPyObject(this); + } + + PyObject* cAccount::getProperty( const QString& name ) { + PY_PROPERTY("acl", acl()); + PY_PROPERTY("email", email()); + // \rproperty account.name The name of this account. + PY_PROPERTY("name", login()); + PY_PROPERTY("multigems", isMultiGems() ); + PY_PROPERTY("password", password()); + PY_PROPERTY("flags", flags()); + /* + \rproperty account.characters A list of <object id="CHAR">char</object> objects. + This list contains all characters assigned to this account. + */ + if (name == "characters") { + PyObject* list = PyList_New(characters_.size()); + for ( uint i = 0; i < characters_.size(); ++i ) + PyList_SetItem( list, i, PyGetCharObject( characters_[i] ) ); + return list; + } + /* + \rproperty account.lastlogin The last login date of this account or + an empty string if it's unknown. + */ + PY_PROPERTY("lastlogin", lastLogin().toString()); + PY_PROPERTY("blockuntil", blockUntil.toString()); + // \rproperty account.inuse Indicates whether this account is currently in use. + PY_PROPERTY("inuse", inUse()); + // \rproperty account.rank Returns the integer rank of this account. This is inherited by the ACL of this account. + PY_PROPERTY("rank", rank()); + + return cPythonScriptable::getProperty(name); + } + + stError* cAccount::setProperty( const QString& name, const cVariant& value ) { + // \property account.acl The name of the ACL used to check the permissions of this account. + if (name == "acl") { + setAcl(value.toString()); + return 0; + } + // \property account.email The E-Mail address associated with this account. + else SET_STR_PROPERTY("email", email_) + // \property account.multigems Indicates whether Multis should be sent as Worldgems to this account. + else if (name == "multigems") { + setMultiGems(value.toInt() != 0); + return 0; + } + /* + \property account.password The password of this account. Please note that if MD5 hashing is activated, + this property will only return the hashed password. But when setting this property you don't need to + specify the MD5 hashed password as it will be automatically converted. + */ + else if (name == "password") { + setPassword(value.toString()); + return 0; + } + /* + \property account.flags This property provides direct access to the flags of this account. Possible flags + are: + <code>0x00000001 blocked + 0x00000002 allmove + 0x00000004 allshow + 0x00000008 showserials + 0x00000010 pagenotify + 0x00000020 staff - gm mode on/off + 0x00000040 multigems on/off</code> + */ + SET_INT_PROPERTY("flags", flags_) + /* + \property account.blockuntil This is the date and time when this account will be unblocked. + The following format for the date and time is used (from the QT documentation): + <code> + Qt::ISODate - ISO 8601 extended format (YYYY-MM-DD, or with time, YYYY-MM-DDTHH:MM:SS) + </code> + */ + else if (name == "blockuntil") { + QDateTime datetime = QDateTime::fromString(value.toString(), Qt::ISODate); + setBlockUntil( datetime ); + return 0; + } + + return cPythonScriptable::setProperty( name, value ); + } + + void cAccount::setAcl( const QString& d ) + { + aclName_ = d; + refreshAcl(); + } Index: accounts.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/accounts.h,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** accounts.h 22 Aug 2004 12:37:31 -0000 1.44 --- accounts.h 22 Aug 2004 15:12:34 -0000 1.45 *************** *** 40,43 **** --- 40,44 ---- #include "typedefs.h" #include "singleton.h" + #include "pythonscript.h" // Forward Class declarations *************** *** 46,50 **** class cAcl; ! class cAccount { friend class cAccounts; // my manager --- 47,51 ---- class cAcl; ! class cAccount : public cPythonScriptable { friend class cAccounts; // my manager *************** *** 130,133 **** --- 131,141 ---- void setStaff( bool data ); void setMultiGems( bool data ); + + // Python Scriptable Interface + const char* className() const; + bool implements( const QString& name ) const; + PyObject* getPyObject(); + PyObject* getProperty( const QString& name ); + stError* setProperty( const QString& name, const cVariant& value ); }; *************** *** 196,204 **** } - inline void cAccount::setAcl( const QString& d ) - { - aclName_ = d; - } - inline void cAccount::block( int seconds ) { --- 204,207 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-08-22 15:13:00
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21686/python Modified Files: char.cpp item.cpp pyaccount.cpp Log Message: Now possible to view and set account properties of characters ingame. We possibly need a new security feature here to prevent lowly gms from viewing and setting user passwords. Index: item.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/item.cpp,v retrieving revision 1.123 retrieving revision 1.124 diff -C2 -d -r1.123 -r1.124 *** item.cpp 22 Aug 2004 02:29:52 -0000 1.123 --- item.cpp 22 Aug 2004 15:12:48 -0000 1.124 *************** *** 1274,1281 **** { cVariant val; ! if ( PyString_Check( value ) ) ! val = cVariant( PyString_AsString( value ) ); ! else if ( PyUnicode_Check( value ) ) ! val = cVariant( QString::fromUcs2( ( ushort * ) PyUnicode_AsUnicode( value ) ) ); else if ( PyInt_Check( value ) ) val = cVariant( PyInt_AsLong( value ) ); --- 1274,1279 ---- { cVariant val; ! if ( PyString_Check( value ) || PyUnicode_Check( value ) ) ! val = cVariant( Python2QString( value ) ); else if ( PyInt_Check( value ) ) val = cVariant( PyInt_AsLong( value ) ); *************** *** 1287,1293 **** val = cVariant( getWpCoord( value ) ); else if ( PyFloat_Check( value ) ) - { val = cVariant( PyFloat_AsDouble( value ) ); ! } //if( !val.isValid() ) --- 1285,1293 ---- val = cVariant( getWpCoord( value ) ); else if ( PyFloat_Check( value ) ) val = cVariant( PyFloat_AsDouble( value ) ); ! else if ( value == Py_True ) ! val = cVariant( 1 ); // True ! else if ( value == Py_False ) ! val = cVariant( 0 ); // false //if( !val.isValid() ) Index: char.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v retrieving revision 1.181 retrieving revision 1.182 diff -C2 -d -r1.181 -r1.182 *** char.cpp 22 Aug 2004 02:29:52 -0000 1.181 --- char.cpp 22 Aug 2004 15:12:34 -0000 1.182 *************** *** 2651,2658 **** { cVariant val; ! if ( PyString_Check( value ) ) ! val = cVariant( PyString_AsString( value ) ); ! else if ( PyUnicode_Check( value ) ) ! val = cVariant( QString::fromUcs2( ( ushort * ) PyUnicode_AsUnicode( value ) ) ); else if ( PyInt_Check( value ) ) val = cVariant( PyInt_AsLong( value ) ); --- 2651,2656 ---- { cVariant val; ! if ( PyString_Check( value ) || PyUnicode_Check( value ) ) ! val = cVariant( Python2QString( value ) ); else if ( PyInt_Check( value ) ) val = cVariant( PyInt_AsLong( value ) ); *************** *** 2665,2677 **** else if ( PyFloat_Check( value ) ) val = cVariant( PyFloat_AsDouble( value ) ); ! ! //if( !val.isValid() ) ! //{ ! // if( value->ob_type ) ! // PyErr_Format( PyExc_TypeError, "Unsupported object type: %s", value->ob_type->tp_name ); ! // else ! // PyErr_Format( PyExc_TypeError, "Unknown object type" ); ! // return 0; ! //} stError * error = self->pChar->setProperty( name, val ); --- 2663,2670 ---- else if ( PyFloat_Check( value ) ) val = cVariant( PyFloat_AsDouble( value ) ); ! else if ( value == Py_True ) ! val = cVariant( 1 ); // True ! else if ( value == Py_False ) ! val = cVariant( 0 ); // false stError * error = self->pChar->setProperty( name, val ); Index: pyaccount.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/pyaccount.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** pyaccount.cpp 22 Aug 2004 12:37:31 -0000 1.38 --- pyaccount.cpp 22 Aug 2004 15:12:48 -0000 1.39 *************** *** 80,84 **** 0, // Call ( reprfunc ) wpAccount_str, ! 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; --- 80,84 ---- 0, // Call ( reprfunc ) wpAccount_str, ! 0, }; *************** *** 239,384 **** }; ! static PyObject* wpAccount_getAttr( wpAccount* self, char* name ) ! { ! if ( !self->account ) ! { return 0; } ! if ( !strcmp( name, "acl" ) ) ! return PyString_FromString( self->account->acl().latin1() ); ! else if ( !strcmp( name, "email" ) ) { ! return QString2Python( self->account->email() ); ! } ! /* ! \rproperty account.name The name of this account. ! */ ! else if ( !strcmp( name, "name" ) ) ! return PyString_FromString( self->account->login().latin1() ); ! else if ( !strcmp( name, "multigems" ) ) ! { ! if ( self->account->isMultiGems() ) ! { ! Py_INCREF( Py_True ); ! return Py_True; ! } ! else ! { ! Py_INCREF( Py_False ); ! return Py_False; ! } ! } ! else if ( !strcmp( name, "password" ) ) ! return PyString_FromString( self->account->password().latin1() ); ! else if ( !strcmp( name, "flags" ) ) ! return PyInt_FromLong( self->account->flags() ); ! /* ! \rproperty account.characters A list of <object id="CHAR">char</object> objects. This list contains ! all characters assigned to this account. ! */ ! else if ( !strcmp( name, "characters" ) ) ! { ! PyObject* list = PyList_New( 0 ); ! QValueVector<P_PLAYER> characters = self->account->caracterList(); ! for ( uint i = 0; i < characters.size(); ++i ) ! PyList_Append( list, PyGetCharObject( characters[i] ) ); ! return list; ! } ! /* ! \rproperty account.lastlogin The last login date of this account or ! "Unknown" if it's unknown. ! */ ! else if ( !strcmp( name, "lastlogin" ) ) ! { ! if ( !self->account->lastLogin().isValid() ) ! return PyString_FromString( "Unknown" ); ! else ! return PyString_FromString( self->account->lastLogin().toString().latin1() ); ! } ! else if ( !strcmp( name, "blockuntil" ) ) ! { ! if ( self->account->blockedUntil() > QDateTime::currentDateTime() ) ! return PyString_FromString( self->account->blockedUntil().toString().latin1() ); ! else ! return PyString_FromString( "" ); ! } ! /* ! \rproperty account.inuse Indicates whether this account is currently in use. ! */ ! else if ( !strcmp( name, "inuse" ) ) ! { ! if ( self->account->inUse() ) ! Py_RETURN_TRUE; ! else ! Py_RETURN_FALSE; ! } ! /* ! \rproperty account.rank Returns the integer rank of this account. This is inherited by the ACL of ! this account. ! */ ! else if ( !strcmp( name, "rank" ) ) ! { ! return PyInt_FromLong( self->account->rank() ); ! } ! else ! { return Py_FindMethod( wpAccountMethods, ( PyObject * ) self, name ); } } ! static int wpAccount_setAttr( wpAccount* self, char* name, PyObject* value ) ! { ! /* ! \property account.acl The name of the ACL used to check the permissions of this account. ! */ ! if ( !strcmp( name, "acl" ) && PyString_Check( value ) ) ! self->account->setAcl( PyString_AsString( value ) ); ! /* ! \property account.email The E-Mail address associated with this account. ! */ ! else if ( !strcmp( name, "email" ) ) { ! self->account->setEmail(Python2QString(value).latin1()); ! } ! /* ! \property account.multigems Indicates whether Multis should be sent as Worldgems to this account. ! */ ! else if ( !strcmp( name, "multigems" ) ) ! { ! if ( PyObject_IsTrue( value ) ) ! { ! self->account->setMultiGems( true ); ! } ! else ! { ! self->account->setMultiGems( false ); ! } ! } ! /* ! \property account.password The password of this account. Please note that if MD5 hashing is activated, ! this property will only return the hashed password. But when setting this property you don't need to ! specify the MD5 hashed password as it will be automatically converted. ! */ ! else if ( !strcmp( name, "password" ) && PyString_Check( value ) ) ! self->account->setPassword( PyString_AsString( value ) ); ! /* ! \property account.flags This property provides direct access to the flags of this account. Possible flags ! are: ! <code>0x00000001 blocked ! 0x00000002 allmove ! 0x00000004 allshow ! 0x00000008 showserials ! 0x00000010 pagenotify ! 0x00000020 staff - gm mode on/off ! 0x00000040 multigems on/off</code> ! */ ! else if ( !strcmp( name, "flags" ) && PyInt_Check( value ) ) ! self->account->setFlags( PyInt_AsLong( value ) ); ! else if ( !strcmp( name, "blockuntil" ) && PyString_Check( value ) ) ! { ! QDateTime datetime = QDateTime::fromString( PyString_AsString( value ), Qt::ISODate ); ! if ( datetime > QDateTime::currentDateTime() ) ! { ! self->account->setBlockUntil( datetime ); ! } } --- 239,282 ---- }; ! static PyObject* wpAccount_getAttr( wpAccount* self, char* name ) { ! if (!self->account) { return 0; } ! PyObject *result = self->account->getProperty(name); ! ! if (result) { ! return result; ! } else { return Py_FindMethod( wpAccountMethods, ( PyObject * ) self, name ); } } ! static int wpAccount_setAttr(wpAccount* self, char* name, PyObject* value) { ! ! cVariant val; ! if ( PyString_Check( value ) || PyUnicode_Check( value ) ) ! val = cVariant( Python2QString( value ) ); ! else if ( PyInt_Check( value ) ) ! val = cVariant( PyInt_AsLong( value ) ); ! else if ( checkWpItem( value ) ) ! val = cVariant( getWpItem( value ) ); ! else if ( checkWpChar( value ) ) ! val = cVariant( getWpChar( value ) ); ! else if ( checkWpCoord( value ) ) ! val = cVariant( getWpCoord( value ) ); ! else if ( PyFloat_Check( value ) ) ! val = cVariant( PyFloat_AsDouble( value ) ); ! else if ( value == Py_True ) ! val = cVariant( 1 ); // True ! else if ( value == Py_False ) ! val = cVariant( 0 ); // false ! ! stError * error = self->account->setProperty( name, val ); ! ! if (error) { ! PyErr_Format( PyExc_TypeError, "Error while setting attribute '%s': %s", name, error->text.latin1() ); ! delete error; ! return 0; } |
|
From: Sebastian H. <dar...@us...> - 2004-08-22 12:37:48
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9187/python Modified Files: pyaccount.cpp Log Message: E-Mail for accounts. Index: pyaccount.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/pyaccount.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** pyaccount.cpp 22 Aug 2004 02:29:52 -0000 1.37 --- pyaccount.cpp 22 Aug 2004 12:37:31 -0000 1.38 *************** *** 248,251 **** --- 248,254 ---- if ( !strcmp( name, "acl" ) ) return PyString_FromString( self->account->acl().latin1() ); + else if ( !strcmp( name, "email" ) ) { + return QString2Python( self->account->email() ); + } /* \rproperty account.name The name of this account. *************** *** 332,335 **** --- 335,344 ---- self->account->setAcl( PyString_AsString( value ) ); /* + \property account.email The E-Mail address associated with this account. + */ + else if ( !strcmp( name, "email" ) ) { + self->account->setEmail(Python2QString(value).latin1()); + } + /* \property account.multigems Indicates whether Multis should be sent as Worldgems to this account. */ |
|
From: Sebastian H. <dar...@us...> - 2004-08-22 12:37:47
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9187 Modified Files: accounts.cpp accounts.h basics.cpp basics.h Log Message: E-Mail for accounts. Index: accounts.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/accounts.cpp,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** accounts.cpp 10 Aug 2004 03:15:56 -0000 1.98 --- accounts.cpp 22 Aug 2004 12:37:31 -0000 1.99 *************** *** 47,50 **** --- 47,51 ---- lastlogin int NOT NULL default '',\ blockuntil int NOT NULL default '',\ + email varchar(255) NOT NULL default '',\ PRIMARY KEY (login)\ );"; *************** *** 364,370 **** cAccount* account = it.data(); ! QString sql( "REPLACE INTO accounts VALUES( '%1', '%2', %3, '%4', %5, %6 );" ); ! sql = sql.arg( account->login_.lower() ).arg( account->password_ ).arg( account->flags_ ).arg( account->aclName_ ).arg( !account->lastLogin_.isNull() ? account->lastLogin_.toTime_t() : 0 ).arg( !account->blockUntil.isNull() ? account->blockUntil.toTime_t() : 0 ); PersistentBroker::instance()->executeQuery( sql ); --- 365,377 ---- cAccount* account = it.data(); ! QString sql( "REPLACE INTO accounts VALUES( '%1', '%2', %3, '%4', %5, %6, '%7' );" ); ! sql = sql.arg( account->login_.lower() ) ! .arg( account->password_ ) ! .arg( account->flags_ ) ! .arg( account->aclName_ ) ! .arg( !account->lastLogin_.isNull() ? account->lastLogin_.toTime_t() : 0 ) ! .arg( !account->blockUntil.isNull() ? account->blockUntil.toTime_t() : 0 ) ! .arg( PersistentBroker::instance()->quoteString(account->email_) ); PersistentBroker::instance()->executeQuery( sql ); *************** *** 412,416 **** PersistentBroker::instance()->lockTable( "accounts" ); ! cDBResult result = PersistentBroker::instance()->query( "SELECT login,password,flags,acl,lastlogin,blockuntil FROM accounts;" ); // Clear Accounts HERE --- 419,423 ---- PersistentBroker::instance()->lockTable( "accounts" ); ! cDBResult result = PersistentBroker::instance()->query( "SELECT login,password,flags,acl,lastlogin,blockuntil,email FROM accounts;" ); // Clear Accounts HERE *************** *** 432,435 **** --- 439,444 ---- account->blockUntil.setTime_t( result.getInt( 5 ) ); + account->email_ = result.getString( 6 ); + // See if the password can and should be hashed, // Md5 hashes are 32 characters long. Index: basics.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basics.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** basics.cpp 19 Aug 2004 13:53:03 -0000 1.39 --- basics.cpp 22 Aug 2004 12:37:31 -0000 1.40 *************** *** 188,191 **** --- 188,193 ---- cBufferedWriter::cBufferedWriter( const QCString& magic, unsigned int version ) { + buffersize = 4096; + d = new cBufferedWriterPrivate; d->version = version; Index: basics.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basics.h,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** basics.h 21 Aug 2004 21:52:17 -0000 1.35 --- basics.h 22 Aug 2004 12:37:31 -0000 1.36 *************** *** 98,102 **** private: class cBufferedWriterPrivate *d; ! QT_STATIC_CONST int buffersize = 4096; public: --- 98,102 ---- private: class cBufferedWriterPrivate *d; ! int buffersize; public: Index: accounts.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/accounts.h,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** accounts.h 19 Aug 2004 01:22:51 -0000 1.43 --- accounts.h 22 Aug 2004 12:37:31 -0000 1.44 *************** *** 57,60 **** --- 57,61 ---- QDateTime lastLogin_; QDateTime blockUntil; + QCString email_; // Flags for this Account *************** *** 75,78 **** --- 76,80 ---- QString login() const; QString password() const; + const QCString &email() const; unsigned int rank() const; void remove(); *************** *** 100,103 **** --- 102,106 ---- QDateTime lastLogin() const; void setLastLogin( const QDateTime& ); + void setEmail(const QCString &email ); void setBlockUntil( const QDateTime& d ); void refreshAcl(); *************** *** 213,216 **** --- 216,227 ---- } + inline const QCString &cAccount::email() const { + return email_; + } + + inline void cAccount::setEmail(const QCString &email ) { + email_ = email; + } + inline void cAccount::setLastLogin( const QDateTime& d ) { |
|
From: Sebastian H. <dar...@us...> - 2004-08-22 12:27:19
|
Update of /cvsroot/wpdev/xmlscripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6467 Modified Files: accounts.sql Log Message: EMail field for accounts Index: accounts.sql =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/accounts.sql,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** accounts.sql 8 Jun 2004 20:33:02 -0000 1.6 --- accounts.sql 22 Aug 2004 12:27:08 -0000 1.7 *************** *** 6,9 **** --- 6,10 ---- `lastlogin` int NOT NULL default '0', `blockuntil` int NOT NULL default '0', + `email` varchar(255) NOT NULL default '', PRIMARY KEY (`login`) ); |
|
From: Correa <thi...@us...> - 2004-08-22 08:57:06
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6691 Modified Files: configure.py Log Message: trying to do MacOS support Index: configure.py =================================================================== RCS file: /cvsroot/wpdev/wolfpack/configure.py,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** configure.py 22 Aug 2004 05:48:54 -0000 1.24 --- configure.py 22 Aug 2004 08:56:54 -0000 1.25 *************** *** 132,136 **** "/usr/include/mysql.h" ] else: ! sys.stdout.write("ERROR: Unknown platform %s to checkMySQL()" % sys.platform ) sys.exit() --- 132,136 ---- "/usr/include/mysql.h" ] else: ! sys.stdout.write("ERROR: Unknown platform %s to checkMySQL()\n" % sys.platform ) sys.exit() *************** *** 195,201 **** PYTHONINCSEARCHPATH = [ "/usr/local/include/[Pp]ython2.3*/Python.h", \ "/usr/include/[Pp]ython2.3*/Python.h"] ! else: ! sys.stdout.write(red("ERROR")+": Unknown platform %s to checkPython()" % sys.platform ) sys.exit() --- 195,204 ---- PYTHONINCSEARCHPATH = [ "/usr/local/include/[Pp]ython2.3*/Python.h", \ "/usr/include/[Pp]ython2.3*/Python.h"] ! elif sys.platform == "darwin": ! PYTHONINCSEARCHPATH = [ "/System/Library/Frameworks/Python.framework/Versions/Current/Headers/Python.h" ] ! PYTHONLIBSEARCHPATH = [ ] ! PYTHONLIBSTATICSEARCHPATH = [] else: ! sys.stdout.write(red("ERROR")+": Unknown platform %s to checkPython()\n" % sys.platform ) sys.exit() |
|
From: Correa <thi...@us...> - 2004-08-22 05:49:05
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22515 Modified Files: configure.py Log Message: freebsd5 support Index: configure.py =================================================================== RCS file: /cvsroot/wpdev/wolfpack/configure.py,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** configure.py 22 Aug 2004 05:02:09 -0000 1.23 --- configure.py 22 Aug 2004 05:48:54 -0000 1.24 *************** *** 118,122 **** "/usr/local/include/mysql.h", \ "/usr/include/mysql.h" ] ! elif sys.platform == "freebsd4": MySQL_LIBSEARCHPATH = [ "/usr/local/lib/mysql/libmysqlclient*.so", \ "/usr/lib/mysql/libmysqlclient*.so", \ --- 118,122 ---- "/usr/local/include/mysql.h", \ "/usr/include/mysql.h" ] ! elif sys.platform == "freebsd4" or sys.platform == " freebsd5": MySQL_LIBSEARCHPATH = [ "/usr/local/lib/mysql/libmysqlclient*.so", \ "/usr/lib/mysql/libmysqlclient*.so", \ *************** *** 180,184 **** PYTHONINCSEARCHPATH = [ "/usr/local/include/[Pp]ython2.3*/Python.h", \ "/usr/include/[Pp]ython2.3*/Python.h"] ! elif sys.platform == "freebsd4": PYTHONLIBSEARCHPATH = [ "/usr/local/lib/libpython2.3*.so", \ "/usr/local/lib/[Pp]ython2.3*/libpython2.3*.so", \ --- 180,184 ---- PYTHONINCSEARCHPATH = [ "/usr/local/include/[Pp]ython2.3*/Python.h", \ "/usr/include/[Pp]ython2.3*/Python.h"] ! elif sys.platform == "freebsd4" or sys.platform == "freebsd5": PYTHONLIBSEARCHPATH = [ "/usr/local/lib/libpython2.3*.so", \ "/usr/local/lib/[Pp]ython2.3*/libpython2.3*.so", \ |
|
From: Correa <thi...@us...> - 2004-08-22 05:02:20
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10439 Modified Files: configure.py Log Message: Small fix Index: configure.py =================================================================== RCS file: /cvsroot/wpdev/wolfpack/configure.py,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** configure.py 19 Aug 2004 12:08:25 -0000 1.22 --- configure.py 22 Aug 2004 05:02:09 -0000 1.23 *************** *** 81,85 **** sys.stdout.write( "Checking QTDIR enviroment variable..." ) ! if ( len( os.environ["QTDIR"] ) > 0 and os.path.exists( os.environ["QTDIR"] ) ): sys.stdout.write( "ok\n" ) else: --- 81,85 ---- sys.stdout.write( "Checking QTDIR enviroment variable..." ) ! if ( os.environ.has_key("QTDIR") and os.path.exists( os.environ["QTDIR"] ) ): sys.stdout.write( "ok\n" ) else: |
|
From: Richard M. <dr...@us...> - 2004-08-22 04:35:57
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3831/webroot Modified Files: FAQ.html introduction.html Log Message: Opera work around, since it doesn't like anchors. Index: introduction.html =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/introduction.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** introduction.html 22 Aug 2004 03:22:23 -0000 1.2 --- introduction.html 22 Aug 2004 04:35:43 -0000 1.3 *************** *** 20,31 **** Table of Contents<br /> <ul class="toc"> ! <li><a href="#01">Explanation of Wolfpack</a></li> ! <li><a href="#02">Explanation of Ultima Online</a></li> ! <li><a href="#03">Getting Started</a></li> ! <li><a href="#04">Configuring Your Wolfpack Server</a></li> ! <li><a href="#05">Configuring Your Ultima Online Client</a></li> ! <li><a href="#06">Managing Your Shard Accounts</a></li> ! <li><a href="#07">Managing Your Items and NPCs</a></li> ! <li><a href="#08">Managing Your Scripts</a></li> </ul> </div> --- 20,31 ---- Table of Contents<br /> <ul class="toc"> ! <li><a href="./introduction.html#01">Explanation of Wolfpack</a></li> ! <li><a href="./introduction.html#02">Explanation of Ultima Online</a></li> ! <li><a href="./introduction.html#03">Getting Started</a></li> ! <li><a href="./introduction.html#04">Configuring Your Wolfpack Server</a></li> ! <li><a href="./introduction.html#05">Configuring Your Ultima Online Client</a></li> ! <li><a href="./introduction.html#06">Managing Your Shard Accounts</a></li> ! <li><a href="./introduction.html#07">Managing Your Items and NPCs</a></li> ! <li><a href="./introduction.html#08">Managing Your Scripts</a></li> </ul> </div> *************** *** 54,58 **** </p> </div> ! <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> <!-- Content 02 --> --- 54,58 ---- </p> </div> ! <a href="./introduction.html#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> <!-- Content 02 --> *************** *** 66,70 **** </p> </div> ! <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> <!-- Content 03 --> --- 66,70 ---- </p> </div> ! <a href="./introduction.html#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> <!-- Content 03 --> *************** *** 86,90 **** </p> </div> ! <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> <!-- Content 04 --> --- 86,90 ---- </p> </div> ! <a href="./introduction.html#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> <!-- Content 04 --> *************** *** 94,98 **** </p> </div> ! <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> <!-- Content 05 --> --- 94,98 ---- </p> </div> ! <a href="./introduction.html#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> <!-- Content 05 --> *************** *** 102,106 **** </p> </div> ! <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> <!-- Content 06 --> --- 102,106 ---- </p> </div> ! <a href="./introduction.html#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> <!-- Content 06 --> *************** *** 110,114 **** </p> </div> ! <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> <!-- Content 07 --> --- 110,114 ---- </p> </div> ! <a href="./introduction.html#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> <!-- Content 07 --> *************** *** 122,126 **** </p> </div> ! <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> <!-- Content 08 --> --- 122,126 ---- </p> </div> ! <a href="./introduction.html#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> <!-- Content 08 --> *************** *** 137,141 **** </p> </div> ! <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> </ul> --- 137,141 ---- </p> </div> ! <a href="./introduction.html#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> </ul> Index: FAQ.html =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/FAQ.html,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** FAQ.html 21 Aug 2004 18:55:07 -0000 1.11 --- FAQ.html 22 Aug 2004 04:35:43 -0000 1.12 *************** *** 20,48 **** Table of Contents<br /> <ul class="toc"> ! <li><a href="#01">What is new in Wolfpack 13.x.x?</a></li> ! <li><a href="#02">What platforms are supported?</a></li> ! <li><a href="#03">What are the system hardware requirements?</a></li> ! <li><a href="#04">What needs to be installed to use Wolfpack?</a></li> ! <li><a href="#05">How do I compile Wolfpack under Windows?</a><br /> <ul> ! <li><a href="#05a">Using MSVC.</a></li> ! <li><a href="#05b">Using Cygwin/MinGW.</a></li> </ul> </li> ! <li><a href="#06">How do I compile Wolfpack under Linux?</a></li> ! <li><a href="#07">How do I compile Wolfpack under BSD?</a></li> ! <li><a href="#08">Can I use the world files for previous Wolfpack versions?</a></li> ! <li><a href="#09">Where can I find documentation?</a></li> ! <li><a href="#10">Help! I get unicode errors with my python scripts!</a></li> ! <li><a href="#11">I found a bug! What can I do?</a></li> ! <li><a href="#12">I wrote some scripts that were missing! What can I do with it?</a></li> ! <li><a href="#13">Where can I find the latest CVS Snapshots?</a></li> ! <li><a href="#14">How do I connect to Wolfpack?</a></li> ! <li><a href="#15">Help! I can't login?!</a></li> ! <li><a href="#16">What ports should I have open?</a></li> ! <li><a href="#17">How can I route to my server behind a router?</a></li> ! <li><a href="#18">When will _______ bug or problem be fixed?</a></li> ! <li><a href="#19">Why is _______ feature is not working the same as on Sphere?</a></li> ! <li><a href="#20">I'm using the CVS scripts with a release binary, why do I get errors?</a></li> </ul> </div> --- 20,48 ---- Table of Contents<br /> <ul class="toc"> ! <li><a href="./FAQ.html#01">What is new in Wolfpack 13.x.x?</a></li> ! <li><a href="./FAQ.html#02">What platforms are supported?</a></li> ! <li><a href="./FAQ.html#03">What are the system hardware requirements?</a></li> ! <li><a href="./FAQ.html#04">What needs to be installed to use Wolfpack?</a></li> ! <li><a href="./FAQ.html#05">How do I compile Wolfpack under Windows?</a><br /> <ul> ! <li><a href="./FAQ.html#05a">Using MSVC.</a></li> ! <li><a href="./FAQ.html#05b">Using Cygwin/MinGW.</a></li> </ul> </li> ! <li><a href="./FAQ.html#06">How do I compile Wolfpack under Linux?</a></li> ! <li><a href="./FAQ.html#07">How do I compile Wolfpack under BSD?</a></li> ! <li><a href="./FAQ.html#08">Can I use the world files for previous Wolfpack versions?</a></li> ! <li><a href="./FAQ.html#09">Where can I find documentation?</a></li> ! <li><a href="./FAQ.html#10">Help! I get unicode errors with my python scripts!</a></li> ! <li><a href="./FAQ.html#11">I found a bug! What can I do?</a></li> ! <li><a href="./FAQ.html#12">I wrote some scripts that were missing! What can I do with it?</a></li> ! <li><a href="./FAQ.html#13">Where can I find the latest CVS Snapshots?</a></li> ! <li><a href="./FAQ.html#14">How do I connect to Wolfpack?</a></li> ! <li><a href="./FAQ.html#15">Help! I can't login?!</a></li> ! <li><a href="./FAQ.html#16">What ports should I have open?</a></li> ! <li><a href="./FAQ.html#17">How can I route to my server behind a router?</a></li> ! <li><a href="./FAQ.html#18">When will _______ bug or problem be fixed?</a></li> ! <li><a href="./FAQ.html#19">Why is _______ feature is not working the same as on Sphere?</a></li> ! <li><a href="./FAQ.html#20">I'm using the CVS scripts with a release binary, why do I get errors?</a></li> </ul> </div> *************** *** 71,75 **** </ul> </div> ! <a href="#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 02 --> --- 71,75 ---- </ul> </div> ! <a href="./FAQ.html#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 02 --> *************** *** 83,87 **** </ul> </div> ! <a href="#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 03 --> --- 83,87 ---- </ul> </div> ! <a href="./FAQ.html#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 03 --> *************** *** 106,110 **** Naturally, the better your hardware the better your server's performance will be. </div> ! <a href="#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 04 --> --- 106,110 ---- Naturally, the better your hardware the better your server's performance will be. </div> ! <a href="./FAQ.html#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 04 --> *************** *** 124,128 **** </ul> </div> ! <a href="#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 05 --> --- 124,128 ---- </ul> </div> ! <a href="./FAQ.html#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 05 --> *************** *** 154,158 **** </li> </ul> ! <a href="#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 06 --> --- 154,158 ---- </li> </ul> ! <a href="./FAQ.html#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 06 --> *************** *** 188,192 **** </div> </div> ! <a href="#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 07 --> --- 188,192 ---- </div> </div> ! <a href="./FAQ.html#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 07 --> *************** *** 208,212 **** </div> </div> ! <a href="#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 08 --> --- 208,212 ---- </div> </div> ! <a href="./FAQ.html#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 08 --> *************** *** 228,232 **** command as an alternative to using import. </div> ! <a href="#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 09 --> --- 228,232 ---- command as an alternative to using import. </div> ! <a href="./FAQ.html#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 09 --> *************** *** 265,273 **** For information reguarding compiling, please check out:<br /> <ul> ! <li><a href="#06">Linux Compile Guide</a></li> ! <li><a href="#07">BSD Compile Guide</a></li> </ul> </div> ! <a href="#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 11 --> --- 265,273 ---- For information reguarding compiling, please check out:<br /> <ul> ! <li><a href="./FAQ.html#06">Linux Compile Guide</a></li> ! <li><a href="./FAQ.html#07">BSD Compile Guide</a></li> </ul> </div> ! <a href="./FAQ.html#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 11 --> *************** *** 282,286 **** </ul> </div> ! <a href="#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 12 --> --- 282,286 ---- </ul> </div> ! <a href="./FAQ.html#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 12 --> *************** *** 299,303 **** </div> </li> ! <a href="#top" style="font-size:9pt;">Return To Questions</a><br /><br /> <!-- Answer 13 --> <li><a name="13" class="question">Where can I find the latest CVS Snapshots?</a><br /> --- 299,303 ---- </div> </li> ! <a href="./FAQ.html#top" style="font-size:9pt;">Return To Questions</a><br /><br /> <!-- Answer 13 --> <li><a name="13" class="question">Where can I find the latest CVS Snapshots?</a><br /> *************** *** 306,310 **** <a href="http://wpdev.sourceforge.net/snapshots/">http://wpdev.sourceforge.net/snapshots/</a> </div> ! <a href="#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 14 --> --- 306,310 ---- <a href="http://wpdev.sourceforge.net/snapshots/">http://wpdev.sourceforge.net/snapshots/</a> </div> ! <a href="./FAQ.html#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 14 --> *************** *** 341,350 **** is completely optional and not required. </div> ! <a href="#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 15 --> <li><a name="15" class="question">Help! I can't login?!</a><br /> <div class="answer"> ! First of all, please check out "<a href="#14">How do I connect to Wolfpack?</a>" to see if that resolves your problem.<br /><br /> If not, then this problem usually occurs when players try to connect to Wolfpack using an --- 341,350 ---- is completely optional and not required. </div> ! <a href="./FAQ.html#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 15 --> <li><a name="15" class="question">Help! I can't login?!</a><br /> <div class="answer"> ! First of all, please check out "<a href="./FAQ.html#14">How do I connect to Wolfpack?</a>" to see if that resolves your problem.<br /><br /> If not, then this problem usually occurs when players try to connect to Wolfpack using an *************** *** 355,359 **** If this fails, you can try finding the free <a href="http://www.google.com/search?q=Download+%22Ultima+Online%22+%22Age+of+Shadows%22+Trial&btnG=Search&hl=en&lr=&ie=UTF-8&safe=off">Age of Shadows Demo Using Google</a>. </div> ! <a href="#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 16 --> --- 355,359 ---- If this fails, you can try finding the free <a href="http://www.google.com/search?q=Download+%22Ultima+Online%22+%22Age+of+Shadows%22+Trial&btnG=Search&hl=en&lr=&ie=UTF-8&safe=off">Age of Shadows Demo Using Google</a>. </div> ! <a href="./FAQ.html#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 16 --> *************** *** 363,367 **** Optionally you can enable TCP port 2594 which is for the remote admin page.<br /> </div> ! <a href="#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 17 --> --- 363,367 ---- Optionally you can enable TCP port 2594 which is for the remote admin page.<br /> </div> ! <a href="./FAQ.html#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 17 --> *************** *** 390,394 **** </div> </div> ! <a href="#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 18 --> --- 390,394 ---- </div> </div> ! <a href="./FAQ.html#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 18 --> *************** *** 403,407 **** eventually get around to it. </div> ! <a href="#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 19 --> --- 403,407 ---- eventually get around to it. </div> ! <a href="./FAQ.html#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 19 --> *************** *** 413,417 **** Please do not ask the developers or file bug reports about this! </div> ! <a href="#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 20 --> --- 413,417 ---- Please do not ask the developers or file bug reports about this! </div> ! <a href="./FAQ.html#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> <!-- Answer 20 --> *************** *** 425,429 **** users and scripters. </div> ! <a href="#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> </ul> --- 425,429 ---- users and scripters. </div> ! <a href="./FAQ.html#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> </ul> |
|
From: Richard M. <dr...@us...> - 2004-08-22 03:22:43
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17874/webroot Modified Files: introduction.html Log Message: Started to work on the content a bit Index: introduction.html =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/introduction.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** introduction.html 21 Aug 2004 18:55:07 -0000 1.1 --- introduction.html 22 Aug 2004 03:22:23 -0000 1.2 *************** *** 34,43 **** <!-- ANSWERS --> <div class="content"> - <br /> - Content<br /> <ul class="content"> <!-- Content 01 --> <li><a name="01" class="question">Explanation of Wolfpack</a> <div class="answer"> </div> <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> --- 34,56 ---- <!-- ANSWERS --> <div class="content"> <ul class="content"> <!-- Content 01 --> <li><a name="01" class="question">Explanation of Wolfpack</a> <div class="answer"> + <p> + Wolfpack is an <a href="http://www.uo.com/">Ultima Online</a> server + emulator. There is a long history of different Ultima Online emulators, + many being branches of each other and all with their own defining + characteristics. Wolfpack is another one of these emulators, and we have + chosen a path for the server that gives it a great edge in functionality + when compared to other emulators. + </p> + <p> + Wolfpack now uses <a href="http://www.python.org/">Python</a> and + <a href="http://www.w3.org/XML/">XML</a> as a script and definition + base. It also uses the + <a href="http://www.trolltech.com/download/qt/x11.html">QT</a> library + for threading and other functions. + </p> </div> <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> *************** *** 46,49 **** --- 59,68 ---- <li><a name="02" class="question">Explanation of Ultima Online</a> <div class="answer"> + <p> + <a href="http://www.uo.com/">Ultima Online</a> is an old, yet still very + popular MMOG. It is a game set in a fantasy environment, played through + an isometric viewpoint. For more information please visit + <a href="http://www.uo.com/">http://www.uo.com/</a>. + </p> </div> <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> *************** *** 52,55 **** --- 71,88 ---- <li><a name="03" class="question">Getting Started</a> <div class="answer"> + <p> + To get started, you will need to have Ultima Online installed. This can + be done by going to your local store and buying it; Usually $30 USD or + by finding one of their free versions online. The newer your version the + better your functionaly will be. + </p> + <p> + After you have Ultima Online installed, you will need to download the + latest version of Wolfpack. This can be done by visiting the project + files page found: + <a href="http://sourceforge.net/project/showfiles.php?group_id=38114"> + here.</a> Please note that the world files are for an ancient version of + Wolfpack and will NOT work with the latest versions. + </p> </div> <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> *************** *** 58,61 **** --- 91,96 ---- <li><a name="04" class="question">Configuring Your Wolfpack Server</a> <div class="answer"> + <p> + </p> </div> <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> *************** *** 64,67 **** --- 99,104 ---- <li><a name="05" class="question">Configuring Your Ultima Online Client</a> <div class="answer"> + <p> + </p> </div> <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> *************** *** 70,73 **** --- 107,112 ---- <li><a name="06" class="question">Managing Your Shard Accounts</a> <div class="answer"> + <p> + </p> </div> <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> *************** *** 76,79 **** --- 115,124 ---- <li><a name="07" class="question">Managing Your Items and NPCs</a> <div class="answer"> + <p> + The base directory where definition files are stored is in + ./definitions/ . There should be in index.xml file in almost every + subfolder within. You can edit these files to modify which definitions + are loaded into Wolfpack. + </p> </div> <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> *************** *** 82,85 **** --- 127,139 ---- <li><a name="08" class="question">Managing Your Scripts</a> <div class="answer"> + <p> + The default file where Python scripts are defined can be found at + definitions/scripts.xml . This file follows the following format: + <div class="code"> + <definitions><br /> +   <script>directiory.scriptname</script><br /> + </definitions> + </div> + </p> </div> <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> *************** *** 87,90 **** --- 141,145 ---- </ul> </div> + <br /><hr /><br /> <div class="smalltext">© 2004 Wolfpack Team | <a href="http://www.wpdev.org/">http://www.wpdev.org</a></div> <br /> |
|
From: Correa <thi...@us...> - 2004-08-22 02:30:43
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3844 Modified Files: commands.cpp customtags.cpp dbdriver.cpp definitions.cpp dragdrop.cpp guilds.cpp items.cpp npc.cpp party.cpp persistentobject.cpp pythonscript.cpp timers.cpp uobject.cpp walking.cpp Log Message: fixes several compiler warnings Index: persistentobject.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/persistentobject.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** persistentobject.cpp 21 Aug 2004 21:52:17 -0000 1.12 --- persistentobject.cpp 22 Aug 2004 02:29:50 -0000 1.13 *************** *** 55,60 **** } - static void buildSqlString( const char* /*objectid*/, QStringList& /*fields*/, QStringList& /*tables*/, QStringList& /*conditions*/ ) - { - } - --- 55,56 ---- Index: dragdrop.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/dragdrop.cpp,v retrieving revision 1.241 retrieving revision 1.242 diff -C2 -d -r1.241 -r1.242 *** dragdrop.cpp 13 Aug 2004 08:55:25 -0000 1.241 --- dragdrop.cpp 22 Aug 2004 02:29:50 -0000 1.242 *************** *** 252,256 **** } ! void DragAndDrop::bounceItem( cUOSocket* socket, P_ITEM pItem, bool denyMove ) { // Reject the move of the item --- 252,256 ---- } ! void DragAndDrop::bounceItem( cUOSocket* socket, P_ITEM pItem, bool /*denyMove*/ ) { // Reject the move of the item Index: uobject.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v retrieving revision 1.176 retrieving revision 1.177 diff -C2 -d -r1.176 -r1.177 *** uobject.cpp 19 Aug 2004 01:55:56 -0000 1.176 --- uobject.cpp 22 Aug 2004 02:29:51 -0000 1.177 *************** *** 74,78 **** } ! cUObject::cUObject( const cUObject& src ) { // Copy Events --- 74,78 ---- } ! cUObject::cUObject( const cUObject& src ) : cDefinable(src), cPythonScriptable(src), PersistentObject( src ) { // Copy Events *************** *** 218,222 **** } ! void cUObject::save( cBufferedWriter& writer, unsigned int version ) { writer.writeUtf8( name_ ); --- 218,222 ---- } ! void cUObject::save( cBufferedWriter& writer, unsigned int /*version*/ ) { writer.writeUtf8( name_ ); *************** *** 230,234 **** } ! void cUObject::load( cBufferedReader& reader, unsigned int version ) { name_ = reader.readUtf8(); --- 230,234 ---- } ! void cUObject::load( cBufferedReader& reader, unsigned int /*version*/ ) { name_ = reader.readUtf8(); *************** *** 932,936 **** } ! void cUObject::createTooltip( cUOTxTooltipList& tooltip, cPlayer* player ) { if ( tooltip.size() != 19 ) --- 932,936 ---- } ! void cUObject::createTooltip( cUOTxTooltipList& tooltip, cPlayer* /*player*/ ) { if ( tooltip.size() != 19 ) Index: commands.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v retrieving revision 1.260 retrieving revision 1.261 diff -C2 -d -r1.260 -r1.261 *** commands.cpp 21 Aug 2004 21:52:17 -0000 1.260 --- commands.cpp 22 Aug 2004 02:29:50 -0000 1.261 *************** *** 1222,1226 **** on custom maps. */ ! void commandDoorGenerator( cUOSocket* socket, const QString& command, const QStringList& args ) throw() { Q_UNUSED( args ); --- 1222,1226 ---- on custom maps. */ ! void commandDoorGenerator( cUOSocket* socket, const QString& /*command*/, const QStringList& args ) throw() { Q_UNUSED( args ); *************** *** 1321,1325 **** cItem* addDoor( int x, int y, int z, int map, DoorFacing facing ) { ! int doorTop = z + 20; if ( y == 1743 && x >= 1343 && x <= 1344 ) --- 1321,1325 ---- cItem* addDoor( int x, int y, int z, int map, DoorFacing facing ) { ! //int doorTop = z + 20; if ( y == 1743 && x >= 1343 && x <= 1344 ) *************** *** 1339,1343 **** public: ! int generate( int region[], int map, cUOSocket* socket ) { int count = 0; --- 1339,1343 ---- public: ! int generate( int region[], int map, cUOSocket* ) { int count = 0; Index: definitions.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/definitions.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** definitions.cpp 21 Aug 2004 21:52:17 -0000 1.16 --- definitions.cpp 22 Aug 2004 02:29:50 -0000 1.17 *************** *** 425,429 **** } ! QString cDefinitions::getText( const QString& TextSection ) const { /*const QDomElement* DefSection = this->getSection( WPDT_TEXT, TextSection ); --- 425,429 ---- } ! QString cDefinitions::getText( const QString& /*TextSection*/ ) const { /*const QDomElement* DefSection = this->getSection( WPDT_TEXT, TextSection ); *************** *** 741,745 **** 0, ( getattrfunc ) wpElement_getAttr, ! 0, }; --- 741,745 ---- 0, ( getattrfunc ) wpElement_getAttr, ! 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; Index: guilds.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/guilds.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** guilds.cpp 19 Aug 2004 05:28:21 -0000 1.22 --- guilds.cpp 22 Aug 2004 02:29:50 -0000 1.23 *************** *** 373,377 **** ( setattrfunc ) wpGuild_setAttr, wpGuild_compare, ! 0, }; --- 373,377 ---- ( setattrfunc ) wpGuild_setAttr, wpGuild_compare, ! 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; *************** *** 832,836 **** } ! void cGuild::load( cBufferedReader& reader, unsigned int version ) { serial_ = reader.readInt(); name_ = reader.readUtf8(); --- 832,837 ---- } ! void cGuild::load( cBufferedReader& reader, unsigned int /*version*/ ) ! { serial_ = reader.readInt(); name_ = reader.readUtf8(); *************** *** 874,878 **** } ! void cGuild::save( cBufferedWriter& writer, unsigned int version ) { writer.writeByte(0xFD); --- 875,880 ---- } ! void cGuild::save( cBufferedWriter& writer, unsigned int /*version*/ ) ! { writer.writeByte(0xFD); *************** *** 904,905 **** --- 906,908 ---- } } + Index: items.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v retrieving revision 1.438 retrieving revision 1.439 diff -C2 -d -r1.438 -r1.439 *** items.cpp 19 Aug 2004 01:59:15 -0000 1.438 --- items.cpp 22 Aug 2004 02:29:50 -0000 1.439 *************** *** 182,186 **** // constructor ! cItem::cItem() : container_( 0 ), totalweight_( 0 ) { basedef_ = 0; --- 182,186 ---- // constructor ! cItem::cItem() : totalweight_( 0 ), container_( 0 ) { basedef_ = 0; *************** *** 188,192 **** }; ! cItem::cItem( const cItem& src ) : container_( 0 ), totalweight_( 0 ) { Init( false ); --- 188,192 ---- }; ! cItem::cItem( const cItem& src ) : cUObject(src), totalweight_( 0 ), container_( 0 ) { Init( false ); *************** *** 477,481 **** } ! void cItem::postload( unsigned int version ) { } --- 477,481 ---- } ! void cItem::postload( unsigned int /*version*/ ) { } *************** *** 548,553 **** } - static void itemRegisterAfterLoading( P_ITEM pi ); - bool cItem::del() { --- 548,551 ---- Index: pythonscript.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/pythonscript.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** pythonscript.cpp 10 Aug 2004 03:15:57 -0000 1.45 --- pythonscript.cpp 22 Aug 2004 02:29:51 -0000 1.46 *************** *** 604,608 **** } ! stError* cPythonScriptable::setProperty( const QString& name, const cVariant& value ) { // No settable properties are available for this class --- 604,608 ---- } ! stError* cPythonScriptable::setProperty( const QString& name, const cVariant& /*value*/ ) { // No settable properties are available for this class *************** *** 833,868 **** } ! bool cPythonScriptable::convertPyObject( PyObject* object, P_ITEM& pItem ) { return false; } ! bool cPythonScriptable::convertPyObject( PyObject* object, Coord_cl& pos ) { return false; } ! bool cPythonScriptable::convertPyObject( PyObject* object, QString& string ) { return false; } ! bool cPythonScriptable::convertPyObject( PyObject* object, QCString& string ) { return false; } ! bool cPythonScriptable::convertPyObject( PyObject* object, unsigned int& data ) { return false; } ! bool cPythonScriptable::convertPyObject( PyObject* object, int& data ) { return false; } ! bool cPythonScriptable::setPropety( const QString& name, PyObject* value ) { return true; } --- 833,869 ---- } ! bool cPythonScriptable::convertPyObject( PyObject* /*object*/, P_ITEM& /*pItem*/ ) { return false; } ! bool cPythonScriptable::convertPyObject( PyObject* /*object*/, Coord_cl& /*pos*/ ) { return false; } ! bool cPythonScriptable::convertPyObject( PyObject* /*object*/, QString& /*string*/ ) { return false; } ! bool cPythonScriptable::convertPyObject( PyObject* /*object*/, QCString& /*string*/ ) { return false; } ! bool cPythonScriptable::convertPyObject( PyObject* /*object*/, unsigned int& /*data*/ ) { return false; } ! bool cPythonScriptable::convertPyObject( PyObject* /*object*/, int& /*data*/ ) { return false; } ! bool cPythonScriptable::setPropety( const QString& /*name*/, PyObject* /*value*/ ) { return true; } + Index: customtags.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/customtags.cpp,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** customtags.cpp 13 Aug 2004 08:55:25 -0000 1.53 --- customtags.cpp 22 Aug 2004 02:29:50 -0000 1.54 *************** *** 630,634 **** } ! void cVariant::serialize( cBufferedWriter& writer, unsigned int version ) { writer.writeByte( typ ); --- 630,634 ---- } ! void cVariant::serialize( cBufferedWriter& writer, unsigned int /*version*/ ) { writer.writeByte( typ ); *************** *** 701,705 **** } ! void cVariant::serialize( cBufferedReader& reader, unsigned int version ) { // Only invalid can be loaded --- 701,705 ---- } ! void cVariant::serialize( cBufferedReader& reader, unsigned int /*version*/ ) { // Only invalid can be loaded Index: timers.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/timers.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** timers.cpp 16 Aug 2004 18:18:03 -0000 1.10 --- timers.cpp 22 Aug 2004 02:29:51 -0000 1.11 *************** *** 219,223 **** } ! void cTimer::load( unsigned int id, const char** result ) { unsigned int offset = 2; --- 219,223 ---- } ! void cTimer::load( unsigned int /*id*/, const char** result ) { unsigned int offset = 2; *************** *** 477,481 **** } ! void cTimer::load(cBufferedReader &reader, unsigned int version) { serializable = true; expiretime = Server::instance()->time() + reader.readInt(); --- 477,482 ---- } ! void cTimer::load(cBufferedReader &reader, unsigned int /*version*/) ! { serializable = true; expiretime = Server::instance()->time() + reader.readInt(); *************** *** 485,489 **** } ! void cTimer::save(cBufferedWriter &writer, unsigned int version) { writer.writeInt(expiretime - Server::instance()->time()); writer.writeBool(dispellable); --- 486,491 ---- } ! void cTimer::save(cBufferedWriter &writer, unsigned int /*version*/) ! { writer.writeInt(expiretime - Server::instance()->time()); writer.writeBool(dispellable); *************** *** 492,499 **** } ! void cTimers::save(cBufferedWriter &writer) { std::vector<cTimer*>::iterator it; ! for (it = teffects.begin(); it != teffects.end(); ++it) { ! if ((*it)->isSerializable()) { writer.writeByte(0xFC); writer.writeAscii((*it)->objectID().latin1()); --- 494,504 ---- } ! void cTimers::save(cBufferedWriter &writer) ! { std::vector<cTimer*>::iterator it; ! for (it = teffects.begin(); it != teffects.end(); ++it) ! { ! if ((*it)->isSerializable()) ! { writer.writeByte(0xFC); writer.writeAscii((*it)->objectID().latin1()); *************** *** 503,507 **** } ! void cTimers::load(cBufferedReader &reader) { QCString objectId = reader.readAscii(); --- 508,513 ---- } ! void cTimers::load(cBufferedReader &reader) ! { QCString objectId = reader.readAscii(); *************** *** 517,518 **** --- 523,525 ---- insert(timer); } + Index: dbdriver.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/dbdriver.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** dbdriver.cpp 21 Aug 2004 14:18:34 -0000 1.44 --- dbdriver.cpp 22 Aug 2004 02:29:50 -0000 1.45 *************** *** 64,76 **** /* dummy functions */ ! bool cDBDriver::exec( const QString& query ) { return true; } ! void cDBDriver::lockTable( const QString& table ) { } ! void cDBDriver::unlockTable( const QString& table ) { } --- 64,76 ---- /* dummy functions */ ! bool cDBDriver::exec( const QString& /*query*/ ) { return true; } ! void cDBDriver::lockTable( const QString& /*table*/ ) { } ! void cDBDriver::unlockTable( const QString& /*table*/ ) { } *************** *** 197,201 **** 0, ( getattrfunc ) wpDbResult_getAttr, ! 0, }; --- 197,201 ---- 0, ( getattrfunc ) wpDbResult_getAttr, ! 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; Index: walking.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v retrieving revision 1.136 retrieving revision 1.137 diff -C2 -d -r1.136 -r1.137 *** walking.cpp 19 Aug 2004 01:59:15 -0000 1.136 --- walking.cpp 22 Aug 2004 02:29:51 -0000 1.137 *************** *** 613,617 **** // This only gets called when running ! void cMovement::checkRunning( cUOSocket* socket, P_CHAR pChar, Q_UINT8 dir ) { // Don't regenerate stamina while running --- 613,617 ---- // This only gets called when running ! void cMovement::checkRunning( cUOSocket* socket, P_CHAR pChar, Q_UINT8 /*dir*/ ) { // Don't regenerate stamina while running *************** *** 753,757 **** for Character we could eventually bump into. */ ! bool cMovement::checkObstacles( P_CHAR pChar, const Coord_cl& newPos, bool running ) { // TODO: insert code here --- 753,757 ---- for Character we could eventually bump into. */ ! bool cMovement::checkObstacles( P_CHAR /*pChar*/, const Coord_cl& /*newPos*/, bool /*running*/ ) { // TODO: insert code here Index: party.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/party.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** party.cpp 10 Aug 2004 03:15:57 -0000 1.16 --- party.cpp 22 Aug 2004 02:29:50 -0000 1.17 *************** *** 218,222 **** the canidate is removed from the party without notification. */ ! void Dispel( P_CHAR source, bool silent ) { P_PLAYER player = dynamic_cast<P_PLAYER>( World::instance()->findChar( destSer ) ); --- 218,222 ---- the canidate is removed from the party without notification. */ ! void Dispel( P_CHAR /*source*/, bool silent ) { P_PLAYER player = dynamic_cast<P_PLAYER>( World::instance()->findChar( destSer ) ); *************** *** 466,470 **** ( setattrfunc ) wpParty_setAttr, wpParty_compare, ! 0, }; --- 466,470 ---- ( setattrfunc ) wpParty_setAttr, wpParty_compare, ! 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; Index: npc.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v retrieving revision 1.108 retrieving revision 1.109 diff -C2 -d -r1.108 -r1.109 *** npc.cpp 19 Aug 2004 01:55:56 -0000 1.108 --- npc.cpp 22 Aug 2004 02:29:50 -0000 1.109 *************** *** 71,75 **** } ! cNPC::cNPC( const cNPC& right ) { } --- 71,75 ---- } ! cNPC::cNPC( const cNPC& right ) : cBaseChar(right) { } *************** *** 80,84 **** } ! cNPC& cNPC::operator=( const cNPC& right ) { return *this; --- 80,84 ---- } ! cNPC& cNPC::operator=( const cNPC& /*right*/ ) { return *this; *************** *** 1057,1061 **** pathnode_cl* currentNode = NULL; pathnode_cl* newNode = NULL; ! pathnode_cl* prevNode = NULL; int iterations = 0; while ( !unvisited_nodes.empty() ) --- 1057,1061 ---- pathnode_cl* currentNode = NULL; pathnode_cl* newNode = NULL; ! //pathnode_cl* prevNode = NULL; int iterations = 0; while ( !unvisited_nodes.empty() ) |
|
From: Correa <thi...@us...> - 2004-08-22 02:30:13
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3844/python Modified Files: char.cpp content.h gump.h item.cpp pyaccount.cpp pyai.cpp pycoord.cpp pypacket.cpp pyregion.cpp pyspawnregion.cpp pytooltip.cpp skills.h socket.cpp target.h tempeffect.h worlditerator.cpp Log Message: fixes several compiler warnings Index: content.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/content.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** content.h 10 Aug 2004 03:27:52 -0000 1.17 --- content.h 22 Aug 2004 02:29:52 -0000 1.18 *************** *** 112,116 **** 0, 0, ! }; --- 112,119 ---- 0, 0, ! 0, ! 0, ! 0, ! 0, }; *************** *** 130,133 **** --- 133,169 ---- 0,& wpContentSequence, 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, }; Index: pypacket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/pypacket.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** pypacket.cpp 10 Aug 2004 03:27:54 -0000 1.14 --- pypacket.cpp 22 Aug 2004 02:29:52 -0000 1.15 *************** *** 70,74 **** 0, wpPacket_getattr, ! 0, }; --- 70,74 ---- 0, wpPacket_getattr, ! 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; Index: pyspawnregion.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/pyspawnregion.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** pyspawnregion.cpp 15 Aug 2004 02:17:40 -0000 1.4 --- pyspawnregion.cpp 22 Aug 2004 02:29:52 -0000 1.5 *************** *** 59,63 **** ( getattrfunc ) wpSpawnRegion_getAttr, ( setattrfunc ) wpSpawnRegion_setAttr, ! 0, }; --- 59,63 ---- ( getattrfunc ) wpSpawnRegion_getAttr, ( setattrfunc ) wpSpawnRegion_setAttr, ! 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; *************** *** 101,105 **** to be spawned. */ ! static PyObject* wpSpawnRegion_spawn( wpSpawnRegion* self, PyObject* args ) { PyObject* baseids = 0; --- 101,105 ---- to be spawned. */ ! static PyObject* wpSpawnRegion_spawn( wpSpawnRegion* /*self*/, PyObject* args ) { PyObject* baseids = 0; Index: pyai.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/pyai.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** pyai.cpp 10 Aug 2004 03:27:54 -0000 1.9 --- pyai.cpp 22 Aug 2004 02:29:52 -0000 1.10 *************** *** 73,76 **** --- 73,109 ---- 0, 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, }; Index: skills.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/skills.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** skills.h 19 Aug 2004 01:55:58 -0000 1.23 --- skills.h 22 Aug 2004 02:29:53 -0000 1.24 *************** *** 98,102 **** 0, ( intobjargproc ) wpSkills_set, ! }; --- 98,105 ---- 0, ( intobjargproc ) wpSkills_set, ! 0, ! 0, ! 0, ! 0, }; *************** *** 116,118 **** --- 119,148 ---- 0,& wpSkillsSequence, 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0,0,0, + 0,0,0, + 0,0,0, }; Index: pycoord.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/pycoord.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** pycoord.cpp 10 Aug 2004 03:27:54 -0000 1.18 --- pycoord.cpp 22 Aug 2004 02:29:52 -0000 1.19 *************** *** 74,78 **** 0, 0, // Call ! ( reprfunc ) wpCoord_str }; --- 74,79 ---- 0, 0, // Call ! ( reprfunc ) wpCoord_str, ! 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; Index: tempeffect.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/tempeffect.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** tempeffect.h 19 Aug 2004 05:28:21 -0000 1.28 --- tempeffect.h 22 Aug 2004 02:29:53 -0000 1.29 *************** *** 231,234 **** --- 231,235 ---- variant.serialize(reader, version); switch (variant.type()) { + case cVariant::Long: case cVariant::Int: object = PyInt_FromLong(variant.asInt()); *************** *** 254,257 **** --- 255,260 ---- object = PyGetCoordObject(variant.toCoord()); break; + case cVariant::Invalid: + break; } Index: socket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/socket.cpp,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -d -r1.83 -r1.84 *** socket.cpp 19 Aug 2004 05:28:21 -0000 1.83 --- socket.cpp 22 Aug 2004 02:29:53 -0000 1.84 *************** *** 60,64 **** ( getattrfunc ) wpSocket_getAttr, ( setattrfunc ) wpSocket_setAttr, ! 0, }; --- 60,64 ---- ( getattrfunc ) wpSocket_getAttr, ( setattrfunc ) wpSocket_setAttr, ! 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; Index: gump.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/gump.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** gump.h 19 Aug 2004 05:28:21 -0000 1.24 --- gump.h 22 Aug 2004 02:29:52 -0000 1.25 *************** *** 106,110 **** 0, 0, ! 0, }; --- 106,110 ---- 0, 0, ! 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; Index: item.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/item.cpp,v retrieving revision 1.122 retrieving revision 1.123 diff -C2 -d -r1.122 -r1.123 *** item.cpp 19 Aug 2004 01:55:58 -0000 1.122 --- item.cpp 22 Aug 2004 02:29:52 -0000 1.123 *************** *** 94,98 **** ( hashfunc ) wpItem_hash, 0, ! ( reprfunc ) wpItem_str }; --- 94,120 ---- ( hashfunc ) wpItem_hash, 0, ! ( reprfunc ) wpItem_str, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0,0,0,0,0,0,0,0,0, }; Index: target.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/target.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** target.h 19 Aug 2004 05:28:21 -0000 1.21 --- target.h 22 Aug 2004 02:29:53 -0000 1.22 *************** *** 91,95 **** 0, 0, ! 0, }; --- 91,95 ---- 0, 0, ! 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; Index: pyaccount.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/pyaccount.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** pyaccount.cpp 10 Aug 2004 03:27:54 -0000 1.36 --- pyaccount.cpp 22 Aug 2004 02:29:52 -0000 1.37 *************** *** 79,83 **** 0, 0, // Call ! ( reprfunc ) wpAccount_str }; --- 79,84 ---- 0, 0, // Call ! ( reprfunc ) wpAccount_str, ! 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; *************** *** 153,157 **** \description Removes a player from this account. */ ! static PyObject* wpAccount_removecharacter( wpAccount* self, PyObject* args ) { if ( !checkArgChar( 0 ) ) --- 154,158 ---- \description Removes a player from this account. */ ! static PyObject* wpAccount_removecharacter( wpAccount* /*self*/, PyObject* args ) { if ( !checkArgChar( 0 ) ) Index: pyregion.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/pyregion.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** pyregion.cpp 10 Aug 2004 03:27:54 -0000 1.21 --- pyregion.cpp 22 Aug 2004 02:29:52 -0000 1.22 *************** *** 75,79 **** 0, // Call ( reprfunc ) wpRegion_str, ! 0, }; --- 75,79 ---- 0, // Call ( reprfunc ) wpRegion_str, ! 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; Index: pytooltip.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/pytooltip.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** pytooltip.cpp 10 Aug 2004 03:27:54 -0000 1.22 --- pytooltip.cpp 22 Aug 2004 02:29:52 -0000 1.23 *************** *** 76,80 **** ( getattrfunc ) wpTooltip_getAttr, ( setattrfunc ) wpTooltip_setAttr, ! 0, }; --- 76,80 ---- ( getattrfunc ) wpTooltip_getAttr, ( setattrfunc ) wpTooltip_setAttr, ! 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; Index: worlditerator.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/worlditerator.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** worlditerator.cpp 10 Aug 2004 03:27:54 -0000 1.10 --- worlditerator.cpp 22 Aug 2004 02:29:53 -0000 1.11 *************** *** 85,89 **** 0, 0, ! 0, }; --- 85,89 ---- 0, 0, ! 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; *************** *** 158,162 **** 0, 0, ! }; --- 158,162 ---- 0, 0, ! 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; Index: char.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v retrieving revision 1.180 retrieving revision 1.181 diff -C2 -d -r1.180 -r1.181 *** char.cpp 19 Aug 2004 01:55:57 -0000 1.180 --- char.cpp 22 Aug 2004 02:29:52 -0000 1.181 *************** *** 98,102 **** ( hashfunc ) wpChar_hash, 0, // Call ! ( reprfunc ) wpChar_str }; --- 98,132 ---- ( hashfunc ) wpChar_hash, 0, // Call ! ( reprfunc ) wpChar_str, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, ! 0, }; |
|
From: Correa <thi...@us...> - 2004-08-22 02:30:05
|
Update of /cvsroot/wpdev/wolfpack/twofish In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3844/twofish Modified Files: twofish2.c Log Message: fixes several compiler warnings Index: twofish2.c =================================================================== RCS file: /cvsroot/wpdev/wolfpack/twofish/twofish2.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** twofish2.c 12 Aug 2004 12:13:33 -0000 1.4 --- twofish2.c 22 Aug 2004 02:29:53 -0000 1.5 *************** *** 1173,1175 **** return x - TwofishCodeStart(); }; ! #endif \ No newline at end of file --- 1173,1176 ---- return x - TwofishCodeStart(); }; ! #endif ! |
|
From: Correa <thi...@us...> - 2004-08-22 02:30:04
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3844/network Modified Files: uosocket.cpp Log Message: fixes several compiler warnings Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.396 retrieving revision 1.397 diff -C2 -d -r1.396 -r1.397 *** uosocket.cpp 19 Aug 2004 01:59:16 -0000 1.396 --- uosocket.cpp 22 Aug 2004 02:29:51 -0000 1.397 *************** *** 811,814 **** --- 811,816 ---- denyPacket.setReason( cUOTxDenyLogin::DL_INUSE ); break; + case cAccounts::NoError: + break; }; |
|
From: Correa <thi...@us...> - 2004-08-21 21:52:39
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20289 Modified Files: basechar.cpp basics.h commands.cpp definitions.cpp pagesystem.h persistentobject.cpp Log Message: Some compiler warning fixes Index: pagesystem.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/pagesystem.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** pagesystem.h 19 Aug 2004 01:22:52 -0000 1.21 --- pagesystem.h 21 Aug 2004 21:52:17 -0000 1.22 *************** *** 131,141 **** { } ! cPagesManager( cPagesManager& ) ! { ! } // Unallow copy constructor ! cPagesManager& operator=( cPagesManager& ) ! { ! return *this; ! } // Unallow Assignment public: void save() --- 131,137 ---- { } ! private: ! cPagesManager( cPagesManager& ); ! cPagesManager& operator=( cPagesManager& ); public: void save() Index: persistentobject.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/persistentobject.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** persistentobject.cpp 19 Aug 2004 01:22:52 -0000 1.11 --- persistentobject.cpp 21 Aug 2004 21:52:17 -0000 1.12 *************** *** 51,57 **** } ! void PersistentObject::postload( unsigned int version ) { } ! static void buildSqlString( const char *objectid, QStringList& fields, QStringList& tables, QStringList& conditions ) { } --- 51,60 ---- } ! void PersistentObject::postload( unsigned int /*version*/ ) ! { } ! static void buildSqlString( const char* /*objectid*/, QStringList& /*fields*/, QStringList& /*tables*/, QStringList& /*conditions*/ ) ! { } + Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.134 retrieving revision 1.135 diff -C2 -d -r1.134 -r1.135 *** basechar.cpp 19 Aug 2004 05:28:21 -0000 1.134 --- basechar.cpp 21 Aug 2004 21:52:17 -0000 1.135 *************** *** 121,125 **** } ! cBaseChar::cBaseChar( const cBaseChar& right ) { } --- 121,125 ---- } ! cBaseChar::cBaseChar( const cBaseChar& right ) : cUObject(right) { } *************** *** 129,133 **** } ! cBaseChar& cBaseChar::operator=( const cBaseChar& right ) { return *this; --- 129,133 ---- } ! cBaseChar& cBaseChar::operator=( const cBaseChar& /*right*/ ) { return *this; *************** *** 227,231 **** } ! void cBaseChar::postload( unsigned int version ) { // Resolve the guarding_ value. --- 227,231 ---- } ! void cBaseChar::postload( unsigned int /*version*/ ) { // Resolve the guarding_ value. Index: commands.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v retrieving revision 1.259 retrieving revision 1.260 diff -C2 -d -r1.259 -r1.260 *** commands.cpp 21 Aug 2004 15:37:02 -0000 1.259 --- commands.cpp 21 Aug 2004 21:52:17 -0000 1.260 *************** *** 792,796 **** else if ( child->name() == "equipped" ) { ! int j; for ( j = 0; j < child->childCount(); ++j ) { --- 792,796 ---- else if ( child->name() == "equipped" ) { ! uint j; for ( j = 0; j < child->childCount(); ++j ) { *************** *** 851,856 **** a file called categories.db in your wolfpack directory. */ ! void commandExportDefinitions( cUOSocket *socket, const QString &command, const QStringList &args) throw() { ! if ( QFile::exists( "categories.db" ) && !QFile::remove( "categories.db" ) ) { socket->sysMessage( "Unable to remove existing categories.db." ); return; --- 851,858 ---- a file called categories.db in your wolfpack directory. */ ! void commandExportDefinitions( cUOSocket* socket, const QString& /*command*/, const QStringList& /*args*/) throw() ! { ! if ( QFile::exists( "categories.db" ) && !QFile::remove( "categories.db" ) ) ! { socket->sysMessage( "Unable to remove existing categories.db." ); return; Index: basics.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basics.h,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** basics.h 21 Aug 2004 15:37:02 -0000 1.34 --- basics.h 21 Aug 2004 21:52:17 -0000 1.35 *************** *** 98,105 **** private: class cBufferedWriterPrivate *d; ! const static int buffersize = 4096; public: ! cBufferedWriter( const QCString& magic, unsigned int version ); ~cBufferedWriter(); --- 98,105 ---- private: class cBufferedWriterPrivate *d; ! QT_STATIC_CONST int buffersize = 4096; public: ! Q_EXPLICIT cBufferedWriter( const QCString& magic, unsigned int version ); ~cBufferedWriter(); Index: definitions.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/definitions.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** definitions.cpp 19 Aug 2004 13:53:03 -0000 1.15 --- definitions.cpp 21 Aug 2004 21:52:17 -0000 1.16 *************** *** 131,135 **** } ! bool startElement( const QString& namespaceURI, const QString& localName, const QString& qName, const QXmlAttributes& atts ) { // Some Parent Elements have special meanings --- 131,135 ---- } ! bool startElement( const QString& /*namespaceURI*/, const QString& localName, const QString& qName, const QXmlAttributes& atts ) { // Some Parent Elements have special meanings *************** *** 164,168 **** } ! bool endElement( const QString& namespaceURI, const QString& localName, const QString& qName ) { if ( stack.isEmpty() ) --- 164,168 ---- } ! bool endElement( const QString& /*namespaceURI*/, const QString& /*localName*/, const QString& /*qName*/ ) { if ( stack.isEmpty() ) |
|
From: Richard M. <dr...@us...> - 2004-08-21 19:04:16
|
Update of /cvsroot/wpdev/xmlscripts/documentation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv934 Modified Files: generate.py generate_html.py Log Message: Made it where ./ can be used to execute the generate scripts in *nix systems. Index: generate_html.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/generate_html.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** generate_html.py 2 Jul 2004 18:30:47 -0000 1.9 --- generate_html.py 21 Aug 2004 19:04:05 -0000 1.10 *************** *** 1,2 **** --- 1,3 ---- + #!/usr/bin/env python import re *************** *** 31,38 **** global functions global constants ! #print "Examining %s..." % path files = glob(path + '/*.py') ! for file in files: if os.path.isfile(file): --- 32,39 ---- global functions global constants ! #print "Examining %s..." % path files = glob(path + '/*.py') ! for file in files: if os.path.isfile(file): *************** *** 42,48 **** functions += newfunctions constants += newconstants ! files = glob(path + '/*.cpp') ! for file in files: if os.path.isfile(file): --- 43,49 ---- functions += newfunctions constants += newconstants ! files = glob(path + '/*.cpp') ! for file in files: if os.path.isfile(file): *************** *** 54,60 **** objectsproperties += newobjectsproperties functions += newfunctions ! files = glob(path + '/*.h') ! for file in files: if os.path.isfile(file): --- 55,61 ---- objectsproperties += newobjectsproperties functions += newfunctions ! files = glob(path + '/*.h') ! for file in files: if os.path.isfile(file): *************** *** 64,70 **** objects += newobjects objectsmethods += newobjectsmethods ! objectsproperties += newobjectsproperties functions += newfunctions ! # Get subdirectories and process them entries = glob(path + '/*') --- 65,71 ---- objects += newobjects objectsmethods += newobjectsmethods ! objectsproperties += newobjectsproperties functions += newfunctions ! # Get subdirectories and process them entries = glob(path + '/*') *************** *** 72,79 **** if os.path.isdir(entry): examine(entry) ! for path in paths: examine(path) ! def quote(text): return text.replace("'", "\\'") --- 73,80 ---- if os.path.isdir(entry): examine(entry) ! for path in paths: examine(path) ! def quote(text): return text.replace("'", "\\'") *************** *** 103,107 **** overview += "<td> </td>\n"; ! overview += "</tr>\n" # Write an index file for the events. --- 104,108 ---- overview += "<td> </td>\n"; ! overview += "</tr>\n" # Write an index file for the events. *************** *** 117,121 **** output.write(text) output.close() ! for command in commands: template = open('templates/command.html') --- 118,122 ---- output.write(text) output.close() ! for command in commands: template = open('templates/command.html') *************** *** 165,169 **** overview += "<td> </td>\n"; ! overview += "</tr>\n" # Write an index file for the events. --- 166,170 ---- overview += "<td> </td>\n"; ! overview += "</tr>\n" # Write an index file for the events. *************** *** 179,183 **** output.write(text) output.close() ! for event in events: template = open('templates/event.html') --- 180,184 ---- output.write(text) output.close() ! for event in events: template = open('templates/event.html') *************** *** 195,199 **** text = text.replace('{GENERATED}', generated) text = text.replace('{VERSION}', version) ! output = open('webroot/event_%s.html' % event['name'].lower(), "wt") output.write(text) --- 196,200 ---- text = text.replace('{GENERATED}', generated) text = text.replace('{VERSION}', version) ! output = open('webroot/event_%s.html' % event['name'].lower(), "wt") output.write(text) *************** *** 202,212 **** def objectcmp(a, b): return cmp(a['object'], b['object']) ! def methodcmp(a, b): ! return cmp(a['method'], b['method']) ! def propertycmp(a, b): ! return cmp(a['property'], b['property']) ! objects.sort(objectcmp) --- 203,213 ---- def objectcmp(a, b): return cmp(a['object'], b['object']) ! def methodcmp(a, b): ! return cmp(a['method'], b['method']) ! def propertycmp(a, b): ! return cmp(a['property'], b['property']) ! objects.sort(objectcmp) *************** *** 227,231 **** overview += "<td> </td>\n"; ! overview += "</tr>\n" # Write an index file for the objects. --- 228,232 ---- overview += "<td> </td>\n"; ! overview += "</tr>\n" # Write an index file for the objects. *************** *** 241,249 **** output.write(text) output.close() ! for object in objects: # Compile a list of objects we inherit from (complete, recursive) inherited = object['inherit'][:] # Create a copy ! for i in range(0, len(objects)): o = objects[i] --- 242,250 ---- output.write(text) output.close() ! for object in objects: # Compile a list of objects we inherit from (complete, recursive) inherited = object['inherit'][:] # Create a copy ! for i in range(0, len(objects)): o = objects[i] *************** *** 263,267 **** if property['object'] in inherited or property['object'] == object['object']: properties.append(property) ! properties.sort(propertycmp) methods.sort(methodcmp) --- 264,268 ---- if property['object'] in inherited or property['object'] == object['object']: properties.append(property) ! properties.sort(propertycmp) methods.sort(methodcmp) *************** *** 271,286 **** text = template.read() template.close() ! text = text.replace('{GENERATED}', generated) ! text = text.replace('{VERSION}', version) ! ! # Compile an overview overview = '' cols = 7 rows = int(math.ceil(len(methods) / 7.0)) ! for row in range(0, rows): overview += "<tr>\n" ! for col in range(0, cols): id = col * rows + row --- 272,287 ---- text = template.read() template.close() ! text = text.replace('{GENERATED}', generated) ! text = text.replace('{VERSION}', version) ! ! # Compile an overview overview = '' cols = 7 rows = int(math.ceil(len(methods) / 7.0)) ! for row in range(0, rows): overview += "<tr>\n" ! for col in range(0, cols): id = col * rows + row *************** *** 290,306 **** else: overview += "<td width=\"15%\"> </td>\n"; ! overview += "</tr>\n" ! text = text.replace('{METHODOVERVIEW}', overview) ! ! # Compile an overview overview = '' cols = 7 rows = int(math.ceil(len(properties) / 7.0)) ! for row in range(0, rows): overview += "<tr>\n" ! for col in range(0, cols): id = col * rows + row --- 291,307 ---- else: overview += "<td width=\"15%\"> </td>\n"; ! overview += "</tr>\n" ! text = text.replace('{METHODOVERVIEW}', overview) ! ! # Compile an overview overview = '' cols = 7 rows = int(math.ceil(len(properties) / 7.0)) ! for row in range(0, rows): overview += "<tr>\n" ! for col in range(0, cols): id = col * rows + row *************** *** 310,335 **** else: overview += "<td width=\"15%\"> </td>\n"; ! overview += "</tr>\n" ! text = text.replace('{PROPERTYOVERVIEW}', overview) ! # Generate a list of methods overview = '' for i in range(0, len(methods)): method = methods[i] ! parameters = '' if len(method['parameters']) > 0: parameters = "%s<br/><br/>\n" % method['parameters'] ! returnvalue = '' if len(method['returnvalue']) > 0: returnvalue = "<span class=\"style2\">Return Value:</span><br/>%s<br/><br/>\n" % method['returnvalue'] ! description = '' if len(method['description']) > 0: description = "<span class=\"style2\">Description:</span><br />%s<br />\n" % method['description'] ! overview += "<a name=\"meth_%(lowername)s\"></a> \ <b><code style=\"font-size: 12px\">%(prototype)s</code></b><br />\ --- 311,336 ---- else: overview += "<td width=\"15%\"> </td>\n"; ! overview += "</tr>\n" ! text = text.replace('{PROPERTYOVERVIEW}', overview) ! # Generate a list of methods overview = '' for i in range(0, len(methods)): method = methods[i] ! parameters = '' if len(method['parameters']) > 0: parameters = "%s<br/><br/>\n" % method['parameters'] ! returnvalue = '' if len(method['returnvalue']) > 0: returnvalue = "<span class=\"style2\">Return Value:</span><br/>%s<br/><br/>\n" % method['returnvalue'] ! description = '' if len(method['description']) > 0: description = "<span class=\"style2\">Description:</span><br />%s<br />\n" % method['description'] ! overview += "<a name=\"meth_%(lowername)s\"></a> \ <b><code style=\"font-size: 12px\">%(prototype)s</code></b><br />\ *************** *** 345,352 **** 'description': description } ! if i != len(methods) - 1: overview += '<hr size="1">' ! text = text.replace('{OBJECTMETHODS}', overview) --- 346,353 ---- 'description': description } ! if i != len(methods) - 1: overview += '<hr size="1">' ! text = text.replace('{OBJECTMETHODS}', overview) *************** *** 363,367 **** if property['readonly'] == '1': readonly = ' (read only)' ! overview += """<a name="prop_%(lowername)s"></a>\ <b><code style="font-size: 12px">%(name)s</code></b>%(readonly)s<br /><br />\ --- 364,368 ---- if property['readonly'] == '1': readonly = ' (read only)' ! overview += """<a name="prop_%(lowername)s"></a>\ <b><code style="font-size: 12px">%(name)s</code></b>%(readonly)s<br /><br />\ *************** *** 376,380 **** if i != len(properties) - 1: overview += '<hr size="1">' ! text = text.replace('{OBJECTPROPERTIES}', overview) --- 377,381 ---- if i != len(properties) - 1: overview += '<hr size="1">' ! text = text.replace('{OBJECTPROPERTIES}', overview) *************** *** 385,389 **** else: text = text.replace('{DESCRIPTION}', '') ! output = open('webroot/object_%s.html' % object['object'].lower(), "wt") output.write(text) --- 386,390 ---- else: text = text.replace('{DESCRIPTION}', '') ! output = open('webroot/object_%s.html' % object['object'].lower(), "wt") output.write(text) *************** *** 401,409 **** current += '.' + module else: ! current = module ! if current not in modules: modules.append(current) ! for constant in constants: module = constant['module'] --- 402,410 ---- current += '.' + module else: ! current = module ! if current not in modules: modules.append(current) ! for constant in constants: module = constant['module'] *************** *** 414,421 **** current += '.' + module else: ! current = module ! if current not in modules: ! modules.append(current) # Create an overview --- 415,422 ---- current += '.' + module else: ! current = module ! if current not in modules: ! modules.append(current) # Create an overview *************** *** 437,441 **** overview += "<td> </td>\n"; ! overview += "</tr>\n" # Write an index file for the objects. --- 438,442 ---- overview += "<td> </td>\n"; ! overview += "</tr>\n" # Write an index file for the objects. *************** *** 460,473 **** if function['module'] == module: localfunctions.append(function) ! localconstants = [] for constant in constants: if constant['module'] == module: localconstants.append(constant) ! template = open('templates/module.html') text = template.read() template.close() ! text = text.replace('{GENERATED}', generated) text = text.replace('{VERSION}', version) --- 461,474 ---- if function['module'] == module: localfunctions.append(function) ! localconstants = [] for constant in constants: if constant['module'] == module: localconstants.append(constant) ! template = open('templates/module.html') text = template.read() template.close() ! text = text.replace('{GENERATED}', generated) text = text.replace('{VERSION}', version) *************** *** 477,486 **** cols = 7 rows = int(math.ceil(len(localfunctions) / 7.0)) ! localfunctions.sort(namesort) ! for row in range(0, rows): overview += "<tr>\n" ! for col in range(0, cols): id = col * rows + row --- 478,487 ---- cols = 7 rows = int(math.ceil(len(localfunctions) / 7.0)) ! localfunctions.sort(namesort) ! for row in range(0, rows): overview += "<tr>\n" ! for col in range(0, cols): id = col * rows + row *************** *** 490,498 **** else: overview += "<td width=\"15%\"> </td>\n"; ! overview += "</tr>\n" ! text = text.replace('{FUNCTIONOVERVIEW}', overview) ! # Generate a list of methods overview = '' --- 491,499 ---- else: overview += "<td width=\"15%\"> </td>\n"; ! overview += "</tr>\n" ! text = text.replace('{FUNCTIONOVERVIEW}', overview) ! # Generate a list of methods overview = '' *************** *** 500,519 **** overview += """<p><span class="sectiontitle">MODULE FUNCTIONS</span><br> <br>""" ! for i in range(0, len(localfunctions)): function = localfunctions[i] ! parameters = '' if len(function['parameters']) > 0: parameters = "%s<br/><br/>\n" % function['parameters'] ! returnvalue = '' if len(function['returnvalue']) > 0: returnvalue = "<span class=\"style2\">Return Value:</span><br/>%s<br/><br/>\n" % function['returnvalue'] ! description = '' if len(function['description']) > 0: description = "<span class=\"style2\">Description:</span><br />%s<br />\n" % function['description'] ! overview += "<a name=\"func_%(lowername)s\"></a> \ <b><code style=\"font-size: 12px\">%(prototype)s</code></b><br />\ --- 501,520 ---- overview += """<p><span class="sectiontitle">MODULE FUNCTIONS</span><br> <br>""" ! for i in range(0, len(localfunctions)): function = localfunctions[i] ! parameters = '' if len(function['parameters']) > 0: parameters = "%s<br/><br/>\n" % function['parameters'] ! returnvalue = '' if len(function['returnvalue']) > 0: returnvalue = "<span class=\"style2\">Return Value:</span><br/>%s<br/><br/>\n" % function['returnvalue'] ! description = '' if len(function['description']) > 0: description = "<span class=\"style2\">Description:</span><br />%s<br />\n" % function['description'] ! overview += "<a name=\"func_%(lowername)s\"></a> \ <b><code style=\"font-size: 12px\">%(prototype)s</code></b><br />\ *************** *** 529,545 **** 'description': description } ! if i != len(localfunctions) - 1: overview += '<hr size="1">' ! text = text.replace('{MODULEFUNCTIONS}', overview) ! # Create a function overview first overview = '' cols = 4 rows = int(math.ceil(len(localconstants) / 4.0)) ! localconstants.sort(namesort) ! for row in range(0, rows): if row == 0: --- 530,546 ---- 'description': description } ! if i != len(localfunctions) - 1: overview += '<hr size="1">' ! text = text.replace('{MODULEFUNCTIONS}', overview) ! # Create a function overview first overview = '' cols = 4 rows = int(math.ceil(len(localconstants) / 4.0)) ! localconstants.sort(namesort) ! for row in range(0, rows): if row == 0: *************** *** 547,553 **** <br><strong>Constants:</strong> <table width="100%" border="0" cellspacing="0" cellpadding="2">""" ! overview += "<tr>\n" ! for col in range(0, cols): id = col * rows + row --- 548,554 ---- <br><strong>Constants:</strong> <table width="100%" border="0" cellspacing="0" cellpadding="2">""" ! overview += "<tr>\n" ! for col in range(0, cols): id = col * rows + row *************** *** 557,581 **** else: overview += "<td width=\"25%\"> </td>\n"; ! overview += "</tr>\n" ! if row == rows - 1: overview += "</table>" ! ! text = text.replace('{CONSTANTSOVERVIEW}', overview) ! # Generate a list of constants overview = '' ! if len(localconstants) > 0: overview += """<p><span class="sectiontitle">MODULE CONSTANTS</span><br> <br>""" ! for i in range(0, len(localconstants)): constant = localconstants[i] consttext = '' ! for const in constant['constants']: ! # If this constant is for a number, # color it red, otherwise color it grey quotecolor = re.compile('((?<!\\\\)".*?(?<!\\\\)")') --- 558,582 ---- else: overview += "<td width=\"25%\"> </td>\n"; ! overview += "</tr>\n" ! if row == rows - 1: overview += "</table>" ! ! text = text.replace('{CONSTANTSOVERVIEW}', overview) ! # Generate a list of constants overview = '' ! if len(localconstants) > 0: overview += """<p><span class="sectiontitle">MODULE CONSTANTS</span><br> <br>""" ! for i in range(0, len(localconstants)): constant = localconstants[i] consttext = '' ! for const in constant['constants']: ! # If this constant is for a number, # color it red, otherwise color it grey quotecolor = re.compile('((?<!\\\\)".*?(?<!\\\\)")') *************** *** 589,593 **** newconst += const[result.end():] const = newconst ! quotecolor = re.compile('\\#.*') curpos = 0 --- 590,594 ---- newconst += const[result.end():] const = newconst ! quotecolor = re.compile('\\#.*') curpos = 0 *************** *** 599,609 **** curpos = len(newconst) newconst += const[result.end():] ! const = newconst ! consttext += const consttext += "<br>\n" if len(constant['description']) > 0: ! constant['description'] += '<br>' overview += "<a name=\"const_%(anchor)s\"></a><b><code style=\"font-size: 12px\">%(name)s</code></b><br />\ --- 600,610 ---- curpos = len(newconst) newconst += const[result.end():] ! const = newconst ! consttext += const consttext += "<br>\n" if len(constant['description']) > 0: ! constant['description'] += '<br>' overview += "<a name=\"const_%(anchor)s\"></a><b><code style=\"font-size: 12px\">%(name)s</code></b><br />\ *************** *** 615,624 **** 'constants': consttext } ! if i != len(localconstants) - 1: ! overview += '<hr size="1">' ! text = text.replace('{MODULECONSTANTS}', overview) ! output = open('webroot/module_%s.html' % module.replace('.', '_').lower(), "wt") output.write(text) --- 616,625 ---- 'constants': consttext } ! if i != len(localconstants) - 1: ! overview += '<hr size="1">' ! text = text.replace('{MODULECONSTANTS}', overview) ! output = open('webroot/module_%s.html' % module.replace('.', '_').lower(), "wt") output.write(text) Index: generate.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/generate.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** generate.py 26 Jun 2004 21:51:28 -0000 1.8 --- generate.py 21 Aug 2004 19:04:05 -0000 1.9 *************** *** 1,2 **** --- 1,3 ---- + #!/usr/bin/env python import time *************** *** 26,33 **** global objectsproperties global functions ! #print "Examining %s..." % path files = glob(path + '/*.py') ! for file in files: if os.path.isfile(file): --- 27,34 ---- global objectsproperties global functions ! #print "Examining %s..." % path files = glob(path + '/*.py') ! for file in files: if os.path.isfile(file): *************** *** 36,42 **** events += newevents functions += newfunctions ! files = glob(path + '/*.cpp') ! for file in files: if os.path.isfile(file): --- 37,43 ---- events += newevents functions += newfunctions ! files = glob(path + '/*.cpp') ! for file in files: if os.path.isfile(file): *************** *** 48,54 **** objectsproperties += newobjectsproperties functions += newfunctions ! files = glob(path + '/*.h') ! for file in files: if os.path.isfile(file): --- 49,55 ---- objectsproperties += newobjectsproperties functions += newfunctions ! files = glob(path + '/*.h') ! for file in files: if os.path.isfile(file): *************** *** 58,64 **** objects += newobjects objectsmethods += newobjectsmethods ! objectsproperties += newobjectsproperties functions += newfunctions ! # Get subdirectories and process them entries = glob(path + '/*') --- 59,65 ---- objects += newobjects objectsmethods += newobjectsmethods ! objectsproperties += newobjectsproperties functions += newfunctions ! # Get subdirectories and process them entries = glob(path + '/*') *************** *** 66,70 **** if os.path.isdir(entry): examine(entry) ! for path in paths: examine(path) --- 67,71 ---- if os.path.isdir(entry): examine(entry) ! for path in paths: examine(path) *************** *** 93,102 **** # Copy methods and properties from inherited object types for method in objectsmethods: ! if method['object'] in object['inherit']: method = dict(method) method['object'] = object['object'] objectsmethods.append(method) ! for property in objectsproperties: if property['object'] in object['inherit']: --- 94,103 ---- # Copy methods and properties from inherited object types for method in objectsmethods: ! if method['object'] in object['inherit']: method = dict(method) method['object'] = object['object'] objectsmethods.append(method) ! for property in objectsproperties: if property['object'] in object['inherit']: *************** *** 106,110 **** print "REPLACE INTO documentation_objects VALUES('%s', '%s');" % (quote(object['object']), quote(object['description'])) ! for method in objectsmethods: print "REPLACE INTO documentation_objects_methods VALUES('%s', '%s', '%s', '%s', '%s', '%s');" % (quote(method['object']), quote(method['method']), quote(method['prototype']), quote(method['parameters']), quote(method['returnvalue']), quote(method['description'])) --- 107,111 ---- print "REPLACE INTO documentation_objects VALUES('%s', '%s');" % (quote(object['object']), quote(object['description'])) ! for method in objectsmethods: print "REPLACE INTO documentation_objects_methods VALUES('%s', '%s', '%s', '%s', '%s', '%s');" % (quote(method['object']), quote(method['method']), quote(method['prototype']), quote(method['parameters']), quote(method['returnvalue']), quote(method['description'])) |
|
From: Richard M. <dr...@us...> - 2004-08-21 19:02:05
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32725/webroot Modified Files: style.css Log Message: Updates! Index: style.css =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/style.css,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** style.css 2 Jul 2004 18:26:23 -0000 1.2 --- style.css 21 Aug 2004 19:01:54 -0000 1.3 *************** *** 34,38 **** img { ! border: 0; } --- 34,38 ---- img { ! border: none; } |
|
From: Richard M. <dr...@us...> - 2004-08-21 19:02:04
|
Update of /cvsroot/wpdev/xmlscripts/documentation/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32725/templates Modified Files: index.html Log Message: Updates! Index: index.html =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/templates/index.html,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** index.html 2 Jul 2004 18:30:47 -0000 1.6 --- index.html 21 Aug 2004 19:01:53 -0000 1.7 *************** *** 14,17 **** --- 14,20 ---- margin-bottom: 0px; } + img { + border: none; + } --> </style> *************** *** 20,32 **** <body> <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td bgcolor="#004B2C"><a href="index.html"><img src="top_logo.jpg" width="586" height="87" border="0"/></a></td> ! </tr> ! <tr> ! <td height="3" bgcolor="#999999"><img src="spacer.gif" width="1" height="3" /></td> ! </tr> </table> <div align="center"> ! <p> <span class="maintitle">Wolfpack Reference </span></p> <table width="740" border="0" cellspacing="3" cellpadding="2"> <tr align="left" valign="top"> --- 23,35 ---- <body> <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td bgcolor="#004B2C"><a href="index.html"><img src="top_logo.jpg" width="586" height="87" border="0"/></a></td> ! </tr> ! <tr> ! <td height="3" bgcolor="#999999"><img src="spacer.gif" width="1" height="3" /></td> ! </tr> </table> <div align="center"> ! <p><span class="maintitle">Wolfpack Reference</span></p> <table width="740" border="0" cellspacing="3" cellpadding="2"> <tr align="left" valign="top"> *************** *** 64,77 **** <a href="#">Read more...</a> </td> ! <td width="33%" class="text"> <span class="sectiontitle">MISCELLANEOUS</span><br /> ! <a href="FAQ.html">FAQ</a><br> ! <a href="http://doc.wpdev.org/ChangeLog.wolfpack">Changelog</a> <img src="external_link.gif" alt="External Link" width="11" height="12" border="0" align="bottom"><br> ! <a href="http://doc.wpdev.org/formats/">File Formats</a> <img src="external_link.gif" alt="External Link" width="11" height="12" border="0" align="bottom"><br> ! <a href="http://doc.wpdev.org/wolfpack-{SHORTVERSION}-doc.zip">Download Documentation</a> <img src="external_link.gif" alt="External Link" width="11" height="12" border="0" align="bottom"></td> </tr> </table> <br /> ! <br> <span class="smalltext">Generated: {GENERATED} | Version: {VERSION}</span> <br /> --- 67,82 ---- <a href="#">Read more...</a> </td> ! <td width="33%" class="text"> <span class="sectiontitle">MISCELLANEOUS</span><br /> ! <a href="introduction.html">Introduction to Wolfpack</a><br /> ! <a href="FAQ.html">FAQ</a><br /> ! <a href="http://doc.wpdev.org/ChangeLog.wolfpack">Changelog</a><img src="external_link.gif" alt="External Link" width="11" height="12" border="0" align="bottom" /><br /> ! <a href="http://doc.wpdev.org/formats/">File Formats</a> <img src="external_link.gif" alt="External Link" width="11" height="12" border="0" align="bottom" /><br /> ! <a href="http://doc.wpdev.org/wolfpack-{SHORTVERSION}-doc.zip">Download Documentation</a> <img src="external_link.gif" alt="External Link" width="11" height="12" border="0" align="bottom" /> ! </td> </tr> </table> <br /> ! <br /> <span class="smalltext">Generated: {GENERATED} | Version: {VERSION}</span> <br /> |
|
From: Richard M. <dr...@us...> - 2004-08-21 19:02:04
|
Update of /cvsroot/wpdev/xmlscripts/documentation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32725 Modified Files: index.php Log Message: Updates! Index: index.php =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/index.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** index.php 20 Jun 2004 20:20:59 -0000 1.5 --- index.php 21 Aug 2004 19:01:53 -0000 1.6 *************** *** 65,70 **** <td width="33%" class="text"> <span class="sectiontitle">MISCELLANEOUS</span><br /> ! Miscelleneous information can be found in this section. Links, configuration and setup among other things.<br /> ! <a href="#">Read more...</a> </td> </tr> --- 65,73 ---- <td width="33%" class="text"> <span class="sectiontitle">MISCELLANEOUS</span><br /> ! <a href="introduction.html">Introduction to Wolfpack</a><br /> ! <a href="FAQ.html">FAQ</a><br /> ! <a href="http://doc.wpdev.org/ChangeLog.wolfpack">Changelog</a><img src="external_link.gif" alt="External Link" width="11" height="12" border="0" align="bottom" /><br /> ! <a href="http://doc.wpdev.org/formats/">File Formats</a> <img src="external_link.gif" alt="External Link" width="11" height="12" border="0" align="bottom" /><br /> ! <a href="http://doc.wpdev.org/wolfpack-{SHORTVERSION}-doc.zip">Download Documentation</a> <img src="external_link.gif" alt="External Link" width="11" height="12" border="0" align="bottom" /> </td> </tr> |
|
From: Richard M. <dr...@us...> - 2004-08-21 18:55:18
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30591 Modified Files: FAQ.html faq.css Added Files: introduction.html Log Message: Layout for the introduction guide. --- NEW FILE: introduction.html --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Introduction To Wolfpack 13.0.0</title> <base href="./" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <link href="./faq.css" rel="stylesheet" type="text/css" /> </head> <body> <div class="header"><a href="index.html"><img src="top_logo.jpg" style="width:586px;height:87px;" alt="" border="0" /></a></div> <div class="header2"><img src="spacer.gif" style="width:1px;height:3px;" alt="" /></div> <a name="top"></a> <br /> <!-- Introduction Contents --> <div class="toc"> <span style="font-size:18px;font-style:italic;color:#002F1B;">Wolfpack 13.x.x</span><br /> An Introduction To Wolfpack<br /> <br /> Table of Contents<br /> <ul class="toc"> <li><a href="#01">Explanation of Wolfpack</a></li> <li><a href="#02">Explanation of Ultima Online</a></li> <li><a href="#03">Getting Started</a></li> <li><a href="#04">Configuring Your Wolfpack Server</a></li> <li><a href="#05">Configuring Your Ultima Online Client</a></li> <li><a href="#06">Managing Your Shard Accounts</a></li> <li><a href="#07">Managing Your Items and NPCs</a></li> <li><a href="#08">Managing Your Scripts</a></li> </ul> </div> <br /><hr /><br /> <!-- Content --> <!-- ANSWERS --> <div class="content"> <br /> Content<br /> <ul class="content"> <!-- Content 01 --> <li><a name="01" class="question">Explanation of Wolfpack</a> <div class="answer"> </div> <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> <!-- Content 02 --> <li><a name="02" class="question">Explanation of Ultima Online</a> <div class="answer"> </div> <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> <!-- Content 03 --> <li><a name="03" class="question">Getting Started</a> <div class="answer"> </div> <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> <!-- Content 04 --> <li><a name="04" class="question">Configuring Your Wolfpack Server</a> <div class="answer"> </div> <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> <!-- Content 05 --> <li><a name="05" class="question">Configuring Your Ultima Online Client</a> <div class="answer"> </div> <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> <!-- Content 06 --> <li><a name="06" class="question">Managing Your Shard Accounts</a> <div class="answer"> </div> <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> <!-- Content 07 --> <li><a name="07" class="question">Managing Your Items and NPCs</a> <div class="answer"> </div> <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> <!-- Content 08 --> <li><a name="08" class="question">Managing Your Scripts</a> <div class="answer"> </div> <a href="#top" style="font-size:9pt;">Return To Contents</a><br /><br /> </li> </ul> </div> <div class="smalltext">© 2004 Wolfpack Team | <a href="http://www.wpdev.org/">http://www.wpdev.org</a></div> <br /> </body> </html> Index: faq.css =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/faq.css,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** faq.css 16 Jul 2004 10:46:57 -0000 1.1 --- faq.css 21 Aug 2004 18:55:07 -0000 1.2 *************** *** 88,92 **** font-weight: bold; } ! div.faq { margin-bottom: 3em; } --- 88,92 ---- font-weight: bold; } ! div.faq, div.content { margin-bottom: 3em; } *************** *** 105,109 **** font-weight: normal; } ! ul.faq { font-weight: normal; list-style-type: decimal-leading-zero; --- 105,109 ---- font-weight: normal; } ! ul.faq, ul.content { font-weight: normal; list-style-type: decimal-leading-zero; Index: FAQ.html =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/FAQ.html,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** FAQ.html 19 Aug 2004 12:01:30 -0000 1.10 --- FAQ.html 21 Aug 2004 18:55:07 -0000 1.11 *************** *** 425,432 **** users and scripters. </div> ! <a href="#top" style="font-size:9pt;">Return To Questions</a><br /> ! <a href="index.html" style="font-size:9pt;">Return To Overview</a><br /><br /> </li> </ul> </div> <div class="smalltext">© 2004 Wolfpack Team | <a href="http://www.wpdev.org/">http://www.wpdev.org</a></div> --- 425,432 ---- users and scripters. </div> ! <a href="#top" style="font-size:9pt;">Return To Questions</a><br /><br /> </li> </ul> + <a href="index.html" style="font-size:9pt;">Return To Overview</a> </div> <div class="smalltext">© 2004 Wolfpack Team | <a href="http://www.wpdev.org/">http://www.wpdev.org</a></div> |
|
From: Richard M. <dr...@us...> - 2004-08-21 15:37:16
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4045 Modified Files: basics.h commands.cpp Log Message: warning fix for basics.h that coding standard stuff for commands.cpp Index: basics.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basics.h,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** basics.h 21 Aug 2004 14:18:34 -0000 1.33 --- basics.h 21 Aug 2004 15:37:02 -0000 1.34 *************** *** 267,271 **** unsigned int pos = 0; ! while ( d->bufferpos + size >= buffersize ) { unsigned int bspace = buffersize - d->bufferpos; --- 267,271 ---- unsigned int pos = 0; ! while ( d->bufferpos + size >= ( unsigned int ) buffersize ) { unsigned int bspace = buffersize - d->bufferpos; Index: commands.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v retrieving revision 1.258 retrieving revision 1.259 diff -C2 -d -r1.258 -r1.259 *** commands.cpp 21 Aug 2004 14:18:34 -0000 1.258 --- commands.cpp 21 Aug 2004 15:37:02 -0000 1.259 *************** *** 678,688 **** Recursive processing function to get neccesary information about items. */ ! static void processItem(QMap<QCString, QString> &item, const cElement *node) { // If there is an inherit tag, inherit a parent item definition. ! QString inherit = node->getAttribute("inherit"); ! if (inherit != QString::null) { ! const cElement *parent = Definitions::instance()->getDefinition(WPDT_ITEM, inherit); ! if (parent) { ! processItem(item, parent); } } --- 678,691 ---- Recursive processing function to get neccesary information about items. */ ! static void processItem( QMap<QCString, QString> &item, const cElement *node ) ! { // If there is an inherit tag, inherit a parent item definition. ! QString inherit = node->getAttribute( "inherit" ); ! if ( inherit != QString::null ) ! { ! const cElement *parent = Definitions::instance()->getDefinition( WPDT_ITEM, inherit ); ! if ( parent ) ! { ! processItem( item, parent ); } } *************** *** 690,717 **** int count = node->childCount(); int i; ! for (i = 0; i < count; ++i) { ! const cElement *child = node->getChild(i); ! // Inherit properties from another item definition ! if (child->name() == "inherit") { const cElement *parent = 0; ! if (child->hasAttribute("id")) { ! parent = Definitions::instance()->getDefinition(WPDT_ITEM, child->getAttribute("id")); ! } else { ! parent = Definitions::instance()->getDefinition(WPDT_ITEM, child->text()); } ! ! if (parent) { ! processItem(item, parent); } ! } else if (child->name() == "id") { ! item["dispid"] = child->value(); ! } else if (child->name() == "name") { ! item["name"] = child->text(); ! } else if (child->name() == "color") { ! item["color"] = child->value(); ! } else if (child->name() == "category") { ! item["categoryname"] = child->text(); } } --- 693,734 ---- int count = node->childCount(); int i; ! for ( i = 0; i < count; ++i ) ! { ! const cElement *child = node->getChild( i ); ! // Inherit properties from another item definition ! if ( child->name() == "inherit" ) ! { const cElement *parent = 0; ! if ( child->hasAttribute("id") ) ! { ! parent = Definitions::instance()->getDefinition( WPDT_ITEM, child->getAttribute( "id" ) ); } ! else ! { ! parent = Definitions::instance()->getDefinition( WPDT_ITEM, child->text() ); ! } ! ! if ( parent ) ! { ! processItem( item, parent ); } ! } ! else if ( child->name() == "id" ) ! { ! item[ "dispid" ] = child->value(); ! } ! else if ( child->name() == "name" ) ! { ! item[ "name" ] = child->text(); ! } ! else if ( child->name() == "color" ) ! { ! item[ "color" ] = child->value(); ! } ! else if ( child->name() == "category" ) ! { ! item[ "categoryname" ] = child->text(); } } *************** *** 723,733 **** Recursive processing function to get neccesary information about npcs. */ ! static void processNpc(QMap<QCString, QString> &item, const cElement *node, EquipmentContainer &equipment) { // If there is an inherit tag, inherit a parent item definition. ! QString inherit = node->getAttribute("inherit"); ! if (inherit != QString::null) { ! const cElement *parent = Definitions::instance()->getDefinition(WPDT_NPC, inherit); ! if (parent) { ! processNpc(item, parent, equipment); } } --- 740,753 ---- Recursive processing function to get neccesary information about npcs. */ ! static void processNpc( QMap<QCString, QString> &item, const cElement *node, EquipmentContainer &equipment ) ! { // If there is an inherit tag, inherit a parent item definition. ! QString inherit = node->getAttribute( "inherit" ); ! if ( inherit != QString::null ) ! { ! const cElement *parent = Definitions::instance()->getDefinition( WPDT_NPC, inherit ); ! if ( parent ) ! { ! processNpc( item, parent, equipment ); } } *************** *** 735,784 **** int count = node->childCount(); int i; ! for (i = 0; i < count; ++i) { ! const cElement *child = node->getChild(i); ! // Inherit properties from another item definition ! if (child->name() == "inherit") { const cElement *parent = 0; ! if (child->hasAttribute("id")) { ! parent = Definitions::instance()->getDefinition(WPDT_NPC, child->getAttribute("id")); ! } else { ! parent = Definitions::instance()->getDefinition(WPDT_NPC, child->text()); } ! ! if (parent) { ! processNpc(item, parent, equipment); } ! } else if (child->name() == "id") { ! item["bodyid"] = child->value(); ! } else if (child->name() == "skin") { ! item["skin"] = child->value(); ! } else if (child->name() == "category") { ! item["categoryname"] = child->text(); ! } else if (child->name() == "equipped") { int j; ! for (j = 0; j < child->childCount(); ++j) { const cElement *subchild = child->getChild(j); ! if (subchild->name() == "item") { QString id; ! if (subchild->hasAttribute("id")) { ! id = subchild->getAttribute("id"); ! } else if (subchild->hasAttribute("list")) { ! id = Definitions::instance()->getRandomListEntry(subchild->getAttribute("list")); } ! const cElement *itemNode = Definitions::instance()->getDefinition(WPDT_ITEM, id); ! if (itemNode) { QMap<QCString, QString> item; ! processItem(item, itemNode); ! ! unsigned int id = item["dispid"].toInt(); ! tile_st tile = TileCache::instance()->getTile(id); ! if (tile.layer != 0 && tile.layer <= 0x19 && tile.animation != 0) { ! item["anim"] = QString::number(tile.animation); ! equipment.insert(tile.layer, item); } } --- 755,825 ---- int count = node->childCount(); int i; ! for ( i = 0; i < count; ++i ) ! { ! const cElement *child = node->getChild( i ); ! // Inherit properties from another item definition ! if ( child->name() == "inherit" ) ! { const cElement *parent = 0; ! if ( child->hasAttribute( "id" ) ) ! { ! parent = Definitions::instance()->getDefinition( WPDT_NPC, child->getAttribute( "id" ) ); } ! else ! { ! parent = Definitions::instance()->getDefinition( WPDT_NPC, child->text() ); } ! ! if ( parent ) ! { ! processNpc( item, parent, equipment ); ! } ! } ! else if ( child->name() == "id" ) ! { ! item[ "bodyid" ] = child->value(); ! } ! else if ( child->name() == "skin" ) ! { ! item[ "skin" ] = child->value(); ! } ! else if ( child->name() == "category" ) ! { ! item[ "categoryname" ] = child->text(); ! } ! else if ( child->name() == "equipped" ) ! { int j; ! for ( j = 0; j < child->childCount(); ++j ) ! { const cElement *subchild = child->getChild(j); ! if ( subchild->name() == "item" ) ! { QString id; ! if ( subchild->hasAttribute( "id" ) ) ! { ! id = subchild->getAttribute( "id" ); ! } ! else if ( subchild->hasAttribute( "list" ) ) ! { ! id = Definitions::instance()->getRandomListEntry( subchild->getAttribute( "list" ) ); } ! const cElement *itemNode = Definitions::instance()->getDefinition( WPDT_ITEM, id ); ! if ( itemNode ) ! { QMap<QCString, QString> item; ! processItem( item, itemNode ); ! ! unsigned int id = item[ "dispid" ].toInt(); ! tile_st tile = TileCache::instance()->getTile( id ); ! if ( tile.layer != 0 && tile.layer <= 0x19 && tile.animation != 0 ) ! { ! item[ "anim" ] = QString::number( tile.animation ); ! equipment.insert( tile.layer, item ); } } *************** *** 789,801 **** } ! static void ensureCategory(QMap<QString, unsigned int> &categories, unsigned int &lastcategory, QString category) { ! int pos = category.findRev('\\'); ! if (pos != -1) { ! QString parentCategory = category.left(pos); ! ensureCategory(categories, lastcategory, parentCategory); } ! if (!categories.contains(category)) { ! categories.insert(category, ++lastcategory); } } --- 830,845 ---- } ! static void ensureCategory( QMap<QString, unsigned int> &categories, unsigned int &lastcategory, QString category ) ! { ! int pos = category.findRev( '\\' ); ! if ( pos != -1 ) ! { ! QString parentCategory = category.left( pos ); ! ensureCategory( categories, lastcategory, parentCategory ); } ! if ( !categories.contains( category ) ) ! { ! categories.insert( category, ++lastcategory ); } } *************** *** 804,829 **** \command exportdefinitions \description Export the definitions used by the WPGM utility. ! \notes This command will export the definitions used by the WPGM utility to a file called categories.db in your wolfpack directory. */ void commandExportDefinitions( cUOSocket *socket, const QString &command, const QStringList &args) throw() { ! if (QFile::exists("categories.db") && !QFile::remove("categories.db")) { ! socket->sysMessage("Unable to remove existing categories.db."); return; } cSQLiteDriver driver; ! driver.setDatabaseName("categories.db"); ! ! if (!driver.open()) { ! socket->sysMessage("Unable to open categories.db in your wolfpack directory."); return; } ! Console::instance()->log(LOG_MESSAGE, QString("Exporting definitions to %1.\n").arg("categories.db")); ! try { // Create Tables ! driver.exec("CREATE TABLE items (\ id INTEGER PRIMARY KEY,\ name varchar(255) NULL,\ --- 848,875 ---- \command exportdefinitions \description Export the definitions used by the WPGM utility. ! \notes This command will export the definitions used by the WPGM utility to a file called categories.db in your wolfpack directory. */ void commandExportDefinitions( cUOSocket *socket, const QString &command, const QStringList &args) throw() { ! if ( QFile::exists( "categories.db" ) && !QFile::remove( "categories.db" ) ) { ! socket->sysMessage( "Unable to remove existing categories.db." ); return; } cSQLiteDriver driver; ! driver.setDatabaseName( "categories.db" ); ! ! if ( !driver.open() ) ! { ! socket->sysMessage( "Unable to open categories.db in your wolfpack directory." ); return; } ! Console::instance()->log( LOG_MESSAGE, QString( "Exporting definitions to %1.\n" ).arg( "categories.db" ) ); ! try ! { // Create Tables ! driver.exec( "CREATE TABLE items (\ id INTEGER PRIMARY KEY,\ name varchar(255) NULL,\ *************** *** 832,852 **** color int,\ addid varchar(255)\ ! );"); ! driver.exec("CREATE TABLE categories (\ id INTEGER PRIMARY KEY,\ name varchar(255) NULL,\ parent int NOT NULL,\ type int\ ! );"); ! driver.exec("CREATE TABLE locationcategories (\ id INTEGER PRIMARY KEY,\ name varchar(255) NULL,\ parent int NOT NULL,\ type int\ ! );"); ! driver.exec("CREATE TABLE locations (\ id INTEGER PRIMARY KEY,\ name varchar(255) NULL,\ --- 878,898 ---- color int,\ addid varchar(255)\ ! );" ); ! driver.exec( "CREATE TABLE categories (\ id INTEGER PRIMARY KEY,\ name varchar(255) NULL,\ parent int NOT NULL,\ type int\ ! );" ); ! driver.exec( "CREATE TABLE locationcategories (\ id INTEGER PRIMARY KEY,\ name varchar(255) NULL,\ parent int NOT NULL,\ type int\ ! );" ); ! driver.exec( "CREATE TABLE locations (\ id INTEGER PRIMARY KEY,\ name varchar(255) NULL,\ *************** *** 857,864 **** posmap INT NOT NULL,\ location varchar(255)\ ! );"); ! // Create Tables ! driver.exec("CREATE TABLE npcs (\ id INTEGER PRIMARY KEY,\ name varchar(255) NULL,\ --- 903,909 ---- posmap INT NOT NULL,\ location varchar(255)\ ! );" ); ! driver.exec( "CREATE TABLE npcs (\ id INTEGER PRIMARY KEY,\ name varchar(255) NULL,\ *************** *** 867,885 **** skin int,\ addid varchar(255)\ ! );"); ! driver.exec("CREATE TABLE npccategories (\ id INTEGER PRIMARY KEY,\ name varchar(255) NULL,\ parent int NOT NULL,\ type int\ ! );"); ! driver.exec("CREATE TABLE npcequipment (\ id int NOT NULL,\ artid int NOT NULL,\ layer int NOT NULL,\ color int NOT NULL\ ! );"); unsigned int lastcategory = 0; --- 912,930 ---- skin int,\ addid varchar(255)\ ! );" ); ! driver.exec( "CREATE TABLE npccategories (\ id INTEGER PRIMARY KEY,\ name varchar(255) NULL,\ parent int NOT NULL,\ type int\ ! );" ); ! driver.exec( "CREATE TABLE npcequipment (\ id int NOT NULL,\ artid int NOT NULL,\ layer int NOT NULL,\ color int NOT NULL\ ! );" ); unsigned int lastcategory = 0; *************** *** 895,953 **** item.clear(); ! item.insert("name", QString::null); ! item.insert("color", "0"); ! item.insert("dispid", "0"); ! item.insert("category", "0"); ! item.insert("categoryname", QString::null); ! processItem(item, element); ! QString category = item["categoryname"]; ! if (category.isNull()) { continue; } ! // Strip out the portion after the last slash ! int pos = category.findRev('\\'); ! if (pos != -1) { ! category = category.left(pos); } // Create an id for the category ! if (!categories.contains(category)) { ! ensureCategory(categories, lastcategory, category); ! item["category"] = QString::number(lastcategory); ! } else { ! item["category"] = QString::number(categories[category]); } // See if there has been a custom name definition ! QString categoryname = item["categoryname"]; ! if (pos != -1) { ! item["name"] = categoryname.right(categoryname.length() - (pos + 1)); ! } else { ! item["name"] = categoryname; } // Insert the item into the table. QString section = *sectionIt; ! QString sql = QString("INSERT INTO items VALUES(NULL,'%1',%2,%3,%4,'%5');") ! .arg(item["name"].replace("'", "''")) ! .arg(item["category"]) ! .arg(item["dispid"]) ! .arg(item["color"]) ! .arg(section.replace("'", "''")); ! driver.exec(sql); } // Ensure that all categories are in the list ! for (categoriesIt = categories.begin(); categoriesIt != categories.end(); ++categoriesIt) { unsigned int parent = 0; ! int pos = categoriesIt.key().findRev('\\'); ! if (pos != -1) { ! QString parentName = categoriesIt.key().left(pos); ! if (categories.contains(parentName)) { ! parent = categories[parentName]; } } --- 940,1009 ---- item.clear(); ! item.insert( "name", QString::null ); ! item.insert( "color", "0" ); ! item.insert( "dispid", "0" ); ! item.insert( "category", "0" ); ! item.insert( "categoryname", QString::null ); ! processItem( item, element ); ! QString category = item[ "categoryname" ]; ! if ( category.isNull() ) ! { continue; } ! // Strip out the portion after the last slash ! int pos = category.findRev( '\\' ); ! if ( pos != -1 ) ! { ! category = category.left( pos ); } // Create an id for the category ! if ( !categories.contains( category ) ) ! { ! ensureCategory( categories, lastcategory, category ); ! item[ "category" ] = QString::number( lastcategory ); ! } ! else ! { ! item[ "category" ] = QString::number( categories[ category ] ); } // See if there has been a custom name definition ! QString categoryname = item[ "categoryname" ]; ! if ( pos != -1 ) ! { ! item[ "name" ] = categoryname.right( categoryname.length() - ( pos + 1 ) ); ! } ! else ! { ! item[ "name" ] = categoryname; } // Insert the item into the table. QString section = *sectionIt; ! QString sql = QString( "INSERT INTO items VALUES(NULL,'%1',%2,%3,%4,'%5');" ) ! .arg( item[ "name" ].replace( "'", "''" ) ) ! .arg( item[ "category" ] ) ! .arg( item[ "dispid" ] ) ! .arg( item[ "color" ] ) ! .arg( section.replace( "'", "''" ) ); ! driver.exec( sql ); } // Ensure that all categories are in the list ! for ( categoriesIt = categories.begin(); categoriesIt != categories.end(); ++categoriesIt ) ! { unsigned int parent = 0; ! int pos = categoriesIt.key().findRev( '\\' ); ! if ( pos != -1 ) ! { ! QString parentName = categoriesIt.key().left( pos ); ! if ( categories.contains( parentName ) ) ! { ! parent = categories[ parentName ]; } } *************** *** 956,1031 **** name = name.right(name.length() - (pos + 1)); ! QString sql = QString("INSERT INTO categories VALUES(%1,'%2',%3,0);") ! .arg(categoriesIt.data()) ! .arg(name.replace("'", "''")) ! .arg(parent); ! driver.exec(sql); } categories.clear(); lastcategory = 0; - - sections = Definitions::instance()->getSections(WPDT_LOCATION); - for (sectionIt = sections.begin(); sectionIt != sections.end(); ++sectionIt) { - const cElement *element = Definitions::instance()->getDefinition(WPDT_LOCATION, *sectionIt); ! QString category = element->getAttribute("category"); ! if (category.isNull()) { continue; } - - int pos = category.findRev('\\'); ! if (pos == -1) { continue; } ! QString name = category.right(category.length() - (pos + 1)); ! category = category.left(pos); // Create an id for the category unsigned int categoryId; ! if (!categories.contains(category)) { ! ensureCategory(categories, lastcategory, category); categoryId = lastcategory; ! } else { ! categoryId = categories[category]; } Coord_cl coord; ! parseCoordinates(element->text(), coord); QString id = *sectionIt; ! ! QString sql = QString("INSERT INTO locations VALUES(NULL,'%1',%2,%3,%4,%5,%6,'%7');") ! .arg(name.replace("'", "''")) ! .arg(categoryId) ! .arg(coord.x) ! .arg(coord.y) ! .arg(coord.z) ! .arg(coord.map) ! .arg(id.replace("'", "''")); ! ! driver.exec(sql); } // Ensure that all categories are in the list ! for (categoriesIt = categories.begin(); categoriesIt != categories.end(); ++categoriesIt) { unsigned int parent = 0; ! int pos = categoriesIt.key().findRev('\\'); ! if (pos != -1) { ! QString parentName = categoriesIt.key().left(pos); ! if (categories.contains(parentName)) { ! parent = categories[parentName]; } } QString name = categoriesIt.key(); ! name = name.right(name.length() - (pos + 1)); ! QString sql = QString("INSERT INTO locationcategories VALUES(%1,'%2',%3,0);") ! .arg(categoriesIt.data()) ! .arg(name.replace("'", "''")) ! .arg(parent); ! driver.exec(sql); } --- 1012,1096 ---- name = name.right(name.length() - (pos + 1)); ! QString sql = QString( "INSERT INTO categories VALUES(%1,'%2',%3,0);" ) ! .arg( categoriesIt.data() ) ! .arg( name.replace( "'", "''" ) ) ! .arg( parent ); ! driver.exec( sql ); } categories.clear(); lastcategory = 0; ! sections = Definitions::instance()->getSections( WPDT_LOCATION ); ! for ( sectionIt = sections.begin(); sectionIt != sections.end(); ++sectionIt ) ! { ! const cElement *element = Definitions::instance()->getDefinition( WPDT_LOCATION, *sectionIt ); ! ! QString category = element->getAttribute( "category" ); ! if ( category.isNull() ) ! { continue; } ! int pos = category.findRev( '\\' ); ! ! if ( pos == -1 ) ! { continue; } ! QString name = category.right( category.length() - ( pos + 1 ) ); ! category = category.left( pos ); // Create an id for the category unsigned int categoryId; ! if ( !categories.contains( category ) ) ! { ! ensureCategory( categories, lastcategory, category ); categoryId = lastcategory; ! } ! else ! { ! categoryId = categories[ category ]; } Coord_cl coord; ! parseCoordinates( element->text(), coord ); QString id = *sectionIt; ! ! QString sql = QString( "INSERT INTO locations VALUES(NULL,'%1',%2,%3,%4,%5,%6,'%7');" ) ! .arg( name.replace( "'", "''" ) ) ! .arg( categoryId ) ! .arg( coord.x ) ! .arg( coord.y ) ! .arg( coord.z ) ! .arg( coord.map ) ! .arg( id.replace( "'", "''" ) ); ! ! driver.exec( sql ); } // Ensure that all categories are in the list ! for ( categoriesIt = categories.begin(); categoriesIt != categories.end(); ++categoriesIt ) ! { unsigned int parent = 0; ! int pos = categoriesIt.key().findRev( '\\' ); ! if ( pos != -1 ) ! { ! QString parentName = categoriesIt.key().left( pos ); ! if ( categories.contains( parentName ) ) ! { ! parent = categories[ parentName ]; } } QString name = categoriesIt.key(); ! name = name.right( name.length() - ( pos + 1 ) ); ! QString sql = QString( "INSERT INTO locationcategories VALUES(%1,'%2',%3,0);" ) ! .arg( categoriesIt.data() ) ! .arg( name.replace( "'", "''" ) ) ! .arg( parent ); ! driver.exec( sql ); } *************** *** 1033,1129 **** lastcategory = 0; categories.clear(); ! sections = Definitions::instance()->getSections(WPDT_NPC); EquipmentContainer equipment; ! for (sectionIt = sections.begin(); sectionIt != sections.end(); ++sectionIt) { ! const cElement *element = Definitions::instance()->getDefinition(WPDT_NPC, *sectionIt); equipment.clear(); item.clear(); ! item.insert("name", QString::null); ! item.insert("skin", "0"); ! item.insert("bodyid", "0"); ! item.insert("category", "0"); ! item.insert("categoryname", QString::null); ! processNpc(item, element, equipment); ! QString category = item["categoryname"]; ! if (category.isNull()) { continue; } ! // Strip out the portion after the last slash ! int pos = category.findRev('\\'); ! if (pos != -1) { ! category = category.left(pos); } // Create an id for the category ! if (!categories.contains(category)) { ! ensureCategory(categories, lastcategory, category); ! item["category"] = QString::number(lastcategory); ! } else { ! item["category"] = QString::number(categories[category]); } ! QString categoryname = item["categoryname"]; ! if (pos != -1) { ! item["name"] = categoryname.right(categoryname.length() - (pos + 1)); ! } else { ! item["name"] = categoryname; } // Insert the item into the table. QString section = *sectionIt; ! QString sql = QString("INSERT INTO npcs VALUES(NULL,'%1',%2,%3,%4,'%5');") ! .arg(item["name"].replace("'", "''")) ! .arg(item["category"]) ! .arg(item["bodyid"]) ! .arg(item["skin"]) ! .arg(section.replace("'", "''")); ! driver.exec(sql); int lastInsertId = driver.lastInsertId(); EquipmentContainer::iterator eIt; ! for (eIt = equipment.begin(); eIt != equipment.end(); ++eIt) { ! QString sql = QString("INSERT INTO npcequipment VALUES(%1,%2,%3,%4);") ! .arg(lastInsertId) ! .arg(eIt.data()["anim"].toInt()) ! .arg(eIt.key()) ! .arg(eIt.data()["color"].toInt()); ! driver.exec(sql); } } // Ensure that all categories are in the list ! for (categoriesIt = categories.begin(); categoriesIt != categories.end(); ++categoriesIt) { unsigned int parent = 0; ! int pos = categoriesIt.key().findRev('\\'); ! if (pos != -1) { ! QString parentName = categoriesIt.key().left(pos); ! if (categories.contains(parentName)) { ! parent = categories[parentName]; } } QString name = categoriesIt.key(); ! name = name.right(name.length() - (pos + 1)); ! QString sql = QString("INSERT INTO npccategories VALUES(%1,'%2',%3,0);") ! .arg(categoriesIt.data()) ! .arg(name.replace("'", "''")) ! .arg(parent); ! driver.exec(sql); } ! socket->sysMessage("Finished exporting definitions to categories.db."); ! } catch(const QString &e) { ! socket->sysMessage(e); ! } catch(const wpException &e) { ! socket->sysMessage(e.error()); } --- 1098,1211 ---- lastcategory = 0; categories.clear(); ! sections = Definitions::instance()->getSections( WPDT_NPC ); EquipmentContainer equipment; ! for ( sectionIt = sections.begin(); sectionIt != sections.end(); ++sectionIt ) ! { ! const cElement *element = Definitions::instance()->getDefinition( WPDT_NPC, *sectionIt ); equipment.clear(); item.clear(); ! item.insert( "name", QString::null ); ! item.insert( "skin", "0" ); ! item.insert( "bodyid", "0" ); ! item.insert( "category", "0" ); ! item.insert( "categoryname", QString::null ); ! processNpc( item, element, equipment ); ! QString category = item[ "categoryname" ]; ! if ( category.isNull() ) ! { continue; } ! // Strip out the portion after the last slash ! int pos = category.findRev( '\\' ); ! if ( pos != -1 ) ! { ! category = category.left( pos ); } // Create an id for the category ! if ( !categories.contains( category ) ) ! { ! ensureCategory( categories, lastcategory, category ); ! item[ "category" ] = QString::number( lastcategory ); ! } ! else ! { ! item[ "category" ] = QString::number( categories[ category ] ); } ! QString categoryname = item[ "categoryname" ]; ! if ( pos != -1 ) ! { ! item[ "name" ] = categoryname.right( categoryname.length() - ( pos + 1 ) ); ! } ! else ! { ! item[ "name" ] = categoryname; } // Insert the item into the table. QString section = *sectionIt; ! QString sql = QString( "INSERT INTO npcs VALUES(NULL,'%1',%2,%3,%4,'%5');" ) ! .arg( item[ "name" ].replace( "'", "''" ) ) ! .arg( item[ "category" ] ) ! .arg( item[ "bodyid" ] ) ! .arg( item[ "skin" ] ) ! .arg( section.replace( "'", "''" ) ); ! driver.exec( sql ); int lastInsertId = driver.lastInsertId(); EquipmentContainer::iterator eIt; ! for ( eIt = equipment.begin(); eIt != equipment.end(); ++eIt ) ! { ! QString sql = QString( "INSERT INTO npcequipment VALUES(%1,%2,%3,%4);" ) ! .arg( lastInsertId ) ! .arg( eIt.data()[ "anim" ].toInt() ) ! .arg( eIt.key() ) ! .arg( eIt.data()[ "color" ].toInt() ); ! driver.exec( sql ); } } // Ensure that all categories are in the list ! for ( categoriesIt = categories.begin(); categoriesIt != categories.end(); ++categoriesIt ) ! { unsigned int parent = 0; ! int pos = categoriesIt.key().findRev( '\\' ); ! if ( pos != -1 ) ! { ! QString parentName = categoriesIt.key().left( pos ); ! if ( categories.contains( parentName ) ) ! { ! parent = categories[ parentName ]; } } QString name = categoriesIt.key(); ! name = name.right( name.length() - ( pos + 1 ) ); ! QString sql = QString( "INSERT INTO npccategories VALUES(%1,'%2',%3,0);" ) ! .arg( categoriesIt.data() ) ! .arg( name.replace( "'", "''" ) ) ! .arg( parent ); ! driver.exec( sql ); } ! socket->sysMessage( "Finished exporting definitions to categories.db." ); ! } ! catch( const QString &e ) ! { ! socket->sysMessage( e ); ! } ! catch( const wpException &e ) ! { ! socket->sysMessage( e.error() ); } |
|
From: Sebastian H. <dar...@us...> - 2004-08-21 14:18:46
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14133 Modified Files: basics.h commands.cpp dbdriver.cpp dbdriver.h Log Message: Exports npc equipment too now. Index: dbdriver.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/dbdriver.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** dbdriver.cpp 19 Aug 2004 01:59:15 -0000 1.43 --- dbdriver.cpp 21 Aug 2004 14:18:34 -0000 1.44 *************** *** 309,312 **** --- 309,316 ---- *****************************************************************************/ + int cSQLiteDriver::lastInsertId() { + return sqlite_last_insert_rowid( (sqlite*)connection ); + } + bool cSQLiteDriver::open( int ) { Index: basics.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basics.h,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** basics.h 19 Aug 2004 13:53:03 -0000 1.32 --- basics.h 21 Aug 2004 14:18:34 -0000 1.33 *************** *** 98,102 **** private: class cBufferedWriterPrivate *d; ! static const int buffersize = 4096; public: --- 98,102 ---- private: class cBufferedWriterPrivate *d; ! const static int buffersize = 4096; public: Index: dbdriver.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/dbdriver.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** dbdriver.h 19 Aug 2004 01:59:15 -0000 1.21 --- dbdriver.h 21 Aug 2004 14:18:34 -0000 1.22 *************** *** 134,137 **** --- 134,138 ---- bool exec( const QString& query ); cDBResult query( const QString& query ); + int lastInsertId(); }; Index: commands.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v retrieving revision 1.257 retrieving revision 1.258 diff -C2 -d -r1.257 -r1.258 *** commands.cpp 19 Aug 2004 13:53:03 -0000 1.257 --- commands.cpp 21 Aug 2004 14:18:34 -0000 1.258 *************** *** 718,721 **** --- 718,792 ---- } + typedef QMap< unsigned char, QMap<QCString, QString> > EquipmentContainer; + + /* + Recursive processing function to get neccesary information about npcs. + */ + static void processNpc(QMap<QCString, QString> &item, const cElement *node, EquipmentContainer &equipment) { + // If there is an inherit tag, inherit a parent item definition. + QString inherit = node->getAttribute("inherit"); + if (inherit != QString::null) { + const cElement *parent = Definitions::instance()->getDefinition(WPDT_NPC, inherit); + if (parent) { + processNpc(item, parent, equipment); + } + } + + int count = node->childCount(); + int i; + for (i = 0; i < count; ++i) { + const cElement *child = node->getChild(i); + + // Inherit properties from another item definition + if (child->name() == "inherit") { + const cElement *parent = 0; + + if (child->hasAttribute("id")) { + parent = Definitions::instance()->getDefinition(WPDT_NPC, child->getAttribute("id")); + } else { + parent = Definitions::instance()->getDefinition(WPDT_NPC, child->text()); + } + + if (parent) { + processNpc(item, parent, equipment); + } + } else if (child->name() == "id") { + item["bodyid"] = child->value(); + } else if (child->name() == "skin") { + item["skin"] = child->value(); + } else if (child->name() == "category") { + item["categoryname"] = child->text(); + } else if (child->name() == "equipped") { + int j; + for (j = 0; j < child->childCount(); ++j) { + const cElement *subchild = child->getChild(j); + + if (subchild->name() == "item") { + QString id; + if (subchild->hasAttribute("id")) { + id = subchild->getAttribute("id"); + } else if (subchild->hasAttribute("list")) { + id = Definitions::instance()->getRandomListEntry(subchild->getAttribute("list")); + } + + const cElement *itemNode = Definitions::instance()->getDefinition(WPDT_ITEM, id); + + if (itemNode) { + QMap<QCString, QString> item; + processItem(item, itemNode); + + unsigned int id = item["dispid"].toInt(); + tile_st tile = TileCache::instance()->getTile(id); + if (tile.layer != 0 && tile.layer <= 0x19 && tile.animation != 0) { + item["anim"] = QString::number(tile.animation); + equipment.insert(tile.layer, item); + } + } + } + } + } + } + } + static void ensureCategory(QMap<QString, unsigned int> &categories, unsigned int &lastcategory, QString category) { int pos = category.findRev('\\'); *************** *** 788,791 **** --- 859,886 ---- );"); + // Create Tables + driver.exec("CREATE TABLE npcs (\ + id INTEGER PRIMARY KEY,\ + name varchar(255) NULL,\ + parent int NOT NULL,\ + bodyid int,\ + skin int,\ + addid varchar(255)\ + );"); + + driver.exec("CREATE TABLE npccategories (\ + id INTEGER PRIMARY KEY,\ + name varchar(255) NULL,\ + parent int NOT NULL,\ + type int\ + );"); + + driver.exec("CREATE TABLE npcequipment (\ + id int NOT NULL,\ + artid int NOT NULL,\ + layer int NOT NULL,\ + color int NOT NULL\ + );"); + unsigned int lastcategory = 0; QMap<QString, unsigned int> categories; *************** *** 829,839 **** // See if there has been a custom name definition ! if (item["name"].isNull()) { ! QString categoryname = item["categoryname"]; ! if (pos != -1) { ! item["name"] = categoryname.right(categoryname.length() - (pos + 1)); ! } else { ! item["name"] = categoryname; ! } } --- 924,932 ---- // See if there has been a custom name definition ! QString categoryname = item["categoryname"]; ! if (pos != -1) { ! item["name"] = categoryname.right(categoryname.length() - (pos + 1)); ! } else { ! item["name"] = categoryname; } *************** *** 937,940 **** --- 1030,1124 ---- } + // Process NPCS + lastcategory = 0; + categories.clear(); + sections = Definitions::instance()->getSections(WPDT_NPC); + + EquipmentContainer equipment; + + for (sectionIt = sections.begin(); sectionIt != sections.end(); ++sectionIt) { + const cElement *element = Definitions::instance()->getDefinition(WPDT_NPC, *sectionIt); + + equipment.clear(); + item.clear(); + item.insert("name", QString::null); + item.insert("skin", "0"); + item.insert("bodyid", "0"); + item.insert("category", "0"); + item.insert("categoryname", QString::null); + + processNpc(item, element, equipment); + + QString category = item["categoryname"]; + + if (category.isNull()) { + continue; + } + + // Strip out the portion after the last slash + int pos = category.findRev('\\'); + if (pos != -1) { + category = category.left(pos); + } + + // Create an id for the category + if (!categories.contains(category)) { + ensureCategory(categories, lastcategory, category); + item["category"] = QString::number(lastcategory); + } else { + item["category"] = QString::number(categories[category]); + } + + QString categoryname = item["categoryname"]; + if (pos != -1) { + item["name"] = categoryname.right(categoryname.length() - (pos + 1)); + } else { + item["name"] = categoryname; + } + + // Insert the item into the table. + QString section = *sectionIt; + QString sql = QString("INSERT INTO npcs VALUES(NULL,'%1',%2,%3,%4,'%5');") + .arg(item["name"].replace("'", "''")) + .arg(item["category"]) + .arg(item["bodyid"]) + .arg(item["skin"]) + .arg(section.replace("'", "''")); + driver.exec(sql); + + int lastInsertId = driver.lastInsertId(); + + EquipmentContainer::iterator eIt; + for (eIt = equipment.begin(); eIt != equipment.end(); ++eIt) { + QString sql = QString("INSERT INTO npcequipment VALUES(%1,%2,%3,%4);") + .arg(lastInsertId) + .arg(eIt.data()["anim"].toInt()) + .arg(eIt.key()) + .arg(eIt.data()["color"].toInt()); + driver.exec(sql); + } + } + + // Ensure that all categories are in the list + for (categoriesIt = categories.begin(); categoriesIt != categories.end(); ++categoriesIt) { + unsigned int parent = 0; + int pos = categoriesIt.key().findRev('\\'); + if (pos != -1) { + QString parentName = categoriesIt.key().left(pos); + if (categories.contains(parentName)) { + parent = categories[parentName]; + } + } + + QString name = categoriesIt.key(); + name = name.right(name.length() - (pos + 1)); + + QString sql = QString("INSERT INTO npccategories VALUES(%1,'%2',%3,0);") + .arg(categoriesIt.data()) + .arg(name.replace("'", "''")) + .arg(parent); + driver.exec(sql); + } + socket->sysMessage("Finished exporting definitions to categories.db."); } catch(const QString &e) { |
|
From: Klaus M. <nad...@us...> - 2004-08-20 10:33:46
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5706 Modified Files: air_elemental.xml Log Message: no message Index: air_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned/air_elemental.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** air_elemental.xml 19 Aug 2004 22:57:44 -0000 1.3 --- air_elemental.xml 20 Aug 2004 10:33:31 -0000 1.4 *************** *** 20,24 **** <maxstamina>50</maxstamina> <!-- Skills --> ! <magicresistance>600/magicresistance> <tactics>1000</tactics> <wrestling>800</wrestling> --- 20,24 ---- <maxstamina>50</maxstamina> <!-- Skills --> ! <magicresistance>600</magicresistance> <tactics>1000</tactics> <wrestling>800</wrestling> |
|
From: Klaus M. <nad...@us...> - 2004-08-19 23:04:37
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/air In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12471/animals/air Modified Files: chicken.xml Log Message: fix Index: chicken.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/air/chicken.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** chicken.xml 9 Aug 2004 18:45:40 -0000 1.9 --- chicken.xml 19 Aug 2004 23:04:29 -0000 1.10 *************** *** 42,46 **** <!-- Super Chicken --> ! <npc id="super_chicken" import="chicken"> <karma>0</karma> <fame><random min="0" max="150" /></fame> --- 42,46 ---- <!-- Super Chicken --> ! <npc id="super_chicken" inherit="chicken"> <karma>0</karma> <fame><random min="0" max="150" /></fame> |
