wpdev-commits Mailing List for Wolfpack Emu (Page 64)
Brought to you by:
rip,
thiagocorrea
Menu
▾
▴
wpdev-commits — Wolfpack CVS commit info
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(121) |
Sep
(256) |
Oct
(59) |
Nov
(73) |
Dec
(120) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(259) |
Feb
(381) |
Mar
(501) |
Apr
(355) |
May
(427) |
Jun
(270) |
Jul
(394) |
Aug
(412) |
Sep
(724) |
Oct
(578) |
Nov
(65) |
Dec
|
|
From: Richard M. <dr...@us...> - 2004-08-19 22:57:53
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11081/summoned Modified Files: air_elemental.xml Log Message: Fixed skills Index: air_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned/air_elemental.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** air_elemental.xml 9 Aug 2004 18:45:42 -0000 1.2 --- air_elemental.xml 19 Aug 2004 22:57:44 -0000 1.3 *************** *** 20,26 **** <maxstamina>50</maxstamina> <!-- Skills --> ! <magicresistance><random min="" max=""/></magicresistance> ! <tactics><random min="" max=""/></tactics> ! <wrestling><random min="" max=""/></wrestling> <!-- Damage --> <mindamage>13</mindamage> --- 20,30 ---- <maxstamina>50</maxstamina> <!-- Skills --> ! <magicresistance>600/magicresistance> ! <tactics>1000</tactics> ! <wrestling>800</wrestling> ! <anatomy>0</anatomy> ! <magery>700</magery> ! <evaluatingintel>700</evaluatingintel> ! <meditation>700</meditation> <!-- Damage --> <mindamage>13</mindamage> |
|
From: Sebastian H. <dar...@us...> - 2004-08-19 22:44:28
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ratmen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8729/npcs/monsters/ratmen Modified Files: ratmen.xml Log Message: Typo fix. Index: ratmen.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ratmen/ratmen.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ratmen.xml 7 Jun 2004 21:40:39 -0000 1.10 --- ratmen.xml 19 Aug 2004 22:44:18 -0000 1.11 *************** *** 12,16 **** <npc id="ratman" inherit="monster_base"> <name><random list="NAMES_RATMAN" /></name> ! <id><radom list="NPCIDS_RATMAN" /></id> <karma><random list="KARMA_L2" /></karma> <fame><random list="FAME_L2" /></fame> --- 12,16 ---- <npc id="ratman" inherit="monster_base"> <name><random list="NAMES_RATMAN" /></name> ! <id><random list="NPCIDS_RATMAN" /></id> <karma><random list="KARMA_L2" /></karma> <fame><random list="FAME_L2" /></fame> |
|
From: Sebastian H. <dar...@us...> - 2004-08-19 22:41:06
|
Update of /cvsroot/wpdev/xmlscripts/definitions/lists In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7926/lists Modified Files: skins.xml Log Message: Fix for skin hues. Index: skins.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/lists/skins.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** skins.xml 26 May 2004 13:45:33 -0000 1.4 --- skins.xml 19 Aug 2004 22:40:49 -0000 1.5 *************** *** 272,287 **** <item>0x901</item> <item>0x902</item> ! <item>9x903</item> ! <item>9x904</item> ! <item>9x905</item> ! <item>9x906</item> ! <item>9x907</item> ! <item>9x908</item> ! <item>9x909</item> ! <item>9x90a</item> ! <item>9x90b</item> ! <item>9x90c</item> ! <item>9x90d</item> ! <item>9x90e</item> </list> --- 272,287 ---- <item>0x901</item> <item>0x902</item> ! <item>0x903</item> ! <item>0x904</item> ! <item>0x905</item> ! <item>0x906</item> ! <item>0x907</item> ! <item>0x908</item> ! <item>0x909</item> ! <item>0x90a</item> ! <item>0x90b</item> ! <item>0x90c</item> ! <item>0x90d</item> ! <item>0x90e</item> </list> |
|
From: Sebastian H. <dar...@us...> - 2004-08-19 19:17:40
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3328 Modified Files: ChangeLog Log Message: Corrected release date Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ChangeLog 19 Aug 2004 19:17:08 -0000 1.9 --- ChangeLog 19 Aug 2004 19:17:25 -0000 1.10 *************** *** 4,8 **** ! Wolfpack 12.9.8 Beta (4. August 2004) - Save fixes - Cleanups and general fixes. --- 4,8 ---- ! Wolfpack 12.9.8 Beta (19. August 2004) - Save fixes - Cleanups and general fixes. |
|
From: Sebastian H. <dar...@us...> - 2004-08-19 19:17:31
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3272 Modified Files: ChangeLog res.rc verinfo.h Log Message: Released 12.9.8 Index: verinfo.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/verinfo.h,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** verinfo.h 6 Aug 2004 21:39:35 -0000 1.40 --- verinfo.h 19 Aug 2004 19:17:08 -0000 1.41 *************** *** 36,40 **** inline const char* productVersion() { ! return "12.9.8"; } --- 36,40 ---- inline const char* productVersion() { ! return "12.9.9"; } Index: res.rc =================================================================== RCS file: /cvsroot/wpdev/wolfpack/res.rc,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** res.rc 4 Jul 2004 16:45:43 -0000 1.31 --- res.rc 19 Aug 2004 19:17:08 -0000 1.32 *************** *** 36,40 **** 1 VERSIONINFO ! FILEVERSION 12,9,8,0 PRODUCTVERSION 13,0,0,0 FILEFLAGSMASK 0x3fL --- 36,40 ---- 1 VERSIONINFO ! FILEVERSION 12,9,9,0 PRODUCTVERSION 13,0,0,0 FILEFLAGSMASK 0x3fL *************** *** 55,59 **** VALUE "CompanyName", "Wolfpack Development Team" VALUE "FileDescription", "Ultima Online Server Emulator" ! VALUE "FileVersion", "12.9.8 Beta" VALUE "LegalCopyright", "© 2001-2004 Wolfpack Dev. Team" VALUE "OriginalFilename", "wolfpack.exe" --- 55,59 ---- VALUE "CompanyName", "Wolfpack Development Team" VALUE "FileDescription", "Ultima Online Server Emulator" ! VALUE "FileVersion", "12.9.9 Beta" VALUE "LegalCopyright", "© 2001-2004 Wolfpack Dev. Team" VALUE "OriginalFilename", "wolfpack.exe" Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ChangeLog 19 Aug 2004 12:06:56 -0000 1.8 --- ChangeLog 19 Aug 2004 19:17:08 -0000 1.9 *************** *** 29,33 **** (See Anti Speed Hack settings in the General group) - Added some additional checking to wolfpack.pro ! - Began binary save feature. (Incomplete) - Fixes for mul and diff files. Haven should now work. --- 29,33 ---- (See Anti Speed Hack settings in the General group) - Added some additional checking to wolfpack.pro ! - Binary save feature. Use the "binary" driver. - Fixes for mul and diff files. Haven should now work. |
|
From: Sebastian H. <dar...@us...> - 2004-08-19 18:14:04
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24577/webroot Modified Files: ChangeLog.wolfpack Log Message: changelog update Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** ChangeLog.wolfpack 19 Aug 2004 12:01:30 -0000 1.43 --- ChangeLog.wolfpack 19 Aug 2004 18:13:53 -0000 1.44 *************** *** 1,5 **** Wolfpack 13.0.0 ChangeLog ! Wolfpack 12.9.9 Beta (N/A) * Core Changes: * Definition Changes: --- 1,5 ---- Wolfpack 13.0.0 ChangeLog ! Wolfpack 12.9.9 Beta (CVS) * Core Changes: * Definition Changes: *************** *** 8,12 **** * Known Issues, Bugs, and Missing Features: ! Wolfpack 12.9.8 Beta (CVS) * Core Changes: - Save fixes --- 8,12 ---- * Known Issues, Bugs, and Missing Features: ! Wolfpack 12.9.8 Beta (19. August 2004) * Core Changes: - Save fixes *************** *** 34,38 **** (See Anti Speed Hack settings in the General group) - Added some additional checking to wolfpack.pro ! - Began binary save feature. (Incomplete) - Fixes for mul and diff files. Haven should now work. --- 34,39 ---- (See Anti Speed Hack settings in the General group) - Added some additional checking to wolfpack.pro ! - Binary save driver. Use "binary" as your database save driver. ! No support for accounts (and none planned). - Fixes for mul and diff files. Haven should now work. |
|
From: Sebastian H. <dar...@us...> - 2004-08-19 13:53:25
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8083 Modified Files: basics.cpp basics.h commands.cpp definitions.cpp Log Message: Documented elements and finished the .exportdefinitions command. Index: basics.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basics.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** basics.cpp 19 Aug 2004 01:55:55 -0000 1.38 --- basics.cpp 19 Aug 2004 13:53:03 -0000 1.39 *************** *** 30,34 **** #include "coord.h" #include "exceptions.h" ! #include "uobject.h" // Library Includes --- 30,34 ---- #include "coord.h" #include "exceptions.h" ! #include "persistentobject.h" // Library Includes Index: basics.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basics.h,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** basics.h 19 Aug 2004 05:29:06 -0000 1.31 --- basics.h 19 Aug 2004 13:53:03 -0000 1.32 *************** *** 54,59 **** unsigned int getNormalizedTime(); - - template <class T> struct destroy_obj : std::unary_function<T, void> --- 54,57 ---- Index: definitions.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/definitions.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** definitions.cpp 13 Aug 2004 08:55:25 -0000 1.14 --- definitions.cpp 19 Aug 2004 13:53:03 -0000 1.15 *************** *** 719,722 **** --- 719,726 ---- } + /* + \object element + \description This object type represents an element in the definitions. + */ struct wpElement { *************** *** 740,743 **** --- 744,754 ---- }; + /* + \method element.hasattribute + \param name The name of the attribute + \return True or False. + \description This method checks if the element has an attribute with the + given name and returns True if so, False otherwise. + */ static PyObject* wpElement_hasattribute( wpElement* self, PyObject* args ) { *************** *** 754,757 **** --- 765,776 ---- } + /* + \method element.getattribute + \param name The name of the attribute. + \param default The return value if the attribute doesn't exist. Defaults to an empty string. + \return A unicode string containing the value of the attribute or the default value if the + attribute doesn't exist. + \description This method retrieves the string value of an attribute. + */ static PyObject* wpElement_getattribute( wpElement* self, PyObject* args ) { *************** *** 774,787 **** QString result = self->element->getAttribute( name, defvalue ); ! if ( result == QString::null ) ! { ! return PyUnicode_FromUnicode( ( Py_UNICODE * ) L"", 0 ); ! } ! else ! { ! return PyUnicode_FromUnicode( ( Py_UNICODE * ) result.ucs2(), result.length() ); ! } } static PyObject* wpElement_findchild( wpElement* self, PyObject* args ) { --- 793,806 ---- QString result = self->element->getAttribute( name, defvalue ); ! return QString2Python(result); } + /* + \method element.findchild + \param name The name of the child element. + \return An <object id="element">element</object> object for the child or None. + \description This method tries to find a child element with the given name. If + none could be found, None is returned. Otherwise the child element is returned. + */ static PyObject* wpElement_findchild( wpElement* self, PyObject* args ) { *************** *** 805,808 **** --- 824,834 ---- } + /* + \method element.getchild + \param index The index of the child element. + \return An <object id="element">element</object> object for the child or None. + \description This method returns a child element at the given index or None if + the index exceeds the number of child elements - 1. + */ static PyObject* wpElement_getchild( wpElement* self, PyObject* args ) { *************** *** 835,842 **** --- 861,873 ---- cElement* element = self->element; + // \rproperty element.name A string containing the name of the element. if ( !strcmp( name, "name" ) ) { return PyString_FromString( element->name().data() ); } + /* + \rproperty element.parent An <object id="element">element</object> object for the parent of this element. + If there is no parent this property is None. + */ else if ( !strcmp( name, "parent" ) ) { *************** *** 851,880 **** } } ! else if ( !strcmp( name, "value" ) ) ! { ! QString value = element->value(); ! ! if ( value == QString::null ) ! { ! return PyUnicode_FromUnicode( ( Py_UNICODE * ) L"", 0 ); ! } ! else ! { ! return PyUnicode_FromUnicode( ( Py_UNICODE * ) value.ucs2(), value.length() ); ! } } else if ( !strcmp( name, "text" ) ) { ! QString value = element->text(); ! ! if ( value == QString::null ) ! { ! return PyUnicode_FromUnicode( ( Py_UNICODE * ) L"", 0 ); ! } ! else ! { ! return PyUnicode_FromUnicode( ( Py_UNICODE * ) value.ucs2(), value.length() ); ! } } else if ( !strcmp( name, "childcount" ) ) { --- 882,904 ---- } } ! /* ! \rproperty element.value The parsed value of this node. ! This converts hexadecimal numbers to decimal numers and ! computes random values. The result still is a unicode string. ! */ ! else if ( !strcmp( name, "value" ) ) { ! return QString2Python(element->value()); } + /* + \rproperty element.text This is the text enclosed by this element. + */ else if ( !strcmp( name, "text" ) ) { ! return QString2Python(element->text()); } + /* + \rproperty element.childcount This is the number of children this + element has. + */ else if ( !strcmp( name, "childcount" ) ) { Index: commands.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v retrieving revision 1.256 retrieving revision 1.257 diff -C2 -d -r1.256 -r1.257 *** commands.cpp 19 Aug 2004 02:14:36 -0000 1.256 --- commands.cpp 19 Aug 2004 13:53:03 -0000 1.257 *************** *** 750,753 **** --- 750,755 ---- } + Console::instance()->log(LOG_MESSAGE, QString("Exporting definitions to %1.\n").arg("categories.db")); + try { // Create Tables *************** *** 867,870 **** --- 869,941 ---- driver.exec(sql); } + + categories.clear(); + lastcategory = 0; + + sections = Definitions::instance()->getSections(WPDT_LOCATION); + for (sectionIt = sections.begin(); sectionIt != sections.end(); ++sectionIt) { + const cElement *element = Definitions::instance()->getDefinition(WPDT_LOCATION, *sectionIt); + + QString category = element->getAttribute("category"); + if (category.isNull()) { + continue; + } + + int pos = category.findRev('\\'); + + if (pos == -1) { + continue; + } + + QString name = category.right(category.length() - (pos + 1)); + category = category.left(pos); + + // Create an id for the category + unsigned int categoryId; + if (!categories.contains(category)) { + ensureCategory(categories, lastcategory, category); + categoryId = lastcategory; + } else { + categoryId = categories[category]; + } + + Coord_cl coord; + parseCoordinates(element->text(), coord); + QString id = *sectionIt; + + QString sql = QString("INSERT INTO locations VALUES(NULL,'%1',%2,%3,%4,%5,%6,'%7');") + .arg(name.replace("'", "''")) + .arg(categoryId) + .arg(coord.x) + .arg(coord.y) + .arg(coord.z) + .arg(coord.map) + .arg(id.replace("'", "''")); + + driver.exec(sql); + } + + // Ensure that all categories are in the list + for (categoriesIt = categories.begin(); categoriesIt != categories.end(); ++categoriesIt) { + unsigned int parent = 0; + int pos = categoriesIt.key().findRev('\\'); + if (pos != -1) { + QString parentName = categoriesIt.key().left(pos); + if (categories.contains(parentName)) { + parent = categories[parentName]; + } + } + + QString name = categoriesIt.key(); + name = name.right(name.length() - (pos + 1)); + + QString sql = QString("INSERT INTO locationcategories VALUES(%1,'%2',%3,0);") + .arg(categoriesIt.data()) + .arg(name.replace("'", "''")) + .arg(parent); + driver.exec(sql); + } + + socket->sysMessage("Finished exporting definitions to categories.db."); } catch(const QString &e) { socket->sysMessage(e); |
|
From: Sebastian H. <dar...@us...> - 2004-08-19 13:10:25
|
Update of /cvsroot/wpdev/xmlscripts/definitions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32283 Modified Files: scripts.xml Log Message: Updates Index: scripts.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v retrieving revision 1.155 retrieving revision 1.156 diff -C2 -d -r1.155 -r1.156 *** scripts.xml 19 Aug 2004 13:08:14 -0000 1.155 --- scripts.xml 19 Aug 2004 13:10:14 -0000 1.156 *************** *** 149,153 **** <!-- NPC --> <script>npc.healer</script> - <script>npc.vendor</script> <!-- Context menu scripts --> --- 149,152 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-08-19 13:09:25
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31961/wolfpack Modified Files: __init__.py accounts.py console.py database.py settings.py sockets.py Log Message: Updates Index: sockets.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/sockets.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** sockets.py 17 Jul 2004 12:29:08 -0000 1.5 --- sockets.py 19 Aug 2004 13:09:11 -0000 1.6 *************** *** 13,18 **** import _wolfpack.sockets ! first = _wolfpack.sockets.first ! next = _wolfpack.sockets.next ! count = _wolfpack.sockets.count ! --- 13,17 ---- import _wolfpack.sockets ! d = globals() ! for (name, obj) in _wolfpack.sockets.__dict__.items(): ! d[name] = obj Index: database.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/database.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** database.py 2 Jul 2004 13:40:47 -0000 1.4 --- database.py 19 Aug 2004 13:09:11 -0000 1.5 *************** *** 23,29 **** MYSQL_WORLD = "`characters`, `corpses`, `corpses_equipment`, `effects`, `effects_properties`, `guilds`, `guilds_canidates`, `guilds_members`, `items`, `npcs`, `players`, `settings`, `skills`, `spawnregions`, `tags`, `uobject`, `uobjectmap`" ! query = _wolfpack.database.query ! execute = _wolfpack.database.execute ! driver = _wolfpack.database.driver ! open = _wolfpack.database.open ! close = _wolfpack.database.close --- 23,27 ---- MYSQL_WORLD = "`characters`, `corpses`, `corpses_equipment`, `effects`, `effects_properties`, `guilds`, `guilds_canidates`, `guilds_members`, `items`, `npcs`, `players`, `settings`, `skills`, `spawnregions`, `tags`, `uobject`, `uobjectmap`" ! d = globals() ! for (name, obj) in _wolfpack.database.__dict__.items(): ! d[name] = obj Index: accounts.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/accounts.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** accounts.py 22 Jul 2004 16:08:43 -0000 1.9 --- accounts.py 19 Aug 2004 13:09:11 -0000 1.10 *************** *** 7,17 **** import _wolfpack.accounts ! find = _wolfpack.accounts.find ! list = _wolfpack.accounts.list ! count = _wolfpack.accounts.count ! acls = _wolfpack.accounts.acls ! acl = _wolfpack.accounts.acl ! add = _wolfpack.accounts.add ! save = _wolfpack.accounts.save ! reload = _wolfpack.accounts.reload ! count = _wolfpack.accounts.count \ No newline at end of file --- 7,11 ---- import _wolfpack.accounts ! d = globals() ! for (name, obj) in _wolfpack.accounts.__dict__.items(): ! d[name] = obj Index: settings.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/settings.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** settings.py 2 Jul 2004 13:40:47 -0000 1.7 --- settings.py 19 Aug 2004 13:09:11 -0000 1.8 *************** *** 15,24 **** import _wolfpack.settings ! getbool = _wolfpack.settings.getbool ! setbool = _wolfpack.settings.setbool ! getnumber = _wolfpack.settings.getnumber ! setnumber = _wolfpack.settings.setnumber ! getstring = _wolfpack.settings.getstring ! setstring = _wolfpack.settings.setstring ! reload = _wolfpack.settings.reload ! save = _wolfpack.settings.save --- 15,19 ---- import _wolfpack.settings ! d = globals() ! for (name, obj) in _wolfpack.settings.__dict__.items(): ! d[name] = obj Index: console.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/console.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** console.py 27 Jun 2004 19:24:46 -0000 1.11 --- console.py 19 Aug 2004 13:09:11 -0000 1.12 *************** *** 15,24 **** import _wolfpack.console ! send = _wolfpack.console.send ! sendprogress = _wolfpack.console.sendprogress ! senddone = _wolfpack.console.senddone ! sendfail = _wolfpack.console.sendfail ! sendskip = _wolfpack.console.sendskip ! getbuffer = _wolfpack.console.getbuffer ! log = _wolfpack.console.log ! shutdown = _wolfpack.console.shutdown --- 15,19 ---- import _wolfpack.console ! d = globals() ! for (name, obj) in _wolfpack.console.__dict__.items(): ! d[name] = obj Index: __init__.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/__init__.py,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** __init__.py 25 Jul 2004 23:00:57 -0000 1.63 --- __init__.py 19 Aug 2004 13:09:10 -0000 1.64 *************** *** 14,74 **** from types import * ! charbase = _wolfpack.charbase ! additem = _wolfpack.additem ! addnpc = _wolfpack.addnpc ! guilds = _wolfpack.guilds ! newguild = _wolfpack.newguild ! findguild = _wolfpack.findguild ! queueaction = _wolfpack.queueaction ! registerpackethook = _wolfpack.registerpackethook ! charcount = _wolfpack.charcount ! itemcount = _wolfpack.itemcount ! npccount = _wolfpack.npccount ! playercount = _wolfpack.playercount ! getdefinition = _wolfpack.getdefinition ! getdefinitions = _wolfpack.getdefinitions ! hasevent = _wolfpack.hasevent ! hasnamedevent = _wolfpack.hasnamedevent ! callevent = _wolfpack.callevent ! callnamedevent = _wolfpack.callnamedevent ! statics = _wolfpack.statics ! finditem = _wolfpack.finditem ! findchar = _wolfpack.findchar ! findmulti = _wolfpack.findmulti ! region = _wolfpack.region ! itemregion = _wolfpack.itemregion ! charregion = _wolfpack.charregion ! map = _wolfpack.map ! hasmap = _wolfpack.hasmap ! statics = _wolfpack.statics ! items = _wolfpack.items ! chars = _wolfpack.chars ! itemiterator = _wolfpack.itemiterator ! chariterator = _wolfpack.chariterator ! addtimer = _wolfpack.addtimer ! list = _wolfpack.list ! registerglobal = _wolfpack.registerglobal ! registercommand = _wolfpack.registercommand ! tiledata = _wolfpack.tiledata ! landdata = _wolfpack.landdata ! coord = _wolfpack.coord ! effect = _wolfpack.effect ! serverversion = _wolfpack.serverversion ! isstarting = _wolfpack.isstarting ! isrunning = _wolfpack.isrunning ! isreloading = _wolfpack.isreloading ! isclosing = _wolfpack.isclosing ! addmulti = _wolfpack.addmulti ! newnpc = _wolfpack.newnpc ! newitem = _wolfpack.newitem ! newplayer = _wolfpack.newplayer ! tickcount = _wolfpack.tickcount ! currenttime = _wolfpack.currenttime ! packet = _wolfpack.packet ! getoption = _wolfpack.getoption ! setoption = _wolfpack.setoption ! playercount = _wolfpack.playercount ! npccount = _wolfpack.npccount ! """ \function wolfpack.findobject --- 14,21 ---- from types import * ! d = globals() ! for (name, obj) in _wolfpack.__dict__.items(): ! d[name] = obj ! """ \function wolfpack.findobject |
|
From: Sebastian H. <dar...@us...> - 2004-08-19 13:08:27
|
Update of /cvsroot/wpdev/xmlscripts/definitions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31798 Modified Files: scripts.xml Log Message: Updates Index: scripts.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v retrieving revision 1.154 retrieving revision 1.155 diff -C2 -d -r1.154 -r1.155 *** scripts.xml 16 Aug 2004 01:19:13 -0000 1.154 --- scripts.xml 19 Aug 2004 13:08:14 -0000 1.155 *************** *** 149,152 **** --- 149,153 ---- <!-- NPC --> <script>npc.healer</script> + <script>npc.vendor</script> <!-- Context menu scripts --> |
|
From: Sebastian H. <dar...@us...> - 2004-08-19 13:08:27
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/equipment In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31798/items/equipment Modified Files: food.xml Log Message: Updates Index: food.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/equipment/food.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** food.xml 17 Jul 2004 03:29:59 -0000 1.13 --- food.xml 19 Aug 2004 13:08:14 -0000 1.14 *************** *** 903,907 **** </item> ! <item id="172b" inherit="172b"> <id>0x172b</id> <weight>0.2</weight> --- 903,907 ---- </item> ! <item id="172b" inherit="172a"> <id>0x172b</id> <weight>0.2</weight> |
|
From: Richard M. <dr...@us...> - 2004-08-19 12:08:34
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20385 Modified Files: configure.py Log Message: Did this to make sure it forces Python2.3, some systems still use 2.2 for some reason. Index: configure.py =================================================================== RCS file: /cvsroot/wpdev/wolfpack/configure.py,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** configure.py 19 Aug 2004 05:55:41 -0000 1.21 --- configure.py 19 Aug 2004 12:08:25 -0000 1.22 *************** *** 1,3 **** ! #!/usr/bin/env python ################################################################# # ) (\_ # Wolfpack 13.0.0 Build Script # --- 1,3 ---- ! #!/usr/bin/env python2.3 ################################################################# # ) (\_ # Wolfpack 13.0.0 Build Script # |
|
From: Richard M. <dr...@us...> - 2004-08-19 12:07:05
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20113 Modified Files: ChangeLog Removed Files: configure Log Message: Removed configure, it's really no longer needed now. ./configure.py should now work for users after a chmod +x configure.py Updated the ChangeLog. --- configure DELETED --- Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ChangeLog 17 Aug 2004 19:35:50 -0000 1.7 --- ChangeLog 19 Aug 2004 12:06:56 -0000 1.8 *************** *** 34,37 **** --- 34,39 ---- - Database Change: items.magic is now items.movable + - QT_CLEAN_NAMESPACE Cleanups + - Python UCS4 Support Wolfpack 12.9.7 Beta (4. July 2004) |
|
From: Richard M. <dr...@us...> - 2004-08-19 12:01:41
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19386/webroot Modified Files: ChangeLog.wolfpack FAQ.html Log Message: Updates Index: FAQ.html =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/FAQ.html,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** FAQ.html 19 Aug 2004 04:32:37 -0000 1.9 --- FAQ.html 19 Aug 2004 12:01:30 -0000 1.10 *************** *** 240,243 **** --- 240,245 ---- <li><a name="10" class="question">Help! I get unicode errors with my python scripts!</a><br /> <div class="answer"> + <span style="font-weight:bold;">This problem should only occur with versions prior to Wolfpack 12.9.8.</span> + <br /><br /> This problem is mostly common with Linux/BSD. Python-2.3 on many distributions comes compiled using UCS4 for Unicode. Wolfpack currently requires that Python-2.3 be compiled with UCS2 for Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** ChangeLog.wolfpack 17 Aug 2004 20:21:24 -0000 1.42 --- ChangeLog.wolfpack 19 Aug 2004 12:01:30 -0000 1.43 *************** *** 39,42 **** --- 39,44 ---- - Database Change: items.magic is now items.movable + - QT_CLEAN_NAMESPACE Cleanups + - Python UCS4 Support * Definition Changes: - Fixed Sheep definitions |
|
From: Correa <thi...@us...> - 2004-08-19 05:55:50
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28071 Modified Files: configure.py Log Message: flush message before spawning qmake process Index: configure.py =================================================================== RCS file: /cvsroot/wpdev/wolfpack/configure.py,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** configure.py 19 Aug 2004 05:29:06 -0000 1.20 --- configure.py 19 Aug 2004 05:55:41 -0000 1.21 *************** *** 316,319 **** --- 316,320 ---- sys.stdout.write(green("Generating makefile...")) + sys.stdout.flush() os.spawnv(os.P_WAIT, qt_qmake, [qt_qmake, "wolfpack.pro"]) if options.dsp: |
|
From: Correa <thi...@us...> - 2004-08-19 05:35:24
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25288/python Modified Files: utilities.h Log Message: ops, missed a call. Index: utilities.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/utilities.h,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** utilities.h 19 Aug 2004 05:28:21 -0000 1.40 --- utilities.h 19 Aug 2004 05:35:14 -0000 1.41 *************** *** 156,160 **** { #if defined(Py_UNICODE_WIDE) ! return QString::fromUtf8( PyUnicode_AsUTF8String( object ) ); #else return QString::fromUcs2( ( ushort * ) PyUnicode_AS_UNICODE( object ) ); --- 156,160 ---- { #if defined(Py_UNICODE_WIDE) ! return QString::fromUtf8( PyString_AsString( PyUnicode_AsUTF8String( object ) ) ); #else return QString::fromUcs2( ( ushort * ) PyUnicode_AS_UNICODE( object ) ); |
|
From: Correa <thi...@us...> - 2004-08-19 05:29:16
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24316 Modified Files: basics.h configure configure.py wolfpack.pro Log Message: Some improvements and cleanups Index: basics.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basics.h,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** basics.h 19 Aug 2004 05:28:21 -0000 1.30 --- basics.h 19 Aug 2004 05:29:06 -0000 1.31 *************** *** 305,306 **** --- 305,307 ---- #endif + Index: wolfpack.pro =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v retrieving revision 1.205 retrieving revision 1.206 diff -C2 -d -r1.205 -r1.206 *** wolfpack.pro 5 Aug 2004 21:36:37 -0000 1.205 --- wolfpack.pro 19 Aug 2004 05:29:06 -0000 1.206 *************** *** 6,11 **** ################################################################# - include( config.pri ) - PROJECT = wolfpack TARGET = wolfpack --- 6,9 ---- *************** *** 19,126 **** CONFIG += console ! # Common unix settings ! # Lets try to figure some paths ! # Checking in /usr first, then /usr/local ! # This will use custom installs over package installs. ! ! ! # MySQL Checks ! mysql { ! isEmpty( MySQL_INCDIR ) { ! message( "Warning: MySQL_INCDIR was not defined!" ) ! exists( /usr/local/include/mysql/mysql.h ) { ! message( "MySQL included found in: /usr/local/include/mysql" ) ! MySQL_INCDIR = /usr/local/include/mysql ! } ! else:exists( /usr/include/mysql/mysql.h ) { ! message( "MySQL included found in: /usr/include/mysql" ) ! MySQL_INCDIR = /usr/include/mysql ! } ! } ! isEmpty( MySQL_LIBDIR ) { ! message( "Warning: MySQL_LIBDIR was not defined!" ) ! exists( /usr/local/lib/mysql/libmysqlclient.so ) { ! message( "Found libmysqlclient.so in: /usr/local/lib/mysql" ) ! MySQL_LIBDIR = -L/usr/local/lib/mysql -lmysqlclient ! } ! else:exists( /usr/lib/mysql/libmysqlclient.so ) { ! message( "Found libmysqlclient.so in: /usr/lib/mysql" ) ! MySQL_LIBDIR = -L/usr/lib/mysql -lmysqlclient ! } ! } ! } ! ! # SQLite Checks ! sqlite { ! isEmpty( SQLite_INCDIR ) { ! message( "Warning: SQLite_INCDIR was not defined!" ) ! SQLite_INCDIR = sqlite ! } ! isEmpty( SQLite_LIBDIR ) { ! message( "Warning: SQLite_LIBDIR was not defined!" ) ! SQLite_LIBDIR = -Lsqlite ! } ! } ! ! # Python includes. Run configure script to initialize it. ! isEmpty( PY_INCDIR ) { ! message( "Warinng: PY_INCDIR was not defined!" ) ! exists( /usr/local/include/python2.3/Python.h ) { ! message( "Python includes found in: /usr/local/include/python2.3" ) ! PY_INCDIR = /usr/local/include/python2.3 ! } ! else:exists( /usr/local/include/Python2.3/Python.h ) { ! message( "Python includes found in: /usr/local/include/Python2.3" ) ! PY_INCDIR = /usr/local/include/Python2.3 ! } ! else:exists( /usr/include/python2.3/Python.h ) { ! message( "Python includes found in: /usr/include/python2.3" ) ! PY_INCDIR = /usr/include/python2.3 ! } ! else:exists( /usr/include/Python2.3/Python.h ) { ! message( "Python includes found in: /usr/include/Python2.3" ) ! PY_INCDIR = /usr/include/Python2.3 ! } ! ! } ! isEmpty( PY_LIBDIR ) { ! message( "Warinng: PY_LIBDIR was not defined!" ) ! shared { ! message( "Using Shared Python Configuration..." ) ! exists( /usr/local/lib/python2.3/config/libpython2.3.a ) { ! message( "Found libpython2.3.a in /usr/local/lib/python2.3/config" ) ! PY_LIBDIR = -L/usr/local/lib/python2.3/config -lpython2.3 ! } ! else:exists( /usr/lib/python2.3/config/libpython2.3.a ) { ! message( "Found libpython2.3.a in /usr/lib/python2.3/config" ) ! PY_LIBDIR = -L/usr/lib/python2.3/config -lpython2.3 ! } ! ! } ! else { ! message( "Using Static Python Configuration..." ) ! exists( /usr/local/lib/libpython2.3.so ) { ! message( "Found libpython2.3.so in /usr/local/lib" ) ! PY_LIBDIR = -lpython2.3 ! } ! exists( /usr/lib/libpython2.3.so ) { ! message( "Found libpython2.3.so in /usr/lib" ) ! PY_LIBDIR = -lpython2.3 ! } ! ! } ! } ! ! INCLUDEPATH += $$PY_INCDIR $$MySQL_INCDIR $$SQLite_INCDIR ! LIBS += $$PY_LIBDIR $$MySQL_LIBDIR $$SQLite_LIBDIR ! ! # We need to remove these to be safe QMAKE_LIBS_X11 -= -lX11 -lXext -lm } ! win32 { ! INCLUDEPATH += $$PY_INCDIR $$MySQL_INCDIR $$SQLite_INCDIR ! LIBS += $$PY_LIBDIR $$MySQL_LIBDIR $$SQLite_LIBDIR ! } RC_FILE = res.rc --- 17,25 ---- CONFIG += console ! # We need to remove these, unnecessary dependency QMAKE_LIBS_X11 -= -lX11 -lXext -lm } ! DEFINES += QT_CLEAN_NAMESPACE RC_FILE = res.rc *************** *** 128,135 **** MOC_DIR = obj ! win32:INCLUDEPATH += sqlite win32:DEFINES -= UNICODE ! # Include configure's settings !include(config.pri) { message("HINT: use ./configure script!") --- 27,34 ---- MOC_DIR = obj ! INCLUDEPATH += sqlite win32:DEFINES -= UNICODE ! # Include configure settings !include(config.pri) { message("HINT: use ./configure script!") *************** *** 378,384 **** LICENSE.GPL - unix { - INCPATH -= /usr/include/python2.2 - } - - message( "Please make sure you execute: python configure.py" ) --- 277,278 ---- Index: configure =================================================================== RCS file: /cvsroot/wpdev/wolfpack/configure,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** configure 5 Aug 2004 22:19:39 -0000 1.36 --- configure 19 Aug 2004 05:29:06 -0000 1.37 *************** *** 9,12 **** echo "" - echo "Now please execute 'make' to compile Wolfpack." --- 9,11 ---- Index: configure.py =================================================================== RCS file: /cvsroot/wpdev/wolfpack/configure.py,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** configure.py 14 Aug 2004 05:42:48 -0000 1.19 --- configure.py 19 Aug 2004 05:29:06 -0000 1.20 *************** *** 24,28 **** mysql_incpath = "" ! sys.stdout.write( "Wolfpack configure script\n" ) def findFile( searchpath ): --- 24,62 ---- mysql_incpath = "" ! # Color codes ( borrowed from Gentoo's portage code ) ! colorcodes = {} ! colorcodes["reset"] = "\x1b[0m" ! colorcodes["bold"] = "\x1b[01m" ! colorcodes["green"] = "\x1b[32;01m" ! colorcodes["red"] = "\x1b[31;01m" ! colorcodes["darkred"] = "\x1b[31;06m" ! ! def nocolor(): ! for x in colorcodes.keys(): ! colorcodes[x] = "" ! def bold( text ): ! return colorcodes["bold"] + text + colorcodes["reset"] ! def red( text ): ! return colorcodes["red"] + text + colorcodes["reset"] ! def darkred( text ): ! return colorcodes["darkred"] + text + colorcodes["reset"] ! def green( text ): ! return colorcodes["green"] + text + colorcodes["reset"] ! ! ! def buildLibLine( path, file ): ! ! if path == "" or file == "": ! return "" ! ! if sys.platform == "win32": ! return path + os.path.pathsep + file ! else: ! if file[0:3] == "lib": ! file = file[3:] ! if file[-3:] == ".so": ! file = file[0:-3] ! result = "-L%s -l%s" % ( path, file ) ! return result def findFile( searchpath ): *************** *** 50,54 **** sys.stdout.write( "ok\n" ) else: ! sys.stdout.write( "failed\n" ) sys.stdout.write( "You must properly setup QTDIR" ) sys.exit(); --- 84,88 ---- sys.stdout.write( "ok\n" ) else: ! sys.stdout.write( red("failed") + "\n" ) sys.stdout.write( "You must properly setup QTDIR" ) sys.exit(); *************** *** 163,167 **** else: ! sys.stdout.write("ERROR: Unknown platform %s to checkPython()" % sys.platform ) sys.exit() --- 197,201 ---- else: ! sys.stdout.write(red("ERROR")+": Unknown platform %s to checkPython()" % sys.platform ) sys.exit() *************** *** 180,196 **** sys.stdout.write("ok\n") else: ! sys.stdout.write( "failed\n" ) ! sys.stdout.write( "Wolfpack requires Python version greater than 2.3.0 " ) sys.exit(); - sys.stdout.write( "Checking unicode support... " ) - if sys.maxunicode > 65535: - sys.stdout.write( "failed\n" ) - sys.stdout.write( "Wolfpack currently requires python to be compiled with UCS2, its compiled with UCS4\n" ) - sys.exit(); - else: - sys.stdout.write( "ok\n" ) ! sys.stdout.write( "Checking CPU byte order... %s" % sys.byteorder ) if sys.byteorder != 'little': sys.stdout.write("\nError: Wolfpack currently only supports little endian systems\n" ) --- 214,223 ---- sys.stdout.write("ok\n") else: ! sys.stdout.write( red("failed") + "\n" ) ! sys.stdout.write( bold("Wolfpack requires Python version greater than 2.3.0 ") ) sys.exit(); ! sys.stdout.write( "Checking CPU byte order... %s\n" % sys.byteorder ) if sys.byteorder != 'little': sys.stdout.write("\nError: Wolfpack currently only supports little endian systems\n" ) *************** *** 206,210 **** sys.stdout.write("%s\n" % os.path.join( py_libpath, py_libfile ) ) else: ! sys.stdout.write("Not Found!\n") sys.exit() --- 233,237 ---- sys.stdout.write("%s\n" % os.path.join( py_libpath, py_libfile ) ) else: ! sys.stdout.write(red("Not Found!") + "\n") sys.exit() *************** *** 216,220 **** sys.stdout.write( "%s\n" % py_incpath ) else: ! sys.stdout.write("Not Found!\n") sys.exit() --- 243,247 ---- sys.stdout.write( "%s\n" % py_incpath ) else: ! sys.stdout.write(red("Not Found!") + "\n") sys.exit() *************** *** 230,233 **** --- 257,261 ---- parser = OptionParser(version="%prog 0.1") parser.add_option("--dsp", action="store_true", dest="dsp", help="also Generate Visual Studio project files") + parser.add_option("--nocolor", action="store_true", dest="nocolor", help="disable color output support on this script") parser.add_option("--python-includes", dest="py_incpath", help="Python include directory") parser.add_option("--python-libraries", dest="py_libpath", help="Python library path") *************** *** 239,242 **** --- 267,273 ---- (options, args) = parser.parse_args() + if options.nocolor: + nocolor() + checkPython(options) if options.enable_mysql: *************** *** 256,268 **** config = file("config.pri", "w") ! config.write("# WARNING: This file was automatically generated by configure.py\n ") config.write("# any changes to this file will be lost!\n") # Build Python LIBS and Includes ! PY_LIBDIR = "" ! if sys.platform == "win32": ! PY_LIBDIR = os.path.join( py_libpath, py_libfile ) ! else: ! PY_LIBDIR = "-L%s -lpython2.3" % ( py_libpath ) config.write("PY_INCDIR = %s\n" % ( py_incpath ) ) config.write("PY_LIBDIR = %s\n" % PY_LIBDIR) --- 287,295 ---- config = file("config.pri", "w") ! config.write("# WARNING: This file was automatically generated by configure.py\n") config.write("# any changes to this file will be lost!\n") # Build Python LIBS and Includes ! PY_LIBDIR = buildLibLine( py_libpath, py_libfile ) config.write("PY_INCDIR = %s\n" % ( py_incpath ) ) config.write("PY_LIBDIR = %s\n" % PY_LIBDIR) *************** *** 270,286 **** # Build MySQL Libs and Includes ! MySQL_LIBDIR = "" ! if sys.platform == "win32": ! MySQL_LIBDIR = os.path.join( mysql_libpath, mysql_libfile ) ! else: ! MySQL_LIBDIR = "-L%s -lmysqlclient" % ( mysql_libpath ) config.write("MySQL_INCDIR = %s\n" % mysql_incpath ) config.write("MySQL_LIBDIR = %s\n" % MySQL_LIBDIR ) - # Build SQLite Libs and Includes - CONFIG += "sqlite " - config.write("SQLite_INCDIR = sqlite\n" ) - config.write("SQLite_LIBDIR = -lsqlite\n" ) - # if --debug if options.enable_debug: --- 297,304 ---- # Build MySQL Libs and Includes ! MySQL_LIBDIR = buildLibLine( mysql_libpath, mysql_libfile ) config.write("MySQL_INCDIR = %s\n" % mysql_incpath ) config.write("MySQL_LIBDIR = %s\n" % MySQL_LIBDIR ) # if --debug if options.enable_debug: *************** *** 293,305 **** config.write("DEFINES += %s\n" % DEFINES) config.write("CONFIG += %s\n" % CONFIG) config.close() ! sys.stdout.write("Generating makefile...\n") os.spawnv(os.P_WAIT, qt_qmake, [qt_qmake, "wolfpack.pro"]) if options.dsp: sys.stdout.write("Generating Visual Studio project files...\n") os.spawnv(os.P_WAIT, qt_qmake, [qt_qmake, "wolfpack.pro", "-t vcapp"]) ! sys.stdout.write("Done\n") ! sys.stdout.write("Configure finished. Please run make now.\n") if __name__ == "__main__": --- 311,325 ---- config.write("DEFINES += %s\n" % DEFINES) config.write("CONFIG += %s\n" % CONFIG) + config.write("LIBS += $$PY_LIBDIR $$MySQL_LIBDIR \n") + config.write("INCLUDEPATH += $$PY_INCDIR $$MySQL_INCDIR \n") config.close() ! sys.stdout.write(green("Generating makefile...")) os.spawnv(os.P_WAIT, qt_qmake, [qt_qmake, "wolfpack.pro"]) if options.dsp: sys.stdout.write("Generating Visual Studio project files...\n") os.spawnv(os.P_WAIT, qt_qmake, [qt_qmake, "wolfpack.pro", "-t vcapp"]) ! sys.stdout.write(bold("Done\n")) ! sys.stdout.write(bold("Configure finished. Please run 'make' now.\n")) if __name__ == "__main__": |
|
From: Correa <thi...@us...> - 2004-08-19 05:28:31
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23996/python Modified Files: gump.h socket.cpp target.h tempeffect.h utilities.h Log Message: should now be possible to use UCS4 python Index: gump.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/gump.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** gump.h 19 Aug 2004 01:59:16 -0000 1.23 --- gump.h 19 Aug 2004 05:28:21 -0000 1.24 *************** *** 143,147 **** { // Find the last dot ! Q_INT32 position = callback.findRev( "." ); QString sModule = callback.left( position ); QString sFunction = callback.right( callback.length() - ( position + 1 ) ); --- 143,147 ---- { // Find the last dot ! int position = callback.findRev( "." ); QString sModule = callback.left( position ); QString sFunction = callback.right( callback.length() - ( position + 1 ) ); Index: tempeffect.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/tempeffect.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** tempeffect.h 19 Aug 2004 01:59:16 -0000 1.27 --- tempeffect.h 19 Aug 2004 05:28:21 -0000 1.28 *************** *** 98,102 **** { // Find the last dot ! Q_INT32 position = dispelFunc_.findRev( "." ); QString sModule = dispelFunc_.left( position ); QString sFunction = dispelFunc_.right( dispelFunc_.length() - ( position + 1 ) ); --- 98,102 ---- { // Find the last dot ! int position = dispelFunc_.findRev( "." ); QString sModule = dispelFunc_.left( position ); QString sFunction = dispelFunc_.right( dispelFunc_.length() - ( position + 1 ) ); *************** *** 146,150 **** { // Find the last dot ! Q_INT32 position = functionName.findRev( "." ); QString sModule = functionName.left( position ); QString sFunction = functionName.right( functionName.length() - ( position + 1 ) ); --- 146,150 ---- { // Find the last dot ! int position = functionName.findRev( "." ); QString sModule = functionName.left( position ); QString sFunction = functionName.right( functionName.length() - ( position + 1 ) ); Index: socket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/socket.cpp,v retrieving revision 1.82 retrieving revision 1.83 diff -C2 -d -r1.82 -r1.83 *** socket.cpp 19 Aug 2004 01:59:16 -0000 1.82 --- socket.cpp 19 Aug 2004 05:28:21 -0000 1.83 *************** *** 421,425 **** else if ( PyUnicode_Check( item ) ) { ! gump->addRawLayout( QString::fromUcs2( ( ushort * ) PyUnicode_AS_UNICODE( item ) ) ); } else --- 421,425 ---- else if ( PyUnicode_Check( item ) ) { ! gump->addRawLayout( Python2QString( item ) ); } else *************** *** 439,443 **** else if ( PyUnicode_Check( item ) ) { ! gump->addRawText( QString::fromUcs2( ( ushort * ) PyUnicode_AS_UNICODE( item ) ) ); } else --- 439,443 ---- else if ( PyUnicode_Check( item ) ) { ! gump->addRawText( Python2QString( item ) ); } else Index: utilities.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/utilities.h,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** utilities.h 2 Jun 2004 15:04:11 -0000 1.39 --- utilities.h 19 Aug 2004 05:28:21 -0000 1.40 *************** *** 129,134 **** #define checkArgStr( id ) ( PyTuple_Size( args ) > id && ( PyString_Check( PyTuple_GetItem( args, id ) ) || PyUnicode_Check( PyTuple_GetItem( args, id ) ) ) ) #define checkArgUnicode( id ) ( PyTuple_Size( args ) > id && PyUnicode_Check( PyTuple_GetItem( args, id ) ) ) ! #define getArgStr( id ) (PyString_Check(PyTuple_GetItem(args,id)) ? QString(PyString_AsString(PyTuple_GetItem(args, id))) : QString::fromUcs2((ushort*)PyUnicode_AS_UNICODE(PyTuple_GetItem(args,id)))) ! #define getArgUnicode( id ) PyUnicode_AsUnicode( PyTuple_GetItem( args, id ) ) #define getUnicodeSize( id ) PyUnicode_GetSize( PyTuple_GetItem( args, id ) ) #define checkArgAccount( id ) ( PyTuple_Size( args ) > id && checkWpAccount( PyTuple_GetItem( args, id ) ) ) --- 129,134 ---- #define checkArgStr( id ) ( PyTuple_Size( args ) > id && ( PyString_Check( PyTuple_GetItem( args, id ) ) || PyUnicode_Check( PyTuple_GetItem( args, id ) ) ) ) #define checkArgUnicode( id ) ( PyTuple_Size( args ) > id && PyUnicode_Check( PyTuple_GetItem( args, id ) ) ) ! #define getArgStr( id ) (Python2QString(PyTuple_GetItem(args,id))) ! #define getArgUnicode( id ) Python2QString( PyTuple_GetItem( args, id ) ) #define getUnicodeSize( id ) PyUnicode_GetSize( PyTuple_GetItem( args, id ) ) #define checkArgAccount( id ) ( PyTuple_Size( args ) > id && checkWpAccount( PyTuple_GetItem( args, id ) ) ) *************** *** 155,159 **** --- 155,163 ---- if ( PyUnicode_Check( object ) ) { + #if defined(Py_UNICODE_WIDE) + return QString::fromUtf8( PyUnicode_AsUTF8String( object ) ); + #else return QString::fromUcs2( ( ushort * ) PyUnicode_AS_UNICODE( object ) ); + #endif } else if ( PyString_Check( object ) ) Index: target.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/target.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** target.h 19 Aug 2004 01:59:16 -0000 1.20 --- target.h 19 Aug 2004 05:28:21 -0000 1.21 *************** *** 137,141 **** { // Find the last dot ! Q_INT32 position = responsefunc.findRev( "." ); QString sModule = responsefunc.left( position ); QString sFunction = responsefunc.right( responsefunc.length() - ( position + 1 ) ); --- 137,141 ---- { // Find the last dot ! int position = responsefunc.findRev( "." ); QString sModule = responsefunc.left( position ); QString sFunction = responsefunc.right( responsefunc.length() - ( position + 1 ) ); *************** *** 175,179 **** { // Find the last dot ! Q_INT32 position = timeoutfunc.findRev( "." ); QString sModule = timeoutfunc.left( position ); QString sFunction = timeoutfunc.right( timeoutfunc.length() - ( position + 1 ) ); --- 175,179 ---- { // Find the last dot ! int position = timeoutfunc.findRev( "." ); QString sModule = timeoutfunc.left( position ); QString sFunction = timeoutfunc.right( timeoutfunc.length() - ( position + 1 ) ); *************** *** 210,214 **** { // Find the last dot ! Q_INT32 position = cancelfunc.findRev( "." ); QString sModule = cancelfunc.left( position ); QString sFunction = cancelfunc.right( cancelfunc.length() - ( position + 1 ) ); --- 210,214 ---- { // Find the last dot ! int position = cancelfunc.findRev( "." ); QString sModule = cancelfunc.left( position ); QString sFunction = cancelfunc.right( cancelfunc.length() - ( position + 1 ) ); |
|
From: Correa <thi...@us...> - 2004-08-19 05:28:31
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23996 Modified Files: basechar.cpp basics.h guilds.cpp pythonscript.h Log Message: should now be possible to use UCS4 python Index: guilds.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/guilds.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** guilds.cpp 19 Aug 2004 01:55:55 -0000 1.21 --- guilds.cpp 19 Aug 2004 05:28:21 -0000 1.22 *************** *** 521,536 **** if ( guildtitle ) { ! if ( PyUnicode_Check( guildtitle ) ) ! { ! info->setGuildTitle( QString::fromUcs2( ( ushort * ) PyUnicode_AS_UNICODE( guildtitle ) ) ); ! } ! else if ( PyString_Check( guildtitle ) ) ! { ! info->setGuildTitle( QString::fromUtf8( PyString_AsString( guildtitle ) ) ); ! } ! else ! { ! info->setGuildTitle( QString::null ); ! } } --- 521,525 ---- if ( guildtitle ) { ! info->setGuildTitle( Python2QString( guildtitle ) ); } *************** *** 791,851 **** else if ( !strcmp( name, "name" ) ) { ! if ( PyUnicode_Check( value ) ) ! { ! self->guild->setName( QString::fromUcs2( ( ushort * ) PyUnicode_AS_UNICODE( value ) ) ); ! } ! else if ( PyString_Check( value ) ) ! { ! self->guild->setName( QString::fromUtf8( PyString_AsString( value ) ) ); ! } ! else ! { ! self->guild->setName( QString::null ); ! } } else if ( !strcmp( name, "abbreviation" ) ) { ! if ( PyUnicode_Check( value ) ) ! { ! self->guild->setAbbreviation( QString::fromUcs2( ( ushort * ) PyUnicode_AS_UNICODE( value ) ) ); ! } ! else if ( PyString_Check( value ) ) ! { ! self->guild->setAbbreviation( QString::fromUtf8( PyString_AsString( value ) ) ); ! } ! else ! { ! self->guild->setAbbreviation( QString::null ); ! } } else if ( !strcmp( name, "charta" ) ) { ! if ( PyUnicode_Check( value ) ) ! { ! self->guild->setCharta( QString::fromUcs2( ( ushort * ) PyUnicode_AS_UNICODE( value ) ) ); ! } ! else if ( PyString_Check( value ) ) ! { ! self->guild->setCharta( QString::fromUtf8( PyString_AsString( value ) ) ); ! } ! else ! { ! self->guild->setCharta( QString::null ); ! } } else if ( !strcmp( name, "website" ) ) { ! if ( PyUnicode_Check( value ) ) ! { ! self->guild->setWebsite( QString::fromUcs2( ( ushort * ) PyUnicode_AS_UNICODE( value ) ) ); ! } ! else if ( PyString_Check( value ) ) ! { ! self->guild->setWebsite( QString::fromUtf8( PyString_AsString( value ) ) ); ! } ! else ! { ! self->guild->setWebsite( QString::null ); ! } } else if ( !strcmp( name, "alignment" ) ) --- 780,796 ---- else if ( !strcmp( name, "name" ) ) { ! self->guild->setName( Python2QString( value ) ); } else if ( !strcmp( name, "abbreviation" ) ) { ! self->guild->setAbbreviation( Python2QString( value ) ); } else if ( !strcmp( name, "charta" ) ) { ! self->guild->setCharta( Python2QString( value ) ); } else if ( !strcmp( name, "website" ) ) { ! self->guild->setWebsite( Python2QString( value ) ); } else if ( !strcmp( name, "alignment" ) ) Index: pythonscript.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/pythonscript.h,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** pythonscript.h 19 Aug 2004 01:59:15 -0000 1.37 --- pythonscript.h 19 Aug 2004 05:28:21 -0000 1.38 *************** *** 155,159 **** #define SET_INT_PROPERTY( id, setter ) if( name == id ) {\ bool ok; \ ! Q_INT32 data = value.toInt( &ok ); \ if( !ok ) \ PROPERTY_ERROR( -2, "Integer expected" ) \ --- 155,159 ---- #define SET_INT_PROPERTY( id, setter ) if( name == id ) {\ bool ok; \ ! int data = value.toInt( &ok ); \ if( !ok ) \ PROPERTY_ERROR( -2, "Integer expected" ) \ Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.133 retrieving revision 1.134 diff -C2 -d -r1.133 -r1.134 *** basechar.cpp 19 Aug 2004 01:59:15 -0000 1.133 --- basechar.cpp 19 Aug 2004 05:28:21 -0000 1.134 *************** *** 1529,1533 **** { bool ok; ! Q_INT32 data = value.toInt( &ok ); if ( !ok ) PROPERTY_ERROR( -2, "Integer expected" ) --- 1529,1533 ---- { bool ok; ! int data = value.toInt( &ok ); if ( !ok ) PROPERTY_ERROR( -2, "Integer expected" ) *************** *** 1542,1546 **** { bool ok; ! Q_INT32 data = value.toInt( &ok ); if ( !ok ) PROPERTY_ERROR( -2, "Integer expected" ) --- 1542,1546 ---- { bool ok; ! int data = value.toInt( &ok ); if ( !ok ) PROPERTY_ERROR( -2, "Integer expected" ) *************** *** 1555,1559 **** { bool ok; ! Q_INT32 data = value.toInt( &ok ); if ( !ok ) PROPERTY_ERROR( -2, "Integer expected" ) --- 1555,1559 ---- { bool ok; ! int data = value.toInt( &ok ); if ( !ok ) PROPERTY_ERROR( -2, "Integer expected" ) *************** *** 1568,1572 **** { bool ok; ! Q_INT32 data = value.toInt( &ok ); if ( !ok ) PROPERTY_ERROR( -2, "Integer expected" ) --- 1568,1572 ---- { bool ok; ! int data = value.toInt( &ok ); if ( !ok ) PROPERTY_ERROR( -2, "Integer expected" ) *************** *** 2620,2632 **** if ( result ) { ! // Strings and Unicode Objects gladly accepted ! if ( PyString_Check( result ) ) ! { ! name = PyString_AsString( result ); ! } ! else if ( PyUnicode_Check( result ) ) ! { ! name = QString::fromUcs2( ( ushort * ) PyUnicode_AS_UNICODE( result ) ); ! } } --- 2620,2624 ---- if ( result ) { ! name = Python2QString( result ); } Index: basics.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basics.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** basics.h 18 Aug 2004 17:05:46 -0000 1.29 --- basics.h 19 Aug 2004 05:28:21 -0000 1.30 *************** *** 54,57 **** --- 54,59 ---- unsigned int getNormalizedTime(); + + template <class T> struct destroy_obj : std::unary_function<T, void> |
|
From: Correa <thi...@us...> - 2004-08-19 05:28:30
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23996/ai Modified Files: ai.cpp Log Message: should now be possible to use UCS4 python Index: ai.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** ai.cpp 19 Aug 2004 01:59:15 -0000 1.26 --- ai.cpp 19 Aug 2004 05:28:21 -0000 1.27 *************** *** 237,241 **** { // Find the last dot ! Q_INT32 position = onspeech.findRev( "." ); QString sModule = onspeech.left( position ); QString sFunction = onspeech.right( onspeech.length() - ( position + 1 ) ); --- 237,241 ---- { // Find the last dot ! int position = onspeech.findRev( "." ); QString sModule = onspeech.left( position ); QString sFunction = onspeech.right( onspeech.length() - ( position + 1 ) ); *************** *** 277,281 **** { // Find the last dot ! Q_INT32 position = precond.findRev( "." ); QString sModule = precond.left( position ); QString sFunction = precond.right( precond.length() - ( position + 1 ) ); --- 277,281 ---- { // Find the last dot ! int position = precond.findRev( "." ); QString sModule = precond.left( position ); QString sFunction = precond.right( precond.length() - ( position + 1 ) ); *************** *** 330,334 **** { // Find the last dot ! Q_INT32 position = postcond.findRev( "." ); QString sModule = postcond.left( position ); QString sFunction = postcond.right( postcond.length() - ( position + 1 ) ); --- 330,334 ---- { // Find the last dot ! int position = postcond.findRev( "." ); QString sModule = postcond.left( position ); QString sFunction = postcond.right( postcond.length() - ( position + 1 ) ); *************** *** 383,387 **** { // Find the last dot ! Q_INT32 position = exec.findRev( "." ); QString sModule = exec.left( position ); QString sFunction = exec.right( exec.length() - ( position + 1 ) ); --- 383,387 ---- { // Find the last dot ! int position = exec.findRev( "." ); QString sModule = exec.left( position ); QString sFunction = exec.right( exec.length() - ( position + 1 ) ); |
|
From: Richard M. <dr...@us...> - 2004-08-19 04:32:46
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16103/webroot Modified Files: FAQ.html Log Message: Updates Index: FAQ.html =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/FAQ.html,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** FAQ.html 2 Aug 2004 16:28:37 -0000 1.8 --- FAQ.html 19 Aug 2004 04:32:37 -0000 1.9 *************** *** 177,185 **** tar xvfj wolfpack.tar.bz2 -C ./<br /> cd wolfpack_source_dir/<br /> ! chmod +x configure<br /> ! ./configure --help<br /> # Please read the options and use those that apply to you.<br /> ! # Running configure should auto detect most options. <br /> ! ./configure --enable-debug --enable-mysql<br /> # At this point you can edit Makefile and add optional CFLAGS<br /> # I personally add -march=athlon -03<br /> --- 177,185 ---- tar xvfj wolfpack.tar.bz2 -C ./<br /> cd wolfpack_source_dir/<br /> ! chmod +x configure.py<br /> ! ./configure.py --help<br /> # Please read the options and use those that apply to you.<br /> ! # Running configure.py should auto detect most options. <br /> ! ./configure.py --enable-debug --enable-mysql<br /> # At this point you can edit Makefile and add optional CFLAGS<br /> # I personally add -march=athlon -03<br /> *************** *** 197,205 **** tar xvfj wolfpack.tar.bz2 -C ./<br /> cd wolfpack_source_dir/<br /> ! chmod +x configure<br /> ! ./configure --help<br /> # Please read the options and use those that apply to you.<br /> ! # Running configure should auto detect most options. <br /> ! ./configure --enable-debug --enable-mysql<br /> # At this point you can edit Makefile and add optional CFLAGS<br /> # I, Dreoth, personally add -march=athlon -03<br /> --- 197,205 ---- tar xvfj wolfpack.tar.bz2 -C ./<br /> cd wolfpack_source_dir/<br /> ! chmod +x configure.py<br /> ! ./configure.py --help<br /> # Please read the options and use those that apply to you.<br /> ! # Running configure.py should auto detect most options. <br /> ! ./configure.py --enable-debug --enable-mysql<br /> # At this point you can edit Makefile and add optional CFLAGS<br /> # I, Dreoth, personally add -march=athlon -03<br /> *************** *** 245,249 **** `--enable-unicode=ucs2 --enable-shared` to the ./configure arguments. After this you can install this Python-2.3 to your /usr/local/ directory or anywhere else. Please be sure to put this new python path ! in the Wolfpack configure arguments!<br /> <br /> Python Fix / Compiling Instructions:<br /> --- 245,249 ---- `--enable-unicode=ucs2 --enable-shared` to the ./configure arguments. After this you can install this Python-2.3 to your /usr/local/ directory or anywhere else. Please be sure to put this new python path ! in the Wolfpack configure.py arguments!<br /> <br /> Python Fix / Compiling Instructions:<br /> |
|
From: Correa <thi...@us...> - 2004-08-19 02:14:49
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28889 Modified Files: commands.cpp Log Message: gcc 3.3.3 compile fix Index: commands.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v retrieving revision 1.255 retrieving revision 1.256 diff -C2 -d -r1.255 -r1.256 *** commands.cpp 19 Aug 2004 00:03:19 -0000 1.255 --- commands.cpp 19 Aug 2004 02:14:36 -0000 1.256 *************** *** 812,816 **** } ! // Strip out the portion after the last \ int pos = category.findRev('\\'); if (pos != -1) { --- 812,816 ---- } ! // Strip out the portion after the last slash int pos = category.findRev('\\'); if (pos != -1) { |
|
From: Correa <thi...@us...> - 2004-08-19 01:59:31
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27002/python Modified Files: engine.cpp gump.h socket.cpp target.h tempeffect.h Log Message: QT_CLEAN_NAMESPACE Index: engine.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/engine.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** engine.cpp 10 Aug 2004 03:27:52 -0000 1.34 --- engine.cpp 19 Aug 2004 01:59:16 -0000 1.35 *************** *** 159,163 **** PyObject* mList = PyDict_Items( modules ); ! for ( INT32 i = 0; i < PyList_Size( mList ); ++i ) { PyObject* m = PyImport_ReloadModule( PyList_GetItem( mList, i ) ); --- 159,163 ---- PyObject* mList = PyDict_Items( modules ); ! for ( Q_INT32 i = 0; i < PyList_Size( mList ); ++i ) { PyObject* m = PyImport_ReloadModule( PyList_GetItem( mList, i ) ); Index: tempeffect.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/tempeffect.h,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** tempeffect.h 17 Aug 2004 00:22:25 -0000 1.26 --- tempeffect.h 19 Aug 2004 01:59:16 -0000 1.27 *************** *** 98,102 **** { // Find the last dot ! INT32 position = dispelFunc_.findRev( "." ); QString sModule = dispelFunc_.left( position ); QString sFunction = dispelFunc_.right( dispelFunc_.length() - ( position + 1 ) ); --- 98,102 ---- { // Find the last dot ! Q_INT32 position = dispelFunc_.findRev( "." ); QString sModule = dispelFunc_.left( position ); QString sFunction = dispelFunc_.right( dispelFunc_.length() - ( position + 1 ) ); *************** *** 146,150 **** { // Find the last dot ! INT32 position = functionName.findRev( "." ); QString sModule = functionName.left( position ); QString sFunction = functionName.right( functionName.length() - ( position + 1 ) ); --- 146,150 ---- { // Find the last dot ! Q_INT32 position = functionName.findRev( "." ); QString sModule = functionName.left( position ); QString sFunction = functionName.right( functionName.length() - ( position + 1 ) ); Index: socket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/socket.cpp,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** socket.cpp 10 Aug 2004 03:27:54 -0000 1.81 --- socket.cpp 19 Aug 2004 01:59:16 -0000 1.82 *************** *** 410,414 **** gump->setNoDispose( nodispose ); ! INT32 i; for ( i = 0; i < PyList_Size( layout ); ++i ) { --- 410,414 ---- gump->setNoDispose( nodispose ); ! Q_INT32 i; for ( i = 0; i < PyList_Size( layout ); ++i ) { Index: target.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/target.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** target.h 19 Aug 2004 01:55:58 -0000 1.19 --- target.h 19 Aug 2004 01:59:16 -0000 1.20 *************** *** 137,141 **** { // Find the last dot ! INT32 position = responsefunc.findRev( "." ); QString sModule = responsefunc.left( position ); QString sFunction = responsefunc.right( responsefunc.length() - ( position + 1 ) ); --- 137,141 ---- { // Find the last dot ! Q_INT32 position = responsefunc.findRev( "." ); QString sModule = responsefunc.left( position ); QString sFunction = responsefunc.right( responsefunc.length() - ( position + 1 ) ); *************** *** 175,179 **** { // Find the last dot ! INT32 position = timeoutfunc.findRev( "." ); QString sModule = timeoutfunc.left( position ); QString sFunction = timeoutfunc.right( timeoutfunc.length() - ( position + 1 ) ); --- 175,179 ---- { // Find the last dot ! Q_INT32 position = timeoutfunc.findRev( "." ); QString sModule = timeoutfunc.left( position ); QString sFunction = timeoutfunc.right( timeoutfunc.length() - ( position + 1 ) ); *************** *** 210,214 **** { // Find the last dot ! INT32 position = cancelfunc.findRev( "." ); QString sModule = cancelfunc.left( position ); QString sFunction = cancelfunc.right( cancelfunc.length() - ( position + 1 ) ); --- 210,214 ---- { // Find the last dot ! Q_INT32 position = cancelfunc.findRev( "." ); QString sModule = cancelfunc.left( position ); QString sFunction = cancelfunc.right( cancelfunc.length() - ( position + 1 ) ); Index: gump.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/gump.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** gump.h 10 Aug 2004 03:27:53 -0000 1.22 --- gump.h 19 Aug 2004 01:59:16 -0000 1.23 *************** *** 143,147 **** { // Find the last dot ! INT32 position = callback.findRev( "." ); QString sModule = callback.left( position ); QString sFunction = callback.right( callback.length() - ( position + 1 ) ); --- 143,147 ---- { // Find the last dot ! Q_INT32 position = callback.findRev( "." ); QString sModule = callback.left( position ); QString sFunction = callback.right( callback.length() - ( position + 1 ) ); |
|
From: Correa <thi...@us...> - 2004-08-19 01:59:27
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27002 Modified Files: basechar.cpp dbdriver.cpp dbdriver.h items.cpp pythonscript.h speech.cpp walking.cpp Log Message: QT_CLEAN_NAMESPACE Index: pythonscript.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/pythonscript.h,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** pythonscript.h 10 Aug 2004 03:15:57 -0000 1.36 --- pythonscript.h 19 Aug 2004 01:59:15 -0000 1.37 *************** *** 155,159 **** #define SET_INT_PROPERTY( id, setter ) if( name == id ) {\ bool ok; \ ! INT32 data = value.toInt( &ok ); \ if( !ok ) \ PROPERTY_ERROR( -2, "Integer expected" ) \ --- 155,159 ---- #define SET_INT_PROPERTY( id, setter ) if( name == id ) {\ bool ok; \ ! Q_INT32 data = value.toInt( &ok ); \ if( !ok ) \ PROPERTY_ERROR( -2, "Integer expected" ) \ *************** *** 173,177 **** #define SET_BOOL_PROPERTY( id, setter ) if( name == id ) {\ bool ok; \ ! INT32 data = value.toInt( &ok ); \ if( !ok ) \ PROPERTY_ERROR( -2, "Boolean expected" ) \ --- 173,177 ---- #define SET_BOOL_PROPERTY( id, setter ) if( name == id ) {\ bool ok; \ ! Q_INT32 data = value.toInt( &ok ); \ if( !ok ) \ PROPERTY_ERROR( -2, "Boolean expected" ) \ Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.132 retrieving revision 1.133 diff -C2 -d -r1.132 -r1.133 *** basechar.cpp 19 Aug 2004 01:55:55 -0000 1.132 --- basechar.cpp 19 Aug 2004 01:59:15 -0000 1.133 *************** *** 1529,1533 **** { bool ok; ! INT32 data = value.toInt( &ok ); if ( !ok ) PROPERTY_ERROR( -2, "Integer expected" ) --- 1529,1533 ---- { bool ok; ! Q_INT32 data = value.toInt( &ok ); if ( !ok ) PROPERTY_ERROR( -2, "Integer expected" ) *************** *** 1542,1546 **** { bool ok; ! INT32 data = value.toInt( &ok ); if ( !ok ) PROPERTY_ERROR( -2, "Integer expected" ) --- 1542,1546 ---- { bool ok; ! Q_INT32 data = value.toInt( &ok ); if ( !ok ) PROPERTY_ERROR( -2, "Integer expected" ) *************** *** 1555,1559 **** { bool ok; ! INT32 data = value.toInt( &ok ); if ( !ok ) PROPERTY_ERROR( -2, "Integer expected" ) --- 1555,1559 ---- { bool ok; ! Q_INT32 data = value.toInt( &ok ); if ( !ok ) PROPERTY_ERROR( -2, "Integer expected" ) *************** *** 1568,1572 **** { bool ok; ! INT32 data = value.toInt( &ok ); if ( !ok ) PROPERTY_ERROR( -2, "Integer expected" ) --- 1568,1572 ---- { bool ok; ! Q_INT32 data = value.toInt( &ok ); if ( !ok ) PROPERTY_ERROR( -2, "Integer expected" ) Index: speech.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/speech.cpp,v retrieving revision 1.184 retrieving revision 1.185 diff -C2 -d -r1.184 -r1.185 *** speech.cpp 19 Aug 2004 01:22:52 -0000 1.184 --- speech.cpp 19 Aug 2004 01:59:15 -0000 1.185 *************** *** 71,75 **** bool ok = false; ! //INT32 num = speech.toInt( &ok ); // Generally try to convert it QString notification; --- 71,75 ---- bool ok = false; ! //Q_INT32 num = speech.toInt( &ok ); // Generally try to convert it QString notification; Index: dbdriver.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/dbdriver.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** dbdriver.cpp 19 Aug 2004 01:22:51 -0000 1.42 --- dbdriver.cpp 19 Aug 2004 01:59:15 -0000 1.43 *************** *** 151,155 **** // Get an integer with a specific offset ! INT32 cDBResult::getInt( Q_UINT32 offset ) const { if ( !_row ) --- 151,155 ---- // Get an integer with a specific offset ! Q_INT32 cDBResult::getInt( Q_UINT32 offset ) const { if ( !_row ) Index: walking.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v retrieving revision 1.135 retrieving revision 1.136 diff -C2 -d -r1.135 -r1.136 *** walking.cpp 19 Aug 2004 01:55:56 -0000 1.135 --- walking.cpp 19 Aug 2004 01:59:15 -0000 1.136 *************** *** 802,806 **** Coord_cl mPos = pos; mPos.z = elev; ! const INT32 dt = DynTile( mPos ); // if there is a dynamic tile at this spot, check to see if its a blocker --- 802,806 ---- Coord_cl mPos = pos; mPos.z = elev; ! const Q_INT32 dt = DynTile( mPos ); // if there is a dynamic tile at this spot, check to see if its a blocker *************** *** 818,822 **** { tile_st tile = TileCache::instance()->getTile( msi->itemid ); ! const INT32 elev = msi->zoff + cTileCache::tileHeight( tile ); if ( ( elev >= pos.z ) && ( msi->zoff <= pos.z ) ) { --- 818,822 ---- { tile_st tile = TileCache::instance()->getTile( msi->itemid ); ! const Q_INT32 elev = msi->zoff + cTileCache::tileHeight( tile ); if ( ( elev >= pos.z ) && ( msi->zoff <= pos.z ) ) { *************** *** 832,836 **** P_ITEM item = items.GetData(); tile_st tile = TileCache::instance()->getTile( item->id() ); ! const INT32 elev = item->pos().z + cTileCache::tileHeight( tile ); if ( ( elev >= pos.z ) && ( item->pos().z <= pos.z ) ) { --- 832,836 ---- P_ITEM item = items.GetData(); tile_st tile = TileCache::instance()->getTile( item->id() ); ! const Q_INT32 elev = item->pos().z + cTileCache::tileHeight( tile ); if ( ( elev >= pos.z ) && ( item->pos().z <= pos.z ) ) { Index: items.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v retrieving revision 1.437 retrieving revision 1.438 diff -C2 -d -r1.437 -r1.438 *** items.cpp 19 Aug 2004 01:55:55 -0000 1.437 --- items.cpp 19 Aug 2004 01:59:15 -0000 1.438 *************** *** 977,981 **** { if ( Value.contains( "." ) || Value.contains( "," ) ) ! setMaxhp( ( INT32 ) ceil( ( float ) maxhp() * Value.toFloat() ) ); else setMaxhp( maxhp() + Value.toLong() ); --- 977,981 ---- { if ( Value.contains( "." ) || Value.contains( "," ) ) ! setMaxhp( ( Q_INT32 ) ceil( ( float ) maxhp() * Value.toFloat() ) ); else setMaxhp( maxhp() + Value.toLong() ); Index: dbdriver.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/dbdriver.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** dbdriver.h 19 Aug 2004 01:22:51 -0000 1.20 --- dbdriver.h 19 Aug 2004 01:59:15 -0000 1.21 *************** *** 179,183 **** char** data() const; // Get the data for the current row bool fetchrow(); // Fetchs a new row, returns false if there is no new row ! INT32 getInt( Q_UINT32 offset ) const; // Get an integer with a specific offset QString getString( Q_UINT32 offset ) const; // Get a string with a specific offset --- 179,183 ---- char** data() const; // Get the data for the current row bool fetchrow(); // Fetchs a new row, returns false if there is no new row ! Q_INT32 getInt( Q_UINT32 offset ) const; // Get an integer with a specific offset QString getString( Q_UINT32 offset ) const; // Get a string with a specific offset |
|
From: Correa <thi...@us...> - 2004-08-19 01:59:26
|
Update of /cvsroot/wpdev/wolfpack/win In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27002/win Modified Files: console_win.cpp Log Message: QT_CLEAN_NAMESPACE Index: console_win.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/win/console_win.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** console_win.cpp 10 Aug 2004 03:19:08 -0000 1.25 --- console_win.cpp 19 Aug 2004 01:59:16 -0000 1.26 *************** *** 146,150 **** Fill a rectangular on a specific context */ ! void paintRect( HDC dc, INT32 x, INT32 y, INT32 width, INT32 height, HBRUSH brush ) { RECT rect; --- 146,150 ---- Fill a rectangular on a specific context */ ! void paintRect( HDC dc, Q_INT32 x, Q_INT32 y, Q_INT32 width, Q_INT32 height, HBRUSH brush ) { RECT rect; |
