wpdev-commits Mailing List for Wolfpack Emu (Page 87)
Brought to you by:
rip,
thiagocorrea
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-07-02 13:35:46
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30391/python Modified Files: char.cpp global.cpp Log Message: New documentation. Index: global.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/global.cpp,v retrieving revision 1.136 retrieving revision 1.137 diff -C2 -d -r1.136 -r1.137 *** global.cpp 2 Jul 2004 06:01:32 -0000 1.136 --- global.cpp 2 Jul 2004 13:35:36 -0000 1.137 *************** *** 127,131 **** /* \function wolfpack.console.log ! \param loglevel The loglevel for this message. See the ERROR_ constants in wolfpack/consts.py for details. \param text The text of the message. --- 127,131 ---- /* \function wolfpack.console.log ! \param loglevel The loglevel for this message. See the "Log Constants" in <module id="wolfpack.consts">wolfpack.consts</module> for details. \param text The text of the message. *************** *** 988,992 **** \function wolfpack.registerglobal \param event An integer constant for the event that should be hooked. ! Take a look at the EVENT constants in <module id="wolfpack.consts">wolfpack.consts</module> for details. \param script The name of a script that should be notified about the given event. \description This function registers a script as a global hook for one given event type. Whenever the --- 988,992 ---- \function wolfpack.registerglobal \param event An integer constant for the event that should be hooked. ! Take a look at the "Event Constants" in <module id="wolfpack.consts">wolfpack.consts</module> for details. \param script The name of a script that should be notified about the given event. \description This function registers a script as a global hook for one given event type. Whenever the *************** *** 1411,1421 **** \function wolfpack.queueaction \param action The action you want to queue. ! One of these constants in <module>wolfpack.consts</module>: ! <code>RELOAD_SCRIPTS ! RELOAD_PYTHON ! RELOAD_ACCOUNTS ! RELOAD_CONFIGURATION ! SAVE_WORLD ! SAVE_ACCOUNTS</code> \description This function queues an action to be executed in the next iteration of the mainloop. */ --- 1411,1415 ---- \function wolfpack.queueaction \param action The action you want to queue. ! Take a look at the "Action Constants" in the <module id="wolfpack.consts">wolfpack.consts</module> module. \description This function queues an action to be executed in the next iteration of the mainloop. */ *************** *** 1437,1441 **** \function wolfpack.getdefinition \param type The definition type. ! Use one of the WPDT constants from <module id="wolfpack.consts">wolfpack.consts</module>. \param id A string representing the id of the desired definition section. \return None if the section could not be found or an <object id="element">element</object> object otherwise. --- 1431,1435 ---- \function wolfpack.getdefinition \param type The definition type. ! Use one of the "Definition Constants" from <module id="wolfpack.consts">wolfpack.consts</module>. \param id A string representing the id of the desired definition section. \return None if the section could not be found or an <object id="element">element</object> object otherwise. *************** *** 1471,1475 **** \function wolfpack.getdefinitions \param type The definition type. ! Use one of the WPDT constants from <module id="wolfpack.consts">wolfpack.consts</module>. \return A tuple of strings. \description This function will compile the ids of all sections of a given type. --- 1465,1469 ---- \function wolfpack.getdefinitions \param type The definition type. ! Use one of the "Definition Constants" from <module id="wolfpack.consts">wolfpack.consts</module>. \return A tuple of strings. \description This function will compile the ids of all sections of a given type. *************** *** 1508,1512 **** \param script The id of the script containing the event. \param event The numeric constant for the event you want to call. ! See the EVENT constants in wolfpack.consts for details. \param args A tuple containing the arguments for the event handler. \return The return value from the event handler is passed trough. --- 1502,1506 ---- \param script The id of the script containing the event. \param event The numeric constant for the event you want to call. ! See the "Event Constants" in <module id="wolfpack.consts">wolfpack.consts</module> for details. \param args A tuple containing the arguments for the event handler. \return The return value from the event handler is passed trough. *************** *** 1547,1551 **** \param script The id of the script containing the event. \param event The numeric constant for the event you want to check for. ! See the EVENT constants in wolfpack.consts for details. \return True or false. \description This function checks if the given script can handle an event of the given type and returns true if it can. --- 1541,1545 ---- \param script The id of the script containing the event. \param event The numeric constant for the event you want to check for. ! See the "Event Constants" in <module id="wolfpack.consts">wolfpack.consts</module> for details. \return True or false. \description This function checks if the given script can handle an event of the given type and returns true if it can. *************** *** 1660,1665 **** --- 1654,1697 ---- } + /* + \function wolfpack.getoption + \param key The name of the option. + \param default The default value that is returned if the option does not exist. + \return A string with the value of the option. + \description This function retrieves an option from the world database. + */ + static PyObject* wpGetOption( PyObject* self, PyObject* args ) + { + Q_UNUSED(self); + QString arg_key = getArgStr(0); + QString arg_def = getArgStr(1); + QString value; + World::instance()->getOption(arg_key, value, arg_def); + return PyString_FromString(value); + } + + /* + \function wolfpack.setoption + \param key The name of the option. + \param value A string containing the value of the option. + \description This function sets a given option in the world database. + */ + static PyObject* wpSetOption( PyObject* self, PyObject* args ) + { + Q_UNUSED( self ); + + QString arg_key = getArgStr( 0 ); + QString arg_val = getArgStr( 1 ); + + World::instance()->setOption( arg_key, arg_val ); + + Py_INCREF(Py_None); + return Py_None; + } + static PyMethodDef wpGlobal[] = { + { "getOption", wpGetOption, METH_VARARGS, "Reads a string value from the database." }, + { "setOption", wpSetOption, METH_VARARGS, "Sets a string value and a key to the database." }, { "callevent", wpCallEvent, METH_VARARGS, "Call an event in a script and return the result." }, { "hasevent", wpHasEvent, METH_VARARGS, "If the given script has the given event. Return true." }, *************** *** 1714,1717 **** --- 1746,1755 ---- }; + /* + \function wolfpack.sockets.first + \return A <object id="socket">socket</object> object or None. + \description This function resets the iterator to the first available socket + and returns it. + */ static PyObject* wpSocketsFirst( PyObject* self, PyObject* args ) { *************** *** 1721,1724 **** --- 1759,1768 ---- } + /* + \function wolfpack.sockets.next + \return A <object id="socket">socket</object> object or None. + \description This function sets the iterator to the next available socket + and returns it. If there is no socket available, None is returned. + */ static PyObject* wpSocketsNext( PyObject* self, PyObject* args ) { *************** *** 1728,1733 **** } ! /*! ! Retrieves the number of currently connected sockets */ static PyObject* wpSocketsCount( PyObject* self, PyObject* args ) --- 1772,1779 ---- } ! /* ! \function wolfpack.sockets.count ! \return An integer value. ! \description This function returns how many sockets are connected. */ static PyObject* wpSocketsCount( PyObject* self, PyObject* args ) *************** *** 1751,1757 **** }; ! /*! ! Finds an Account object. ! */ static PyObject* wpAccountsFind( PyObject* self, PyObject* args ) { --- 1797,1807 ---- }; ! /* ! \function wolfpack.accounts.find ! \param name A string containing the account name. ! \return An <object id="account">account</object> object if an account was found. ! None otherwise. ! \description This function tries to find an account with the given name and returns it. ! */ static PyObject* wpAccountsFind( PyObject* self, PyObject* args ) { *************** *** 1767,1774 **** } ! /*! ! Gets a list of Account names. ! */ ! static PyObject* wpAccountsList( PyObject* self, PyObject* args ) { Q_UNUSED( self ); --- 1817,1826 ---- } ! /* ! \function wolfpack.accounts.list ! \return A list of strings. ! \description This function generates a list of all account names and returns it. ! */ ! satic PyObject* wpAccountsList( PyObject* self, PyObject* args ) { Q_UNUSED( self ); *************** *** 1788,1794 **** } ! /*! ! Gets a list of ACL names. ! */ static PyObject* wpAccountsAcls( PyObject* self, PyObject* args ) { --- 1840,1848 ---- } ! /* ! \function wolfpack.accounts.acls ! \return A list of strings. ! \description This function generates a list of the names of all available acls and returns it. ! */ static PyObject* wpAccountsAcls( PyObject* self, PyObject* args ) { *************** *** 1809,1815 **** } ! /*! ! Returns an ACL as a dictionary. ! */ static PyObject* wpAccountsAcl( PyObject* self, PyObject* args ) { --- 1863,1881 ---- } ! /* ! \function wolfpack.accounts.acl ! \param acl The name of the acl. ! \return None if no acl with the given name could be found. Otherwise a dictionary ! with information about the acl is returned. For each group in the acl it contains ! a key-value pair where the value is another dictionary containing the actions within the ! group. If for instance you want to check if the gm acl has access to any command, the following ! code should give you an idea: ! <code> ! allowed = 0 ! acl = wolfpack.accounts.acl('gm') ! if acl.has_key('command') and acl['command'].has_key('any'): ! allowed = acl['command']['any'].lower() == 'true'</code> ! \description Retrieve an access control list from the server. ! */ static PyObject* wpAccountsAcl( PyObject* self, PyObject* args ) { *************** *** 1844,1850 **** } ! /*! ! Creates an account (username + password is enough) ! */ static PyObject* wpAccountsAdd( PyObject* self, PyObject* args ) { --- 1910,1922 ---- } ! /* ! \function wolfpack.accounts.add ! \param username A string containing the username of the new account. ! \param password A string containing the password for the new account. ! If MD5 password hashing is enabled, this password will be automatically converted. ! \return None or an <object id="account">account</object> object. ! \description This function creates a new account and returns it. If the account couldn't be created, ! it returns None. ! */ static PyObject* wpAccountsAdd( PyObject* self, PyObject* args ) { *************** *** 1859,1877 **** QString password = getArgStr( 1 ); ! if ( login.length() < 1 && password.length() < 1 ) ! return PyFalse(); ! cAccount* account = Accounts::instance()->getRecord( login ); ! if ( account ) ! return PyFalse(); ! account = Accounts::instance()->createAccount( login, password ); ! return PyGetAccountObject( account ); } ! /*! ! Reload accounts. ! */ static PyObject* wpAccountsReload( PyObject* self, PyObject* args ) { --- 1931,1955 ---- QString password = getArgStr( 1 ); ! if (login.length() < 1 && password.length() < 1) { ! Py_INCREF(Py_None); ! return Py_None; ! } ! cAccount* account = Accounts::instance()->getRecord(login); ! if (account) { ! Py_INCREF(Py_None); ! return Py_None; ! } ! account = Accounts::instance()->createAccount(login, password); ! return PyGetAccountObject(account); } ! /* ! \function wolfpack.accounts.reload ! \description Reload the accounts in the next mainloop tick. This means ! that the accounts will not be reloaded instantly. ! */ static PyObject* wpAccountsReload( PyObject* self, PyObject* args ) { *************** *** 1882,1888 **** } ! /*! ! Save accounts. ! */ static PyObject* wpAccountsSave( PyObject* self, PyObject* args ) { --- 1960,1968 ---- } ! /* ! \function wolfpack.accounts.save ! \description Save the account database during the next mainloop iteration. ! That means that the accounts will not be saved instantly. ! */ static PyObject* wpAccountsSave( PyObject* self, PyObject* args ) { *************** *** 1910,1918 **** }; ! /*! ! Reads the boolean entry specified by key and group. ! The key is created if it doesn't exist, using the default argument. ! If an error occurs the settings are left unchanged and FALSE is returned; ! otherwise TRUE is returned */ static PyObject* wpSettingsGetBool( PyObject* self, PyObject* args ) --- 1990,2002 ---- }; ! /* ! \function wolfpack.settings.getbool ! \param group A string containing the name of the group the configuration option is in. ! \param key A string containing the name of the configuration option within the given group. ! \param default If the configuration option does not exist, this value is returned instead. ! \param create Defaults to false. If this is true and the option does not exist, the value given ! as the default value will be written to the configuration file. ! \return A boolean value. ! \description This function retrieves a value from the configuration file. */ static PyObject* wpSettingsGetBool( PyObject* self, PyObject* args ) *************** *** 1929,1937 **** } ! /*! ! Writes the boolean entry value into specified key and group. ! The key is created if it doesn't exist. Any previous value is overwritten by value. ! If an error occurs the settings are left unchanged and FALSE is returned; ! otherwise TRUE is returned */ static PyObject* wpSettingsSetBool( PyObject* self, PyObject* args ) --- 2013,2022 ---- } ! /* ! \function wolfpack.settings.setbool ! \param group A string containing the name of the group the configuration option is in. ! \param key A string containing the name of the configuration option within the given group. ! \param value The new value of the configuration option. ! \description This function changes or creates a new configuration option. */ static PyObject* wpSettingsSetBool( PyObject* self, PyObject* args ) *************** *** 1948,1957 **** } ! /*! ! Reads the numeric entry specified by key and group. ! The key is created if it doesn't exist using the default argument, provided ! that \a create argument is true. ! If an error occurs the settings are left unchanged and FALSE is returned; ! otherwise TRUE is returned */ static PyObject* wpSettingsGetNumber( PyObject* self, PyObject* args ) --- 2033,2045 ---- } ! /* ! \function wolfpack.settings.getnumber ! \param group A string containing the name of the group the configuration option is in. ! \param key A string containing the name of the configuration option within the given group. ! \param default If the configuration option does not exist, this value is returned instead. ! \param create Defaults to false. If this is true and the option does not exist, the value given ! as the default value will be written to the configuration file. ! \return An integer value. ! \description This function retrieves a value from the configuration file. */ static PyObject* wpSettingsGetNumber( PyObject* self, PyObject* args ) *************** *** 1968,1976 **** } ! /*! ! Writes the numeric entry value into specified key and group. ! The key is created if it doesn't exist. Any previous value is overwritten by value. ! If an error occurs the settings are left unchanged and FALSE is returned; ! otherwise TRUE is returned */ static PyObject* wpSettingsSetNumber( PyObject* self, PyObject* args ) --- 2056,2065 ---- } ! /* ! \function wolfpack.settings.setnumber ! \param group A string containing the name of the group the configuration option is in. ! \param key A string containing the name of the configuration option within the given group. ! \param value The new value of the configuration option. ! \description This function changes or creates a new configuration option. */ static PyObject* wpSettingsSetNumber( PyObject* self, PyObject* args ) *************** *** 1987,1997 **** } ! /*! ! getString( group, key, default, create ) ! Reads the string entry specified by key and group. ! The key is created if it doesn't exist using the default argument, provided that ! \a create argument is true. ! If an error occurs the settings are left unchanged and FALSE is returned; ! otherwise TRUE is returned */ static PyObject* wpSettingsGetString( PyObject* self, PyObject* args ) --- 2076,2088 ---- } ! /* ! \function wolfpack.settings.getstring ! \param group A string containing the name of the group the configuration option is in. ! \param key A string containing the name of the configuration option within the given group. ! \param default If the configuration option does not exist, this value is returned instead. ! \param create Defaults to false. If this is true and the option does not exist, the value given ! as the default value will be written to the configuration file. ! \return A string. ! \description This function retrieves a value from the configuration file. */ static PyObject* wpSettingsGetString( PyObject* self, PyObject* args ) *************** *** 2008,2016 **** } ! /*! ! Writes the string entry value into specified key and group. ! The key is created if it doesn't exist. Any previous value is overwritten by value. ! If an error occurs the settings are left unchanged and FALSE is returned; ! otherwise TRUE is returned */ static PyObject* wpSettingsSetString( PyObject* self, PyObject* args ) --- 2099,2108 ---- } ! /* ! \function wolfpack.settings.setstring ! \param group A string containing the name of the group the configuration option is in. ! \param key A string containing the name of the configuration option within the given group. ! \param value The new value of the configuration option. ! \description This function changes or creates a new configuration option. */ static PyObject* wpSettingsSetString( PyObject* self, PyObject* args ) *************** *** 2027,2032 **** } ! /*! ! Reloads wolfpack.xml */ static PyObject* wpSettingsReload( PyObject* self, PyObject* args ) --- 2119,2125 ---- } ! /* ! \function wolfpack.settings.reload ! \description This function reloads the settings file. */ static PyObject* wpSettingsReload( PyObject* self, PyObject* args ) *************** *** 2038,2043 **** } ! /*! ! Saves wolfpack.xml */ static PyObject* wpSettingsSave( PyObject* self, PyObject* args ) --- 2131,2137 ---- } ! /* ! \function wolfpack.settings.save ! \description This function saves the settings file to disk. */ static PyObject* wpSettingsSave( PyObject* self, PyObject* args ) *************** *** 2055,2064 **** static PyMethodDef wpSettings[] = { ! { "getBool", wpSettingsGetBool, METH_VARARGS, "Reads a boolean value from wolfpack.xml." }, ! { "setBool", wpSettingsSetBool, METH_VARARGS, "Sets a boolean value to wolfpack.xml." }, ! { "getNumber", wpSettingsGetNumber, METH_VARARGS, "Gets a numeric value from wolfpack.xml." }, ! { "setNumber", wpSettingsSetNumber, METH_VARARGS, "Sets a numeric value to wolfpack.xml." }, ! { "getString", wpSettingsGetString, METH_VARARGS, "Reads a string value from wolfpack.xml." }, ! { "setString", wpSettingsSetString, METH_VARARGS, "Writes a string value to wolfpack.xml." }, { "reload", wpSettingsReload, METH_NOARGS, "Reloads wolfpack.xml." }, { "save", wpSettingsSave, METH_NOARGS, "Saves changes made to wolfpack.xml" }, --- 2149,2158 ---- static PyMethodDef wpSettings[] = { ! { "getbool", wpSettingsGetBool, METH_VARARGS, "Reads a boolean value from wolfpack.xml." }, ! { "setbool", wpSettingsSetBool, METH_VARARGS, "Sets a boolean value to wolfpack.xml." }, ! { "getnumber", wpSettingsGetNumber, METH_VARARGS, "Gets a numeric value from wolfpack.xml." }, ! { "setnumber", wpSettingsSetNumber, METH_VARARGS, "Sets a numeric value to wolfpack.xml." }, ! { "getstring", wpSettingsGetString, METH_VARARGS, "Reads a string value from wolfpack.xml." }, ! { "setstring", wpSettingsSetString, METH_VARARGS, "Writes a string value to wolfpack.xml." }, { "reload", wpSettingsReload, METH_NOARGS, "Reloads wolfpack.xml." }, { "save", wpSettingsSave, METH_NOARGS, "Saves changes made to wolfpack.xml" }, *************** *** 2067,2108 **** }; ! static PyObject* wpOptionsGetOption( PyObject* self, PyObject* args ) ! { ! Q_UNUSED( self ); ! ! QString arg_key = getArgStr( 0 ); ! QString arg_def = getArgStr( 1 ); ! ! QString value; ! ! World::instance()->getOption( arg_key, value, arg_def ); ! ! return PyString_FromString( value ); ! } ! ! static PyObject* wpOptionsSetOption( PyObject* self, PyObject* args ) ! { ! Q_UNUSED( self ); ! ! QString arg_key = getArgStr( 0 ); ! QString arg_val = getArgStr( 1 ); ! ! World::instance()->setOption( arg_key, arg_val ); ! ! return PyTrue(); ! } ! ! /*! ! wolfpack.options ! config using the settings table */ - static PyMethodDef wpOptions[] = - { - { "getOption", wpOptionsGetOption, METH_VARARGS, "Reads a string value from the database." }, - { "setOption", wpOptionsSetOption, METH_VARARGS, "Sets a string value and a key to the database." }, - { NULL, NULL, 0, NULL } // Terminator - - }; - static PyObject* wpQuery( PyObject* self, PyObject* args ) { --- 2161,2170 ---- }; ! /* ! \function wolfpack.database.query ! \param query A string containing the SQL query for the database. ! \return A <object id="dbresult">dbresult</object> object. ! \description This function executes the given SQL query in the currently connected database and returns the result. */ static PyObject* wpQuery( PyObject* self, PyObject* args ) { *************** *** 2138,2141 **** --- 2200,2208 ---- } + /* + \function wolfpack.database.execute + \param query A string containing the SQL statement. + \description This function executes the given SQL query in the currently connected database and discards the result if there is any. + */ static PyObject* wpExecute( PyObject* self, PyObject* args ) { *************** *** 2165,2171 **** PyMem_Free( query ); ! return PyTrue(); } static PyObject* wpDriver( PyObject* self, PyObject* args ) { --- 2232,2246 ---- PyMem_Free( query ); ! ! Py_INCREF(Py_None); ! return Py_None; } + /* + \function wolfpack.database.driver + \param database The id of the database you want to query. See the "Database Constants" in this module. + \return A string. + \description This function returns the name of the database driver in use for the given database. + */ static PyObject* wpDriver( PyObject* self, PyObject* args ) { *************** *** 2187,2190 **** --- 2262,2270 ---- } + /* + \function wolfpack.database.close + \param database The id of the database you want to close. See the "Database Constants" in this module. + \description This function closes the connection to the given database. + */ static PyObject* wpClose( PyObject* self, PyObject* args ) { *************** *** 2203,2206 **** --- 2283,2291 ---- } + /* + \function wolfpack.database.open + \param database The id of the database you want to open. See the "Database Constants" in this module. + \description This function opens the connection to the given database. + */ static PyObject* wpOpen( PyObject* self, PyObject* args ) { Index: char.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v retrieving revision 1.172 retrieving revision 1.173 diff -C2 -d -r1.172 -r1.173 *** char.cpp 1 Jul 2004 21:37:44 -0000 1.172 --- char.cpp 2 Jul 2004 13:35:36 -0000 1.173 *************** *** 400,405 **** \description Play an animation for the character. The animation id is automatically translated if the character is on a horse or ! if the current body id of the character doesn't support the animation. \param id The id of the animation that should be played. */ static PyObject* wpChar_action( wpChar* self, PyObject* args ) --- 400,406 ---- \description Play an animation for the character. The animation id is automatically translated if the character is on a horse or ! if the current body id of the character doesn't support the animation. \param id The id of the animation that should be played. + See the "Animation Constants" in <module id="wolfpack.consts">wolfpack.consts</module> for a list. */ static PyObject* wpChar_action( wpChar* self, PyObject* args ) *************** *** 2448,2452 **** /* ! \rproperty char.party A <object id="PARTY">PARTY</object> object for the party the player belongs to. None for NPCs or if the player is not in a party. This property is exclusive to python scripts and overrides normal properties with the same name. --- 2449,2453 ---- /* ! \rproperty char.party A <object id="party">party</object> object for the party the player belongs to. None for NPCs or if the player is not in a party. This property is exclusive to python scripts and overrides normal properties with the same name. *************** *** 2466,2470 **** /* ! \rproperty char.guild A <object id="GUILD">GUILD</object> object for the guild the player belongs to. None for NPCs or if the player is not in a guild. This property is exclusive to python scripts and overrides normal properties with the same name. --- 2467,2471 ---- /* ! \rproperty char.guild A <object id="guild">guild</object> object for the guild the player belongs to. None for NPCs or if the player is not in a guild. This property is exclusive to python scripts and overrides normal properties with the same name. |
From: Sebastian H. <dar...@us...> - 2004-07-02 13:35:45
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30391 Modified Files: dbdriver.cpp guilds.cpp party.cpp wolfpack.vcproj Log Message: New documentation. Index: wolfpack.vcproj =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wolfpack.vcproj,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** wolfpack.vcproj 23 May 2004 11:26:28 -0000 1.33 --- wolfpack.vcproj 2 Jul 2004 13:35:36 -0000 1.34 *************** *** 107,111 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="qt-mt322.lib ws2_32.lib comctl32.lib msvcrt.lib python23.lib wininet.lib imagehlp.lib" OutputFile="../wolfpack.exe" LinkIncremental="1" --- 107,111 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="qt-mt331.lib ws2_32.lib comctl32.lib msvcrt.lib python23.lib wininet.lib imagehlp.lib" OutputFile="../wolfpack.exe" LinkIncremental="1" Index: dbdriver.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/dbdriver.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** dbdriver.cpp 19 Jun 2004 02:06:51 -0000 1.36 --- dbdriver.cpp 2 Jul 2004 13:35:36 -0000 1.37 *************** *** 183,186 **** --- 183,190 ---- static PyObject* wpDbResult_getAttr( wpDbResult* self, char* name ); + /* + \object dbresult + \description This object type represents the response from the database to a query. + */ PyTypeObject wpDbResultType = { *************** *** 189,192 **** --- 193,201 ---- }; + /* + \method dbresult.free + \description This function frees the resources allocated by this dbresult object. Always call this + when you no longer need this object. + */ static PyObject* wpDbResult_free( wpDbResult* self, PyObject* args ) { *************** *** 197,200 **** --- 206,214 ---- } + /* + \method dbresult.fetchrow + \return A boolean value. + \description Fetch a new row from the database and return false if the end of the result set was reached. + */ static PyObject* wpDbResult_fetchrow( wpDbResult* self, PyObject* args ) { *************** *** 208,211 **** --- 222,233 ---- } + /* + \method dbresult.getint + \param position The position of the integer value you want to get. + \return An integer value. + \description Get an integer value from the row at the given position. + Please be careful with this function. If you specify an invalid position + it can lead to a crash of your server. + */ static PyObject* wpDbResult_getint( wpDbResult* self, PyObject* args ) { *************** *** 218,221 **** --- 240,251 ---- } + /* + \method dbresult.getstring + \param position The position of the string value you want to get. + \return A string value. + \description Get a string value from the row at the given position. + Please be careful with this function. If you specify an invalid position + it can lead to a crash of your server. + */ static PyObject* wpDbResult_getstring( wpDbResult* self, PyObject* args ) { Index: guilds.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/guilds.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** guilds.cpp 2 Jun 2004 15:04:05 -0000 1.14 --- guilds.cpp 2 Jul 2004 13:35:36 -0000 1.15 *************** *** 358,363 **** static int wpGuild_compare( PyObject* a, PyObject* b ); ! /*! ! The python type object for the guild type. */ PyTypeObject wpGuildType = --- 358,364 ---- static int wpGuild_compare( PyObject* a, PyObject* b ); ! /* ! \object guild ! \description This object type represents a guild. */ PyTypeObject wpGuildType = *************** *** 375,378 **** --- 376,385 ---- } + /* + \method guild.addmember + \param player A <object id="char">char</object> object for a player. + \return False if a npc was passed, True otherwise. + \description This method adds a member to this guild. + */ PyObject* wpGuild_addmember( wpGuild* self, PyObject* args ) { *************** *** 394,397 **** --- 401,410 ---- } + /* + \method guild.removemember + \param player A <object id="char">char</object> object for a player. + \return False if a npc was passed, True otherwise. + \description This method removes a member from this guild. + */ PyObject* wpGuild_removemember( wpGuild* self, PyObject* args ) { *************** *** 413,416 **** --- 426,435 ---- } + /* + \method guild.addcanidate + \param player A <object id="char">char</object> object for a player. + \return False if a npc was passed, True otherwise. + \description This method adds a canidate to this guild. + */ PyObject* wpGuild_addcanidate( wpGuild* self, PyObject* args ) { *************** *** 432,435 **** --- 451,460 ---- } + /* + \method guild.removecanidate + \param player A <object id="char">char</object> object for a player. + \return False if a npc was passed, True otherwise. + \description This method removes a canidate from this guild. + */ PyObject* wpGuild_removecanidate( wpGuild* self, PyObject* args ) { *************** *** 451,454 **** --- 476,489 ---- } + /* + \method guild.setmemberinfo + \param player A <object id="char">char</object> object for a player. + \param info A dictionary with represents the member information for the given player in this guilds. + The following keys are valid: + - <code>showsign</code> Set this item to True if the guild abbreviation should be appended to the players name. + - <code>guildtitle</code> If this item is not None, it will be shown as this members title within the guild. + - <code>joined</code> This is a UNIX timestamp representing the time and date when this member joined the guild. + \description This method changes the member information structure for a member of this guild. + */ PyObject* wpGuild_setmemberinfo( wpGuild* self, PyObject* args ) { *************** *** 508,511 **** --- 543,556 ---- } + /* + \method guild.getmemberinfo + \param player A <object id="char">char</object> object for a player. + \return A dictionary with data from the member information structure for the given player in this guilds. + The following keys are valid: + - <code>showsign</code> This item is True if the guilds abbreviation is appended to this players name. + - <code>guildtitle</code> This item is the players title within the guild. It is a unicode string. + - <code>joined</code> This is a UNIX timestamp representing the time and date when this member joined the guild. + \description This method retrieves the memebr information structure for a member of this guild. + */ PyObject* wpGuild_getmemberinfo( wpGuild* self, PyObject* args ) { *************** *** 542,545 **** --- 587,594 ---- } + /* + \method guild.delete + \description Delete this guild. + */ PyObject* wpGuild_delete( wpGuild* self, PyObject* args ) { *************** *** 564,567 **** --- 613,619 ---- } + /* + \rproperty guild.members This property is a list of <object id="char">char</object> objects for every member of the guild. + */ if ( !strcmp( name, "members" ) ) { *************** *** 577,580 **** --- 629,635 ---- return list; } + /* + \rproperty guild.canidates This property is a list of <object id="char">char</object> objects for every canidate of the guild. + */ else if ( !strcmp( name, "canidates" ) ) { *************** *** 590,593 **** --- 645,652 ---- return list; } + /* + \property guild.leader This property is a <object id="char">char</object> object for the leader of the guild. This can also be None if there + is no leader. + */ else if ( !strcmp( name, "leader" ) ) { *************** *** 602,605 **** --- 661,667 ---- } } + /* + \property guild.name This is the name of this guild. + */ else if ( !strcmp( name, "name" ) ) { *************** *** 614,617 **** --- 676,682 ---- } } + /* + \property guild.abbreviation This is the abbreviation of this guilds name. + */ else if ( !strcmp( name, "abbreviation" ) ) { *************** *** 626,629 **** --- 691,697 ---- } } + /* + \property guild.charta This is the charta of this guild. + */ else if ( !strcmp( name, "charta" ) ) { *************** *** 638,641 **** --- 706,712 ---- } } + /* + \property guild.website This is the URL of the website for this guild. + */ else if ( !strcmp( name, "website" ) ) { *************** *** 650,665 **** --- 721,752 ---- } } + /* + \property guild.alignment This integer value indicates the alignment of the guild. + <code>0: Neutral + 1: Evil + 2: Good</code> + */ else if ( !strcmp( name, "alignment" ) ) { return PyInt_FromLong( self->guild->alignment() ); } + /* + \property guild.serial This is the unique integer id for this guild. It can be used to + retrieve a guild object by using the wolfpack.findguild function. + */ else if ( !strcmp( name, "serial" ) ) { return PyInt_FromLong( self->guild->serial() ); } + /* + \property guild.founded This property is a UNIX timestamp indicating when this guild was founded. + */ else if ( !strcmp( name, "founded" ) ) { return PyInt_FromLong( self->guild->founded().toTime_t() ); } + /* + \property guild.guildstone This is the main guildstone for this guild. It can be None if there is no main guildstone for this guild. + */ else if ( !strcmp( name, "guildstone" ) ) { Index: party.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/party.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** party.cpp 15 Jun 2004 02:44:44 -0000 1.13 --- party.cpp 2 Jul 2004 13:35:36 -0000 1.14 *************** *** 437,442 **** } ! /*! ! The python object structure for a party. */ struct wpParty --- 437,443 ---- } ! /* ! \object party ! \description This object type represents a party. */ struct wpParty *************** *** 467,470 **** --- 468,478 ---- } + /* + \method party.tellsingle + \param source A <object id="char">char</object> object for the source of the message. + \param target A <object id="char">char</object> object for the target of the message. + \param message A string containing the message to be sent. + \description Send a single party member a partymessage from a given source. + */ static PyObject* wpParty_tellsingle( wpParty* self, PyObject* args ) { *************** *** 482,486 **** PyMem_Free( message ); ! return PyTrue(); } --- 490,495 ---- PyMem_Free( message ); ! Py_INCREF(Py_None); ! return Py_None; } *************** *** 488,491 **** --- 497,506 ---- } + /* + \method party.tellsingle + \param source A <object id="char">char</object> object for the source of the message. + \param message A string containing the message to be sent. + \description Send a message to all party members from a single source. + */ static PyObject* wpParty_tellall( wpParty* self, PyObject* args ) { *************** *** 517,524 **** --- 532,545 ---- cParty* party = self->party; + /* + \rproperty party.leader A <object id="char">char</object> object for the leader of this party. + */ if ( !strcmp( name, "leader" ) ) { return party->leader()->getPyObject(); } + /* + \rproperty party.members A list of <object id="char">char</object> objects for the members in this party. + */ else if ( !strcmp( name, "members" ) ) { *************** *** 529,532 **** --- 550,556 ---- return list; } + /* + \rproperty party.canidates A list of <object id="char">char</object> objects for the canidates in this party. + */ else if ( !strcmp( name, "canidates" ) ) { *************** *** 537,540 **** --- 561,567 ---- return list; } + /* + \rproperty party.lootingallowed A list of <object id="char">char</object> objects for the members of this party who allowed looting their corpse. + */ else if ( !strcmp( name, "lootingallowed" ) ) { |
From: Sebastian H. <dar...@us...> - 2004-07-02 13:29:09
|
Update of /cvsroot/wpdev/xmlscripts/documentation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28554 Modified Files: generate_html.py parse.py Log Message: Another big documentation update. Constants ! Index: parse.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/parse.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** parse.py 29 Jun 2004 22:46:13 -0000 1.8 --- parse.py 2 Jul 2004 13:29:00 -0000 1.9 *************** *** 17,20 **** --- 17,21 ---- FUNCTION_NAME_PATTERN = re.compile("\\\\function\s([\w\.]+)", re.S) LINK_OBJECT_PATTERN = re.compile("<object\\s+id=\"([^\\\"]+)\">(.*?)<\\/object>", re.S) + LINK_MODULE_PATTERN = re.compile("<module\\s+id=\"([^\\\"]+)\">(.*?)<\\/module>", re.S) VERSION = "Unknown" *************** *** 46,49 **** --- 47,61 ---- replacement = '<a href="object_%s.html">%s</a>' % (link.group(1).lower(), link.group(2)) text = text[0:link.start()] + replacement + text[link.end():] + + # Replace the <module tags + while 1: + link = LINK_MODULE_PATTERN.search(text) + + if not link: + break + + # Replace + replacement = '<a href="module_%s.html">%s</a>' % (link.group(1).lower().replace('.', '_'), link.group(2)) + text = text[0:link.start()] + replacement + text[link.end():] return text *************** *** 298,301 **** --- 310,314 ---- commands = [] functions = [] + constants = [] results = pattern.finditer(content) for result in results: *************** *** 309,313 **** if function: functions.append(function) ! return (commands, [], [], [], [], functions) # --- 322,364 ---- if function: functions.append(function) ! ! # Parse Constants ! #constants = re.compile('"""\\s*(.*?)\\s*"""', re.S) # Multiline comment pattern ! constantsre = re.compile('"""[^"]+\s*\\\\constants\s+([^\s]+)\s+(.*?)\\s*"""(.*?)"""[^"]*?\\\\end[^"]*?"""', re.S) ! iterator = constantsre.finditer(content) ! for result in iterator: ! module = result.group(1) ! name = result.group(2) ! code = result.group(3) ! description = '' ! if "\n" in name: ! (name, description) = name.split("\n", 1) ! ! # Remove multiline comments and intended lines from the ! # code and start parsing constants ! removemultiline = re.compile('""".*?"""', re.S) ! while 1: ! result = removemultiline.search(code) ! if not result: ! break ! code = code[:result.start()] + code[result.end():] ! ! constant = { ! 'module': module, ! 'name': name, ! 'description': processtext(description), ! 'constants': [], ! } ! ! findconstants = re.compile('^(\w+)\s*=\s*.*?$', re.M) ! results = findconstants.finditer(code) ! for result in results: ! name = result.group(1) ! if name.upper() != name: ! continue ! constant['constants'].append(result.group(0).strip()) ! constants.append(constant) ! ! return (commands, [], [], [], [], functions, constants) # *************** *** 426,428 **** BETA = result.group(1) ! return (commands, events, objects, objectsmethods, objectsproperties, functions) --- 477,479 ---- BETA = result.group(1) ! return (commands, events, objects, objectsmethods, objectsproperties, functions, []) Index: generate_html.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/generate_html.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** generate_html.py 1 Jul 2004 21:32:35 -0000 1.7 --- generate_html.py 2 Jul 2004 13:29:00 -0000 1.8 *************** *** 1,4 **** --- 1,6 ---- + import re import math + import urllib import time import os *************** *** 15,18 **** --- 17,21 ---- objectsproperties = [] functions = [] + constants = [] if len(paths) == 0: *************** *** 27,30 **** --- 30,34 ---- global objectsproperties global functions + global constants #print "Examining %s..." % path *************** *** 33,40 **** for file in files: if os.path.isfile(file): ! (newcommands, newevents, newobjects, newobjectsmethods, newobjectsproperties, newfunctions) = parsepython(file) commands += newcommands events += newevents functions += newfunctions files = glob(path + '/*.cpp') --- 37,45 ---- for file in files: if os.path.isfile(file): ! (newcommands, newevents, newobjects, newobjectsmethods, newobjectsproperties, newfunctions, newconstants) = parsepython(file) commands += newcommands events += newevents functions += newfunctions + constants += newconstants files = glob(path + '/*.cpp') *************** *** 42,46 **** for file in files: if os.path.isfile(file): ! (newcommands, newevents, newobjects, newobjectsmethods, newobjectsproperties, newfunctions) = parsecpp(file) commands += newcommands events += newevents --- 47,51 ---- for file in files: if os.path.isfile(file): ! (newcommands, newevents, newobjects, newobjectsmethods, newobjectsproperties, newfunctions, newconstants) = parsecpp(file) commands += newcommands events += newevents *************** *** 54,58 **** for file in files: if os.path.isfile(file): ! (newcommands, newevents, newobjects, newobjectsmethods, newobjectsproperties, newfunctions) = parsecpp(file) commands += newcommands events += newevents --- 59,63 ---- for file in files: if os.path.isfile(file): ! (newcommands, newevents, newobjects, newobjectsmethods, newobjectsproperties, newfunctions, newconstants) = parsecpp(file) commands += newcommands events += newevents *************** *** 400,403 **** --- 405,421 ---- if current not in modules: modules.append(current) + + for constant in constants: + module = constant['module'] + current = '' + fmodules = module.split('.') + for module in fmodules: + if current != '': + current += '.' + module + else: + current = module + + if current not in modules: + modules.append(current) # Create an overview *************** *** 442,446 **** if function['module'] == module: localfunctions.append(function) ! template = open('templates/module.html') text = template.read() --- 460,469 ---- 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() *************** *** 464,470 **** if id < len(localfunctions): function = localfunctions[id] ! overview += '<td>- <a href="#func_%s">%s</a></td>' % (function['name'].lower(), function['name']) else: ! overview += "<td> </td>\n"; overview += "</tr>\n" --- 487,493 ---- if id < len(localfunctions): function = localfunctions[id] ! overview += '<td width="15%%">- <a href="#func_%s">%s</a></td>' % (function['name'].lower(), function['name']) else: ! overview += "<td width=\"15%\"> </td>\n"; overview += "</tr>\n" *************** *** 474,477 **** --- 497,504 ---- # Generate a list of methods overview = '' + if len(localfunctions) > 0: + overview += """<p><span class="sectiontitle">MODULE FUNCTIONS</span><br> + <br>""" + for i in range(0, len(localfunctions)): function = localfunctions[i] *************** *** 505,510 **** if i != len(localfunctions) - 1: overview += '<hr size="1">' ! text = text.replace('{MODULEFUNCTIONS}', overview) output = open('webroot/module_%s.html' % module.replace('.', '_').lower(), "wt") --- 532,623 ---- 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: + overview += """ + <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 + if id < len(localconstants): + constant = localconstants[id] + overview += '<td width="25%%">- <a href="#const_%s">%s</a></td>' % (urllib.quote(constant['name'].lower()), constant['name']) + 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('((?<!\\\\)".*?(?<!\\\\)")') + curpos = 0 + while 1: + result = quotecolor.search(const, curpos) + if not result: + break + newconst = const[:result.start()] + '<font color="#008000">%s</font>' % result.group(0) + curpos = len(newconst) + newconst += const[result.end():] + const = newconst + + quotecolor = re.compile('\\#.*') + curpos = 0 + while 1: + result = quotecolor.search(const, curpos) + if not result: + break + newconst = const[:result.start()] + '<font color="#008000">%s</font>' % result.group(0) + 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 />\ + %(description)s<br/><code>%(constants)s</code>\n\ + <br /><a href=\"#top\">Back to top</a>\n" % { + 'name': constant['name'], + 'description': constant['description'], + 'anchor': urllib.quote(constant['name'].lower()), + '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") |
From: Sebastian H. <dar...@us...> - 2004-07-02 13:29:09
|
Update of /cvsroot/wpdev/xmlscripts/documentation/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28554/templates Modified Files: module.html Log Message: Another big documentation update. Constants ! Index: module.html =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/templates/module.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** module.html 29 Jun 2004 15:19:49 -0000 1.4 --- module.html 2 Jul 2004 13:29:00 -0000 1.5 *************** *** 60,70 **** <table width="100%" border="0" cellspacing="0" cellpadding="2"> {FUNCTIONOVERVIEW} ! </table> ! <p><span class="sectiontitle">MODULE FUNCTIONS</span><br> ! <br> {MODULEFUNCTIONS} ! <br> ! <br> ! </td> </tr> <tr valign="top"> --- 60,70 ---- <table width="100%" border="0" cellspacing="0" cellpadding="2"> {FUNCTIONOVERVIEW} ! </table> ! {CONSTANTSOVERVIEW} {MODULEFUNCTIONS} ! <br> ! <br> ! ! {MODULECONSTANTS}</td> </tr> <tr valign="top"> |
From: Richard M. <dr...@us...> - 2004-07-02 06:28:13
|
Update of /cvsroot/wpdev/xmlscripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16816 Modified Files: wolfpack.sql Log Message: sql updates Index: wolfpack.sql =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/wolfpack.sql,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** wolfpack.sql 2 Jul 2004 00:53:25 -0000 1.53 --- wolfpack.sql 2 Jul 2004 06:28:04 -0000 1.54 *************** *** 1,14 **** CREATE TABLE `characters` ( ! `serial` int(11) unsigned NOT NULL default '0', `name` varchar(255) default NULL, `title` varchar(255) default NULL, `creationdate` varchar(19) default NULL, ! `body` smallint(5) NOT NULL default '0', ! `orgbody` smallint(5) NOT NULL default '0', ! `skin` smallint(5) NOT NULL default '0', ! `orgskin` smallint(5) NOT NULL default '0', ! `saycolor` smallint(5) NOT NULL default '0', ! `emotecolor` smallint(5) NOT NULL default '0', `strength` smallint(6) NOT NULL default '0', `strengthmod` smallint(6) NOT NULL default '0', --- 1,14 ---- CREATE TABLE `characters` ( ! `serial` int(10) unsigned NOT NULL default '0', `name` varchar(255) default NULL, `title` varchar(255) default NULL, `creationdate` varchar(19) default NULL, ! `body` smallint(5) unsigned NOT NULL default '0', ! `orgbody` smallint(5) unsigned NOT NULL default '0', ! `skin` smallint(5) unsigned NOT NULL default '0', ! `orgskin` smallint(5) unsigned NOT NULL default '0', ! `saycolor` smallint(5) unsigned NOT NULL default '0', ! `emotecolor` smallint(5) unsigned NOT NULL default '0', `strength` smallint(6) NOT NULL default '0', `strengthmod` smallint(6) NOT NULL default '0', *************** *** 25,38 **** `karma` int(11) NOT NULL default '0', `fame` int(11) NOT NULL default '0', ! `kills` int(10) NOT NULL default '0', ! `deaths` int(10) NOT NULL default '0', ! `hunger` int(11) NOT NULL default '0', `poison` tinyint(2) NOT NULL default '-1', ! `murderertime` int(11) NOT NULL default '0', ! `criminaltime` int(11) NOT NULL default '0', ! `gender` tinyint(1) NOT NULL default '0', `propertyflags` int(11) NOT NULL default '0', ! `murderer` int(11) unsigned NOT NULL default '4294967295', ! `guarding` int(11) unsigned NOT NULL default '4294967295', `hitpointsbonus` smallint(6) NOT NULL default '0', `staminabonus` smallint(6) NOT NULL default '0', --- 25,38 ---- `karma` int(11) NOT NULL default '0', `fame` int(11) NOT NULL default '0', ! `kills` int(10) unsigned NOT NULL default '0', ! `deaths` int(10) unsigned NOT NULL default '0', ! `hunger` int(10) unsigned NOT NULL default '0', `poison` tinyint(2) NOT NULL default '-1', ! `murderertime` int(10) unsigned NOT NULL default '0', ! `criminaltime` int(10) unsigned NOT NULL default '0', ! `gender` tinyint(1) unsigned NOT NULL default '0', `propertyflags` int(11) NOT NULL default '0', ! `murderer` int(10) unsigned NOT NULL default '0', ! `guarding` int(10) unsigned NOT NULL default '0', `hitpointsbonus` smallint(6) NOT NULL default '0', `staminabonus` smallint(6) NOT NULL default '0', *************** *** 41,83 **** `dexcap` tinyint(4) NOT NULL default '125', `intcap` tinyint(4) NOT NULL default '125', ! `statcap` tinyint(4) NOT NULL default '127', `baseid` varchar(64) NOT NULL default '', ! `direction` char(1) NOT NULL default '0', PRIMARY KEY (`serial`) ); CREATE TABLE `corpses` ( ! `serial` int(11) unsigned NOT NULL default '0', ! `bodyid` smallint(6) NOT NULL default '0', ! `hairstyle` smallint(6) NOT NULL default '0', ! `haircolor` smallint(6) NOT NULL default '0', ! `beardstyle` smallint(6) NOT NULL default '0', ! `beardcolor` smallint(6) NOT NULL default '0', ! `direction` char(1) NOT NULL default '0', `charbaseid` varchar(64) NOT NULL default '', ! `murderer` int(11) unsigned NOT NULL default '4294967295', ! `murdertime` int(11) NOT NULL default '0', PRIMARY KEY (`serial`) ); CREATE TABLE `corpses_equipment` ( ! `serial` int(11) unsigned NOT NULL default '0', ! `layer` tinyint(3) NOT NULL default '0', ! `item` int(11) unsigned NOT NULL default '4294967295', PRIMARY KEY (`serial`,`layer`) ); CREATE TABLE `effects` ( ! `id` int(11) unsigned NOT NULL default '0', `objectid` varchar(64) NOT NULL default '', ! `expiretime` int(11) NOT NULL default '0', `dispellable` tinyint(4) NOT NULL default '0', ! `source` int(11) unsigned NOT NULL default '4294967295', ! `destination` int(11) unsigned NOT NULL default '4294967295', PRIMARY KEY (`id`) ); CREATE TABLE `effects_properties` ( ! `id` int(11) NOT NULL default '0', `keyname` varchar(64) NOT NULL default '', `type` varchar(64) NOT NULL default '', --- 41,83 ---- `dexcap` tinyint(4) NOT NULL default '125', `intcap` tinyint(4) NOT NULL default '125', ! `statcap` tinyint(4) NOT NULL default '225', `baseid` varchar(64) NOT NULL default '', ! `direction` tinyint(1) unsigned NOT NULL default '0', PRIMARY KEY (`serial`) ); CREATE TABLE `corpses` ( ! `serial` int(10) unsigned NOT NULL default '0', ! `bodyid` smallint(5) unsigned NOT NULL default '0', ! `hairstyle` smallint(5) unsigned NOT NULL default '0', ! `haircolor` smallint(5) unsigned NOT NULL default '0', ! `beardstyle` smallint(5) unsigned NOT NULL default '0', ! `beardcolor` smallint(5) unsigned NOT NULL default '0', ! `direction` tinyint(1) unsigned NOT NULL default '0', `charbaseid` varchar(64) NOT NULL default '', ! `murderer` int(10) unsigned NOT NULL default '0', ! `murdertime` int(10) unsigned NOT NULL default '0', PRIMARY KEY (`serial`) ); CREATE TABLE `corpses_equipment` ( ! `serial` int(10) unsigned NOT NULL default '0', ! `layer` tinyint(3) unsigned NOT NULL default '0', ! `item` int(10) unsigned NOT NULL default '0', PRIMARY KEY (`serial`,`layer`) ); CREATE TABLE `effects` ( ! `id` int(10) unsigned NOT NULL default '0', `objectid` varchar(64) NOT NULL default '', ! `expiretime` int(10) unsigned NOT NULL default '0', `dispellable` tinyint(4) NOT NULL default '0', ! `source` int(10) unsigned NOT NULL default '0', ! `destination` int(10) unsigned NOT NULL default '0', PRIMARY KEY (`id`) ); CREATE TABLE `effects_properties` ( ! `id` int(10) unsigned NOT NULL default '0', `keyname` varchar(64) NOT NULL default '', `type` varchar(64) NOT NULL default '', *************** *** 87,112 **** CREATE TABLE `guilds` ( ! `serial` int(11) unsigned NOT NULL default '0', `name` varchar(255) NOT NULL default '', `abbreviation` varchar(6) NOT NULL default '', `charta` longtext NOT NULL, `website` varchar(255) NOT NULL default 'http://www.wpdev.org', ! `alignment` int(2) NOT NULL default '0', ! `leader` int(11) unsigned NOT NULL default '4294967295', `founded` int(11) NOT NULL default '0', ! `guildstone` int(11) unsigned NOT NULL default '4294967295', PRIMARY KEY (`serial`) ); CREATE TABLE `guilds_canidates` ( ! `guild` int(11) unsigned NOT NULL default '0', ! `player` int(11) unsigned NOT NULL default '0', PRIMARY KEY (`guild`,`player`) ); CREATE TABLE `guilds_members` ( ! `guild` int(11) unsigned NOT NULL default '0', ! `player` int(11) unsigned NOT NULL default '0', ! `showsign` int(1) NOT NULL default '0', `guildtitle` varchar(255) NOT NULL default '', `joined` int(11) NOT NULL default '0', --- 87,112 ---- CREATE TABLE `guilds` ( ! `serial` int(10) unsigned NOT NULL default '0', `name` varchar(255) NOT NULL default '', `abbreviation` varchar(6) NOT NULL default '', `charta` longtext NOT NULL, `website` varchar(255) NOT NULL default 'http://www.wpdev.org', ! `alignment` tinyint(2) NOT NULL default '0', ! `leader` int(10) unsigned NOT NULL default '0', `founded` int(11) NOT NULL default '0', ! `guildstone` int(10) unsigned NOT NULL default '0', PRIMARY KEY (`serial`) ); CREATE TABLE `guilds_canidates` ( ! `guild` int(10) unsigned NOT NULL default '0', ! `player` int(10) unsigned NOT NULL default '0', PRIMARY KEY (`guild`,`player`) ); CREATE TABLE `guilds_members` ( ! `guild` int(10) unsigned NOT NULL default '0', ! `player` int(10) unsigned NOT NULL default '0', ! `showsign` tinyint(1) unsigned NOT NULL default '0', `guildtitle` varchar(255) NOT NULL default '', `joined` int(11) NOT NULL default '0', *************** *** 115,128 **** CREATE TABLE `items` ( ! `serial` int(11) unsigned NOT NULL default '0', ! `id` smallint(5) NOT NULL default '0', ! `color` smallint(5) NOT NULL default '0', ! `cont` int(11) unsigned NOT NULL default '4294967295', ! `layer` tinyint(3) NOT NULL default '0', `amount` smallint(5) NOT NULL default '0', `hp` smallint(6) NOT NULL default '0', `maxhp` smallint(6) NOT NULL default '0', `magic` tinyint(3) NOT NULL default '0', ! `owner` int(11) unsigned NOT NULL default '4294967295', `visible` tinyint(3) NOT NULL default '0', `priv` tinyint(3) NOT NULL default '0', --- 115,128 ---- CREATE TABLE `items` ( ! `serial` int(10) unsigned NOT NULL default '0', ! `id` smallint(5) unsigned NOT NULL default '0', ! `color` smallint(5) unsigned NOT NULL default '0', ! `cont` int(10) unsigned NOT NULL default '0', ! `layer` tinyint(3) unsigned NOT NULL default '0', `amount` smallint(5) NOT NULL default '0', `hp` smallint(6) NOT NULL default '0', `maxhp` smallint(6) NOT NULL default '0', `magic` tinyint(3) NOT NULL default '0', ! `owner` int(10) unsigned NOT NULL default '0', `visible` tinyint(3) NOT NULL default '0', `priv` tinyint(3) NOT NULL default '0', *************** *** 132,140 **** CREATE TABLE `npcs` ( ! `serial` int(11) unsigned NOT NULL default '0', `summontime` int(11) NOT NULL default '0', `additionalflags` int(11) NOT NULL default '0', ! `owner` int(11) unsigned NOT NULL default '4294967295', ! `stablemaster` int(11) unsigned NOT NULL default '4294967295', `ai` varchar(255) default NULL, `wandertype` smallint(3) NOT NULL default '0', --- 132,140 ---- CREATE TABLE `npcs` ( ! `serial` int(10) unsigned NOT NULL default '0', `summontime` int(11) NOT NULL default '0', `additionalflags` int(11) NOT NULL default '0', ! `owner` int(10) unsigned NOT NULL default '0', ! `stablemaster` int(10) unsigned NOT NULL default '0', `ai` varchar(255) default NULL, `wandertype` smallint(3) NOT NULL default '0', *************** *** 148,157 **** CREATE TABLE `players` ( ! `serial` int(11) unsigned NOT NULL default '0', ! `account` varchar(255) default NULL, `additionalflags` int(10) NOT NULL default '0', ! `visualrange` tinyint(3) NOT NULL default '0', `profile` longtext, ! `fixedlight` tinyint(3) NOT NULL default '0', `strlock` tinyint(4) NOT NULL default '0', `dexlock` tinyint(4) NOT NULL default '0', --- 148,157 ---- CREATE TABLE `players` ( ! `serial` int(10) unsigned NOT NULL default '0', ! `account` varchar(16) default NULL, `additionalflags` int(10) NOT NULL default '0', ! `visualrange` tinyint(3) unsigned NOT NULL default '0', `profile` longtext, ! `fixedlight` tinyint(3) unsigned NOT NULL default '0', `strlock` tinyint(4) NOT NULL default '0', `dexlock` tinyint(4) NOT NULL default '0', *************** *** 167,172 **** CREATE TABLE `skills` ( ! `serial` int(11) unsigned NOT NULL default '0', ! `skill` tinyint(3) NOT NULL default '0', `value` smallint(6) NOT NULL default '0', `locktype` tinyint(4) default '0', --- 167,172 ---- CREATE TABLE `skills` ( ! `serial` int(10) unsigned NOT NULL default '0', ! `skill` tinyint(2) unsigned NOT NULL default '0', `value` smallint(6) NOT NULL default '0', `locktype` tinyint(4) default '0', *************** *** 175,187 **** ); - CREATE TABLE `spawnregions` ( `spawnregion` varchar(64) NOT NULL default '', ! `serial` int(11) unsigned NOT NULL default '0', PRIMARY KEY (`spawnregion`,`serial`) ); CREATE TABLE `tags` ( ! `serial` int(11) unsigned NOT NULL default '0', `name` varchar(64) NOT NULL default '', `type` varchar(6) NOT NULL default '', --- 175,186 ---- ); CREATE TABLE `spawnregions` ( `spawnregion` varchar(64) NOT NULL default '', ! `serial` int(10) unsigned NOT NULL default '0', PRIMARY KEY (`spawnregion`,`serial`) ); CREATE TABLE `tags` ( ! `serial` int(10) unsigned NOT NULL default '0', `name` varchar(64) NOT NULL default '', `type` varchar(6) NOT NULL default '', *************** *** 192,208 **** CREATE TABLE `uobject` ( `name` varchar(255) default NULL, ! `serial` int(11) unsigned NOT NULL default '0', ! `multis` int(11) unsigned NOT NULL default '4294967295', ! `pos_x` smallint(6) NOT NULL default '0', ! `pos_y` smallint(6) NOT NULL default '0', ! `pos_z` smallint(6) NOT NULL default '0', ! `pos_map` tinyint(4) NOT NULL default '0', `events` varchar(255) default NULL, ! `havetags` tinyint(1) NOT NULL default '0', PRIMARY KEY (`serial`) ); CREATE TABLE `uobjectmap` ( ! `serial` int(11) unsigned NOT NULL default '0', `type` varchar(80) NOT NULL default '', PRIMARY KEY (`serial`) --- 191,207 ---- CREATE TABLE `uobject` ( `name` varchar(255) default NULL, ! `serial` int(10) unsigned NOT NULL default '0', ! `multis` int(10) unsigned NOT NULL default '0', ! `pos_x` smallint(6) unsigned NOT NULL default '0', ! `pos_y` smallint(6) unsigned NOT NULL default '0', ! `pos_z` tinyint(4) NOT NULL default '0', ! `pos_map` tinyint(1) unsigned NOT NULL default '0', `events` varchar(255) default NULL, ! `havetags` tinyint(1) unsigned NOT NULL default '0', PRIMARY KEY (`serial`) ); CREATE TABLE `uobjectmap` ( ! `serial` int(10) unsigned NOT NULL default '0', `type` varchar(80) NOT NULL default '', PRIMARY KEY (`serial`) |
From: Richard M. <dr...@us...> - 2004-07-02 06:27:40
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16790 Modified Files: world.cpp Log Message: Tweaks! Index: world.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** world.cpp 2 Jul 2004 06:01:19 -0000 1.102 --- world.cpp 2 Jul 2004 06:27:32 -0000 1.103 *************** *** 91,134 **** { { "guilds", "CREATE TABLE guilds ( \ ! serial unsigned int(11) NOT NULL default '0', \ name varchar(255) NOT NULL default '', \ abbreviation varchar(6) NOT NULL default '', \ charta LONGTEXT NOT NULL, \ website varchar(255) NOT NULL default 'http://www.wpdev.org', \ ! alignment int(2) NOT NULL default '0', \ ! leader unsigned int(11) NOT NULL default '0', \ founded int(11) NOT NULL default '0', \ ! guildstone unsigned int(11) NOT NULL default '0', \ PRIMARY KEY(serial) \ ! );" }, ! { "guilds_members", "CREATE TABLE guilds_members ( \ ! guild unsigned int(11) NOT NULL default '0', \ ! player unsigned int(11) NOT NULL default '0', \ ! showsign int(1) NOT NULL default '0', \ guildtitle varchar(255) NOT NULL default '', \ joined int(11) NOT NULL default '0', \ PRIMARY KEY(guild,player) \ ! );"}, { "guilds_canidates", "CREATE TABLE guilds_canidates ( \ ! guild unsigned int(11) NOT NULL default '0', \ ! player unsigned int(11) NOT NULL default '0', \ PRIMARY KEY(guild,player) \ ! );"}, { "settings", "CREATE TABLE settings ( \ option varchar(255) NOT NULL default '', \ value varchar(255) NOT NULL default '', \ PRIMARY KEY (option) \ ! );" }, { "characters", "CREATE TABLE characters (\ ! serial unsigned int(11) NOT NULL default '0',\ name varchar(255) default NULL,\ title varchar(255) default NULL,\ creationdate varchar(19) default NULL,\ ! body smallint(5) NOT NULL default '0',\ ! orgbody smallint(5) NOT NULL default '0',\ ! skin smallint(5) NOT NULL default '0',\ ! orgskin smallint(5) NOT NULL default '0',\ ! saycolor smallint(5) NOT NULL default '0',\ ! emotecolor smallint(5) NOT NULL default '0',\ strength smallint(6) NOT NULL default '0',\ strengthmod smallint(6) NOT NULL default '0',\ --- 91,134 ---- { { "guilds", "CREATE TABLE guilds ( \ ! serial unsigned int(10) NOT NULL default '0', \ name varchar(255) NOT NULL default '', \ abbreviation varchar(6) NOT NULL default '', \ charta LONGTEXT NOT NULL, \ website varchar(255) NOT NULL default 'http://www.wpdev.org', \ ! alignment tinyint(2) NOT NULL default '0', \ ! leader unsigned int(10) NOT NULL default '0', \ founded int(11) NOT NULL default '0', \ ! guildstone unsigned int(10) NOT NULL default '0', \ PRIMARY KEY(serial) \ ! );" }, ! { "guilds_members", "CREATE TABLE guilds_members ( \ ! guild unsigned int(10) NOT NULL default '0', \ ! player unsigned int(10) NOT NULL default '0', \ ! showsign unsigned tinyint(1) NOT NULL default '0', \ guildtitle varchar(255) NOT NULL default '', \ joined int(11) NOT NULL default '0', \ PRIMARY KEY(guild,player) \ ! );"}, { "guilds_canidates", "CREATE TABLE guilds_canidates ( \ ! guild unsigned int(10) NOT NULL default '0', \ ! player unsigned int(10) NOT NULL default '0', \ PRIMARY KEY(guild,player) \ ! );"}, { "settings", "CREATE TABLE settings ( \ option varchar(255) NOT NULL default '', \ value varchar(255) NOT NULL default '', \ PRIMARY KEY (option) \ ! );" }, { "characters", "CREATE TABLE characters (\ ! serial unsigned int(10) NOT NULL default '0',\ name varchar(255) default NULL,\ title varchar(255) default NULL,\ creationdate varchar(19) default NULL,\ ! body unsigned smallint(5) NOT NULL default '0',\ ! orgbody unsigned smallint(5) NOT NULL default '0',\ ! skin unsigned smallint(5) NOT NULL default '0',\ ! orgskin unsigned smallint(5) NOT NULL default '0',\ ! saycolor unsigned smallint(5) NOT NULL default '0',\ ! emotecolor unsigned smallint(5) NOT NULL default '0',\ strength smallint(6) NOT NULL default '0',\ strengthmod smallint(6) NOT NULL default '0',\ *************** *** 145,158 **** karma int(11) NOT NULL default '0',\ fame int(11) NOT NULL default '0',\ ! kills int(10) NOT NULL default '0',\ ! deaths int(10) NOT NULL default '0',\ ! hunger int(11) NOT NULL default '0',\ poison tinyint(2) NOT NULL default '-1',\ ! murderertime int(11) NOT NULL default '0',\ ! criminaltime int(11) NOT NULL default '0',\ ! gender tinyint(1) NOT NULL default '0',\ propertyflags int(11) NOT NULL default '0',\ ! murderer unsigned int(11) NOT NULL default '0',\ ! guarding unsigned int(11) NOT NULL default '0',\ hitpointsbonus smallint(6) NOT NULL default '0',\ staminabonus smallint(6) NOT NULL default '0',\ --- 145,158 ---- karma int(11) NOT NULL default '0',\ fame int(11) NOT NULL default '0',\ ! kills unsigned int(10) NOT NULL default '0',\ ! deaths unsigned int(10) NOT NULL default '0',\ ! hunger unsigned int(10) NOT NULL default '0',\ poison tinyint(2) NOT NULL default '-1',\ ! murderertime unsigned int(10) NOT NULL default '0',\ ! criminaltime unsigned int(10) NOT NULL default '0',\ ! gender unsigned tinyint(1) NOT NULL default '0',\ propertyflags int(11) NOT NULL default '0',\ ! murderer unsigned int(10) NOT NULL default '0',\ ! guarding unsigned int(10) NOT NULL default '0',\ hitpointsbonus smallint(6) NOT NULL default '0',\ staminabonus smallint(6) NOT NULL default '0',\ *************** *** 163,199 **** statcap tinyint(4) NOT NULL default '225',\ baseid varchar(64) NOT NULL default '',\ ! direction char(1) NOT NULL default '0',\ PRIMARY KEY (serial)\ ! );" }, { "corpses", "CREATE TABLE corpses (\ ! serial unsigned int(11) NOT NULL default '0',\ ! bodyid smallint(6) NOT NULL default '0',\ ! hairstyle smallint(6) NOT NULL default '0',\ ! haircolor smallint(6) NOT NULL default '0',\ ! beardstyle smallint(6) NOT NULL default '0',\ ! beardcolor smallint(6) NOT NULL default '0',\ ! direction char(1) NOT NULL default '0',\ charbaseid varchar(64) NOT NULL default '',\ ! murderer unsigned int(11) NOT NULL default '0',\ ! murdertime int(11) NOT NULL default '0',\ PRIMARY KEY (serial)\ ! );" }, { "corpses_equipment", "CREATE TABLE corpses_equipment (\ ! serial unsigned int(11) NOT NULL default '0',\ ! layer tinyint(3) NOT NULL default '0',\ ! item unsigned int(11) NOT NULL default '0', \ PRIMARY KEY (serial,layer)\ ! );" }, { "items", "CREATE TABLE items (\ ! serial unsigned int(11) NOT NULL default '0',\ ! id smallint(5) NOT NULL default '0',\ ! color smallint(5) NOT NULL default '0',\ ! cont unsigned int(11) NOT NULL default '0',\ ! layer tinyint(3) NOT NULL default '0',\ amount smallint(5) NOT NULL default '0',\ hp smallint(6) NOT NULL default '0',\ maxhp smallint(6) NOT NULL default '0',\ magic tinyint(3) NOT NULL default '0',\ ! owner unsigned int(11) NOT NULL default '0',\ visible tinyint(3) NOT NULL default '0',\ priv tinyint(3) NOT NULL default '0',\ --- 163,199 ---- statcap tinyint(4) NOT NULL default '225',\ baseid varchar(64) NOT NULL default '',\ ! direction unsigned tinyint(1) NOT NULL default '0',\ PRIMARY KEY (serial)\ ! );" }, { "corpses", "CREATE TABLE corpses (\ ! serial unsigned int(10) NOT NULL default '0',\ ! bodyid unsigned smallint(5) NOT NULL default '0',\ ! hairstyle unsigned smallint(5) NOT NULL default '0',\ ! haircolor unsigned smallint(5) NOT NULL default '0',\ ! beardstyle unsigned smallint(5) NOT NULL default '0',\ ! beardcolor unsigned smallint(5) NOT NULL default '0',\ ! direction unsigned tinyint(1) NOT NULL default '0',\ charbaseid varchar(64) NOT NULL default '',\ ! murderer unsigned int(10) NOT NULL default '0',\ ! murdertime unsigned int(10) NOT NULL default '0',\ PRIMARY KEY (serial)\ ! );" }, { "corpses_equipment", "CREATE TABLE corpses_equipment (\ ! serial unsigned int(10) NOT NULL default '0',\ ! layer unsigned tinyint(3) NOT NULL default '0',\ ! item unsigned int(10) NOT NULL default '0', \ PRIMARY KEY (serial,layer)\ ! );" }, { "items", "CREATE TABLE items (\ ! serial unsigned int(10) NOT NULL default '0',\ ! id unsigned smallint(5) NOT NULL default '0',\ ! color unsigned smallint(5) NOT NULL default '0',\ ! cont unsigned int(10) NOT NULL default '0',\ ! layer unsigned tinyint(3) NOT NULL default '0',\ amount smallint(5) NOT NULL default '0',\ hp smallint(6) NOT NULL default '0',\ maxhp smallint(6) NOT NULL default '0',\ magic tinyint(3) NOT NULL default '0',\ ! owner unsigned int(10) NOT NULL default '0',\ visible tinyint(3) NOT NULL default '0',\ priv tinyint(3) NOT NULL default '0',\ *************** *** 202,210 **** );" }, { "npcs", "CREATE TABLE npcs (\ ! serial unsigned int(11) NOT NULL default '0',\ summontime int(11) NOT NULL default '0',\ additionalflags int(11) NOT NULL default '0',\ ! owner unsigned int(11) NOT NULL default '0',\ ! stablemaster unsigned int(11) NOT NULL default '0',\ ai varchar(255) default NULL,\ wandertype smallint(3) NOT NULL default '0',\ --- 202,210 ---- );" }, { "npcs", "CREATE TABLE npcs (\ ! serial unsigned int(10) NOT NULL default '0',\ summontime int(11) NOT NULL default '0',\ additionalflags int(11) NOT NULL default '0',\ ! owner unsigned int(10) NOT NULL default '0',\ ! stablemaster unsigned int(10) NOT NULL default '0',\ ai varchar(255) default NULL,\ wandertype smallint(3) NOT NULL default '0',\ *************** *** 217,274 **** );" }, { "players", "CREATE TABLE players (\ ! serial unsigned int(11) NOT NULL default '0',\ ! account varchar(255) default NULL,\ ! additionalflags int(10) NOT NULL default '0',\ ! visualrange tinyint(3) NOT NULL default '0',\ profile longtext,\ ! fixedlight tinyint(3) NOT NULL default '0',\ ! strlock tinyint(4) NOT NULL default '0',\ ! dexlock tinyint(4) NOT NULL default '0',\ ! intlock tinyint(4) NOT NULL default '0',\ PRIMARY KEY (serial)\ ! );" }, { "skills", "CREATE TABLE skills (\ ! serial unsigned int(11) NOT NULL default '0',\ ! skill tinyint(3) NOT NULL default '0',\ value smallint(6) NOT NULL default '0',\ locktype tinyint(4) default '0',\ cap smallint(6) default '0',\ PRIMARY KEY (serial,skill)\ ! );" }, { "tags", "CREATE TABLE tags (\ ! serial unsigned int(11) NOT NULL default '0',\ name varchar(64) NOT NULL default '',\ type varchar(6) NOT NULL default '',\ value longtext NOT NULL,\ PRIMARY KEY (serial,name)\ ! );" }, { "uobject", "CREATE TABLE uobject (\ name varchar(255) default NULL,\ ! serial unsigned int(11) NOT NULL default '0',\ ! multis unsigned int(11) NOT NULL default '0',\ ! pos_x smallint(6) NOT NULL default '0',\ ! pos_y smallint(6) NOT NULL default '0',\ ! pos_z smallint(6) NOT NULL default '0',\ ! pos_map tinyint(4) NOT NULL default '0', \ events varchar(255) default NULL,\ ! havetags tinyint(1) NOT NULL default '0',\ PRIMARY KEY (serial)\ );" }, { "uobjectmap", "CREATE TABLE uobjectmap (\ ! serial unsigned int(11) NOT NULL default '0',\ type varchar(80) NOT NULL default '',\ PRIMARY KEY (serial)\ );" }, { "effects", "CREATE TABLE effects (\ ! id unsigned int(11) NOT NULL default '0',\ objectid varchar(64) NOT NULL,\ ! expiretime int(11) NOT NULL,\ dispellable tinyint(4) NOT NULL default '0',\ ! source unsigned int(11) NOT NULL default '0',\ ! destination unsigned int(11) NOT NULL default '0',\ PRIMARY KEY (id)\ );" }, { "effects_properties", "CREATE TABLE effects_properties (\ ! id unsigned int(11) NOT NULL default '0',\ keyname varchar(64) NOT NULL,\ type varchar(64) NOT NULL,\ --- 217,274 ---- );" }, { "players", "CREATE TABLE players (\ ! serial unsigned int(10) NOT NULL default '0',\ ! account varchar(16) default NULL,\ ! additionalflags int(10) NOT NULL default '0',\ ! visualrange unsigned tinyint(3) NOT NULL default '0',\ profile longtext,\ ! fixedlight unsigned tinyint(3) NOT NULL default '0',\ ! strlock tinyint(4) NOT NULL default '0',\ ! dexlock tinyint(4) NOT NULL default '0',\ ! intlock tinyint(4) NOT NULL default '0',\ PRIMARY KEY (serial)\ ! );" }, { "skills", "CREATE TABLE skills (\ ! serial unsigned int(10) NOT NULL default '0',\ ! skill unsigned tinyint(2) NOT NULL default '0',\ value smallint(6) NOT NULL default '0',\ locktype tinyint(4) default '0',\ cap smallint(6) default '0',\ PRIMARY KEY (serial,skill)\ ! );" }, { "tags", "CREATE TABLE tags (\ ! serial unsigned int(10) NOT NULL default '0',\ name varchar(64) NOT NULL default '',\ type varchar(6) NOT NULL default '',\ value longtext NOT NULL,\ PRIMARY KEY (serial,name)\ ! );" }, { "uobject", "CREATE TABLE uobject (\ name varchar(255) default NULL,\ ! serial unsigned int(10) NOT NULL default '0',\ ! multis unsigned int(10) NOT NULL default '0',\ ! pos_x unsigned smallint(5) NOT NULL default '0',\ ! pos_y unsigned smallint(5) NOT NULL default '0',\ ! pos_z tinyint(4) NOT NULL default '0',\ ! pos_map unsigned tinyint(1) NOT NULL default '0', \ events varchar(255) default NULL,\ ! havetags unsigned tinyint(1) NOT NULL default '0',\ PRIMARY KEY (serial)\ );" }, { "uobjectmap", "CREATE TABLE uobjectmap (\ ! serial unsigned int(10) NOT NULL default '0',\ type varchar(80) NOT NULL default '',\ PRIMARY KEY (serial)\ );" }, { "effects", "CREATE TABLE effects (\ ! id unsigned int(10) NOT NULL default '0',\ objectid varchar(64) NOT NULL,\ ! expiretime unsigned int(10) NOT NULL,\ dispellable tinyint(4) NOT NULL default '0',\ ! source unsigned int(10) NOT NULL default '0',\ ! destination unsigned int(10) NOT NULL default '0',\ PRIMARY KEY (id)\ );" }, { "effects_properties", "CREATE TABLE effects_properties (\ ! id unsigned int(10) NOT NULL default '0',\ keyname varchar(64) NOT NULL,\ type varchar(64) NOT NULL,\ *************** *** 278,282 **** { "spawnregions", "CREATE TABLE spawnregions (\ spawnregion varchar(64) NOT NULL,\ ! serial unsigned int(11) NOT NULL default '0',\ PRIMARY KEY (spawnregion, serial)\ );" }, --- 278,282 ---- { "spawnregions", "CREATE TABLE spawnregions (\ spawnregion varchar(64) NOT NULL,\ ! serial unsigned int(10) NOT NULL default '0',\ PRIMARY KEY (spawnregion, serial)\ );" }, |
From: Thiago A C. <thi...@us...> - 2004-07-02 06:02:35
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12447 Modified Files: coord.cpp corpse.cpp defines.h items.cpp targetrequest.h targetrequests.h world.cpp Log Message: Should fix some bugs related to loading items from inside containers introduced by the change in INVALID_SERIAL Index: targetrequests.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/targetrequests.h,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** targetrequests.h 10 Jun 2004 00:27:12 -0000 1.67 --- targetrequests.h 2 Jul 2004 06:01:18 -0000 1.68 *************** *** 608,612 **** } ! virtual bool responsed( cUOSocket* socket, cUORxTarget* target ) { if ( m_npc ) --- 608,612 ---- } ! virtual bool responsed( cUOSocket*, cUORxTarget* target ) { if ( m_npc ) Index: defines.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/defines.h,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** defines.h 14 Jun 2004 22:32:25 -0000 1.54 --- defines.h 2 Jul 2004 06:01:16 -0000 1.55 *************** *** 133,137 **** #define MY_CLOCKS_PER_SEC 1000 ! #define INVALID_SERIAL static_cast<unsigned int>(~0) #define CONN_MAIN 1 --- 133,137 ---- #define MY_CLOCKS_PER_SEC 1000 ! #define INVALID_SERIAL 0 #define CONN_MAIN 1 Index: targetrequest.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/targetrequest.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** targetrequest.h 2 Jun 2004 15:04:07 -0000 1.2 --- targetrequest.h 2 Jul 2004 06:01:18 -0000 1.3 *************** *** 57,61 **** The target request timed out after the given timeout. */ ! virtual void timedout( cUOSocket* socket ) { } --- 57,61 ---- The target request timed out after the given timeout. */ ! virtual void timedout( cUOSocket* ) { } *************** *** 64,68 **** The target request has been canceled by the client. */ ! virtual void canceled( cUOSocket* socket ) { } --- 64,68 ---- The target request has been canceled by the client. */ ! virtual void canceled( cUOSocket* ) { } Index: world.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** world.cpp 2 Jul 2004 00:52:55 -0000 1.101 --- world.cpp 2 Jul 2004 06:01:19 -0000 1.102 *************** *** 91,95 **** { { "guilds", "CREATE TABLE guilds ( \ ! serial int(11) unsigned NOT NULL default '0', \ name varchar(255) NOT NULL default '', \ abbreviation varchar(6) NOT NULL default '', \ --- 91,95 ---- { { "guilds", "CREATE TABLE guilds ( \ ! serial unsigned int(11) NOT NULL default '0', \ name varchar(255) NOT NULL default '', \ abbreviation varchar(6) NOT NULL default '', \ *************** *** 97,121 **** website varchar(255) NOT NULL default 'http://www.wpdev.org', \ alignment int(2) NOT NULL default '0', \ ! leader int(11) unsigned NOT NULL default '4294967295', \ founded int(11) NOT NULL default '0', \ ! guildstone int(11) unsigned NOT NULL default '4294967295', \ PRIMARY KEY(serial) \ ! );" }, { "guilds_members", "CREATE TABLE guilds_members ( \ ! guild int(11) unsigned NOT NULL default '0', \ ! player int(11) unsigned NOT NULL default '0', \ showsign int(1) NOT NULL default '0', \ guildtitle varchar(255) NOT NULL default '', \ joined int(11) NOT NULL default '0', \ PRIMARY KEY(guild,player) \ ! );"}, { "guilds_canidates", "CREATE TABLE guilds_canidates ( \ ! guild int(11) unsigned NOT NULL default '0', \ ! player int(11) unsigned NOT NULL default '0', \ PRIMARY KEY(guild,player) \ ! );"}, { "settings", "CREATE TABLE settings ( \ option varchar(255) NOT NULL default '', \ value varchar(255) NOT NULL default '', \ PRIMARY KEY (option) \ ! );" }, { "characters", "CREATE TABLE characters (\ ! serial int(11) unsigned NOT NULL default '0',\ name varchar(255) default NULL,\ title varchar(255) default NULL,\ --- 97,125 ---- website varchar(255) NOT NULL default 'http://www.wpdev.org', \ alignment int(2) NOT NULL default '0', \ ! leader unsigned int(11) NOT NULL default '0', \ founded int(11) NOT NULL default '0', \ ! guildstone unsigned int(11) NOT NULL default '0', \ PRIMARY KEY(serial) \ ! );" }, ! { "guilds_members", "CREATE TABLE guilds_members ( \ ! guild unsigned int(11) NOT NULL default '0', \ ! player unsigned int(11) NOT NULL default '0', \ showsign int(1) NOT NULL default '0', \ guildtitle varchar(255) NOT NULL default '', \ joined int(11) NOT NULL default '0', \ PRIMARY KEY(guild,player) \ ! );"}, ! { "guilds_canidates", "CREATE TABLE guilds_canidates ( \ ! guild unsigned int(11) NOT NULL default '0', \ ! player unsigned int(11) NOT NULL default '0', \ PRIMARY KEY(guild,player) \ ! );"}, ! { "settings", "CREATE TABLE settings ( \ option varchar(255) NOT NULL default '', \ value varchar(255) NOT NULL default '', \ PRIMARY KEY (option) \ ! );" }, ! { "characters", "CREATE TABLE characters (\ ! serial unsigned int(11) NOT NULL default '0',\ name varchar(255) default NULL,\ title varchar(255) default NULL,\ *************** *** 149,154 **** gender tinyint(1) NOT NULL default '0',\ propertyflags int(11) NOT NULL default '0',\ ! murderer int(11) unsigned NOT NULL default '4294967295',\ ! guarding int(11) unsigned NOT NULL default '4294967295',\ hitpointsbonus smallint(6) NOT NULL default '0',\ staminabonus smallint(6) NOT NULL default '0',\ --- 153,158 ---- gender tinyint(1) NOT NULL default '0',\ propertyflags int(11) NOT NULL default '0',\ ! murderer unsigned int(11) NOT NULL default '0',\ ! guarding unsigned int(11) NOT NULL default '0',\ hitpointsbonus smallint(6) NOT NULL default '0',\ staminabonus smallint(6) NOT NULL default '0',\ *************** *** 161,166 **** direction char(1) NOT NULL default '0',\ PRIMARY KEY (serial)\ ! );" }, { "corpses", "CREATE TABLE corpses (\ ! serial int(11) unsigned NOT NULL default '0',\ bodyid smallint(6) NOT NULL default '0',\ hairstyle smallint(6) NOT NULL default '0',\ --- 165,171 ---- direction char(1) NOT NULL default '0',\ PRIMARY KEY (serial)\ ! );" }, ! { "corpses", "CREATE TABLE corpses (\ ! serial unsigned int(11) NOT NULL default '0',\ bodyid smallint(6) NOT NULL default '0',\ hairstyle smallint(6) NOT NULL default '0',\ *************** *** 170,186 **** direction char(1) NOT NULL default '0',\ charbaseid varchar(64) NOT NULL default '',\ ! murderer int(11) unsigned NOT NULL default '4294967295',\ murdertime int(11) NOT NULL default '0',\ PRIMARY KEY (serial)\ ! );" }, { "corpses_equipment", "CREATE TABLE corpses_equipment (\ ! serial int(11) unsigned NOT NULL default '0',\ layer tinyint(3) NOT NULL default '0',\ ! item int(11) unsigned NOT NULL default '4294967295', \ PRIMARY KEY (serial,layer)\ ! );" }, { "items", "CREATE TABLE items (\ ! serial int(11) unsigned NOT NULL default '0',\ id smallint(5) NOT NULL default '0',\ color smallint(5) NOT NULL default '0',\ ! cont int(11) NOT NULL default '-1',\ layer tinyint(3) NOT NULL default '0',\ amount smallint(5) NOT NULL default '0',\ --- 175,193 ---- direction char(1) NOT NULL default '0',\ charbaseid varchar(64) NOT NULL default '',\ ! murderer unsigned int(11) NOT NULL default '0',\ murdertime int(11) NOT NULL default '0',\ PRIMARY KEY (serial)\ ! );" }, ! { "corpses_equipment", "CREATE TABLE corpses_equipment (\ ! serial unsigned int(11) NOT NULL default '0',\ layer tinyint(3) NOT NULL default '0',\ ! item unsigned int(11) NOT NULL default '0', \ PRIMARY KEY (serial,layer)\ ! );" }, ! { "items", "CREATE TABLE items (\ ! serial unsigned int(11) NOT NULL default '0',\ id smallint(5) NOT NULL default '0',\ color smallint(5) NOT NULL default '0',\ ! cont unsigned int(11) NOT NULL default '0',\ layer tinyint(3) NOT NULL default '0',\ amount smallint(5) NOT NULL default '0',\ *************** *** 188,202 **** maxhp smallint(6) NOT NULL default '0',\ magic tinyint(3) NOT NULL default '0',\ ! owner int(11) unsigned NOT NULL default '4294967295',\ visible tinyint(3) NOT NULL default '0',\ priv tinyint(3) NOT NULL default '0',\ baseid varchar(64) NOT NULL default '',\ PRIMARY KEY (serial)\ ! );" }, { "npcs", "CREATE TABLE npcs (\ ! serial int(11) unsigned NOT NULL default '0',\ summontime int(11) NOT NULL default '0',\ additionalflags int(11) NOT NULL default '0',\ ! owner int(11) unsigned NOT NULL default '4294967295',\ ! stablemaster int(11) unsigned NOT NULL default '4294967295',\ ai varchar(255) default NULL,\ wandertype smallint(3) NOT NULL default '0',\ --- 195,210 ---- maxhp smallint(6) NOT NULL default '0',\ magic tinyint(3) NOT NULL default '0',\ ! owner unsigned int(11) NOT NULL default '0',\ visible tinyint(3) NOT NULL default '0',\ priv tinyint(3) NOT NULL default '0',\ baseid varchar(64) NOT NULL default '',\ PRIMARY KEY (serial)\ ! );" }, ! { "npcs", "CREATE TABLE npcs (\ ! serial unsigned int(11) NOT NULL default '0',\ summontime int(11) NOT NULL default '0',\ additionalflags int(11) NOT NULL default '0',\ ! owner unsigned int(11) NOT NULL default '0',\ ! stablemaster unsigned int(11) NOT NULL default '0',\ ai varchar(255) default NULL,\ wandertype smallint(3) NOT NULL default '0',\ *************** *** 207,212 **** wanderradius smallint(6) NOT NULL default '0',\ PRIMARY KEY (serial)\ ! );" }, { "players", "CREATE TABLE players (\ ! serial int(11) unsigned NOT NULL default '0',\ account varchar(255) default NULL,\ additionalflags int(10) NOT NULL default '0',\ --- 215,221 ---- wanderradius smallint(6) NOT NULL default '0',\ PRIMARY KEY (serial)\ ! );" }, ! { "players", "CREATE TABLE players (\ ! serial unsigned int(11) NOT NULL default '0',\ account varchar(255) default NULL,\ additionalflags int(10) NOT NULL default '0',\ *************** *** 218,223 **** intlock tinyint(4) NOT NULL default '0',\ PRIMARY KEY (serial)\ ! );" }, { "skills", "CREATE TABLE skills (\ ! serial int(11) unsigned NOT NULL default '0',\ skill tinyint(3) NOT NULL default '0',\ value smallint(6) NOT NULL default '0',\ --- 227,233 ---- intlock tinyint(4) NOT NULL default '0',\ PRIMARY KEY (serial)\ ! );" }, ! { "skills", "CREATE TABLE skills (\ ! serial unsigned int(11) NOT NULL default '0',\ skill tinyint(3) NOT NULL default '0',\ value smallint(6) NOT NULL default '0',\ *************** *** 225,238 **** cap smallint(6) default '0',\ PRIMARY KEY (serial,skill)\ ! );" }, { "tags", "CREATE TABLE tags (\ ! serial int(11) unsigned NOT NULL default '0',\ name varchar(64) NOT NULL default '',\ type varchar(6) NOT NULL default '',\ value longtext NOT NULL,\ PRIMARY KEY (serial,name)\ ! );" }, { "uobject", "CREATE TABLE uobject (\ name varchar(255) default NULL,\ ! serial int(11) unsigned NOT NULL default '0',\ ! multis int(11) unsigned NOT NULL default '4294967295',\ pos_x smallint(6) NOT NULL default '0',\ pos_y smallint(6) NOT NULL default '0',\ --- 235,250 ---- cap smallint(6) default '0',\ PRIMARY KEY (serial,skill)\ ! );" }, ! { "tags", "CREATE TABLE tags (\ ! serial unsigned int(11) NOT NULL default '0',\ name varchar(64) NOT NULL default '',\ type varchar(6) NOT NULL default '',\ value longtext NOT NULL,\ PRIMARY KEY (serial,name)\ ! );" }, ! { "uobject", "CREATE TABLE uobject (\ name varchar(255) default NULL,\ ! serial unsigned int(11) NOT NULL default '0',\ ! multis unsigned int(11) NOT NULL default '0',\ pos_x smallint(6) NOT NULL default '0',\ pos_y smallint(6) NOT NULL default '0',\ *************** *** 242,268 **** havetags tinyint(1) NOT NULL default '0',\ PRIMARY KEY (serial)\ ! );" }, { "uobjectmap", "CREATE TABLE uobjectmap (\ ! serial int(11) unsigned NOT NULL default '0',\ type varchar(80) NOT NULL default '',\ PRIMARY KEY (serial)\ ! );" }, { "effects", "CREATE TABLE effects (\ ! id int(11) unsigned NOT NULL default '0',\ objectid varchar(64) NOT NULL,\ expiretime int(11) NOT NULL,\ dispellable tinyint(4) NOT NULL default '0',\ ! source int(11) unsigned NOT NULL default '4294967295',\ ! destination int(11) unsigned NOT NULL default '4294967295',\ PRIMARY KEY (id)\ ! );" }, { "effects_properties", "CREATE TABLE effects_properties (\ ! id int(11) unsigned NOT NULL default '0',\ keyname varchar(64) NOT NULL,\ type varchar(64) NOT NULL,\ value text NOT NULL,\ PRIMARY KEY (id,keyname)\ ! );" }, { "spawnregions", "CREATE TABLE spawnregions (\ spawnregion varchar(64) NOT NULL,\ ! serial int(11) unsigned NOT NULL default '0',\ PRIMARY KEY (spawnregion, serial)\ ! );" }, { NULL, NULL } }; --- 254,285 ---- havetags tinyint(1) NOT NULL default '0',\ PRIMARY KEY (serial)\ ! );" }, ! { "uobjectmap", "CREATE TABLE uobjectmap (\ ! serial unsigned int(11) NOT NULL default '0',\ type varchar(80) NOT NULL default '',\ PRIMARY KEY (serial)\ ! );" }, ! { "effects", "CREATE TABLE effects (\ ! id unsigned int(11) NOT NULL default '0',\ objectid varchar(64) NOT NULL,\ expiretime int(11) NOT NULL,\ dispellable tinyint(4) NOT NULL default '0',\ ! source unsigned int(11) NOT NULL default '0',\ ! destination unsigned int(11) NOT NULL default '0',\ PRIMARY KEY (id)\ ! );" }, ! { "effects_properties", "CREATE TABLE effects_properties (\ ! id unsigned int(11) NOT NULL default '0',\ keyname varchar(64) NOT NULL,\ type varchar(64) NOT NULL,\ value text NOT NULL,\ PRIMARY KEY (id,keyname)\ ! );" }, ! { "spawnregions", "CREATE TABLE spawnregions (\ spawnregion varchar(64) NOT NULL,\ ! serial unsigned int(11) NOT NULL default '0',\ PRIMARY KEY (spawnregion, serial)\ ! );" }, ! { NULL, NULL } }; Index: coord.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/coord.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** coord.cpp 19 Jun 2004 07:37:53 -0000 1.48 --- coord.cpp 2 Jul 2004 06:01:15 -0000 1.49 *************** *** 780,784 **** map_st map1, map2; - SI32 j; bool posHigherThanMap; --- 780,783 ---- Index: items.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v retrieving revision 1.420 retrieving revision 1.421 diff -C2 -d -r1.420 -r1.421 *** items.cpp 15 Jun 2004 02:44:44 -0000 1.420 --- items.cpp 2 Jul 2004 06:01:16 -0000 1.421 *************** *** 479,483 **** color. */ ! static int ContainerCountItems( const int serial, short id, short color ) { int total = 0; --- 479,483 ---- color. */ ! static int ContainerCountItems( SERIAL serial, short id, short color ) { int total = 0; Index: corpse.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/corpse.cpp,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** corpse.cpp 2 Jun 2004 15:04:04 -0000 1.55 --- corpse.cpp 2 Jul 2004 06:01:16 -0000 1.56 *************** *** 323,328 **** else SET_STR_PROPERTY( "charbaseid", charbaseid_ ) ! else ! return cItem::setProperty( name, value ); } --- 323,328 ---- else SET_STR_PROPERTY( "charbaseid", charbaseid_ ) ! ! return cItem::setProperty( name, value ); } |
From: Thiago A C. <thi...@us...> - 2004-07-02 06:01:42
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12447/python Modified Files: global.cpp tempeffect.h Log Message: Should fix some bugs related to loading items from inside containers introduced by the change in INVALID_SERIAL Index: global.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/global.cpp,v retrieving revision 1.135 retrieving revision 1.136 diff -C2 -d -r1.135 -r1.136 *** global.cpp 29 Jun 2004 11:36:41 -0000 1.135 --- global.cpp 2 Jul 2004 06:01:32 -0000 1.136 *************** *** 1664,1669 **** { "callevent", wpCallEvent, METH_VARARGS, "Call an event in a script and return the result." }, { "hasevent", wpHasEvent, METH_VARARGS, "If the given script has the given event. Return true." }, ! { "callnamedevent", wpCallEvent, METH_VARARGS, "Call an event in a script and return the result." }, ! { "hasnamedevent", wpHasEvent, METH_VARARGS, "If the given script has the given event. Return true." }, { "getdefinition", wpGetDefinition, METH_VARARGS, "Gets a certain definition by it's id." }, { "getdefinitions", wpGetDefinitions, METH_VARARGS, "Gets all definitions by type." }, --- 1664,1669 ---- { "callevent", wpCallEvent, METH_VARARGS, "Call an event in a script and return the result." }, { "hasevent", wpHasEvent, METH_VARARGS, "If the given script has the given event. Return true." }, ! { "callnamedevent", wpCallNamedEvent, METH_VARARGS, "Call an event in a script and return the result." }, ! { "hasnamedevent", wpHasNamedEvent, METH_VARARGS, "If the given script has the given event. Return true." }, { "getdefinition", wpGetDefinition, METH_VARARGS, "Gets a certain definition by it's id." }, { "getdefinitions", wpGetDefinitions, METH_VARARGS, "Gets all definitions by type." }, *************** *** 2170,2173 **** --- 2170,2174 ---- static PyObject* wpDriver( PyObject* self, PyObject* args ) { + Q_UNUSED(self); Q_UNUSED( args ); unsigned int database; Index: tempeffect.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/tempeffect.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** tempeffect.h 2 Jun 2004 19:13:14 -0000 1.22 --- tempeffect.h 2 Jul 2004 06:01:33 -0000 1.23 *************** *** 80,84 **** } ! void Dispel( P_CHAR pSource, bool silent ) { // We will ignore silent here. --- 80,84 ---- } ! void Dispel( P_CHAR pSource, bool /*silent*/ ) { // We will ignore silent here. |
From: Thiago A C. <thi...@us...> - 2004-07-02 06:01:41
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12447/network Modified Files: uorxpackets.h uotxpackets.h Log Message: Should fix some bugs related to loading items from inside containers introduced by the change in INVALID_SERIAL Index: uorxpackets.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uorxpackets.h,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** uorxpackets.h 1 Jul 2004 20:07:07 -0000 1.63 --- uorxpackets.h 2 Jul 2004 06:01:21 -0000 1.64 *************** *** 1209,1212 **** --- 1209,1213 ---- { } + uint serial() const { *************** *** 1228,1241 **** // 0x98 AllNames ! class cUORxAllNames : public cUOPacket { public: ! cUORxAllNames(const QByteArray &data) : cUOPacket( data ) { } ! unsigned int serial() { return getInt(3); } ! const QString &name() { return getAsciiString(7); } --- 1229,1246 ---- // 0x98 AllNames ! class cUORxAllNames : public cUOPacket ! { public: ! cUORxAllNames(const QByteArray &data) : cUOPacket( data ) ! { } ! unsigned int serial() ! { return getInt(3); } ! const QString name() ! { return getAsciiString(7); } Index: uotxpackets.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uotxpackets.h,v retrieving revision 1.109 retrieving revision 1.110 diff -C2 -d -r1.109 -r1.110 *** uotxpackets.h 1 Jul 2004 20:07:08 -0000 1.109 --- uotxpackets.h 2 Jul 2004 06:01:31 -0000 1.110 *************** *** 2365,2369 **** setShort( 10, 0 ); setInt( 12, 0xFF ); ! ( *this )[16] = 0xFF; } void setSerial( unsigned int data ) --- 2365,2369 ---- setShort( 10, 0 ); setInt( 12, 0xFF ); ! ( *this )[16] = static_cast<uchar>(0xFF); } void setSerial( unsigned int data ) |
From: Richard M. <dr...@us...> - 2004-07-02 00:53:41
|
Update of /cvsroot/wpdev/xmlscripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv913 Modified Files: wolfpack.sql Log Message: Changes to resolve an unsigned int issue with serials. Index: wolfpack.sql =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/wolfpack.sql,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** wolfpack.sql 8 Jun 2004 20:33:02 -0000 1.52 --- wolfpack.sql 2 Jul 2004 00:53:25 -0000 1.53 *************** *** 1,20 **** - CREATE TABLE `settings` ( - `option` varchar(255) NOT NULL default '', - `value` varchar(255) NOT NULL default '', - PRIMARY KEY (`option`) - ); - CREATE TABLE `characters` ( ! `serial` int(11) NOT NULL default '0', `name` varchar(255) default NULL, `title` varchar(255) default NULL, `creationdate` varchar(19) default NULL, ! `body` smallint(5) NOT NULL default '0', ! `orgbody` smallint(5) NOT NULL default '0', ! `skin` smallint(5) NOT NULL default '0', ! `orgskin` smallint(5) NOT NULL default '0', ! `saycolor` smallint(5) NOT NULL default '0', ! `emotecolor` smallint(5) NOT NULL default '0', `strength` smallint(6) NOT NULL default '0', `strengthmod` smallint(6) NOT NULL default '0', --- 1,14 ---- CREATE TABLE `characters` ( ! `serial` int(11) unsigned NOT NULL default '0', `name` varchar(255) default NULL, `title` varchar(255) default NULL, `creationdate` varchar(19) default NULL, ! `body` smallint(5) NOT NULL default '0', ! `orgbody` smallint(5) NOT NULL default '0', ! `skin` smallint(5) NOT NULL default '0', ! `orgskin` smallint(5) NOT NULL default '0', ! `saycolor` smallint(5) NOT NULL default '0', ! `emotecolor` smallint(5) NOT NULL default '0', `strength` smallint(6) NOT NULL default '0', `strengthmod` smallint(6) NOT NULL default '0', *************** *** 31,100 **** `karma` int(11) NOT NULL default '0', `fame` int(11) NOT NULL default '0', ! `kills` int(10) NOT NULL default '0', ! `deaths` int(10) NOT NULL default '0', `hunger` int(11) NOT NULL default '0', `poison` tinyint(2) NOT NULL default '-1', ! `murderertime` int(11) NOT NULL default '0', ! `criminaltime` int(11) NOT NULL default '0', ! `gender` tinyint(1) NOT NULL default '0', ! `propertyflags` int(11) NOT NULL default '0', ! `murderer` int(11) NOT NULL default '-1', ! `guarding` int(11) NOT NULL default '-1', `hitpointsbonus` smallint(6) NOT NULL default '0', `staminabonus` smallint(6) NOT NULL default '0', `manabonus` smallint(6) NOT NULL default '0', ! `strcap` tinyint(4) NOT NULL default '125', ! `dexcap` tinyint(4) NOT NULL default '125', ! `intcap` tinyint(4) NOT NULL default '125', ! `statcap` tinyint(4) NOT NULL default '225', `baseid` varchar(64) NOT NULL default '', `direction` char(1) NOT NULL default '0', ! PRIMARY KEY (`serial`) ); CREATE TABLE `corpses` ( ! `serial` int(11) NOT NULL default '0', ! `bodyid` smallint(6) NOT NULL default '0', ! `hairstyle` smallint(6) NOT NULL default '0', ! `haircolor` smallint(6) NOT NULL default '0', ! `beardstyle` smallint(6) NOT NULL default '0', ! `beardcolor` smallint(6) NOT NULL default '0', `direction` char(1) NOT NULL default '0', `charbaseid` varchar(64) NOT NULL default '', ! `murderer` int(11) NOT NULL default '-1', `murdertime` int(11) NOT NULL default '0', ! PRIMARY KEY (`serial`) ); CREATE TABLE `corpses_equipment` ( ! `serial` int(11) NOT NULL default '0', ! `layer` tinyint(3) NOT NULL default '0', ! `item` int(11) NOT NULL default '-1', ! PRIMARY KEY (`serial`,`layer`) ); CREATE TABLE `items` ( ! `serial` int(11) NOT NULL default '0', ! `id` smallint(5) NOT NULL default '0', ! `color` smallint(5) NOT NULL default '0', ! `cont` int(11) NOT NULL default '-1', ! `layer` tinyint(3) NOT NULL default '0', ! `amount` smallint(5) NOT NULL default '0', `hp` smallint(6) NOT NULL default '0', `maxhp` smallint(6) NOT NULL default '0', ! `magic` tinyint(3) NOT NULL default '0', ! `owner` int(11) NOT NULL default '-1', ! `visible` tinyint(3) NOT NULL default '0', ! `priv` tinyint(3) NOT NULL default '0', `baseid` varchar(64) NOT NULL default '', ! PRIMARY KEY (`serial`) ); CREATE TABLE `npcs` ( ! `serial` int(11) NOT NULL default '0', ! `summontime` int(11) NOT NULL default '0', ! `additionalflags` int(11) NOT NULL default '0', ! `owner` int(11) NOT NULL default '-1', ! `stablemaster` int(11) NOT NULL default '-1', `ai` varchar(255) default NULL, `wandertype` smallint(3) NOT NULL default '0', --- 25,140 ---- `karma` int(11) NOT NULL default '0', `fame` int(11) NOT NULL default '0', ! `kills` int(10) NOT NULL default '0', ! `deaths` int(10) NOT NULL default '0', `hunger` int(11) NOT NULL default '0', `poison` tinyint(2) NOT NULL default '-1', ! `murderertime` int(11) NOT NULL default '0', ! `criminaltime` int(11) NOT NULL default '0', ! `gender` tinyint(1) NOT NULL default '0', ! `propertyflags` int(11) NOT NULL default '0', ! `murderer` int(11) unsigned NOT NULL default '4294967295', ! `guarding` int(11) unsigned NOT NULL default '4294967295', `hitpointsbonus` smallint(6) NOT NULL default '0', `staminabonus` smallint(6) NOT NULL default '0', `manabonus` smallint(6) NOT NULL default '0', ! `strcap` tinyint(4) NOT NULL default '125', ! `dexcap` tinyint(4) NOT NULL default '125', ! `intcap` tinyint(4) NOT NULL default '125', ! `statcap` tinyint(4) NOT NULL default '127', `baseid` varchar(64) NOT NULL default '', `direction` char(1) NOT NULL default '0', ! PRIMARY KEY (`serial`) ); CREATE TABLE `corpses` ( ! `serial` int(11) unsigned NOT NULL default '0', ! `bodyid` smallint(6) NOT NULL default '0', ! `hairstyle` smallint(6) NOT NULL default '0', ! `haircolor` smallint(6) NOT NULL default '0', ! `beardstyle` smallint(6) NOT NULL default '0', ! `beardcolor` smallint(6) NOT NULL default '0', `direction` char(1) NOT NULL default '0', `charbaseid` varchar(64) NOT NULL default '', ! `murderer` int(11) unsigned NOT NULL default '4294967295', `murdertime` int(11) NOT NULL default '0', ! PRIMARY KEY (`serial`) ); CREATE TABLE `corpses_equipment` ( ! `serial` int(11) unsigned NOT NULL default '0', ! `layer` tinyint(3) NOT NULL default '0', ! `item` int(11) unsigned NOT NULL default '4294967295', ! PRIMARY KEY (`serial`,`layer`) ! ); ! ! CREATE TABLE `effects` ( ! `id` int(11) unsigned NOT NULL default '0', ! `objectid` varchar(64) NOT NULL default '', ! `expiretime` int(11) NOT NULL default '0', ! `dispellable` tinyint(4) NOT NULL default '0', ! `source` int(11) unsigned NOT NULL default '4294967295', ! `destination` int(11) unsigned NOT NULL default '4294967295', ! PRIMARY KEY (`id`) ! ); ! ! CREATE TABLE `effects_properties` ( ! `id` int(11) NOT NULL default '0', ! `keyname` varchar(64) NOT NULL default '', ! `type` varchar(64) NOT NULL default '', ! `value` text NOT NULL, ! PRIMARY KEY (`id`,`keyname`) ! ); ! ! CREATE TABLE `guilds` ( ! `serial` int(11) unsigned NOT NULL default '0', ! `name` varchar(255) NOT NULL default '', ! `abbreviation` varchar(6) NOT NULL default '', ! `charta` longtext NOT NULL, ! `website` varchar(255) NOT NULL default 'http://www.wpdev.org', ! `alignment` int(2) NOT NULL default '0', ! `leader` int(11) unsigned NOT NULL default '4294967295', ! `founded` int(11) NOT NULL default '0', ! `guildstone` int(11) unsigned NOT NULL default '4294967295', ! PRIMARY KEY (`serial`) ! ); ! ! CREATE TABLE `guilds_canidates` ( ! `guild` int(11) unsigned NOT NULL default '0', ! `player` int(11) unsigned NOT NULL default '0', ! PRIMARY KEY (`guild`,`player`) ! ); ! ! CREATE TABLE `guilds_members` ( ! `guild` int(11) unsigned NOT NULL default '0', ! `player` int(11) unsigned NOT NULL default '0', ! `showsign` int(1) NOT NULL default '0', ! `guildtitle` varchar(255) NOT NULL default '', ! `joined` int(11) NOT NULL default '0', ! PRIMARY KEY (`guild`,`player`) ); CREATE TABLE `items` ( ! `serial` int(11) unsigned NOT NULL default '0', ! `id` smallint(5) NOT NULL default '0', ! `color` smallint(5) NOT NULL default '0', ! `cont` int(11) unsigned NOT NULL default '4294967295', ! `layer` tinyint(3) NOT NULL default '0', ! `amount` smallint(5) NOT NULL default '0', `hp` smallint(6) NOT NULL default '0', `maxhp` smallint(6) NOT NULL default '0', ! `magic` tinyint(3) NOT NULL default '0', ! `owner` int(11) unsigned NOT NULL default '4294967295', ! `visible` tinyint(3) NOT NULL default '0', ! `priv` tinyint(3) NOT NULL default '0', `baseid` varchar(64) NOT NULL default '', ! PRIMARY KEY (`serial`) ); CREATE TABLE `npcs` ( ! `serial` int(11) unsigned NOT NULL default '0', ! `summontime` int(11) NOT NULL default '0', ! `additionalflags` int(11) NOT NULL default '0', ! `owner` int(11) unsigned NOT NULL default '4294967295', ! `stablemaster` int(11) unsigned NOT NULL default '4294967295', `ai` varchar(255) default NULL, `wandertype` smallint(3) NOT NULL default '0', *************** *** 104,208 **** `wandery2` smallint(6) NOT NULL default '0', `wanderradius` smallint(6) NOT NULL default '0', ! PRIMARY KEY (`serial`) ); CREATE TABLE `players` ( ! `serial` int(11) NOT NULL default '0', `account` varchar(255) default NULL, ! `additionalflags` int(10) NOT NULL default '0', ! `visualrange` tinyint(3) NOT NULL default '0', `profile` longtext, ! `fixedlight` tinyint(3) NOT NULL default '0', ! `strlock` tinyint(4) NOT NULL default '0', ! `dexlock` tinyint(4) NOT NULL default '0', ! `intlock` tinyint(4) NOT NULL default '0', ! PRIMARY KEY (`serial`) ); CREATE TABLE `skills` ( ! `serial` int(11) NOT NULL default '0', ! `skill` tinyint(3) NOT NULL default '0', `value` smallint(6) NOT NULL default '0', `locktype` tinyint(4) default '0', `cap` smallint(6) default '0', ! PRIMARY KEY (`serial`,`skill`) ); CREATE TABLE `tags` ( ! `serial` int(11) NOT NULL default '0', `name` varchar(64) NOT NULL default '', `type` varchar(6) NOT NULL default '', `value` longtext NOT NULL, ! PRIMARY KEY (`serial`,`name`) ); CREATE TABLE `uobject` ( `name` varchar(255) default NULL, ! `serial` int(11) NOT NULL default '0', ! `multis` int(11) NOT NULL default '-1', ! `pos_x` smallint(6) NOT NULL default '0', ! `pos_y` smallint(6) NOT NULL default '0', `pos_z` smallint(6) NOT NULL default '0', `pos_map` tinyint(4) NOT NULL default '0', `events` varchar(255) default NULL, `havetags` tinyint(1) NOT NULL default '0', ! PRIMARY KEY (`serial`) ); CREATE TABLE `uobjectmap` ( ! `serial` int(11) NOT NULL default '0', ! `type` varchar(80) NOT NULL default '', ! PRIMARY KEY (`serial`) ! ); ! ! CREATE TABLE `effects` ( ! `id` int(11) NOT NULL default '0', ! `objectid` varchar(64) NOT NULL default '', ! `expiretime` int(11) NOT NULL default '0', ! `dispellable` tinyint(4) NOT NULL default '0', ! `source` int(11) NOT NULL default '-1', ! `destination` int(11) NOT NULL default '-1', ! PRIMARY KEY (`id`) ! ); ! ! CREATE TABLE `effects_properties` ( ! `id` int(11) NOT NULL default '0', ! `keyname` varchar(64) NOT NULL default '', ! `type` varchar(64) NOT NULL default '', ! `value` text NOT NULL, ! PRIMARY KEY (`id`,`keyname`) ! ); ! ! CREATE TABLE `guilds` ( ! `serial` int(11) NOT NULL default '0', ! `name` varchar(255) NOT NULL default '', ! `abbreviation` varchar(6) NOT NULL default '', ! `charta` LONGTEXT NOT NULL, ! `website` varchar(255) NOT NULL default 'http://www.wpdev.org', ! `alignment` int(2) NOT NULL default '0', ! `leader` int(11) NOT NULL default '-1', ! `founded` int(11) NOT NULL default '0', ! `guildstone` int(11) NOT NULL default '-1', ! PRIMARY KEY(`serial`) ! ); ! ! CREATE TABLE `guilds_members` ( ! `guild` int(11) NOT NULL default '0', ! `player` int(11) NOT NULL default '0', ! `showsign` int(1) NOT NULL default '0', ! `guildtitle` varchar(255) NOT NULL default '', ! `joined` int(11) NOT NULL default '0', ! PRIMARY KEY(`guild`,`player`) ! ); ! ! CREATE TABLE `guilds_canidates` ( ! `guild` int(11) NOT NULL default '0', ! `player` int(11) NOT NULL default '0', ! PRIMARY KEY(`guild`,`player`) ! ); ! ! CREATE TABLE `spawnregions` ( ! `spawnregion` varchar(64) NOT NULL, ! `serial` int(11) NOT NULL default '0', ! PRIMARY KEY (`spawnregion`, `serial`) ); --- 144,209 ---- `wandery2` smallint(6) NOT NULL default '0', `wanderradius` smallint(6) NOT NULL default '0', ! PRIMARY KEY (`serial`) ); CREATE TABLE `players` ( ! `serial` int(11) unsigned NOT NULL default '0', `account` varchar(255) default NULL, ! `additionalflags` int(10) NOT NULL default '0', ! `visualrange` tinyint(3) NOT NULL default '0', `profile` longtext, ! `fixedlight` tinyint(3) NOT NULL default '0', ! `strlock` tinyint(4) NOT NULL default '0', ! `dexlock` tinyint(4) NOT NULL default '0', ! `intlock` tinyint(4) NOT NULL default '0', ! PRIMARY KEY (`serial`) ! ); ! ! CREATE TABLE `settings` ( ! `option` varchar(255) NOT NULL default '', ! `value` varchar(255) NOT NULL default '', ! PRIMARY KEY (`option`) ); CREATE TABLE `skills` ( ! `serial` int(11) unsigned NOT NULL default '0', ! `skill` tinyint(3) NOT NULL default '0', `value` smallint(6) NOT NULL default '0', `locktype` tinyint(4) default '0', `cap` smallint(6) default '0', ! PRIMARY KEY (`serial`,`skill`) ! ); ! ! ! CREATE TABLE `spawnregions` ( ! `spawnregion` varchar(64) NOT NULL default '', ! `serial` int(11) unsigned NOT NULL default '0', ! PRIMARY KEY (`spawnregion`,`serial`) ); CREATE TABLE `tags` ( ! `serial` int(11) unsigned NOT NULL default '0', `name` varchar(64) NOT NULL default '', `type` varchar(6) NOT NULL default '', `value` longtext NOT NULL, ! PRIMARY KEY (`serial`,`name`) ); CREATE TABLE `uobject` ( `name` varchar(255) default NULL, ! `serial` int(11) unsigned NOT NULL default '0', ! `multis` int(11) unsigned NOT NULL default '4294967295', ! `pos_x` smallint(6) NOT NULL default '0', ! `pos_y` smallint(6) NOT NULL default '0', `pos_z` smallint(6) NOT NULL default '0', `pos_map` tinyint(4) NOT NULL default '0', `events` varchar(255) default NULL, `havetags` tinyint(1) NOT NULL default '0', ! PRIMARY KEY (`serial`) ); CREATE TABLE `uobjectmap` ( ! `serial` int(11) unsigned NOT NULL default '0', ! `type` varchar(80) NOT NULL default '', ! PRIMARY KEY (`serial`) ); |
From: Richard M. <dr...@us...> - 2004-07-02 00:53:04
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv808 Modified Files: world.cpp Log Message: Updated the database thing to resolve the unsigned int issue I stumbled across. Index: world.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v retrieving revision 1.100 retrieving revision 1.101 diff -C2 -d -r1.100 -r1.101 *** world.cpp 3 Jun 2004 14:43:00 -0000 1.100 --- world.cpp 2 Jul 2004 00:52:55 -0000 1.101 *************** *** 91,267 **** { { "guilds", "CREATE TABLE guilds ( \ ! serial int(11) NOT NULL default '0', \ ! name varchar(255) NOT NULL default '', \ ! abbreviation varchar(6) NOT NULL default '', \ ! charta LONGTEXT NOT NULL, \ ! website varchar(255) NOT NULL default 'http://www.wpdev.org', \ ! alignment int(2) NOT NULL default '0', \ ! leader int(11) NOT NULL default '-1', \ ! founded int(11) NOT NULL default '0', \ ! guildstone int(11) NOT NULL default '-1', \ ! PRIMARY KEY(serial) \ );" }, { "guilds_members", "CREATE TABLE guilds_members ( \ ! guild int(11) NOT NULL default '0', \ ! player int(11) NOT NULL default '0', \ ! showsign int(1) NOT NULL default '0', \ ! guildtitle varchar(255) NOT NULL default '', \ ! joined int(11) NOT NULL default '0', \ ! PRIMARY KEY(guild,player) \ );"}, { "guilds_canidates", "CREATE TABLE guilds_canidates ( \ ! guild int(11) NOT NULL default '0', \ ! player int(11) NOT NULL default '0', \ ! PRIMARY KEY(guild,player) \ );"}, { "settings", "CREATE TABLE settings ( \ ! option varchar(255) NOT NULL default '', \ ! value varchar(255) NOT NULL default '', \ ! PRIMARY KEY (option) \ );" }, { "characters", "CREATE TABLE characters (\ ! serial int(11) NOT NULL default '0',\ ! name varchar(255) default NULL,\ ! title varchar(255) default NULL,\ ! creationdate varchar(19) default NULL,\ ! body smallint(5) NOT NULL default '0',\ ! orgbody smallint(5) NOT NULL default '0',\ ! skin smallint(5) NOT NULL default '0',\ ! orgskin smallint(5) NOT NULL default '0',\ ! saycolor smallint(5) NOT NULL default '0',\ ! emotecolor smallint(5) NOT NULL default '0',\ ! strength smallint(6) NOT NULL default '0',\ ! strengthmod smallint(6) NOT NULL default '0',\ ! dexterity smallint(6) NOT NULL default '0',\ ! dexteritymod smallint(6) NOT NULL default '0',\ ! intelligence smallint(6) NOT NULL default '0',\ ! intelligencemod smallint(6) NOT NULL default '0',\ ! maxhitpoints smallint(6) NOT NULL default '0',\ ! hitpoints smallint(6) NOT NULL default '0',\ ! maxstamina smallint(6) NOT NULL default '0',\ ! stamina smallint(6) NOT NULL default '0',\ ! maxmana smallint(6) default NULL,\ ! mana smallint(6) default NULL,\ ! karma int(11) NOT NULL default '0',\ ! fame int(11) NOT NULL default '0',\ ! kills int(10) NOT NULL default '0',\ ! deaths int(10) NOT NULL default '0',\ ! hunger int(11) NOT NULL default '0',\ ! poison tinyint(2) NOT NULL default '-1',\ ! murderertime int(11) NOT NULL default '0',\ ! criminaltime int(11) NOT NULL default '0',\ ! gender tinyint(1) NOT NULL default '0',\ ! propertyflags int(11) NOT NULL default '0',\ ! murderer int(11) NOT NULL default '-1',\ ! guarding int(11) NOT NULL default '-1',\ ! hitpointsbonus smallint(6) NOT NULL default '0',\ ! staminabonus smallint(6) NOT NULL default '0',\ ! manabonus smallint(6) NOT NULL default '0',\ ! strcap tinyint(4) NOT NULL default '125',\ ! dexcap tinyint(4) NOT NULL default '125',\ ! intcap tinyint(4) NOT NULL default '125',\ ! statcap tinyint(4) NOT NULL default '225',\ ! baseid varchar(64) NOT NULL default '',\ ! direction char(1) NOT NULL default '0',\ ! PRIMARY KEY (serial)\ );" }, { "corpses", "CREATE TABLE corpses (\ ! serial int(11) NOT NULL default '0',\ ! bodyid smallint(6) NOT NULL default '0',\ ! hairstyle smallint(6) NOT NULL default '0',\ ! haircolor smallint(6) NOT NULL default '0',\ ! beardstyle smallint(6) NOT NULL default '0',\ ! beardcolor smallint(6) NOT NULL default '0',\ ! direction char(1) NOT NULL default '0',\ ! charbaseid varchar(64) NOT NULL default '',\ ! murderer int(11) NOT NULL default '-1',\ ! murdertime int(11) NOT NULL default '0',\ ! PRIMARY KEY (serial)\ );" }, { "corpses_equipment", "CREATE TABLE corpses_equipment (\ ! serial int(11) NOT NULL default '0',\ ! layer tinyint(3) NOT NULL default '0',\ ! item int(11) NOT NULL default '-1', \ ! PRIMARY KEY (serial,layer)\ );" }, { "items", "CREATE TABLE items (\ ! serial int(11) NOT NULL default '0',\ ! id smallint(5) NOT NULL default '0',\ ! color smallint(5) NOT NULL default '0',\ ! cont int(11) NOT NULL default '-1',\ ! layer tinyint(3) NOT NULL default '0',\ ! amount smallint(5) NOT NULL default '0',\ ! hp smallint(6) NOT NULL default '0',\ ! maxhp smallint(6) NOT NULL default '0',\ ! magic tinyint(3) NOT NULL default '0',\ ! owner int(11) NOT NULL default '-1',\ ! visible tinyint(3) NOT NULL default '0',\ ! priv tinyint(3) NOT NULL default '0',\ ! baseid varchar(64) NOT NULL default '',\ ! PRIMARY KEY (serial)\ );" }, { "npcs", "CREATE TABLE npcs (\ ! serial int(11) NOT NULL default '0',\ ! summontime int(11) NOT NULL default '0',\ ! additionalflags int(11) NOT NULL default '0',\ ! owner int(11) NOT NULL default '-1',\ ! stablemaster int(11) NOT NULL default '-1',\ ! ai varchar(255) default NULL,\ ! wandertype smallint(3) NOT NULL default '0',\ ! wanderx1 smallint(6) NOT NULL default '0',\ ! wanderx2 smallint(6) NOT NULL default '0',\ ! wandery1 smallint(6) NOT NULL default '0',\ ! wandery2 smallint(6) NOT NULL default '0',\ ! wanderradius smallint(6) NOT NULL default '0',\ ! PRIMARY KEY (serial)\ );" }, { "players", "CREATE TABLE players (\ ! serial int(11) NOT NULL default '0',\ ! account varchar(255) default NULL,\ ! additionalflags int(10) NOT NULL default '0',\ ! visualrange tinyint(3) NOT NULL default '0',\ ! profile longtext,\ ! fixedlight tinyint(3) NOT NULL default '0',\ ! strlock tinyint(4) NOT NULL default '0',\ ! dexlock tinyint(4) NOT NULL default '0',\ ! intlock tinyint(4) NOT NULL default '0',\ ! PRIMARY KEY (serial)\ );" }, { "skills", "CREATE TABLE skills (\ ! serial int(11) NOT NULL default '0',\ ! skill tinyint(3) NOT NULL default '0',\ ! value smallint(6) NOT NULL default '0',\ ! locktype tinyint(4) default '0',\ ! cap smallint(6) default '0',\ ! PRIMARY KEY (serial,skill)\ );" }, { "tags", "CREATE TABLE tags (\ ! serial int(11) NOT NULL default '0',\ ! name varchar(64) NOT NULL default '',\ ! type varchar(6) NOT NULL default '',\ ! value longtext NOT NULL,\ ! PRIMARY KEY (serial,name)\ );" }, { "uobject", "CREATE TABLE uobject (\ ! name varchar(255) default NULL,\ ! serial int(11) NOT NULL default '0',\ ! multis int(11) NOT NULL default '-1',\ ! pos_x smallint(6) NOT NULL default '0',\ ! pos_y smallint(6) NOT NULL default '0',\ ! pos_z smallint(6) NOT NULL default '0',\ ! pos_map tinyint(4) NOT NULL default '0', \ ! events varchar(255) default NULL,\ ! havetags tinyint(1) NOT NULL default '0',\ ! PRIMARY KEY (serial)\ );" }, { "uobjectmap", "CREATE TABLE uobjectmap (\ ! serial int(11) NOT NULL default '0',\ ! type varchar(80) NOT NULL default '',\ ! PRIMARY KEY (serial)\ );" }, { "effects", "CREATE TABLE effects (\ ! id int NOT NULL,\ ! objectid varchar(64) NOT NULL,\ ! expiretime int NOT NULL,\ ! dispellable tinyint NOT NULL default '0',\ ! source int NOT NULL default '-1',\ ! destination int NOT NULL default '-1',\ ! PRIMARY KEY (id)\ );" }, { "effects_properties", "CREATE TABLE effects_properties (\ ! id int NOT NULL,\ ! keyname varchar(64) NOT NULL,\ ! type varchar(64) NOT NULL,\ ! value text NOT NULL,\ ! PRIMARY KEY (id,keyname)\ );" }, { "spawnregions", "CREATE TABLE spawnregions (\ ! spawnregion varchar(64) NOT NULL,\ ! serial int(11) NOT NULL default '0',\ ! PRIMARY KEY (spawnregion, serial)\ );" }, { NULL, NULL } }; --- 91,267 ---- { { "guilds", "CREATE TABLE guilds ( \ ! serial int(11) unsigned NOT NULL default '0', \ ! name varchar(255) NOT NULL default '', \ ! abbreviation varchar(6) NOT NULL default '', \ ! charta LONGTEXT NOT NULL, \ ! website varchar(255) NOT NULL default 'http://www.wpdev.org', \ ! alignment int(2) NOT NULL default '0', \ ! leader int(11) unsigned NOT NULL default '4294967295', \ ! founded int(11) NOT NULL default '0', \ ! guildstone int(11) unsigned NOT NULL default '4294967295', \ ! PRIMARY KEY(serial) \ );" }, { "guilds_members", "CREATE TABLE guilds_members ( \ ! guild int(11) unsigned NOT NULL default '0', \ ! player int(11) unsigned NOT NULL default '0', \ ! showsign int(1) NOT NULL default '0', \ ! guildtitle varchar(255) NOT NULL default '', \ ! joined int(11) NOT NULL default '0', \ ! PRIMARY KEY(guild,player) \ );"}, { "guilds_canidates", "CREATE TABLE guilds_canidates ( \ ! guild int(11) unsigned NOT NULL default '0', \ ! player int(11) unsigned NOT NULL default '0', \ ! PRIMARY KEY(guild,player) \ );"}, { "settings", "CREATE TABLE settings ( \ ! option varchar(255) NOT NULL default '', \ ! value varchar(255) NOT NULL default '', \ ! PRIMARY KEY (option) \ );" }, { "characters", "CREATE TABLE characters (\ ! serial int(11) unsigned NOT NULL default '0',\ ! name varchar(255) default NULL,\ ! title varchar(255) default NULL,\ ! creationdate varchar(19) default NULL,\ ! body smallint(5) NOT NULL default '0',\ ! orgbody smallint(5) NOT NULL default '0',\ ! skin smallint(5) NOT NULL default '0',\ ! orgskin smallint(5) NOT NULL default '0',\ ! saycolor smallint(5) NOT NULL default '0',\ ! emotecolor smallint(5) NOT NULL default '0',\ ! strength smallint(6) NOT NULL default '0',\ ! strengthmod smallint(6) NOT NULL default '0',\ ! dexterity smallint(6) NOT NULL default '0',\ ! dexteritymod smallint(6) NOT NULL default '0',\ ! intelligence smallint(6) NOT NULL default '0',\ ! intelligencemod smallint(6) NOT NULL default '0',\ ! maxhitpoints smallint(6) NOT NULL default '0',\ ! hitpoints smallint(6) NOT NULL default '0',\ ! maxstamina smallint(6) NOT NULL default '0',\ ! stamina smallint(6) NOT NULL default '0',\ ! maxmana smallint(6) default NULL,\ ! mana smallint(6) default NULL,\ ! karma int(11) NOT NULL default '0',\ ! fame int(11) NOT NULL default '0',\ ! kills int(10) NOT NULL default '0',\ ! deaths int(10) NOT NULL default '0',\ ! hunger int(11) NOT NULL default '0',\ ! poison tinyint(2) NOT NULL default '-1',\ ! murderertime int(11) NOT NULL default '0',\ ! criminaltime int(11) NOT NULL default '0',\ ! gender tinyint(1) NOT NULL default '0',\ ! propertyflags int(11) NOT NULL default '0',\ ! murderer int(11) unsigned NOT NULL default '4294967295',\ ! guarding int(11) unsigned NOT NULL default '4294967295',\ ! hitpointsbonus smallint(6) NOT NULL default '0',\ ! staminabonus smallint(6) NOT NULL default '0',\ ! manabonus smallint(6) NOT NULL default '0',\ ! strcap tinyint(4) NOT NULL default '125',\ ! dexcap tinyint(4) NOT NULL default '125',\ ! intcap tinyint(4) NOT NULL default '125',\ ! statcap tinyint(4) NOT NULL default '225',\ ! baseid varchar(64) NOT NULL default '',\ ! direction char(1) NOT NULL default '0',\ ! PRIMARY KEY (serial)\ );" }, { "corpses", "CREATE TABLE corpses (\ ! serial int(11) unsigned NOT NULL default '0',\ ! bodyid smallint(6) NOT NULL default '0',\ ! hairstyle smallint(6) NOT NULL default '0',\ ! haircolor smallint(6) NOT NULL default '0',\ ! beardstyle smallint(6) NOT NULL default '0',\ ! beardcolor smallint(6) NOT NULL default '0',\ ! direction char(1) NOT NULL default '0',\ ! charbaseid varchar(64) NOT NULL default '',\ ! murderer int(11) unsigned NOT NULL default '4294967295',\ ! murdertime int(11) NOT NULL default '0',\ ! PRIMARY KEY (serial)\ );" }, { "corpses_equipment", "CREATE TABLE corpses_equipment (\ ! serial int(11) unsigned NOT NULL default '0',\ ! layer tinyint(3) NOT NULL default '0',\ ! item int(11) unsigned NOT NULL default '4294967295', \ ! PRIMARY KEY (serial,layer)\ );" }, { "items", "CREATE TABLE items (\ ! serial int(11) unsigned NOT NULL default '0',\ ! id smallint(5) NOT NULL default '0',\ ! color smallint(5) NOT NULL default '0',\ ! cont int(11) NOT NULL default '-1',\ ! layer tinyint(3) NOT NULL default '0',\ ! amount smallint(5) NOT NULL default '0',\ ! hp smallint(6) NOT NULL default '0',\ ! maxhp smallint(6) NOT NULL default '0',\ ! magic tinyint(3) NOT NULL default '0',\ ! owner int(11) unsigned NOT NULL default '4294967295',\ ! visible tinyint(3) NOT NULL default '0',\ ! priv tinyint(3) NOT NULL default '0',\ ! baseid varchar(64) NOT NULL default '',\ ! PRIMARY KEY (serial)\ );" }, { "npcs", "CREATE TABLE npcs (\ ! serial int(11) unsigned NOT NULL default '0',\ ! summontime int(11) NOT NULL default '0',\ ! additionalflags int(11) NOT NULL default '0',\ ! owner int(11) unsigned NOT NULL default '4294967295',\ ! stablemaster int(11) unsigned NOT NULL default '4294967295',\ ! ai varchar(255) default NULL,\ ! wandertype smallint(3) NOT NULL default '0',\ ! wanderx1 smallint(6) NOT NULL default '0',\ ! wanderx2 smallint(6) NOT NULL default '0',\ ! wandery1 smallint(6) NOT NULL default '0',\ ! wandery2 smallint(6) NOT NULL default '0',\ ! wanderradius smallint(6) NOT NULL default '0',\ ! PRIMARY KEY (serial)\ );" }, { "players", "CREATE TABLE players (\ ! serial int(11) unsigned NOT NULL default '0',\ ! account varchar(255) default NULL,\ ! additionalflags int(10) NOT NULL default '0',\ ! visualrange tinyint(3) NOT NULL default '0',\ ! profile longtext,\ ! fixedlight tinyint(3) NOT NULL default '0',\ ! strlock tinyint(4) NOT NULL default '0',\ ! dexlock tinyint(4) NOT NULL default '0',\ ! intlock tinyint(4) NOT NULL default '0',\ ! PRIMARY KEY (serial)\ );" }, { "skills", "CREATE TABLE skills (\ ! serial int(11) unsigned NOT NULL default '0',\ ! skill tinyint(3) NOT NULL default '0',\ ! value smallint(6) NOT NULL default '0',\ ! locktype tinyint(4) default '0',\ ! cap smallint(6) default '0',\ ! PRIMARY KEY (serial,skill)\ );" }, { "tags", "CREATE TABLE tags (\ ! serial int(11) unsigned NOT NULL default '0',\ ! name varchar(64) NOT NULL default '',\ ! type varchar(6) NOT NULL default '',\ ! value longtext NOT NULL,\ ! PRIMARY KEY (serial,name)\ );" }, { "uobject", "CREATE TABLE uobject (\ ! name varchar(255) default NULL,\ ! serial int(11) unsigned NOT NULL default '0',\ ! multis int(11) unsigned NOT NULL default '4294967295',\ ! pos_x smallint(6) NOT NULL default '0',\ ! pos_y smallint(6) NOT NULL default '0',\ ! pos_z smallint(6) NOT NULL default '0',\ ! pos_map tinyint(4) NOT NULL default '0', \ ! events varchar(255) default NULL,\ ! havetags tinyint(1) NOT NULL default '0',\ ! PRIMARY KEY (serial)\ );" }, { "uobjectmap", "CREATE TABLE uobjectmap (\ ! serial int(11) unsigned NOT NULL default '0',\ ! type varchar(80) NOT NULL default '',\ ! PRIMARY KEY (serial)\ );" }, { "effects", "CREATE TABLE effects (\ ! id int(11) unsigned NOT NULL default '0',\ ! objectid varchar(64) NOT NULL,\ ! expiretime int(11) NOT NULL,\ ! dispellable tinyint(4) NOT NULL default '0',\ ! source int(11) unsigned NOT NULL default '4294967295',\ ! destination int(11) unsigned NOT NULL default '4294967295',\ ! PRIMARY KEY (id)\ );" }, { "effects_properties", "CREATE TABLE effects_properties (\ ! id int(11) unsigned NOT NULL default '0',\ ! keyname varchar(64) NOT NULL,\ ! type varchar(64) NOT NULL,\ ! value text NOT NULL,\ ! PRIMARY KEY (id,keyname)\ );" }, { "spawnregions", "CREATE TABLE spawnregions (\ ! spawnregion varchar(64) NOT NULL,\ ! serial int(11) unsigned NOT NULL default '0',\ ! PRIMARY KEY (spawnregion, serial)\ );" }, { NULL, NULL } }; |
From: Richard M. <dr...@us...> - 2004-07-01 23:51:35
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/buildings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22336 Modified Files: banisters.xml carpets.xml chairs.xml curtains.xml Log Message: Tweaks Index: curtains.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/buildings/curtains.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** curtains.xml 26 May 2004 13:45:12 -0000 1.7 --- curtains.xml 1 Jul 2004 23:51:25 -0000 1.8 *************** *** 13,17 **** <!-- Red Curtains --> <item id="980"> ! <id>0x0980</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 1</categories> --- 13,17 ---- <!-- Red Curtains --> <item id="980"> ! <id>0x980</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 1</categories> *************** *** 19,23 **** <item id="981"> ! <id>0x0981</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 2</categories> --- 19,23 ---- <item id="981"> ! <id>0x981</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 2</categories> *************** *** 25,29 **** <item id="982"> ! <id>0x0982</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 3</categories> --- 25,29 ---- <item id="982"> ! <id>0x982</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 3</categories> *************** *** 31,35 **** <item id="983"> ! <id>0x0983</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 4</categories> --- 31,35 ---- <item id="983"> ! <id>0x983</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 4</categories> *************** *** 37,41 **** <item id="984"> ! <id>0x0984</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 5</categories> --- 37,41 ---- <item id="984"> ! <id>0x984</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 5</categories> *************** *** 43,47 **** <item id="985"> ! <id>0x0985</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 6</categories> --- 43,47 ---- <item id="985"> ! <id>0x985</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 6</categories> *************** *** 49,53 **** <item id="986"> ! <id>0x0986</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 7</categories> --- 49,53 ---- <item id="986"> ! <id>0x986</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 7</categories> *************** *** 55,59 **** <item id="987"> ! <id>0x0987</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 8</categories> --- 55,59 ---- <item id="987"> ! <id>0x987</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 8</categories> *************** *** 61,65 **** <item id="988"> ! <id>0x0988</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 9</categories> --- 61,65 ---- <item id="988"> ! <id>0x988</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 9</categories> *************** *** 67,71 **** <item id="989"> ! <id>0x0989</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 10</categories> --- 67,71 ---- <item id="989"> ! <id>0x989</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 10</categories> *************** *** 73,77 **** <item id="98a"> ! <id>0x098a</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 11</categories> --- 73,77 ---- <item id="98a"> ! <id>0x98a</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 11</categories> *************** *** 79,83 **** <item id="98b"> ! <id>0x098b</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 12</categories> --- 79,83 ---- <item id="98b"> ! <id>0x98b</id> <nodecay /> <categories>Decoration\Curtains\Red Curtain\Red Curtain 12</categories> Index: banisters.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/buildings/banisters.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** banisters.xml 22 Feb 2004 08:38:17 -0000 1.3 --- banisters.xml 1 Jul 2004 23:51:25 -0000 1.4 *************** *** 13,17 **** <!-- Wooden Rail --> <item id="87e"> ! <id>0x087e</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (W/E) 1</category> --- 13,17 ---- <!-- Wooden Rail --> <item id="87e"> ! <id>0x87e</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (W/E) 1</category> *************** *** 19,23 **** <item id="87f"> ! <id>0x087f</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (W/E) 2</category> --- 19,23 ---- <item id="87f"> ! <id>0x87f</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (W/E) 2</category> *************** *** 25,29 **** <item id="880"> ! <id>0x0880</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (W/E) 3</category> --- 25,29 ---- <item id="880"> ! <id>0x880</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (W/E) 3</category> *************** *** 31,35 **** <item id="881"> ! <id>0x0881</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (W/E) 4</category> --- 31,35 ---- <item id="881"> ! <id>0x881</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (W/E) 4</category> *************** *** 37,41 **** <item id="882"> ! <id>0x0882</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (W/E) 5</category> --- 37,41 ---- <item id="882"> ! <id>0x882</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (W/E) 5</category> *************** *** 43,47 **** <item id="883"> ! <id>0x0883</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (W/E) 6</category> --- 43,47 ---- <item id="883"> ! <id>0x883</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (W/E) 6</category> *************** *** 49,53 **** <item id="884"> ! <id>0x0884</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (N/S) 1</category> --- 49,53 ---- <item id="884"> ! <id>0x884</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (N/S) 1</category> *************** *** 55,59 **** <item id="885"> ! <id>0x0885</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (N/S) 2</category> --- 55,59 ---- <item id="885"> ! <id>0x885</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (N/S) 2</category> *************** *** 61,65 **** <item id="886"> ! <id>0x0886</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (N/S) 3</category> --- 61,65 ---- <item id="886"> ! <id>0x886</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (N/S) 3</category> *************** *** 67,71 **** <item id="887"> ! <id>0x0887</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (N/S) 4</category> --- 67,71 ---- <item id="887"> ! <id>0x887</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (N/S) 4</category> *************** *** 73,77 **** <item id="888"> ! <id>0x0888</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (N/S) 5</category> --- 73,77 ---- <item id="888"> ! <id>0x888</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (N/S) 5</category> *************** *** 79,83 **** <item id="889"> ! <id>0x0889</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (N/S) 6</category> --- 79,83 ---- <item id="889"> ! <id>0x889</id> <nodecay /> <category>Buildings\Banisters\Wooden Rail\Rail (N/S) 6</category> *************** *** 86,90 **** <!-- Wooden Banister --> <item id="8ae"> ! <id>0x08ae</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 1</category> --- 86,90 ---- <!-- Wooden Banister --> <item id="8ae"> ! <id>0x8ae</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 1</category> *************** *** 92,96 **** <item id="8af"> ! <id>0x08af</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 2</category> --- 92,96 ---- <item id="8af"> ! <id>0x8af</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 2</category> *************** *** 98,102 **** <item id="8b0"> ! <id>0x08b0</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 3</category> --- 98,102 ---- <item id="8b0"> ! <id>0x8b0</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 3</category> *************** *** 104,108 **** <item id="8b1"> ! <id>0x08b1</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 4</category> --- 104,108 ---- <item id="8b1"> ! <id>0x8b1</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 4</category> *************** *** 110,114 **** <item id="8b2"> ! <id>0x08b2</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 5</category> --- 110,114 ---- <item id="8b2"> ! <id>0x8b2</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 5</category> *************** *** 116,120 **** <item id="8b3"> ! <id>0x08b3</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 6</category> --- 116,120 ---- <item id="8b3"> ! <id>0x8b3</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 6</category> *************** *** 122,126 **** <item id="8b4"> ! <id>0x08b4</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 7</category> --- 122,126 ---- <item id="8b4"> ! <id>0x8b4</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 7</category> *************** *** 128,132 **** <item id="8b5"> ! <id>0x08b5</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 8</category> --- 128,132 ---- <item id="8b5"> ! <id>0x8b5</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 8</category> *************** *** 134,138 **** <item id="8b6"> ! <id>0x08b6</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 9</category> --- 134,138 ---- <item id="8b6"> ! <id>0x8b6</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 9</category> *************** *** 140,144 **** <item id="8b7"> ! <id>0x08b7</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 10</category> --- 140,144 ---- <item id="8b7"> ! <id>0x8b7</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 10</category> *************** *** 146,150 **** <item id="8b8"> ! <id>0x08b8</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 11</category> --- 146,150 ---- <item id="8b8"> ! <id>0x8b8</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 11</category> *************** *** 152,156 **** <item id="8b9"> ! <id>0x08b9</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 12</category> --- 152,156 ---- <item id="8b9"> ! <id>0x8b9</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 12</category> *************** *** 158,162 **** <item id="8ba"> ! <id>0x08ba</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 13</category> --- 158,162 ---- <item id="8ba"> ! <id>0x8ba</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 13</category> *************** *** 164,168 **** <item id="8bb"> ! <id>0x08bb</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 14</category> --- 164,168 ---- <item id="8bb"> ! <id>0x8bb</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 14</category> *************** *** 170,174 **** <item id="8bc"> ! <id>0x08bc</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 15</category> --- 170,174 ---- <item id="8bc"> ! <id>0x8bc</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 15</category> *************** *** 176,180 **** <item id="8bd"> ! <id>0x08bd</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 16</category> --- 176,180 ---- <item id="8bd"> ! <id>0x8bd</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 16</category> *************** *** 182,186 **** <item id="8be"> ! <id>0x08be</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 17</category> --- 182,186 ---- <item id="8be"> ! <id>0x8be</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 17</category> *************** *** 188,192 **** <item id="8bf"> ! <id>0x08bf</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 18</category> --- 188,192 ---- <item id="8bf"> ! <id>0x8bf</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 18</category> *************** *** 194,198 **** <item id="8c0"> ! <id>0x08c0</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 19</category> --- 194,198 ---- <item id="8c0"> ! <id>0x8c0</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 19</category> *************** *** 200,204 **** <item id="8c1"> ! <id>0x08c1</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 20</category> --- 200,204 ---- <item id="8c1"> ! <id>0x8c1</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 20</category> *************** *** 206,210 **** <item id="8c2"> ! <id>0x08c2</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 21</category> --- 206,210 ---- <item id="8c2"> ! <id>0x8c2</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 21</category> *************** *** 212,216 **** <item id="8c3"> ! <id>0x08c3</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 22</category> --- 212,216 ---- <item id="8c3"> ! <id>0x8c3</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 22</category> *************** *** 218,222 **** <item id="8c4"> ! <id>0x08c4</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 23</category> --- 218,222 ---- <item id="8c4"> ! <id>0x8c4</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 23</category> *************** *** 224,228 **** <item id="8c5"> ! <id>0x08c5</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 24</category> --- 224,228 ---- <item id="8c5"> ! <id>0x8c5</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 24</category> *************** *** 230,234 **** <item id="8c6"> ! <id>0x08c6</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 25</category> --- 230,234 ---- <item id="8c6"> ! <id>0x8c6</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 25</category> *************** *** 236,240 **** <item id="8c7"> ! <id>0x08c7</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 26</category> --- 236,240 ---- <item id="8c7"> ! <id>0x8c7</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 26</category> *************** *** 242,246 **** <item id="8c8"> ! <id>0x08c8</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 27</category> --- 242,246 ---- <item id="8c8"> ! <id>0x8c8</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 27</category> *************** *** 248,252 **** <item id="8c9"> ! <id>0x08c9</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 28</category> --- 248,252 ---- <item id="8c9"> ! <id>0x8c9</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 28</category> *************** *** 254,258 **** <item id="8ca"> ! <id>0x08ca</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 29</category> --- 254,258 ---- <item id="8ca"> ! <id>0x8ca</id> <nodecay /> <category>Buildings\Banisters\Wooden Banister\Banister 29</category> *************** *** 261,265 **** <!-- Edging --> <item id="8cb"> ! <id>0x08cb</id> <nodecay /> <category>Buildings\Banisters\Edging\Edging 1</category> --- 261,265 ---- <!-- Edging --> <item id="8cb"> ! <id>0x8cb</id> <nodecay /> <category>Buildings\Banisters\Edging\Edging 1</category> *************** *** 267,271 **** <item id="8cc"> ! <id>0x08cc</id> <nodecay /> <category>Buildings\Banisters\Edging\Edging 2</category> --- 267,271 ---- <item id="8cc"> ! <id>0x8cc</id> <nodecay /> <category>Buildings\Banisters\Edging\Edging 2</category> *************** *** 273,277 **** <item id="8cd"> ! <id>0x08cd</id> <nodecay /> <category>Buildings\Banisters\Edging\Edging 3</category> --- 273,277 ---- <item id="8cd"> ! <id>0x8cd</id> <nodecay /> <category>Buildings\Banisters\Edging\Edging 3</category> *************** *** 279,283 **** <item id="8ce"> ! <id>0x08ce</id> <nodecay /> <category>Buildings\Banisters\Edging\Edging 4</category> --- 279,283 ---- <item id="8ce"> ! <id>0x8ce</id> <nodecay /> <category>Buildings\Banisters\Edging\Edging 4</category> Index: chairs.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/buildings/chairs.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** chairs.xml 23 Apr 2004 21:49:27 -0000 1.13 --- chairs.xml 1 Jul 2004 23:51:25 -0000 1.14 *************** *** 13,17 **** <!-- Marble Bench --> <item id="459"> ! <id>0x0459</id> <nodecay /> <category>Decoration\Chairs\Marble Bench\Marble Bench 1 (N/S)</category> --- 13,17 ---- <!-- Marble Bench --> <item id="459"> ! <id>0x459</id> <nodecay /> <category>Decoration\Chairs\Marble Bench\Marble Bench 1 (N/S)</category> *************** *** 19,23 **** <item id="45a"> ! <id>0x045a</id> <nodecay /> <category>Decoration\Chairs\Marble Bench\Marble Bench 1 (W/E)</category> --- 19,23 ---- <item id="45a"> ! <id>0x45a</id> <nodecay /> <category>Decoration\Chairs\Marble Bench\Marble Bench 1 (W/E)</category> *************** *** 26,30 **** <!-- Sandstone Bench --> <item id="45b"> ! <id>0x045b</id> <nodecay /> <category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 1 (N/S)</category> --- 26,30 ---- <!-- Sandstone Bench --> <item id="45b"> ! <id>0x45b</id> <nodecay /> <category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 1 (N/S)</category> *************** *** 32,36 **** <item id="45c"> ! <id>0x045c</id> <nodecay /> <category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 1 (W/E)</category> --- 32,36 ---- <item id="45c"> ! <id>0x45c</id> <nodecay /> <category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 1 (W/E)</category> *************** *** 39,43 **** <!-- Stool --> <item id="a2a"> ! <id>0x0a2a</id> <nodecay /> <buyprice>12</buyprice> --- 39,43 ---- <!-- Stool --> <item id="a2a"> ! <id>0xa2a</id> <nodecay /> <buyprice>12</buyprice> *************** *** 47,51 **** <item id="a2b"> ! <id>0x0a2b</id> <nodecay /> <category>Decoration\Chairs\Stool\Stool 2</category> --- 47,51 ---- <item id="a2b"> ! <id>0xa2b</id> <nodecay /> <category>Decoration\Chairs\Stool\Stool 2</category> *************** *** 54,58 **** <!-- Wooden Bench --> <item id="b2c"> ! <id>0x0b2c</id> <nodecay /> <buyprice>12</buyprice> --- 54,58 ---- <!-- Wooden Bench --> <item id="b2c"> ! <id>0xb2c</id> <nodecay /> <buyprice>12</buyprice> *************** *** 62,66 **** <item id="b2d"> ! <id>0x0b2d</id> <nodecay /> <category>Decoration\Chairs\Wooden Bench\Wooden Bench 1 (N/S)</category> --- 62,66 ---- <item id="b2d"> ! <id>0xb2d</id> <nodecay /> <category>Decoration\Chairs\Wooden Bench\Wooden Bench 1 (N/S)</category> *************** *** 69,73 **** <!-- Wooden Chair --> <item id="b2e"> ! <id>0x0b2e</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Wooden Chair 1</category> --- 69,73 ---- <!-- Wooden Chair --> <item id="b2e"> ! <id>0xb2e</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Wooden Chair 1</category> *************** *** 75,79 **** <item id="b2f"> ! <id>0x0b2f</id> <nodecay /> <buyprice>12</buyprice> --- 75,79 ---- <item id="b2f"> ! <id>0xb2f</id> <nodecay /> <buyprice>12</buyprice> *************** *** 83,87 **** <item id="b30"> ! <id>0x0b30</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Wooden Chair 3</category> --- 83,87 ---- <item id="b30"> ! <id>0xb30</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Wooden Chair 3</category> *************** *** 89,93 **** <item id="b31"> ! <id>0x0b31</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Wooden Chair 4</category> --- 89,93 ---- <item id="b31"> ! <id>0xb31</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Wooden Chair 4</category> *************** *** 96,100 **** <!-- Wooden Throne --> <item id="b32"> ! <id>0x0b32</id> <nodecay /> <category>Decoration\Chairs\Wooden Throne\Wooden Throne 1</category> --- 96,100 ---- <!-- Wooden Throne --> <item id="b32"> ! <id>0xb32</id> <nodecay /> <category>Decoration\Chairs\Wooden Throne\Wooden Throne 1</category> *************** *** 102,106 **** <item id="b33"> ! <id>0x0b33</id> <nodecay /> <buyprice>58</buyprice> --- 102,106 ---- <item id="b33"> ! <id>0xb33</id> <nodecay /> <buyprice>58</buyprice> *************** *** 111,115 **** <!-- Wooden Chair --> <item id="b4e"> ! <id>0x0b4e</id> <nodecay /> <buyprice>24</buyprice> --- 111,115 ---- <!-- Wooden Chair --> <item id="b4e"> ! <id>0xb4e</id> <nodecay /> <buyprice>24</buyprice> *************** *** 119,123 **** <item id="b4f"> ! <id>0x0b4f</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Fancy Wooden Chair 2</category> --- 119,123 ---- <item id="b4f"> ! <id>0xb4f</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Fancy Wooden Chair 2</category> *************** *** 125,129 **** <item id="b50"> ! <id>0x0b50</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Fancy Wooden Chair 3</category> --- 125,129 ---- <item id="b50"> ! <id>0xb50</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Fancy Wooden Chair 3</category> *************** *** 131,135 **** <item id="b51"> ! <id>0x0b51</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Fancy Wooden Chair 4</category> --- 131,135 ---- <item id="b51"> ! <id>0xb51</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Fancy Wooden Chair 4</category> *************** *** 137,141 **** <item id="b52"> ! <id>0x0b52</id> <nodecay /> <buyprice>20</buyprice> --- 137,141 ---- <item id="b52"> ! <id>0xb52</id> <nodecay /> <buyprice>20</buyprice> *************** *** 145,149 **** <item id="b53"> ! <id>0x0b53</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Simple Wooden Chair 2</category> --- 145,149 ---- <item id="b53"> ! <id>0xb53</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Simple Wooden Chair 2</category> *************** *** 151,155 **** <item id="b54"> ! <id>0x0b54</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Simple Wooden Chair 3</category> --- 151,155 ---- <item id="b54"> ! <id>0xb54</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Simple Wooden Chair 3</category> *************** *** 157,161 **** <item id="b55"> ! <id>0x0b55</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Simple Wooden Chair 4</category> --- 157,161 ---- <item id="b55"> ! <id>0xb55</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Simple Wooden Chair 4</category> *************** *** 163,167 **** <item id="b56"> ! <id>0x0b56</id> <nodecay /> <buyprice>16</buyprice> --- 163,167 ---- <item id="b56"> ! <id>0xb56</id> <nodecay /> <buyprice>16</buyprice> *************** *** 171,175 **** <item id="b57"> ! <id>0x0b57</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Plain Wooden Chair 2</category> --- 171,175 ---- <item id="b57"> ! <id>0xb57</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Plain Wooden Chair 2</category> *************** *** 177,181 **** <item id="b58"> ! <id>0x0b58</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Plain Wooden Chair 3</category> --- 177,181 ---- <item id="b58"> ! <id>0xb58</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Plain Wooden Chair 3</category> *************** *** 183,187 **** <item id="b59"> ! <id>0x0b59</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Plain Wooden Chair 4</category> --- 183,187 ---- <item id="b59"> ! <id>0xb59</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Plain Wooden Chair 4</category> *************** *** 189,193 **** <item id="b5a"> ! <id>0x0b5a</id> <nodecay /> <buyprice>12</buyprice> --- 189,193 ---- <item id="b5a"> ! <id>0xb5a</id> <nodecay /> <buyprice>12</buyprice> *************** *** 197,201 **** <item id="b5b"> ! <id>0x0b5b</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Rustic Wooden Chair 2</category> --- 197,201 ---- <item id="b5b"> ! <id>0xb5b</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Rustic Wooden Chair 2</category> *************** *** 203,207 **** <item id="b5c"> ! <id>0x0b5c</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Rustic Wooden Chair 3</category> --- 203,207 ---- <item id="b5c"> ! <id>0xb5c</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Rustic Wooden Chair 3</category> *************** *** 209,213 **** <item id="b5d"> ! <id>0x0b5d</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Rustic Wooden Chair 4</category> --- 209,213 ---- <item id="b5d"> ! <id>0xb5d</id> <nodecay /> <category>Decoration\Chairs\Wooden Chair\Rustic Wooden Chair 4</category> *************** *** 216,220 **** <!-- misc --> <item id="b5e"> ! <id>0x0b5e</id> <nodecay /> <buyprice>12</buyprice> --- 216,220 ---- <!-- misc --> <item id="b5e"> ! <id>0xb5e</id> <nodecay /> <buyprice>12</buyprice> *************** *** 225,229 **** <!-- Wooden Bench --> <item id="b5f"> ! <id>0x0b5f</id> <nodecay /> <category>Decoration\Chairs\Wooden Bench\Wooden Bench 2 (W/E) (1/3)</category> --- 225,229 ---- <!-- Wooden Bench --> <item id="b5f"> ! <id>0xb5f</id> <nodecay /> <category>Decoration\Chairs\Wooden Bench\Wooden Bench 2 (W/E) (1/3)</category> *************** *** 231,235 **** <item id="b60"> ! <id>0x0b60</id> <nodecay /> <category>Decoration\Chairs\Wooden Bench\Wooden Bench 2 (W/E) (2/3)</category> --- 231,235 ---- <item id="b60"> ! <id>0xb60</id> <nodecay /> <category>Decoration\Chairs\Wooden Bench\Wooden Bench 2 (W/E) (2/3)</category> *************** *** 237,241 **** <item id="b61"> ! <id>0x0b61</id> <nodecay /> <category>Decoration\Chairs\Wooden Bench\Wooden Bench 2 (W/E) (3/3)</category> --- 237,241 ---- <item id="b61"> ! <id>0xb61</id> <nodecay /> <category>Decoration\Chairs\Wooden Bench\Wooden Bench 2 (W/E) (3/3)</category> *************** *** 244,248 **** <!-- Sandstone Bench --> <item id="b62"> ! <id>0x0b62</id> <nodecay /> <category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 2 (W/E) (1/3)</category> --- 244,248 ---- <!-- Sandstone Bench --> <item id="b62"> ! <id>0xb62</id> <nodecay /> <category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 2 (W/E) (1/3)</category> *************** *** 250,254 **** <item id="b63"> ! <id>0x0b63</id> <nodecay /> <category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 2 (W/E) (2/3)</category> --- 250,254 ---- <item id="b63"> ! <id>0xb63</id> <nodecay /> <category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 2 (W/E) (2/3)</category> *************** *** 256,260 **** <item id="b64"> ! <id>0x0b64</id> <nodecay /> <category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 2 (W/E) (3/3)</category> --- 256,260 ---- <item id="b64"> ! <id>0xb64</id> <nodecay /> <category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 2 (W/E) (3/3)</category> *************** *** 263,267 **** <!-- Wooden Bench --> <item id="b65"> ! <id>0x0b65</id> <nodecay /> <category>Decoration\Chairs\Wooden Bench\Wooden Bench 2 (N/S) (1/3)</category> --- 263,267 ---- <!-- Wooden Bench --> <item id="b65"> ! <id>0xb65</id> <nodecay /> <category>Decoration\Chairs\Wooden Bench\Wooden Bench 2 (N/S) (1/3)</category> *************** *** 269,273 **** <item id="b66"> ! <id>0x0b66</id> <nodecay /> <category>Decoration\Chairs\Wooden Bench\Wooden Bench 2 (N/S) (2/3)</category> --- 269,273 ---- <item id="b66"> ! <id>0xb66</id> <nodecay /> <category>Decoration\Chairs\Wooden Bench\Wooden Bench 2 (N/S) (2/3)</category> *************** *** 275,279 **** <item id="b67"> ! <id>0x0b67</id> <nodecay /> <category>Decoration\Chairs\Wooden Bench\Wooden Bench 2 (N/S) (3/3)</category> --- 275,279 ---- <item id="b67"> ! <id>0xb67</id> <nodecay /> <category>Decoration\Chairs\Wooden Bench\Wooden Bench 2 (N/S) (3/3)</category> *************** *** 282,286 **** <!-- Sandstone Bench --> <item id="b68"> ! <id>0x0b68</id> <nodecay /> <category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 2 (N/S) (1/3)</category> --- 282,286 ---- <!-- Sandstone Bench --> <item id="b68"> ! <id>0xb68</id> <nodecay /> <category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 2 (N/S) (1/3)</category> *************** *** 288,292 **** <item id="b69"> ! <id>0x0b69</id> <nodecay /> <category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 2 (N/S) (2/3)</category> --- 288,292 ---- <item id="b69"> ! <id>0xb69</id> <nodecay /> <category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 2 (N/S) (2/3)</category> *************** *** 294,298 **** <item id="b6a"> ! <id>0x0b6a</id> <nodecay /> <category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 2 (N/S) (3/3)</category> --- 294,298 ---- <item id="b6a"> ! <id>0xb6a</id> <nodecay /> <category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 2 (N/S) (3/3)</category> *************** *** 301,305 **** <!-- Wall Bench --> <item id="b91"> ! <id>0x0b91</id> <nodecay /> <category>Decoration\Chairs\Wall Bench\Bench (N/S) (1/2)</category> --- 301,305 ---- <!-- Wall Bench --> <item id="b91"> ! <id>0xb91</id> <nodecay /> <category>Decoration\Chairs\Wall Bench\Bench (N/S) (1/2)</category> *************** *** 307,311 **** <item id="b92"> ! <id>0x0b92</id> <nodecay /> <category>Decoration\Chairs\Wall Bench\Bench (N/S) (2/2)</category> --- 307,311 ---- <item id="b92"> ! <id>0xb92</id> <nodecay /> <category>Decoration\Chairs\Wall Bench\Bench (N/S) (2/2)</category> *************** *** 313,317 **** <item id="b93"> ! <id>0x0b93</id> <nodecay /> <category>Decoration\Chairs\Wall Bench\Bench (W/E) (1/2)</category> --- 313,317 ---- <item id="b93"> ! <id>0xb93</id> <nodecay /> <category>Decoration\Chairs\Wall Bench\Bench (W/E) (1/2)</category> *************** *** 319,323 **** <item id="b94"> ! <id>0x0b94</id> <nodecay /> <category>Decoration\Chairs\Wall Bench\Bench (N/S) (2/2)</category> --- 319,323 ---- <item id="b94"> ! <id>0xb94</id> <nodecay /> <category>Decoration\Chairs\Wall Bench\Bench (N/S) (2/2)</category> Index: carpets.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/buildings/carpets.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** carpets.xml 22 Feb 2004 08:38:17 -0000 1.5 --- carpets.xml 1 Jul 2004 23:51:25 -0000 1.6 *************** *** 11,15 **** <!-- Rug - Brown --> <item id="aa9"> ! <id>0x0aa9</id> <nodecay /> <category>Decoration\Carpets\Rug - Brown\Rug 1</category> --- 11,15 ---- <!-- Rug - Brown --> <item id="aa9"> ! <id>0xaa9</id> <nodecay /> [...1034 lines suppressed...] <category>Decoration\Carpets\Carpet - Blue 3\Carpet 9</category> --- 666,670 ---- <item id="af4"> ! <id>0xaf4</id> <nodecay /> <category>Decoration\Carpets\Carpet - Blue 3\Carpet 9</category> *************** *** 672,676 **** <item id="af5"> ! <id>0x0af5</id> <nodecay /> <category>Decoration\Carpets\Carpet - Blue 3\Carpet 10</category> --- 672,676 ---- <item id="af5"> ! <id>0xaf5</id> <nodecay /> <category>Decoration\Carpets\Carpet - Blue 3\Carpet 10</category> |
From: Richard M. <dr...@us...> - 2004-07-01 23:01:44
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11984/webroot Modified Files: ChangeLog.wolfpack Log Message: Updates Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ChangeLog.wolfpack 29 Jun 2004 15:10:25 -0000 1.1 --- ChangeLog.wolfpack 1 Jul 2004 23:01:35 -0000 1.2 *************** *** 17,20 **** --- 17,21 ---- - Support for Client 4.0.3a. - Support for 6th character slot. + - Support for the new All Names macro. (CTRL + SHIFT). * Definition Changes: * Item Updates: *************** *** 48,54 **** --- 49,57 ---- - SQLite database optimization added. - Script system.debugging created to set different debugging options. + - Support for the Open Door Macro * Misc. Changes: - FAQ.html included in the documentaiton. - ChangeLog.wolfpack included in the documentaiton. + - Massive Documentation Update * Known Issues, Bugs, and Missing Features. - Spawn regions are incomplete. |
From: Richard M. <dr...@us...> - 2004-07-01 22:31:43
|
Update of /cvsroot/wpdev/xmlscripts/definitions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5506 Modified Files: scripts.xml Log Message: Added support for the open door macro! Index: scripts.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v retrieving revision 1.134 retrieving revision 1.135 diff -C2 -d -r1.134 -r1.135 *** scripts.xml 20 Jun 2004 20:10:55 -0000 1.134 --- scripts.xml 1 Jul 2004 22:31:34 -0000 1.135 *************** *** 153,156 **** --- 153,157 ---- <script>system.hardwareinfo</script> <script>system.loot</script> + <script>system.macro_opendoor</script> <script>system.makemenus</script> <script>system.mysql_backup_db</script> |
From: Richard M. <dr...@us...> - 2004-07-01 22:29:03
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4859/system Added Files: macro_opendoor.py Log Message: The open door macro now works! --- NEW FILE: macro_opendoor.py --- import wolfpack from wolfpack.consts import * dirs = { 0: [0, -1], 1: [1, -1], 2: [1, 0], 3: [1, 1], 4: [0, 1], 5: [-1, 1], 6: [-1, 0], 7: [-1, -1] } def onLoad(): wolfpack.registerpackethook( 0x12, openDoor ) def openDoor( socket, packet ): if packet.size != 5 and packet.getShort(3) != 0x5800: return 0 if not socket.player: return 0 char = socket.player dir = char.direction doors = wolfpack.items(char.pos.x + dirs[dir][0], char.pos.y + dirs[dir][1], char.pos.map, 0) if not doors: return 0 reach = 0 for door in doors: if char.pos.z == door.pos.z: reach = 1 elif char.pos.z < door.pos.z and char.pos.z >= ( door.pos.z - 5): reach = 1 elif char.pos.z > door.pos.z and char.pos.z <= ( door.pos.z + 5): reach = 1 if reach == 1: events = door.events for event in events: if event == 'door': opendoor = 1 break if opendoor == 1: wolfpack.callevent( event, EVENT_USE, (char, door) ) break return |
From: Richard M. <dr...@us...> - 2004-07-01 21:43:38
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26504 Modified Files: door.py wall_clock.py Log Message: Updates, doors should not close on people now! Index: door.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/door.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** door.py 26 May 2004 13:07:19 -0000 1.9 --- door.py 1 Jul 2004 21:43:28 -0000 1.10 *************** *** 225,229 **** # Change the Door id and resend item.id = door[1] ! item.moveto( pos.x + door[2], pos.y + door[3] ) item.update() --- 225,229 ---- # Change the Door id and resend item.id = door[1] ! item.moveto( pos.x + door[2], pos.y + door[3], pos.z ) item.update() *************** *** 262,266 **** # Change the door id and update the clients around it item.id = door[0] ! item.moveto( pos.x - door[2], pos.y - door[3] ) if item.hastag('opened'): item.deltag( 'opened' ) --- 262,266 ---- # Change the door id and update the clients around it item.id = door[0] ! item.moveto( pos.x - door[2], pos.y - door[3], pos.z ) if item.hastag('opened'): item.deltag( 'opened' ) *************** *** 284,301 **** return ! # Find the door definition for this item for door in doors: if door[1] == item.id: ! pos = item.pos ! # Change the door id and update the clients around it ! item.id = door[0] ! item.moveto( pos.x - door[2], pos.y - door[3] ) ! if item.hastag( 'opened' ): ! item.deltag( 'opened' ) ! item.update() ! # Soundeffect (close) ! item.soundeffect( door[5] ) --- 284,321 ---- return ! """ ! # NOTE! ! # We need to put in a form of character checking for the location ! # where the door closes, this way the door doesn't close ON people. ! """ ! blocked = 0 for door in doors: if door[1] == item.id: ! chars = wolfpack.chars( item.pos.x - door[2], item.pos.y - door[3], item.pos.map, 0 ) ! for char in chars: ! if char.pos.z == item.pos.z: ! blocked = 1 ! elif char.pos.z < item.pos.z and char.pos.z >= ( item.pos.z - 5): ! blocked = 1 ! elif char.pos.z > item.pos.z and char.pos.z <= ( item.pos.z + 5): ! blocked = 1 ! if blocked == 1: ! item.addtimer(CLOSEDOOR_DELAY, "door.autoclose", [ int(item.gettag('opencount')) ], 1) ! else: ! # Find the door definition for this item ! for door in doors: ! if door[1] == item.id: ! pos = item.pos ! # Change the door id and update the clients around it ! item.id = door[0] ! item.moveto( pos.x - door[2], pos.y - door[3], pos.z ) ! if item.hastag( 'opened' ): ! item.deltag( 'opened' ) ! item.update() ! ! # Soundeffect (close) ! item.soundeffect( door[5] ) *************** *** 319,321 **** def onTelekinesis(char, item): return onUse(char, item, 1) - --- 339,340 ---- Index: wall_clock.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wall_clock.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wall_clock.py 26 May 2004 13:07:20 -0000 1.4 --- wall_clock.py 1 Jul 2004 21:43:28 -0000 1.5 *************** *** 56,58 **** char.message( time ) ! return 1 \ No newline at end of file --- 56,58 ---- char.message( time ) ! return 1 |
From: Sebastian H. <dar...@us...> - 2004-07-01 21:37:53
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25224/python Modified Files: char.cpp Log Message: corrections Index: char.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v retrieving revision 1.171 retrieving revision 1.172 diff -C2 -d -r1.171 -r1.172 *** char.cpp 29 Jun 2004 22:22:59 -0000 1.171 --- char.cpp 1 Jul 2004 21:37:44 -0000 1.172 *************** *** 2144,2151 **** /* ! \method char.aiengine \description Get the ai engine associated with this NPC. This only works for NPCs and returns None otherwise ! \return The Ai object used by this npc. */ static PyObject* wpChar_aiengine( wpChar* self, PyObject* args ) --- 2144,2151 ---- /* ! \method char.aiengine \description Get the ai engine associated with this NPC. This only works for NPCs and returns None otherwise ! \return The <object id="ai">ai</object> object used by this npc. */ static PyObject* wpChar_aiengine( wpChar* self, PyObject* args ) |
From: Sebastian H. <dar...@us...> - 2004-07-01 21:36:38
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25066/python Modified Files: pyai.cpp Log Message: Last object type documented! Index: pyai.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/pyai.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pyai.cpp 15 Jun 2004 02:44:46 -0000 1.6 --- pyai.cpp 1 Jul 2004 21:36:29 -0000 1.7 *************** *** 38,43 **** #include "objectcache.h" ! /*! ! The object for Wolfpack Python items */ struct wpAI --- 38,44 ---- #include "objectcache.h" ! /* ! \object ai ! \description This object type represents the ai assigned to a npc. */ struct wpAI *************** *** 88,93 **** } ! // Method declarations ! static PyObject* wpAI_onSpeechInput( wpAI* self, PyObject* args ) { --- 89,99 ---- } ! /* ! \method ai.onSpeechInput ! \param from A <object id="char">char</object> object for the character the text is coming from. ! \param text A string with the text that should be processed. ! \description This method sends a text with a given source to the ai engine to proces it. This ! could be used to force the banker engine to open the bankbox for instance. ! */ static PyObject* wpAI_onSpeechInput( wpAI* self, PyObject* args ) { |
From: Sebastian H. <dar...@us...> - 2004-07-01 21:32:44
|
Update of /cvsroot/wpdev/xmlscripts/documentation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24470 Modified Files: generate_html.py Log Message: A fix for tables. Index: generate_html.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/generate_html.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** generate_html.py 29 Jun 2004 22:46:13 -0000 1.6 --- generate_html.py 1 Jul 2004 21:32:35 -0000 1.7 *************** *** 95,100 **** command = commands[id] overview += '<td>- <a href="command_%s.html">%s</a></td>' % (command['name'].lower(), command['name']) ! else: ! overview += "<td> </td>\n"; overview += "</tr>\n" --- 95,100 ---- command = commands[id] overview += '<td>- <a href="command_%s.html">%s</a></td>' % (command['name'].lower(), command['name']) ! else: ! overview += "<td> </td>\n"; overview += "</tr>\n" *************** *** 157,162 **** event = events[id] overview += '<td><a href="event_%s.html">%s</a></td>' % (event['name'].lower(), event['name']) ! else: ! overview += "<td> </td>\n"; overview += "</tr>\n" --- 157,162 ---- event = events[id] overview += '<td><a href="event_%s.html">%s</a></td>' % (event['name'].lower(), event['name']) ! else: ! overview += "<td> </td>\n"; overview += "</tr>\n" *************** *** 219,224 **** object = objects[id] overview += '<td><a href="object_%s.html">%s</a></td>' % (object['object'].lower(), object['object']) ! else: ! overview += "<td> </td>\n"; overview += "</tr>\n" --- 219,224 ---- object = objects[id] overview += '<td><a href="object_%s.html">%s</a></td>' % (object['object'].lower(), object['object']) ! else: ! overview += "<td> </td>\n"; overview += "</tr>\n" *************** *** 282,288 **** if id < len(methods): method = methods[id] ! overview += '<td>- <a href="#meth_%s">%s</a></td>' % (method['method'].lower(), method['method']) ! else: ! overview += "<td> </td>\n"; overview += "</tr>\n" --- 282,288 ---- if id < len(methods): method = methods[id] ! overview += '<td width="15%%">- <a href="#meth_%s">%s</a></td>' % (method['method'].lower(), method['method']) ! else: ! overview += "<td width=\"15%\"> </td>\n"; overview += "</tr>\n" *************** *** 302,308 **** if id < len(properties): property = properties[id] ! overview += '<td>- <a href="#prop_%s">%s</a></td>' % (property['property'].lower(), property['property']) ! else: ! overview += "<td> </td>\n"; overview += "</tr>\n" --- 302,308 ---- if id < len(properties): property = properties[id] ! overview += '<td width="15%%">- <a href="#prop_%s">%s</a></td>' % (property['property'].lower(), property['property']) ! else: ! overview += "<td width=\"15%\"> </td>\n"; overview += "</tr>\n" *************** *** 416,421 **** module = modules[id] overview += '<td>- <a href="module_%s.html">%s</a></td>' % (module.replace('.', '_').lower(), module) ! else: ! overview += "<td> </td>\n"; overview += "</tr>\n" --- 416,421 ---- module = modules[id] overview += '<td>- <a href="module_%s.html">%s</a></td>' % (module.replace('.', '_').lower(), module) ! else: ! overview += "<td> </td>\n"; overview += "</tr>\n" *************** *** 465,470 **** function = localfunctions[id] overview += '<td>- <a href="#func_%s">%s</a></td>' % (function['name'].lower(), function['name']) ! else: ! overview += "<td> </td>\n"; overview += "</tr>\n" --- 465,470 ---- function = localfunctions[id] overview += '<td>- <a href="#func_%s">%s</a></td>' % (function['name'].lower(), function['name']) ! else: ! overview += "<td> </td>\n"; overview += "</tr>\n" |
From: Sebastian H. <dar...@us...> - 2004-07-01 20:07:17
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7148/network Modified Files: uorxpackets.cpp uorxpackets.h uosocket.cpp uosocket.h uotxpackets.h Log Message: Implemented the new allnames feature. Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.379 retrieving revision 1.380 diff -C2 -d -r1.379 -r1.380 *** uosocket.cpp 15 Jun 2004 02:44:45 -0000 1.379 --- uosocket.cpp 1 Jul 2004 20:07:07 -0000 1.380 *************** *** 336,339 **** --- 336,341 ---- case 0x91: handleServerAttach( dynamic_cast<cUORxServerAttach*>( packet ) ); break; + case 0x98: + handleAllNames(dynamic_cast<cUORxAllNames*>(packet)); break; case 0x9B: handleHelpRequest( dynamic_cast<cUORxHelpRequest*>( packet ) ); break; *************** *** 792,795 **** --- 794,798 ---- return; } + QValueVector<P_PLAYER> characters = _account->caracterList(); *************** *** 3198,3199 **** --- 3201,3214 ---- return false; } + + void cUOSocket::handleAllNames(cUORxAllNames *packet) { + cUObject *object = World::instance()->findObject(packet->serial()); + + // Send a packet back with the name of the requested object + if (object) { + cUOTxAllNames allnames; + allnames.setSerial(object->serial()); + allnames.setName(object->name()); + send(&allnames); + } + } Index: uorxpackets.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uorxpackets.cpp,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** uorxpackets.cpp 15 Jun 2004 02:44:45 -0000 1.63 --- uorxpackets.cpp 1 Jul 2004 20:07:07 -0000 1.64 *************** *** 92,95 **** --- 92,97 ---- case 0x91: return new cUORxServerAttach( data ); + case 0x98: + return new cUORxAllNames( data ); case 0x9B: return new cUORxHelpRequest( data ); Index: uotxpackets.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uotxpackets.h,v retrieving revision 1.108 retrieving revision 1.109 diff -C2 -d -r1.108 -r1.109 *** uotxpackets.h 9 Jun 2004 22:49:43 -0000 1.108 --- uotxpackets.h 1 Jul 2004 20:07:08 -0000 1.109 *************** *** 2465,2467 **** --- 2465,2483 ---- }; + // 0x98 AllNames + class cUOTxAllNames : public cUOPacket { + public: + cUOTxAllNames() : cUOPacket(0x98, 37) { + setShort(1, 37); + } + + void setSerial(unsigned int data) { + setInt(3, data); + } + + void setName(const QString &name) { + setAsciiString(7, name.latin1(), 29); + } + }; + #endif // __UO_TXPACKETS__ Index: uorxpackets.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uorxpackets.h,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** uorxpackets.h 2 Jun 2004 15:04:09 -0000 1.62 --- uorxpackets.h 1 Jul 2004 20:07:07 -0000 1.63 *************** *** 1227,1229 **** --- 1227,1244 ---- }; + // 0x98 AllNames + class cUORxAllNames : public cUOPacket { + public: + cUORxAllNames(const QByteArray &data) : cUOPacket( data ) { + } + + unsigned int serial() { + return getInt(3); + } + + const QString &name() { + return getAsciiString(7); + } + }; + #endif // __UO_RXPACKETS__ Index: uosocket.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.h,v retrieving revision 1.118 retrieving revision 1.119 diff -C2 -d -r1.118 -r1.119 *** uosocket.h 2 Jun 2004 15:04:10 -0000 1.118 --- uosocket.h 1 Jul 2004 20:07:08 -0000 1.119 *************** *** 220,223 **** --- 220,224 ---- void handleExtendedStats( cUORxExtendedStats* packet ); void handleAction( cUORxAction* packet ); + void handleAllNames( cUORxAllNames *packet ); void handleGumpResponse( cUORxGumpResponse* packet ); void handleHelpRequest( cUORxHelpRequest* packet ); |
From: Sebastian H. <dar...@us...> - 2004-07-01 16:31:06
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29008 Modified Files: pythonscript.cpp Log Message: New documentation Index: pythonscript.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/pythonscript.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** pythonscript.cpp 14 Jun 2004 22:15:30 -0000 1.40 --- pythonscript.cpp 1 Jul 2004 16:30:56 -0000 1.41 *************** *** 245,249 **** \param player The player who requested the tooltip. \param object The object the tooltip was requested for. ! \param tooltip The tooltip that is about to be sent. \condition Triggered just before a tooltip is sent for an object. \notes Please note that you cannot stop the tooltip from being sent. --- 245,249 ---- \param player The player who requested the tooltip. \param object The object the tooltip was requested for. ! \param tooltip The <object id="tooltip">tooltip</object> object that is about to be sent. \condition Triggered just before a tooltip is sent for an object. \notes Please note that you cannot stop the tooltip from being sent. |
From: Sebastian H. <dar...@us...> - 2004-07-01 16:31:04
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29008/python Modified Files: pytooltip.cpp Log Message: New documentation Index: pytooltip.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/pytooltip.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** pytooltip.cpp 15 Jun 2004 02:44:46 -0000 1.19 --- pytooltip.cpp 1 Jul 2004 16:30:55 -0000 1.20 *************** *** 35,38 **** --- 35,43 ---- #include "../player.h" + /* + \object tooltip + \description This object represents a tooltip for an object. It allows you to modify the tooltip sent to + the client. + */ typedef struct { *************** *** 74,77 **** --- 79,92 ---- }; + /* + \method tooltip.add + \param id The cliloc id of the text. + \param params Parameters for the cliloc text. + \description This method adds a line to the tooltip. The text is + determined by the given cliloc id and the parameters for it. + Please note that the first line is automatically colored by the + client. HTML is also allowed in tooltips. A cliloc id can only be used once + in a tooltip. + */ static PyObject* wpTooltip_add( wpTooltip* self, PyObject* args ) { *************** *** 89,92 **** --- 104,111 ---- } + /* + \method tooltip.reset + \description This method deletes all lines from the tooltip. + */ static PyObject* wpTooltip_reset( wpTooltip* self, PyObject* args ) { *************** *** 119,124 **** --- 138,149 ---- static PyObject* wpTooltip_getAttr( wpTooltip* self, char* name ) { + /* + \property tooltip.id This is the internal id of this tooltip. + */ if ( !strcmp( name, "id" ) ) return PyInt_FromLong( self->list->getInt( 11 ) ); + /* + \property tooltip.serial This is the serial of the object this tooltip is for. + */ else if ( !strcmp( name, "serial" ) ) return PyInt_FromLong( self->list->getInt( 5 ) ); |
From: Sebastian H. <dar...@us...> - 2004-07-01 14:17:14
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1510/python Modified Files: pypacket.cpp Log Message: packet doc Index: pypacket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/pypacket.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** pypacket.cpp 2 Jun 2004 19:13:14 -0000 1.11 --- pypacket.cpp 1 Jul 2004 14:17:02 -0000 1.12 *************** *** 33,37 **** #include "../network/uosocket.h" ! // Object Information struct wpPacket { --- 33,41 ---- #include "../network/uosocket.h" ! /* ! \object packet ! \description This object type represents a packet received from the client or one that should ! be sent to the client. ! */ struct wpPacket { *************** *** 69,73 **** }; ! // Resize the packet static PyObject* wpPacket_resize( PyObject* self, PyObject* args ) { --- 73,82 ---- }; ! /* ! \method packet.resize ! \param size The new size in bytes of the packet. ! \description This method resizes the packet and either truncates to the new size or ! fills newly added bytes with zeros. ! */ static PyObject* wpPacket_resize( PyObject* self, PyObject* args ) { *************** *** 83,87 **** } ! // Set a byte static PyObject* wpPacket_setbyte( PyObject* self, PyObject* args ) { --- 92,101 ---- } ! /* ! \method packet.setbyte ! \param offset The byte offset within the packet. ! \param value The integer value that should be set. ! \description This method sets a byte (8 bit) value within the packet. ! */ static PyObject* wpPacket_setbyte( PyObject* self, PyObject* args ) { *************** *** 97,101 **** } ! // Set a short static PyObject* wpPacket_setshort( PyObject* self, PyObject* args ) { --- 111,120 ---- } ! /* ! \method packet.setshort ! \param offset The byte offset within the packet. ! \param value The integer value that should be set. ! \description This method sets a short (16 bit) value within the packet. ! */ static PyObject* wpPacket_setshort( PyObject* self, PyObject* args ) { *************** *** 111,115 **** } ! // Set an integer static PyObject* wpPacket_setint( PyObject* self, PyObject* args ) { --- 130,139 ---- } ! /* ! \method packet.setint ! \param offset The byte offset within the packet. ! \param value The integer value that should be set. ! \description This method sets a integer (32 bit) value within the packet. ! */ static PyObject* wpPacket_setint( PyObject* self, PyObject* args ) { *************** *** 125,129 **** } ! // Get a byte static PyObject* wpPacket_getbyte( PyObject* self, PyObject* args ) { --- 149,158 ---- } ! /* ! \method packet.getbyte ! \param offset The byte offset within the packet. ! \return An integer value. ! \description This methods get an 8-bit value from the packet. ! */ static PyObject* wpPacket_getbyte( PyObject* self, PyObject* args ) { *************** *** 136,140 **** } ! // Get a short static PyObject* wpPacket_getshort( PyObject* self, PyObject* args ) { --- 165,174 ---- } ! /* ! \method packet.getshort ! \param offset The byte offset within the packet. ! \return An integer value. ! \description This methods get a 16-bit value from the packet. ! */ static PyObject* wpPacket_getshort( PyObject* self, PyObject* args ) { *************** *** 147,151 **** } ! // Get an integer static PyObject* wpPacket_getint( PyObject* self, PyObject* args ) { --- 181,190 ---- } ! /* ! \method packet.getint ! \param offset The byte offset within the packet. ! \return An integer value. ! \description This methods get a 32-bit value from the packet. ! */ static PyObject* wpPacket_getint( PyObject* self, PyObject* args ) { *************** *** 158,163 **** } ! ! // Set raw data in the packet buffer static PyObject* wpPacket_setascii( PyObject* self, PyObject* args ) { --- 197,206 ---- } ! /* ! \method packet.setascii ! \param offset The byte offset within the packet. ! \param value The string value. ! \description This method copies an ASCII string into the packet including the null termination byte. ! */ static PyObject* wpPacket_setascii( PyObject* self, PyObject* args ) { *************** *** 185,189 **** } ! // Set data in unicode encoding static PyObject* wpPacket_setunicode( PyObject* self, PyObject* args ) { --- 228,237 ---- } ! /* ! \method packet.setunicode ! \param offset The byte offset within the packet. ! \param value The unicode or utf-8 value. ! \description This method copies an unicode string into the packet including the null termination byte. ! */ static PyObject* wpPacket_setunicode( PyObject* self, PyObject* args ) { *************** *** 204,207 **** --- 252,261 ---- } + /* + \method packet.getunicode + \param offset The byte offset within the packet. + \param length The maximum length. + \description This method gets an unicode string from the packet. + */ static PyObject* wpPacket_getunicode( PyObject* self, PyObject* args ) { *************** *** 220,223 **** --- 274,283 ---- } + /* + \method packet.getascii + \param offset The byte offset within the packet. + \param length The maximum length. + \description This method gets an ASCII string from the packet. + */ static PyObject* wpPacket_getascii( PyObject* self, PyObject* args ) { *************** *** 243,247 **** } ! // Send the packet static PyObject* wpPacket_send( PyObject* self, PyObject* args ) { --- 303,311 ---- } ! /* ! \method packet.send ! \param socket A <object id="socket">socket</object> object. ! \description This method sends this packet to a given socket. ! */ static PyObject* wpPacket_send( PyObject* self, PyObject* args ) { *************** *** 257,261 **** } ! // Return a Packet Dump static PyObject* wpPacket_dump( PyObject* self, PyObject* args ) { --- 321,329 ---- } ! /* ! \method packet.dump ! \return A string. ! \description This method creates a dump of the packet and returns it as a human readable string. ! */ static PyObject* wpPacket_dump( PyObject* self, PyObject* args ) { *************** *** 287,290 **** --- 355,361 ---- static PyObject* wpPacket_getattr( PyObject* self, char* name ) { + /* + \rproperty packet.size The current size of this packet. + */ if ( !strcmp( name, "size" ) ) { |
From: Sebastian H. <dar...@us...> - 2004-06-30 21:20:37
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25535/webroot Added Files: zip.gif Log Message: New documentation --- NEW FILE: zip.gif --- (This appears to be a binary file; contents omitted.) |
From: Sebastian H. <dar...@us...> - 2004-06-29 22:46:22
|
Update of /cvsroot/wpdev/xmlscripts/documentation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7284 Modified Files: generate_html.py parse.py Log Message: New documentation Index: parse.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/parse.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** parse.py 29 Jun 2004 11:36:25 -0000 1.7 --- parse.py 29 Jun 2004 22:46:13 -0000 1.8 *************** *** 26,29 **** --- 26,32 ---- else: return 'Wolfpack ' + VERSION + ' ' + BETA + + def getVersionNumber(): + return VERSION # <object id="char">....</object> Index: generate_html.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/generate_html.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** generate_html.py 29 Jun 2004 14:47:20 -0000 1.5 --- generate_html.py 29 Jun 2004 22:46:13 -0000 1.6 *************** *** 5,9 **** import os.path import sys ! from parse import parsepython, parsecpp, getVersion from glob import glob --- 5,9 ---- import os.path import sys ! from parse import parsepython, parsecpp, getVersion, getVersionNumber from glob import glob *************** *** 266,269 **** --- 266,272 ---- text = template.read() template.close() + + text = text.replace('{GENERATED}', generated) + text = text.replace('{VERSION}', version) # Compile an overview *************** *** 523,525 **** output = open('webroot/index.html', "wt") output.write(text) ! output.close() \ No newline at end of file --- 526,532 ---- output = open('webroot/index.html', "wt") output.write(text) ! output.close() ! ! output = open('version', 'wt') ! output.write(str(getVersionNumber())) ! output.close() |