wpdev-commits Mailing List for Wolfpack Emu (Page 32)
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: Correa <thi...@us...> - 2004-09-25 22:57:20
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20437/network Modified Files: network.h uotxpackets.h Log Message: - Human_Stablemaster inherits from Human_vendors now - Added wolfpack.tr to public Python API - Some additional user visible strings from the core are tr()'ed Index: network.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/network.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** network.h 19 Sep 2004 16:25:37 -0000 1.4 --- network.h 25 Sep 2004 22:57:09 -0000 1.5 *************** *** 36,39 **** --- 36,40 ---- #include "../singleton.h" #include "../typedefs.h" + #include "../objectdef.h" #include "uosocket.h" *************** *** 45,48 **** --- 46,50 ---- class cNetwork : public cComponent { + OBJECTDEF(cNetwork) class cNetworkPrivate; cNetworkPrivate* d; Index: uotxpackets.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uotxpackets.h,v retrieving revision 1.114 retrieving revision 1.115 diff -C2 -d -r1.114 -r1.115 *** uotxpackets.h 14 Sep 2004 04:20:26 -0000 1.114 --- uotxpackets.h 25 Sep 2004 22:57:09 -0000 1.115 *************** *** 35,38 **** --- 35,39 ---- #include "../typedefs.h" #include "../coord.h" + #include "../objectdef.h" #include <vector> *************** *** 1239,1242 **** --- 1240,1244 ---- class cUOTxOpenPaperdoll : public cUOPacket { + OBJECTDEF(cUOTxOpenPaperdoll) public: cUOTxOpenPaperdoll() : cUOPacket( 0x88, 66 ) |
|
From: Correa <thi...@us...> - 2004-09-25 22:57:19
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20437/ai Modified Files: ai.cpp ai.h ai_humans.cpp Log Message: - Human_Stablemaster inherits from Human_vendors now - Added wolfpack.tr to public Python API - Some additional user visible strings from the core are tr()'ed Index: ai_humans.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai_humans.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** ai_humans.cpp 10 Sep 2004 04:06:27 -0000 1.19 --- ai_humans.cpp 25 Sep 2004 22:57:09 -0000 1.20 *************** *** 73,77 **** } ! Human_Stablemaster::Human_Stablemaster( P_NPC npc ) : AbstractAI( npc ) { notorietyOverride_ = 1; --- 73,77 ---- } ! Human_Stablemaster::Human_Stablemaster( P_NPC npc ) : Human_Vendor( npc ) { notorietyOverride_ = 1; *************** *** 97,103 **** void Human_Stablemaster::onSpeechInput( P_PLAYER pTalker, const QString& message ) { if ( !pTalker->socket() ) return; - if ( m_npc->inRange( pTalker, 4 ) && ( VendorChkName( m_npc, message ) || message.contains( tr( "STABLEMASTER" ) ) ) ) { --- 97,103 ---- void Human_Stablemaster::onSpeechInput( P_PLAYER pTalker, const QString& message ) { + Human_Vendor::onSpeechInput( pTalker, message ); if ( !pTalker->socket() ) return; if ( m_npc->inRange( pTalker, 4 ) && ( VendorChkName( m_npc, message ) || message.contains( tr( "STABLEMASTER" ) ) ) ) { Index: ai.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ai.h 18 Sep 2004 21:10:40 -0000 1.15 --- ai.h 25 Sep 2004 22:57:09 -0000 1.16 *************** *** 443,446 **** --- 443,447 ---- class Human_Vendor : public AbstractAI { + OBJECTDEF(Human_Vendor) protected: Human_Vendor() : AbstractAI() *************** *** 468,475 **** class cUORxTarget; ! class Human_Stablemaster : public AbstractAI { protected: ! Human_Stablemaster() : AbstractAI() { notorietyOverride_ = 1; --- 469,477 ---- class cUORxTarget; ! class Human_Stablemaster : public Human_Vendor { + OBJECTDEF(Human_Stablemaster) protected: ! Human_Stablemaster() { notorietyOverride_ = 1; *************** *** 647,650 **** --- 649,653 ---- class Human_Guard_Called_Fight : public AbstractAction { + OBJECTDEF(Human_Guard_Called_Fight) protected: Human_Guard_Called_Fight() : AbstractAction() *************** *** 769,772 **** --- 772,776 ---- class Human_Guard_Fight : public AbstractAction { + OBJECTDEF(Human_Guard_Fight) protected: Human_Guard_Fight() : AbstractAction() Index: ai.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** ai.cpp 19 Sep 2004 22:13:35 -0000 1.31 --- ai.cpp 25 Sep 2004 22:57:09 -0000 1.32 *************** *** 217,221 **** } else ! Console::instance()->send( "Action tag in ai definition must contain attributes for pre-,postcondition and execute at least\n" ); } else if ( TagName == "onspeech" ) --- 217,221 ---- } else ! Console::instance()->send( tr("Action tag in ai definition must contain attributes for pre-,postcondition and execute at least\n") ); } else if ( TagName == "onspeech" ) *************** *** 943,950 **** else if ( ( comm.contains( " FETCH" ) ) || ( comm.contains( " GET" ) ) ) { ! //pPlayer->setGuarded(false); ! // >> LEGACY ! //addx[s]=pPet->serial(); ! //target(s, 0, 1, 0, 124, "Click on the object to fetch."); } else if ( comm.contains( " COME" ) ) --- 943,948 ---- else if ( ( comm.contains( " FETCH" ) ) || ( comm.contains( " GET" ) ) ) { ! #pragma note( Implement me ) ! pTalker->message( tr( "Sorry, not implemented yet :(" ) ); } else if ( comm.contains( " COME" ) ) |
|
From: Sebastian H. <dar...@us...> - 2004-09-25 21:16:05
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28084 Modified Files: ChangeLog console.cpp console.h world.cpp Log Message: fixes Index: console.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/console.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** console.h 24 Sep 2004 04:47:23 -0000 1.20 --- console.h 25 Sep 2004 21:15:46 -0000 1.21 *************** *** 185,188 **** --- 185,192 ---- void queueCommand( const QString& command ); + inline void setProgress(const QString &progress) { + this->progress = progress; + } + /*! \brief This function sets the text attribute for advanced Index: world.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v retrieving revision 1.129 retrieving revision 1.130 diff -C2 -d -r1.129 -r1.130 *** world.cpp 24 Sep 2004 04:47:38 -0000 1.129 --- world.cpp 25 Sep 2004 21:15:46 -0000 1.130 *************** *** 433,436 **** --- 433,437 ---- Console::instance()->log( LOG_MESSAGE, QString( "Loading %1 objects from %2.\n" ).arg( reader.objectCount() ).arg( filename ) ); Console::instance()->send( "0%" ); + Console::instance()->setProgress( "0%" ); unsigned char type; *************** *** 462,470 **** if ( percent != lastpercent ) { unsigned int revert = QString::number( lastpercent ).length() + 1; Console::instance()->rollbackChars(revert); - lastpercent = percent; Console::instance()->send( QString::number( percent ) + "%" ); } // Special Type for Tags --- 463,472 ---- if ( percent != lastpercent ) { + Console::instance()->setProgress(QString::null); unsigned int revert = QString::number( lastpercent ).length() + 1; Console::instance()->rollbackChars(revert); lastpercent = percent; Console::instance()->send( QString::number( percent ) + "%" ); + Console::instance()->setProgress(QString::number( percent ) + "%"); } // Special Type for Tags *************** *** 519,522 **** --- 521,525 ---- // Rollback the last percentage + Console::instance()->setProgress( QString::null ); unsigned int revert = QString::number( lastpercent ).length() + 1; Console::instance()->rollbackChars(revert); Index: console.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/console.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** console.cpp 19 Sep 2004 16:25:36 -0000 1.26 --- console.cpp 25 Sep 2004 21:15:46 -0000 1.27 *************** *** 76,80 **** send( sMessage + "... " ); changeColor( WPC_NORMAL ); ! progress = sMessage; } --- 76,80 ---- send( sMessage + "... " ); changeColor( WPC_NORMAL ); ! progress = sMessage + "... "; } Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** ChangeLog 25 Sep 2004 19:57:12 -0000 1.77 --- ChangeLog 25 Sep 2004 21:15:46 -0000 1.78 *************** *** 54,57 **** --- 54,59 ---- - Added an onShowVirtueGump event. - Fixed the emotecolor property not being set on speech. + - Fixed a gump response vulnerability. + - Fixed console bugs. Wolfpack 12.9.10 Beta (10. September 2004) |
|
From: Sebastian H. <dar...@us...> - 2004-09-25 21:16:05
|
Update of /cvsroot/wpdev/wolfpack/muls In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28084/muls Modified Files: maps.cpp Log Message: fixes Index: maps.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/muls/maps.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** maps.cpp 20 Sep 2004 03:35:37 -0000 1.13 --- maps.cpp 25 Sep 2004 21:15:46 -0000 1.14 *************** *** 322,325 **** --- 322,327 ---- bool cMaps::registerMap( uint id, const QString& mapfile, uint mapwidth, uint mapheight, const QString& staticsfile, const QString& staticsidx ) { + MapsPrivate* p = 0; + try { *************** *** 335,341 **** if ( ( *it ).lower() == staticsfile.lower() ) staticsFileName = *it; } - MapsPrivate* p = new MapsPrivate( basePath + staticsIdxName, basePath + mapFileName, basePath + staticsFileName ); p->height = mapheight; p->width = mapwidth; --- 337,349 ---- if ( ( *it ).lower() == staticsfile.lower() ) staticsFileName = *it; + } + + try { + p = new MapsPrivate( basePath + staticsIdxName, basePath + mapFileName, basePath + staticsFileName ); + } catch(wpFileNotFoundException &e) { + Console::instance()->log(LOG_WARNING, QString("Unable to find the files for map %1.\n").arg(id)); + return false; } p->height = mapheight; p->width = mapwidth; *************** *** 344,347 **** --- 352,356 ---- return true; } catch ( wpFileNotFoundException& e ) { + delete p; Console::instance()->log(LOG_WARNING, e.error()); return false; |
|
From: Sebastian H. <dar...@us...> - 2004-09-25 21:16:05
|
Update of /cvsroot/wpdev/wolfpack/win In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28084/win Modified Files: console_win.cpp Log Message: fixes Index: console_win.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/win/console_win.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** console_win.cpp 19 Sep 2004 16:50:44 -0000 1.29 --- console_win.cpp 25 Sep 2004 21:15:47 -0000 1.30 *************** *** 856,860 **** void cConsole::rollbackChars(unsigned int count) { ! int length = GetWindowTextLength(logWindow); // Select the rest --- 856,861 ---- void cConsole::rollbackChars(unsigned int count) { ! int ctrlLength = GetWindowTextLength(logWindow); ! SendMessage( logWindow, EM_SETSEL, ctrlLength, ctrlLength ); // Select the rest *************** *** 876,880 **** QString temp = progress; progress = QString::null; ! rollbackChars(temp.length() + 4); progress = temp; } --- 877,881 ---- QString temp = progress; progress = QString::null; ! rollbackChars(temp.length()); progress = temp; } *************** *** 928,932 **** QString temp = progress; progress = QString::null; ! sendProgress( temp ); } } --- 929,934 ---- QString temp = progress; progress = QString::null; ! send( temp ); ! progress = temp; } } |
|
From: Sebastian H. <dar...@us...> - 2004-09-25 21:16:05
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28084/network Modified Files: uorxpackets.cpp uosocket.cpp Log Message: fixes Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.418 retrieving revision 1.419 diff -C2 -d -r1.418 -r1.419 *** uosocket.cpp 25 Sep 2004 19:57:12 -0000 1.418 --- uosocket.cpp 25 Sep 2004 21:15:47 -0000 1.419 *************** *** 2541,2545 **** std::vector<unsigned int> switches = packet->choice().switches; ! if (!target && switches.size() != 0) { target = World::instance()->findChar(switches[0]); } --- 2541,2545 ---- std::vector<unsigned int> switches = packet->choice().switches; ! if (switches.size() == 1) { target = World::instance()->findChar(switches[0]); } *************** *** 2558,2562 **** if ( it == gumps.end() ) { ! sysMessage( tr( "Unexpected button input" ) ); return; } --- 2558,2562 ---- if ( it == gumps.end() ) { ! sysMessage( tr( "Unexpected button input." ) ); return; } Index: uorxpackets.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uorxpackets.cpp,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** uorxpackets.cpp 19 Aug 2004 01:22:56 -0000 1.65 --- uorxpackets.cpp 25 Sep 2004 21:15:47 -0000 1.66 *************** *** 195,198 **** --- 195,203 ---- choice.button = getInt( 11 ); Q_UINT32 numSwitches = getInt( 15 ); + + if (numSwitches > 2000) { + return choice; + } + Q_UINT32 i; for ( i = 0; i < numSwitches; i++ ) *************** *** 200,205 **** choice.switches.push_back( getInt( 19 + 4 * i ) ); } ! Q_UINT32 numTextEntries = getInt( 19 + 4 * numSwitches ); ! Q_UINT32 offset = 0; for ( i = 0; i < numTextEntries; i++ ) { --- 205,222 ---- choice.switches.push_back( getInt( 19 + 4 * i ) ); } ! ! Q_UINT32 offset = 19 + 4 * numSwitches; ! ! if (offset >= size()) { ! return choice; ! } ! ! Q_UINT32 numTextEntries = getInt( offset ); ! ! if (numTextEntries > 2000) { ! return choice; ! } ! ! offset = 0; for ( i = 0; i < numTextEntries; i++ ) { |
|
From: Sebastian H. <dar...@us...> - 2004-09-25 20:53:39
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22550/commands Modified Files: info.py Log Message: fixes Index: info.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/info.py,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** info.py 25 Sep 2004 19:57:27 -0000 1.23 --- info.py 25 Sep 2004 20:53:18 -0000 1.24 *************** *** 575,579 **** char.direction = int( textentries[ key ] ) elif key == 13: ! char.invulnerable = str2bool( textentries[ key ] ) elif key == 14: char.strength = int( textentries[ key ] ) --- 575,579 ---- char.direction = int( textentries[ key ] ) elif key == 13: ! char.invulnerable = str2bool( textentries[ key ] ) elif key == 14: char.strength = int( textentries[ key ] ) |
|
From: Sebastian H. <dar...@us...> - 2004-09-25 19:57:52
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10484/network Modified Files: uosocket.cpp Log Message: fixes Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.417 retrieving revision 1.418 diff -C2 -d -r1.417 -r1.418 *** uosocket.cpp 25 Sep 2004 02:03:21 -0000 1.417 --- uosocket.cpp 25 Sep 2004 19:57:12 -0000 1.418 *************** *** 68,71 **** --- 68,72 ---- #include <qhostaddress.h> + #include <vector> #include <qvaluelist.h> #include <functional> *************** *** 2534,2537 **** --- 2535,2557 ---- void cUOSocket::handleGumpResponse( cUORxGumpResponse* packet ) { + // There is special handling for the virtue gump button + // on the paperdoll. + if (packet->type() == 461) { + P_CHAR target = World::instance()->findChar(packet->serial()); + std::vector<unsigned int> switches = packet->choice().switches; + + if (!target && switches.size() != 0) { + target = World::instance()->findChar(switches[0]); + } + + if (target) { + PyObject *args = Py_BuildValue("(NN)", target->getPyObject(), _player->getPyObject()); + target->callEventHandler(EVENT_SHOWVIRTUEGUMP, args); + Py_DECREF(args); + } + + return; + } + QMap<SERIAL, cGump*>::iterator it( gumps.find( packet->serial() ) ); |
|
From: Sebastian H. <dar...@us...> - 2004-09-25 19:57:45
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10520/wolfpack Modified Files: consts.py Log Message: necro Index: consts.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/consts.py,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** consts.py 20 Sep 2004 17:50:32 -0000 1.79 --- consts.py 25 Sep 2004 19:57:28 -0000 1.80 *************** *** 392,396 **** EVENT_SPAWN = 43 EVENT_UPDATEDATABASE = 44 ! EVENT_COUNT = 43 """ \end --- 392,398 ---- EVENT_SPAWN = 43 EVENT_UPDATEDATABASE = 44 ! EVENT_GETSELLPRICE = 45 ! EVENT_SHOWVIRTUEGUMP = 46 ! EVENT_COUNT = 47 """ \end |
|
From: Sebastian H. <dar...@us...> - 2004-09-25 19:57:45
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10520/commands Modified Files: go.py info.py Log Message: necro Index: go.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/go.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** go.py 11 Jul 2004 21:07:13 -0000 1.10 --- go.py 25 Sep 2004 19:57:27 -0000 1.11 *************** *** 110,113 **** --- 110,116 ---- object.moveto(pos) object.update() + + if object.ischar() and object.socket: + object.socket.resendworld() else: player.socket.sysmessage('Usage: send <x, y, z, map>|<location>') Index: info.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/info.py,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** info.py 17 Sep 2004 23:35:09 -0000 1.22 --- info.py 25 Sep 2004 19:57:27 -0000 1.23 *************** *** 385,394 **** gump.addInputField( 284, 180, 200, 16, 0x834, 41, char.profile) # 43 ! gump.addText( 113, 220, "Notoriety:", 0x834 ) ! gump.addResizeGump( 280, 220, 0xBB8, 215, 20 ) ! if char.hastag('notoriety'): ! gump.addInputField( 284, 200, 200, 16, 0x834, 43, unicode( char.gettag('notoriety') ) ) ! else: ! gump.addInputField( 284, 200, 200, 16, 0x834, 43, '' ) # 44 gump.addText( 113, 240, "Poisoned:", 0x834 ) --- 385,394 ---- gump.addInputField( 284, 180, 200, 16, 0x834, 41, char.profile) # 43 ! #gump.addText( 113, 220, "Notoriety:", 0x834 ) ! #gump.addResizeGump( 280, 220, 0xBB8, 215, 20 ) ! #if char.hastag('notoriety'): ! # gump.addInputField( 284, 200, 200, 16, 0x834, 43, unicode( char.gettag('notoriety') ) ) ! #else: ! # gump.addInputField( 284, 200, 200, 16, 0x834, 43, '' ) # 44 gump.addText( 113, 240, "Poisoned:", 0x834 ) *************** *** 575,579 **** char.direction = int( textentries[ key ] ) elif key == 13: ! char.invulnerable = str2bool( textentries[ key ] ) elif key == 14: char.strength = int( textentries[ key ] ) --- 575,579 ---- char.direction = int( textentries[ key ] ) elif key == 13: ! char.invulnerable = str2bool( textentries[ key ] ) elif key == 14: char.strength = int( textentries[ key ] ) *************** *** 663,672 **** char.settag( 'guild', int( hex2dec( textentries[ key ] ) ) ) elif key == 43: ! if not char.npc: ! if (textentries[ key ]) == '': ! if char.hastag( 'notoriety' ): ! char.deltag( 'notoriety' ) ! else: ! char.settag( 'notoriety', int( textentries[ key ] ) ) #elif char.npc: # if not textentries[ key ] == '': --- 663,673 ---- char.settag( 'guild', int( hex2dec( textentries[ key ] ) ) ) elif key == 43: ! pass ! #if not char.npc: ! # if (textentries[ key ]) == '': ! # if char.hastag( 'notoriety' ): ! # char.deltag( 'notoriety' ) ! # else: ! # char.settag( 'notoriety', int( textentries[ key ] ) ) #elif char.npc: # if not textentries[ key ] == '': |
|
From: Sebastian H. <dar...@us...> - 2004-09-25 19:57:45
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10529/webroot Modified Files: ChangeLog.wolfpack Log Message: fixes Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.115 retrieving revision 1.116 diff -C2 -d -r1.115 -r1.116 *** ChangeLog.wolfpack 25 Sep 2004 15:50:51 -0000 1.115 --- ChangeLog.wolfpack 25 Sep 2004 19:57:27 -0000 1.116 *************** *** 60,63 **** --- 60,65 ---- - Fixed a bug with kindlings. - Fixed a bug with canceling a magery target not canceling the spell. + - Fixed a bug where the send command didn't resend the world to the target. + - Fix for the info command. * Misc. Changes: - Fixed configure.py for FreeBSD 5 |
|
From: Sebastian H. <dar...@us...> - 2004-09-25 19:57:34
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10484 Modified Files: ChangeLog pythonscript.cpp pythonscript.h speech.cpp Log Message: fixes Index: speech.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/speech.cpp,v retrieving revision 1.188 retrieving revision 1.189 diff -C2 -d -r1.188 -r1.189 *** speech.cpp 28 Aug 2004 21:14:53 -0000 1.188 --- speech.cpp 25 Sep 2004 19:57:12 -0000 1.189 *************** *** 278,283 **** color = 0x2; ! if ( type == 0 || type == 2 ) pChar->setSaycolor( color ); if ( pChar->onTalk( type, color, font, speech, lang ) ) --- 278,285 ---- color = 0x2; ! if ( type == 0 ) pChar->setSaycolor( color ); + else if ( type == 2 ) + pChar->setEmoteColor( color ); if ( pChar->onTalk( type, color, font, speech, lang ) ) Index: pythonscript.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/pythonscript.h,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** pythonscript.h 22 Sep 2004 05:34:47 -0000 1.41 --- pythonscript.h 25 Sep 2004 19:57:12 -0000 1.42 *************** *** 87,90 **** --- 87,91 ---- EVENT_UPDATEDATABASE, EVENT_GETSELLPRICE, + EVENT_SHOWVIRTUEGUMP, EVENT_COUNT, }; Index: pythonscript.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/pythonscript.cpp,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** pythonscript.cpp 25 Sep 2004 02:03:19 -0000 1.50 --- pythonscript.cpp 25 Sep 2004 19:57:12 -0000 1.51 *************** *** 530,533 **** --- 530,541 ---- "onGetSellPrice", + /* + \event onShowVirtueGump + \param player The player who pressed the button. + \param target The owner of the paperdoll the button was on. + \condition Triggered when a player presses the virtue gump button on his or another characters paperdoll. + */ + "onShowVirtueGump", + 0 }; Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** ChangeLog 25 Sep 2004 02:03:19 -0000 1.76 --- ChangeLog 25 Sep 2004 19:57:12 -0000 1.77 *************** *** 52,55 **** --- 52,57 ---- - Fixed a log rotation bug related to uninitialized variables (valgrind.kde.org) - Fixed memory leaks in Territories, ACLs and PythonScripts. (valgrind.kde.org) + - Added an onShowVirtueGump event. + - Fixed the emotecolor property not being set on speech. Wolfpack 12.9.10 Beta (10. September 2004) |
|
From: Sebastian H. <dar...@us...> - 2004-09-25 15:51:01
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21179/webroot Modified Files: ChangeLog.wolfpack Log Message: lightsource fix. Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.114 retrieving revision 1.115 diff -C2 -d -r1.114 -r1.115 *** ChangeLog.wolfpack 24 Sep 2004 11:07:47 -0000 1.114 --- ChangeLog.wolfpack 25 Sep 2004 15:50:51 -0000 1.115 *************** *** 16,19 **** --- 16,21 ---- - Added carve information to all npcs. - Fixed reagent requirements for cure potions. + - Fixed the shopkeeper inventory for mages. + - Fixed the lightsource id for braziers. * Python Script Changes: - Removed weight from the info menu. |
|
From: Sebastian H. <dar...@us...> - 2004-09-25 15:50:46
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/buildings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21108/items/buildings Modified Files: lightsources.xml Log Message: lightsource fix. Index: lightsources.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/buildings/lightsources.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** lightsources.xml 10 Sep 2004 20:17:33 -0000 1.18 --- lightsources.xml 25 Sep 2004 15:50:36 -0000 1.19 *************** *** 387,390 **** --- 387,391 ---- <nodecay /> <category>Decoration\Lightsources\Brazier 1</category> + <lightsource>2</lightsource> </item> *************** *** 392,395 **** --- 393,397 ---- <id>0xe32</id> <nodecay /> + <lightsource>2</lightsource> </item> *************** *** 397,400 **** --- 399,403 ---- <id>0xe33</id> <nodecay /> + <lightsource>2</lightsource> </item> *************** *** 403,406 **** --- 406,410 ---- <nodecay /> <category>Decoration\Lightsources\Brazier 2</category> + <lightsource>2</lightsource> </item> *************** *** 409,412 **** --- 413,417 ---- <nodecay /> <category>Decoration\Lightsources\Brazier 3</category> + <lightsource>2</lightsource> </item> *************** *** 415,418 **** --- 420,424 ---- <nodecay /> <category>Decoration\Lightsources\Brazier 4</category> + <lightsource>2</lightsource> </item> |
|
From: Sebastian H. <dar...@us...> - 2004-09-25 15:37:00
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17832/npcs/humans/vendors Modified Files: mage.xml Log Message: mage vendor fixes Index: mage.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/mage.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mage.xml 25 Sep 2004 15:33:31 -0000 1.6 --- mage.xml 25 Sep 2004 15:36:50 -0000 1.7 *************** *** 127,134 **** <amount>999</amount> </item> ! <item id="e34"> ! <amount>10</amount> ! </item> ! <item id="scribes_pen"><amount>10</amount></item> <!-- Blank Scrolls --> <item id="e34"><amount>20</amount></item> <!-- Blank Scrolls --> --- 127,131 ---- <amount>999</amount> </item> ! <item id="scribes_pen"><amount>10</amount></item> <!-- Blank Scrolls --> <item id="e34"><amount>20</amount></item> <!-- Blank Scrolls --> |
|
From: Sebastian H. <dar...@us...> - 2004-09-25 15:33:43
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16913/npcs/humans/vendors Modified Files: mage.xml Log Message: mage vendor fixes Index: mage.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/mage.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mage.xml 10 Sep 2004 20:17:35 -0000 1.5 --- mage.xml 25 Sep 2004 15:33:31 -0000 1.6 *************** *** 11,17 **** --- 11,92 ---- <shopkeeper> <restockable> + <!-- Scrolls --> + <item id="1f2d"><amount>20</amount></item> + <item id="1f2e"><amount>20</amount></item> + <item id="1f2f"><amount>20</amount></item> + <item id="1f30"><amount>20</amount></item> + <item id="1f31"><amount>20</amount></item> + <item id="1f32"><amount>20</amount></item> + <item id="1f33"><amount>20</amount></item> + <item id="1f34"><amount>20</amount></item> + <item id="1f35"><amount>20</amount></item> + <item id="1f36"><amount>20</amount></item> + <item id="1f37"><amount>20</amount></item> + <item id="1f38"><amount>20</amount></item> + <item id="1f39"><amount>20</amount></item> + <item id="1f3a"><amount>20</amount></item> + <item id="1f3b"><amount>20</amount></item> + <item id="1f3c"><amount>20</amount></item> + <item id="1f3d"><amount>20</amount></item> + <item id="1f3e"><amount>20</amount></item> + <item id="1f3f"><amount>20</amount></item> + <item id="1f40"><amount>20</amount></item> + <item id="1f41"><amount>20</amount></item> + <item id="1f42"><amount>20</amount></item> + <item id="1f43"><amount>20</amount></item> + <item id="1f44"><amount>20</amount></item> + <item id="1f45"><amount>20</amount></item> + <item id="1f46"><amount>20</amount></item> + <item id="1f47"><amount>20</amount></item> + <item id="1f48"><amount>20</amount></item> + <item id="1f49"><amount>20</amount></item> + <item id="1f4a"><amount>20</amount></item> + <item id="1f4b"><amount>20</amount></item> + <item id="1f4c"><amount>20</amount></item> + <item id="1f4d"><amount>20</amount></item> + <item id="1f4e"><amount>20</amount></item> + <item id="1f4f"><amount>20</amount></item> + <item id="1f50"><amount>20</amount></item> + <item id="1f51"><amount>20</amount></item> + <item id="1f52"><amount>20</amount></item> + <item id="1f53"><amount>20</amount></item> + <item id="1f54"><amount>20</amount></item> + <item id="1f55"><amount>20</amount></item> + <item id="1f56"><amount>20</amount></item> + <item id="1f57"><amount>20</amount></item> + <item id="1f58"><amount>20</amount></item> + <item id="1f59"><amount>20</amount></item> + <item id="1f5a"><amount>20</amount></item> + <item id="1f5b"><amount>20</amount></item> + <item id="1f5c"><amount>20</amount></item> + <item id="1f5d"><amount>20</amount></item> + <item id="1f5e"><amount>20</amount></item> + <item id="1f5f"><amount>20</amount></item> + <item id="1f60"><amount>20</amount></item> + <item id="1f61"><amount>20</amount></item> + <item id="1f62"><amount>20</amount></item> + <item id="1f63"><amount>20</amount></item> + <item id="1f64"><amount>20</amount></item> + <item id="1f65"><amount>20</amount></item> + <item id="1f66"><amount>20</amount></item> + <item id="1f67"><amount>20</amount></item> + <item id="1f68"><amount>20</amount></item> + <item id="1f69"><amount>20</amount></item> + <item id="1f6a"><amount>20</amount></item> + <item id="1f6b"><amount>20</amount></item> + <item id="1f6c"><amount>20</amount></item> + <item id="1f6d"><amount>20</amount></item> + <item id="1f6e"><amount>20</amount></item> + <item id="1f6f"><amount>20</amount></item> + <item id="1f70"><amount>20</amount></item> + <item id="1f71"><amount>20</amount></item> + <item id="1f72"><amount>20</amount></item> + + <!-- Spellbook --> <item id="efa"> <amount>10</amount> </item> + + <!-- Runes --> <item id="1f14"> <amount>10</amount> *************** *** 26,65 **** <amount>10</amount> </item> ! <item id="1f2e"> ! <amount>10</amount> ! </item> ! <item id="1f2f"> ! <amount>10</amount> ! </item> ! <item id="1f30"> ! <amount>10</amount> ! </item> ! <item id="1f31"> ! <amount>10</amount> ! </item> ! <item id="1f32"> ! <amount>10</amount> ! </item> ! <item id="1f33"> ! <amount>10</amount> ! </item> ! <item id="1f2d"> ! <amount>10</amount> ! </item> ! <item id="1f34"> ! <amount>10</amount> ! </item> ! <item id="1f35"> ! <amount>10</amount> ! </item> ! <item id="1f36"> ! <amount>10</amount> ! </item> ! <item id="1f37"> ! <amount>10</amount> ! </item> ! <item id="1f38"> ! <amount>10</amount> ! </item> <item id="f7a"> <amount>999</amount> --- 101,106 ---- <amount>10</amount> </item> ! ! <!-- Reagents --> <item id="f7a"> <amount>999</amount> *************** *** 89,92 **** --- 130,134 ---- <amount>10</amount> </item> + <item id="scribes_pen"><amount>10</amount></item> <!-- Blank Scrolls --> <item id="e34"><amount>20</amount></item> <!-- Blank Scrolls --> *************** *** 98,101 **** --- 140,154 ---- <item id="1f16"/> <item id="1f17"/> + <item id="f7a"/> + <item id="f7b"/> + <item id="f84"/> + <item id="f85"/> + <item id="f86"/> + <item id="f88"/> + <item id="f8c"/> + <item id="f8d"/> + <item id="e34"/> + <!-- Scrolls --> + <item id="1f2d"/> <item id="1f2e"/> <item id="1f2f"/> *************** *** 104,108 **** <item id="1f32"/> <item id="1f33"/> - <item id="1f2d"/> <item id="1f34"/> <item id="1f35"/> --- 157,160 ---- *************** *** 110,122 **** <item id="1f37"/> <item id="1f38"/> ! <item id="f7a"/> ! <item id="f7b"/> ! <item id="f84"/> ! <item id="f85"/> ! <item id="f86"/> ! <item id="f88"/> ! <item id="f8c"/> ! <item id="f8d"/> ! <item id="e34"/> </sellable> </shopkeeper> --- 162,223 ---- <item id="1f37"/> <item id="1f38"/> ! <item id="1f39"/> ! <item id="1f3a"/> ! <item id="1f3b"/> ! <item id="1f3c"/> ! <item id="1f3d"/> ! <item id="1f3e"/> ! <item id="1f3f"/> ! <item id="1f40"/> ! <item id="1f41"/> ! <item id="1f42"/> ! <item id="1f43"/> ! <item id="1f44"/> ! <item id="1f45"/> ! <item id="1f46"/> ! <item id="1f47"/> ! <item id="1f48"/> ! <item id="1f49"/> ! <item id="1f4a"/> ! <item id="1f4b"/> ! <item id="1f4c"/> ! <item id="1f4d"/> ! <item id="1f4e"/> ! <item id="1f4f"/> ! <item id="1f50"/> ! <item id="1f51"/> ! <item id="1f52"/> ! <item id="1f53"/> ! <item id="1f54"/> ! <item id="1f55"/> ! <item id="1f56"/> ! <item id="1f57"/> ! <item id="1f58"/> ! <item id="1f59"/> ! <item id="1f5a"/> ! <item id="1f5b"/> ! <item id="1f5c"/> ! <item id="1f5d"/> ! <item id="1f5e"/> ! <item id="1f5f"/> ! <item id="1f60"/> ! <item id="1f61"/> ! <item id="1f62"/> ! <item id="1f63"/> ! <item id="1f64"/> ! <item id="1f65"/> ! <item id="1f66"/> ! <item id="1f67"/> ! <item id="1f68"/> ! <item id="1f69"/> ! <item id="1f6a"/> ! <item id="1f6b"/> ! <item id="1f6c"/> ! <item id="1f6d"/> ! <item id="1f6e"/> ! <item id="1f6f"/> ! <item id="1f70"/> ! <item id="1f71"/> ! <item id="1f72"/> </sellable> </shopkeeper> |
|
From: Sebastian H. <dar...@us...> - 2004-09-25 15:26:44
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/professions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15119/items/professions Modified Files: mage.xml Log Message: mage vendor fixes Index: mage.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/mage.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** mage.xml 10 Sep 2004 22:17:09 -0000 1.18 --- mage.xml 25 Sep 2004 15:26:33 -0000 1.19 *************** *** 872,875 **** --- 872,877 ---- <category>Professions\Mage\Empty Scroll (W/E)</category> <weight>1.0</weight> + <buyprice>5</buyprice> + <sellprice>3</sellprice> </item> *************** *** 1000,1003 **** --- 1002,1006 ---- <basescripts>skills.inscription</basescripts> <weight>1.0</weight> + <buyprice>8</buyprice> </item> |
|
From: Sebastian H. <dar...@us...> - 2004-09-25 12:07:08
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2092/magic Modified Files: spell.py Log Message: magie Index: spell.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/spell.py,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** spell.py 23 Sep 2004 01:11:49 -0000 1.26 --- spell.py 25 Sep 2004 12:06:59 -0000 1.27 *************** *** 101,104 **** --- 101,118 ---- # Change this to 0 for AoS behaviour self.castrecovery = 1 * circle + + # + # Show the cast action + # + def docastaction(self, char, mode): + if char.bodytype == BODY_HUMAN and not char.itemonlayer( LAYER_MOUNT ): + char.action(self.castaction) + + # + # Say the mantra + # + def saymantra(self, char, mode): + if self.mantra and mode in [MODE_BOOK, MODE_SCROLL]: + char.say(self.mantra) # *************** *** 138,143 **** char.reveal() ! if self.mantra: ! char.say(self.mantra) # Precasting --- 152,157 ---- char.reveal() ! # Say the mantra ! self.saymantra(char, mode) # Precasting *************** *** 145,150 **** # Show the cast action ! if char.bodytype == BODY_HUMAN and not char.itemonlayer( LAYER_MOUNT ): ! char.action(self.castaction) if item: --- 159,163 ---- # Show the cast action ! self.docastaction(char, mode) if item: |
|
From: Sebastian H. <dar...@us...> - 2004-09-25 02:03:36
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24767 Modified Files: ChangeLog commands.cpp commands.h definitions.cpp log.cpp pythonscript.cpp scriptmanager.cpp server.cpp territories.cpp timers.cpp timers.h Log Message: Fixed MANY memory leaks. Index: commands.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v retrieving revision 1.262 retrieving revision 1.263 diff -C2 -d -r1.262 -r1.263 *** commands.cpp 22 Aug 2004 16:34:51 -0000 1.262 --- commands.cpp 25 Sep 2004 02:03:19 -0000 1.263 *************** *** 1533,1536 **** --- 1533,1544 ---- } + // Clear ACLs + cCommands::~cCommands() { + QMap<QString, cAcl*>::iterator itA( _acls.begin() ); + for ( ; itA != _acls.end(); ++itA ) + delete itA.data(); + _acls.clear(); + } + // Command Table (Keep this at the end) stCommand cCommands::commands[] = Index: log.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/log.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** log.cpp 4 Aug 2004 23:17:36 -0000 1.19 --- log.cpp 25 Sep 2004 02:03:19 -0000 1.20 *************** *** 39,42 **** --- 39,43 ---- cLog::cLog() { + currentday = 0xFF; } *************** *** 61,65 **** if ( !logfile.isOpen() || currentday != today.day() ) { ! logfile.close(); // Just to be sure QString path = Config::instance()->logPath(); --- 62,68 ---- if ( !logfile.isOpen() || currentday != today.day() ) { ! currentday = today.day(); ! ! logfile.close(); // Just to be sure QString path = Config::instance()->logPath(); *************** *** 86,90 **** Console::instance()->send( QString( "Couldn't open logfile '%1'\n" ).arg( path + filename ) ); return false; ! } } --- 89,93 ---- Console::instance()->send( QString( "Couldn't open logfile '%1'\n" ).arg( path + filename ) ); return false; ! } } Index: timers.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/timers.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** timers.cpp 10 Sep 2004 04:06:26 -0000 1.15 --- timers.cpp 25 Sep 2004 02:03:20 -0000 1.16 *************** *** 523,524 **** --- 523,532 ---- } + cTimers::~cTimers() { + // Clear all teffects + std::vector<cTimer*>::iterator it; + for (it = teffects.begin(); it != teffects.end(); ++it) { + delete *it; + } + teffects.clear(); + } Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** ChangeLog 24 Sep 2004 04:47:22 -0000 1.75 --- ChangeLog 25 Sep 2004 02:03:19 -0000 1.76 *************** *** 50,53 **** --- 50,55 ---- - Fixed translation support. - Added ability to disable translation support during compile time thru configure.py + - Fixed a log rotation bug related to uninitialized variables (valgrind.kde.org) + - Fixed memory leaks in Territories, ACLs and PythonScripts. (valgrind.kde.org) Wolfpack 12.9.10 Beta (10. September 2004) Index: definitions.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/definitions.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** definitions.cpp 3 Sep 2004 15:43:50 -0000 1.18 --- definitions.cpp 25 Sep 2004 02:03:19 -0000 1.19 *************** *** 114,117 **** --- 114,125 ---- this->filename = filename; }; + + virtual ~cXmlHandler() { + while ( stack.count() > 1 ) + stack.pop(); // The parent node should take care of deleting the children + + if ( stack.count() == 1 ) + delete stack.pop(); + } void setDocumentLocator( QXmlLocator* locator ) Index: scriptmanager.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/scriptmanager.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** scriptmanager.cpp 1 Sep 2004 20:03:52 -0000 1.26 --- scriptmanager.cpp 25 Sep 2004 02:03:20 -0000 1.27 *************** *** 85,90 **** // Stop + Restart Python ! stopPython(); ! startPython( qApp->argc(), qApp->argv() ); load(); --- 85,92 ---- // Stop + Restart Python ! //stopPython(); ! //startPython( qApp->argc(), qApp->argv() ); ! PythonEngine::instance()->unload(); ! PythonEngine::instance()->load(); load(); *************** *** 106,119 **** cUOSocket::clearPacketHandlers(); - cScriptManager::iterator it; - - for ( it = scripts.begin(); it != scripts.end(); ++it ) - { - it.data()->unload(); - delete it.data(); - } - - scripts.clear(); - for ( unsigned int i = 0; i < EVENT_COUNT; ++i ) { --- 108,111 ---- *************** *** 129,132 **** --- 121,135 ---- commandhooks.clear(); + + cScriptManager::iterator it; + + for ( it = scripts.begin(); it != scripts.end(); ++it ) + { + it.data()->unload(); + delete it.data(); + } + + scripts.clear(); + cComponent::unload(); } Index: timers.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/timers.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** timers.h 10 Sep 2004 04:06:26 -0000 1.7 --- timers.h 25 Sep 2004 02:03:20 -0000 1.8 *************** *** 180,183 **** --- 180,185 ---- public: cTimers(); + ~cTimers(); + std::vector<cTimer*> teffects; Index: commands.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/commands.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** commands.h 2 Jun 2004 15:04:04 -0000 1.22 --- commands.h 25 Sep 2004 02:03:19 -0000 1.23 *************** *** 76,79 **** --- 76,81 ---- } + ~cCommands(); + // Privlevel System void loadACLs( void ); Index: territories.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/territories.cpp,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** territories.cpp 29 Aug 2004 20:40:50 -0000 1.54 --- territories.cpp 25 Sep 2004 02:03:20 -0000 1.55 *************** *** 302,305 **** --- 302,308 ---- void cTerritories::unload() { + // Delete old regions + + topregions.clear(); cComponent::unload(); *************** *** 323,326 **** --- 326,330 ---- territory->rectangles().append( rect ); topregions[i].append( territory ); + topregions[i].setAutoDelete( true ); // set to auto delete } } Index: pythonscript.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/pythonscript.cpp,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** pythonscript.cpp 22 Sep 2004 05:34:47 -0000 1.49 --- pythonscript.cpp 25 Sep 2004 02:03:19 -0000 1.50 *************** *** 562,566 **** if ( events[i] ) { ! Py_XDECREF( events[i] ); events[i] = 0; } --- 562,566 ---- if ( events[i] ) { ! Py_DECREF( events[i] ); events[i] = 0; } *************** *** 666,669 **** --- 666,671 ---- reportPythonError( name_ ); } + + Py_XDECREF(event); } Index: server.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/server.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** server.cpp 24 Sep 2004 15:19:06 -0000 1.27 --- server.cpp 25 Sep 2004 02:03:20 -0000 1.28 *************** *** 110,113 **** --- 110,115 ---- unsigned int time; QValueVector<cAction*> actionQueue; + QApplication *app; + Private() : running( true ), state( STARTUP ), secure( true ), time( 0 ) { *************** *** 204,207 **** --- 206,210 ---- d = new Private; + d->app = 0; // Register Components *************** *** 231,234 **** --- 234,238 ---- cServer::~cServer() { + delete d->app; delete d; } *************** *** 260,264 **** setState( STARTUP ); ! new QApplication ( argc, argv, false ); // Load wolfpack.xml --- 264,268 ---- setState( STARTUP ); ! d->app = new QApplication ( argc, argv, false ); // Load wolfpack.xml |
|
From: Sebastian H. <dar...@us...> - 2004-09-25 02:03:36
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24767/python Modified Files: gump.h pyaccount.cpp target.cpp target.h tempeffect.h Log Message: Fixed MANY memory leaks. Index: tempeffect.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/tempeffect.h,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** tempeffect.h 19 Sep 2004 22:13:37 -0000 1.31 --- tempeffect.h 25 Sep 2004 02:03:22 -0000 1.32 *************** *** 52,55 **** --- 52,56 ---- { objectid = "cPythonEffect"; + args = 0; } *************** *** 62,66 **** virtual ~cPythonEffect() { ! ;} void setDispelId( const QString& data ) --- 63,68 ---- virtual ~cPythonEffect() { ! Py_XDECREF( args ); ! } void setDispelId( const QString& data ) *************** *** 85,89 **** { // We will ignore silent here. ! Dispel( pSource, PyList_New( 0 ) ); } --- 87,93 ---- { // We will ignore silent here. ! PyObject *list = PyList_New( 0 ); ! Dispel( pSource, list ); ! Py_DECREF(list); } *************** *** 111,114 **** --- 115,119 ---- // Create our Argument list PyObject* p_args = PyTuple_New( 4 ); + if ( isItemSerial( destSer ) ) PyTuple_SetItem( p_args, 0, PyGetItemObject( FindItemBySerial( destSer ) ) ); *************** *** 123,127 **** --- 128,134 ---- Py_INCREF(args); // PyTuple_SetItem steals a reference PyTuple_SetItem( p_args, 1, args ); + PyTuple_SetItem( p_args, 2, PyGetCharObject( pSource ) ); + Py_INCREF(disp_args); PyTuple_SetItem( p_args, 3, disp_args ); *************** *** 131,143 **** reportPythonError( sModule ); Py_DECREF( p_args ); } - Py_XDECREF( pFunc ); } Py_XDECREF( pModule ); } - - Py_DECREF( args ); } --- 138,148 ---- reportPythonError( sModule ); + Py_DECREF( p_args ); } Py_XDECREF( pFunc ); } Py_XDECREF( pModule ); } } *************** *** 175,180 **** PyObject* result = PyEval_CallObject( pFunc, p_args ); Py_XDECREF( result ); - reportPythonError( sModule ); Py_DECREF( p_args ); } --- 180,185 ---- PyObject* result = PyEval_CallObject( pFunc, p_args ); Py_XDECREF( result ); + reportPythonError( sModule ); Py_DECREF( p_args ); } *************** *** 183,188 **** Py_XDECREF( pModule ); } - - Py_DECREF( args ); } --- 188,191 ---- Index: target.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/target.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** target.cpp 19 Sep 2004 22:13:37 -0000 1.2 --- target.cpp 25 Sep 2004 02:03:22 -0000 1.3 *************** *** 145,150 **** Py_XDECREF( pModule ); } - - Py_DECREF( args ); return true; } --- 145,148 ---- *************** *** 181,186 **** Py_XDECREF( pModule ); } - - Py_DECREF( args ); } --- 179,182 ---- *************** *** 217,221 **** Py_XDECREF( pModule ); } - - Py_DECREF( args ); } --- 213,215 ---- Index: target.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/target.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** target.h 16 Sep 2004 01:40:19 -0000 1.24 --- target.h 25 Sep 2004 02:03:22 -0000 1.25 *************** *** 63,66 **** --- 63,70 ---- } + virtual ~cPythonTarget() { + Py_XDECREF(args); + } + bool responsed( cUOSocket* socket, cUORxTarget* target ); void timedout( cUOSocket* socket ); Index: pyaccount.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/pyaccount.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** pyaccount.cpp 3 Sep 2004 20:37:44 -0000 1.41 --- pyaccount.cpp 25 Sep 2004 02:03:22 -0000 1.42 *************** *** 63,67 **** static PyTypeObject wpAccountType = { ! PyObject_HEAD_INIT( &wpAccountType ) 0, "wpaccount", --- 63,67 ---- static PyTypeObject wpAccountType = { ! PyObject_HEAD_INIT( 0 ) 0, "wpaccount", Index: gump.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/gump.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** gump.h 19 Sep 2004 22:13:36 -0000 1.27 --- gump.h 25 Sep 2004 02:03:22 -0000 1.28 *************** *** 132,136 **** { // Increase ref-count for argument list ! Py_INCREF( args ); } --- 132,140 ---- { // Increase ref-count for argument list ! Py_INCREF(args); ! } ! ! virtual ~cPythonGump() { ! Py_XDECREF(args); } *************** *** 156,166 **** // Create our Argument list PyObject* p_args = PyTuple_New( 3 ); PyTuple_SetItem( p_args, 0, PyGetCharObject( socket->player() ) ); Py_INCREF(args); PyTuple_SetItem( p_args, 1, args ); PyTuple_SetItem( p_args, 2, PyGetGumpResponse( choice ) ); ! PyEval_CallObject( pFunc, p_args ); reportPythonError( sModule ); } } else --- 160,179 ---- // Create our Argument list PyObject* p_args = PyTuple_New( 3 ); + PyTuple_SetItem( p_args, 0, PyGetCharObject( socket->player() ) ); + Py_INCREF(args); PyTuple_SetItem( p_args, 1, args ); PyTuple_SetItem( p_args, 2, PyGetGumpResponse( choice ) ); ! ! PyObject *result = PyEval_CallObject( pFunc, p_args ); ! Py_XDECREF(result); ! ! Py_DECREF(p_args); ! reportPythonError( sModule ); } + Py_XDECREF(pFunc); + Py_DECREF(pModule); } else *************** *** 169,174 **** } } - - Py_DECREF( args ); } }; --- 182,185 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-09-25 02:03:33
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24767/network Modified Files: uosocket.cpp Log Message: Fixed MANY memory leaks. Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.416 retrieving revision 1.417 diff -C2 -d -r1.416 -r1.417 *** uosocket.cpp 22 Sep 2004 05:34:47 -0000 1.416 --- uosocket.cpp 25 Sep 2004 02:03:21 -0000 1.417 *************** *** 111,116 **** void cUOSocket::registerPacketHandler( unsigned char packet, PyObject* handler ) { ! if ( handlers[packet] ) Py_DECREF( handlers[packet] ); // Only install callable packet handlers. --- 111,118 ---- void cUOSocket::registerPacketHandler( unsigned char packet, PyObject* handler ) { ! if ( handlers[packet] ) { Py_DECREF( handlers[packet] ); + handlers[packet] = 0; + } // Only install callable packet handlers. |
|
From: Sebastian H. <dar...@us...> - 2004-09-24 16:11:20
|
Update of /cvsroot/wpdev/wolfpack/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9945/languages Modified Files: wolfpack_de.ts Log Message: German translation started Index: wolfpack_de.ts =================================================================== RCS file: /cvsroot/wpdev/wolfpack/languages/wolfpack_de.ts,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wolfpack_de.ts 24 Sep 2004 15:33:38 -0000 1.1 --- wolfpack_de.ts 24 Sep 2004 16:11:07 -0000 1.2 *************** *** 12,20 **** <message> <source>Server time: %1</source> ! <translation type="unfinished"></translation> </message> <message> <source>Please select a target</source> ! <translation type="unfinished"></translation> </message> <message> --- 12,20 ---- <message> <source>Server time: %1</source> ! <translation>Serverzeit: %1</translation> </message> <message> <source>Please select a target</source> ! <translation>Bitte wähle ein Ziel</translation> </message> <message> *************** *** 132,136 **** <message> <source>You cannot wear that item.</source> ! <translation type="unfinished"></translation> </message> <message> --- 132,136 ---- <message> <source>You cannot wear that item.</source> ! <translation>Du kannst diesen Gegenstand nicht tragen.</translation> </message> <message> *************** *** 176,192 **** <message> <source>Hello, my name is %1.</source> ! <translation type="unfinished"></translation> </message> <message> <source>It is now %1 hours and %2 minutes.</source> ! <translation type="unfinished"></translation> </message> <message> <source>You are in %1</source> ! <translation type="unfinished"></translation> </message> <message> <source>You are in the wilderness</source> ! <translation type="unfinished"></translation> </message> <message> --- 176,192 ---- <message> <source>Hello, my name is %1.</source> ! <translation>Hallo, mein Name ist %1.</translation> </message> <message> <source>It is now %1 hours and %2 minutes.</source> ! <translation>Es ist nun %1 Uhr und %2 Minuten.</translation> </message> <message> <source>You are in %1</source> ! <translation>Du befindest dich in %1</translation> </message> <message> <source>You are in the wilderness</source> ! <translation>Du befindest dich in der Wildnis</translation> </message> <message> *************** *** 197,201 **** <source>Compiled: %1 %2 </source> ! <translation type="unfinished"></translation> </message> <message> --- 197,202 ---- <source>Compiled: %1 %2 </source> ! <translation>Kompiliert: %1 %2 ! </translation> </message> <message> *************** *** 446,450 **** <message> <source>*You see %1 attacking you.*</source> ! <translation type="unfinished"></translation> </message> </context> --- 447,451 ---- <message> <source>*You see %1 attacking you.*</source> ! <translation>*Du siehst wie %1 dich angreift*</translation> </message> </context> *************** *** 453,462 **** <message> <source>Access to command '%1' was denied</source> ! <translation type="unfinished"></translation> </message> <message> <source>Access to command '%1' was denied </source> ! <translation type="unfinished"></translation> </message> <message> --- 454,464 ---- <message> <source>Access to command '%1' was denied</source> ! <translation>Der Zugriff auf den Befehl '%1' wurde verweigert</translation> </message> <message> <source>Access to command '%1' was denied </source> ! <translation>Der Zugriff auf den Befehl '%1' wurde verweigert ! </translation> </message> <message> *************** *** 467,471 **** <message> <source>Unknown Command</source> ! <translation type="unfinished"></translation> </message> </context> --- 469,473 ---- <message> <source>Unknown Command</source> ! <translation>Unbekannter Befehl</translation> </message> </context> *************** *** 554,578 **** <message> <source> [frozen]</source> ! <translation type="unfinished"></translation> </message> <message> <source> [guarded]</source> ! <translation type="unfinished"></translation> </message> <message> <source> [guarding]</source> ! <translation type="unfinished"></translation> </message> <message> <source>Sorry but i have no goods to sell</source> ! <translation type="unfinished"></translation> </message> <message> <source>(frozen)</source> ! <translation type="unfinished"></translation> </message> <message> <source> (frozen)</source> ! <translation type="unfinished"></translation> </message> </context> --- 556,581 ---- <message> <source> [frozen]</source> ! <translation>[eingefroren] ! </translation> </message> <message> <source> [guarded]</source> ! <translation>[bewacht]</translation> </message> <message> <source> [guarding]</source> ! <translation>[bewachend]</translation> </message> <message> <source>Sorry but i have no goods to sell</source> ! <translation>Es tut mir leid, aber ich habe nichts zu verkaufen</translation> </message> <message> <source>(frozen)</source> ! <translation>(eingefroren)</translation> </message> <message> <source> (frozen)</source> ! <translation>(eingefroren)</translation> </message> </context> *************** *** 709,749 **** <message> <source>You are too far away to mount!</source> ! <translation type="unfinished"></translation> </message> <message> <source>You dont own that creature.</source> ! <translation type="unfinished"></translation> </message> <message> <source>Lady </source> ! <translation type="unfinished"></translation> </message> <message> <source>Lord </source> ! <translation type="unfinished"></translation> </message> <message> <source> [offline]</source> ! <translation type="unfinished"></translation> </message> <message> <source> [guarded]</source> ! <translation type="unfinished"></translation> </message> <message> <source> [guarding]</source> ! <translation type="unfinished"></translation> </message> <message> <source>You loose your concentration</source> ! <translation type="unfinished"></translation> </message> <message> ! <source> <byte value="x9"/>Lady %1<byte value="x9"/>%2</source> ! <translation type="unfinished"></translation> </message> <message> ! <source> <byte value="x9"/>Lord %1<byte value="x9"/>%2</source> ! <translation type="unfinished"></translation> </message> </context> --- 712,753 ---- <message> <source>You are too far away to mount!</source> ! <translation>Du bist zu weit entfernt um aufzusteigen!</translation> </message> <message> <source>You dont own that creature.</source> ! <translation>Dir gehört diese Kreatur nicht.</translation> </message> <message> <source>Lady </source> ! <translation></translation> </message> <message> <source>Lord </source> ! <translation></translation> </message> <message> <source> [offline]</source> ! <translation>[ausgeloggt]</translation> </message> <message> <source> [guarded]</source> ! <translation>[bewacht]</translation> </message> <message> <source> [guarding]</source> ! <translation>[bewachend] ! </translation> </message> <message> <source>You loose your concentration</source> ! <translation>Du verlierst deine Konzentration</translation> </message> <message> ! <source><byte value="x9"/>Lady %1<byte value="x9"/>%2</source> ! <translation></translation> </message> <message> ! <source><byte value="x9"/>Lord %1<byte value="x9"/>%2</source> ! <translation></translation> </message> </context> *************** *** 860,948 **** <message> <source>You cannot do that as a ghost.</source> ! <translation type="unfinished"></translation> </message> <message> <source>You can't do that while you are casting.</source> ! <translation type="unfinished"></translation> </message> <message> <source>You must wait a few moments before using another skill.</source> ! <translation type="unfinished"></translation> </message> <message> <source>That skill has not been implemented yet.</source> ! <translation type="unfinished"></translation> </message> <message> <source>Why don't you simply take it?</source> ! <translation type="unfinished"></translation> </message> <message> <source>You can't steal from game masters.</source> ! <translation type="unfinished"></translation> </message> <message> <source>You are too far away to steal from that person.</source> ! <translation type="unfinished"></translation> </message> <message> <source>Bad luck, your victim doesn't have a backpack.</source> ! <translation type="unfinished"></translation> </message> <message> <source>Your victim posesses nothing you could steal.</source> ! <translation type="unfinished"></translation> </message> <message> <source>You reach into %1's backpack and try to steal something...</source> ! <translation type="unfinished"></translation> </message> <message> <source>You successfully steal %1.</source> ! <translation type="unfinished"></translation> </message> <message> <source>You fail to steal the item.</source> ! <translation type="unfinished"></translation> </message> <message> <source>You have been cought!</source> ! <translation type="unfinished"></translation> </message> <message> <source>Guards! A thief is amoung us!</source> ! <translation type="unfinished"></translation> </message> <message> <source>You notice %1 trying to steal %2 from you.</source> ! <translation type="unfinished"></translation> </message> <message> <source>You notice %1 trying to steal %2 from %3.</source> ! <translation type="unfinished"></translation> </message> <message> <source>%1 is trying to snoop in your pack</source> ! <translation type="unfinished"></translation> </message> <message> <source>You can't peek into that container or you'll be jailed.</source> ! <translation type="unfinished"></translation> </message> <message> <source>You successfully peek into that container.</source> ! <translation type="unfinished"></translation> </message> <message> <source>You failed to peek into that container.</source> ! <translation type="unfinished"></translation> </message> <message> <source>Art thou attempting to disturb my privacy?</source> ! <translation type="unfinished"></translation> </message> <message> <source>You notice %1 trying to peek into your pack!</source> ! <translation type="unfinished"></translation> </message> </context> --- 864,952 ---- <message> <source>You cannot do that as a ghost.</source> ! <translation>Das kannst du nicht machen als Geist.</translation> </message> <message> <source>You can't do that while you are casting.</source> ! <translation>Du kannst das nicht tun während du einen Zauber sprichst.</translation> </message> <message> <source>You must wait a few moments before using another skill.</source> ! <translation>Du musst einen Moment warten bevor du eine andere Fertigkeit einsetzt.</translation> </message> <message> <source>That skill has not been implemented yet.</source> ! <translation>Diese Fertigkeit wurde noch nicht implementiert.</translation> </message> <message> <source>Why don't you simply take it?</source> ! <translation>Warum nimmst du es nicht einfach?</translation> </message> <message> <source>You can't steal from game masters.</source> ! <translation>Du kannst von Spielleitern nichst stehlen.</translation> </message> <message> <source>You are too far away to steal from that person.</source> ! <translation>Du bist zu weit weg um von dieser Person etwas zu stehlen.</translation> </message> <message> <source>Bad luck, your victim doesn't have a backpack.</source> ! <translation>Pech gehabt, dein Opfer hat keinen Rucksack.</translation> </message> <message> <source>Your victim posesses nothing you could steal.</source> ! <translation>Dein Opfer hat nichts, das du stehlen könntest.</translation> </message> <message> <source>You reach into %1's backpack and try to steal something...</source> ! <translation>Du greifst in den Rucksack von %1 und versuchst etwas zu stehlen...</translation> </message> <message> <source>You successfully steal %1.</source> ! <translation>Du stielst erfolgreich %1.</translation> </message> <message> <source>You fail to steal the item.</source> ! <translation>Dein Versuch den Gegenstand zu stehlen schlägt fehl.</translation> </message> <message> <source>You have been cought!</source> ! <translation>Du wurdest entdeckt!</translation> </message> <message> <source>Guards! A thief is amoung us!</source> ! <translation>Wachen! Ein Dieb ist unter uns!</translation> </message> <message> <source>You notice %1 trying to steal %2 from you.</source> ! <translation>Du bemerkst wie %1 versucht dir %2 zu stehlen.</translation> </message> <message> <source>You notice %1 trying to steal %2 from %3.</source> ! <translation>Du bemerkst wie %1 versucht %2 von %3 zu stehlen.</translation> </message> <message> <source>%1 is trying to snoop in your pack</source> ! <translation>%1 versucht in deinen Rucksack zu sehen</translation> </message> <message> <source>You can't peek into that container or you'll be jailed.</source> ! <translation>Du kannst nicht in diesen Behälter schauen oder du kommst ins Gefängnis.</translation> </message> <message> <source>You successfully peek into that container.</source> ! <translation>Du wirfst erfolgreich einen Blick in den Behälter.</translation> </message> <message> <source>You failed to peek into that container.</source> ! <translation>Du schaffst es nicht in den Behälter zu schauen.</translation> </message> <message> <source>Art thou attempting to disturb my privacy?</source> ! <translation>Versucht Ihr meine Privatsphäre zu stören?</translation> </message> <message> <source>You notice %1 trying to peek into your pack!</source> ! <translation>Du bemerkst wie %1 versucht in deinen Rucksack zu schauen!</translation> </message> </context> *************** *** 989,1005 **** <message> <source>You have left %1.</source> ! <translation type="unfinished"></translation> </message> <message> <source>You have entered %1.</source> ! <translation type="unfinished"></translation> </message> <message> <source>You have left the protection of %1 guards.</source> ! <translation type="unfinished"></translation> </message> <message> <source>You are now under the protection of %1 guards.</source> ! <translation type="unfinished"></translation> </message> </context> --- 993,1009 ---- <message> <source>You have left %1.</source> ! <translation>Du verlässt %1.</translation> </message> <message> <source>You have entered %1.</source> ! <translation>Du betrittst %1.</translation> </message> <message> <source>You have left the protection of %1 guards.</source> ! <translation>Du verlässt nun den Schutz der %1.</translation> </message> <message> <source>You are now under the protection of %1 guards.</source> ! <translation>Du stehst nun unter dem Schutz der %1.</translation> </message> </context> *************** *** 1008,1036 **** <message> <source>You are no longer criminal.</source> ! <translation type="unfinished"></translation> </message> <message> <source>You are no longer a murderer.</source> ! <translation type="unfinished"></translation> </message> <message> <source>You are starving.</source> ! <translation type="unfinished"></translation> </message> <message> <source>*%1 looks a little hungry*</source> ! <translation type="unfinished"></translation> </message> <message> <source>*%1 looks fairly hungry*</source> ! <translation type="unfinished"></translation> </message> <message> <source>*%1 looks extremely hungry*</source> ! <translation type="unfinished"></translation> </message> <message> <source>*%1 looks weak from starvation*</source> ! <translation type="unfinished"></translation> </message> </context> --- 1012,1041 ---- <message> <source>You are no longer criminal.</source> ! <translation>Du bist nicht länger als Verbrecher bekannt.</translation> </message> <message> <source>You are no longer a murderer.</source> ! <translation>Du bist nicht länger als Mörder bekannt.</translation> </message> <message> <source>You are starving.</source> ! <translation>Du verhungerst.</translation> </message> <message> <source>*%1 looks a little hungry*</source> ! <translation>*%1 sieht ein wenig hungrig aus*</translation> </message> <message> <source>*%1 looks fairly hungry*</source> ! <translation>*%1 sieht ziemlich hungrig aus*</translation> </message> <message> <source>*%1 looks extremely hungry*</source> ! <translation>*%1 sieht extrem hungrig aus* ! </translation> </message> <message> <source>*%1 looks weak from starvation*</source> ! <translation>*%1 sieht verhungernd aus*</translation> </message> </context> *************** *** 1203,1211 **** <message> <source>Lady</source> ! <translation type="unfinished"></translation> </message> <message> <source>Lord</source> ! <translation type="unfinished"></translation> </message> </context> --- 1208,1216 ---- <message> <source>Lady</source> ! <translation></translation> </message> <message> <source>Lord</source> ! <translation></translation> </message> </context> *************** *** 1222,1242 **** <message> <source>Worldsave Initialized</source> ! <translation type="unfinished"></translation> </message> <message> <source>WORLDSAVE IN PROGRESS</source> ! <translation type="unfinished"></translation> </message> <message> <source>Saving %1 items.</source> ! <translation type="unfinished"></translation> </message> <message> <source>Saving %1 characters.</source> ! <translation type="unfinished"></translation> </message> <message> <source>Worldsave Completed In %1ms</source> ! <translation type="unfinished"></translation> </message> </context> --- 1227,1247 ---- <message> <source>Worldsave Initialized</source> ! <translation type="unfinished">Worldsave gestartet</translation> </message> <message> <source>WORLDSAVE IN PROGRESS</source> ! <translation type="unfinished">WORLDSAVE LÃUFT</translation> </message> <message> <source>Saving %1 items.</source> ! <translation type="unfinished">Speichere %1 Gegenstände.</translation> </message> <message> <source>Saving %1 characters.</source> ! <translation type="unfinished">Speichere %1 Charaktere.</translation> </message> <message> <source>Worldsave Completed In %1ms</source> ! <translation type="unfinished">Worldsave nach %1 ms abgeschlossen</translation> </message> </context> |
|
From: Sebastian H. <dar...@us...> - 2004-09-24 15:33:59
|
Update of /cvsroot/wpdev/wolfpack/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1635/languages Modified Files: wolfpack_it.ts wolfpack_nl.ts wolfpack_pt_br.ts Added Files: wolfpack_de.ts wolfpack_es.ts wolfpack_fr.ts wolfpack_ge.ts Log Message: new translation files Index: wolfpack_it.ts =================================================================== RCS file: /cvsroot/wpdev/wolfpack/languages/wolfpack_it.ts,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wolfpack_it.ts 24 Sep 2004 04:47:38 -0000 1.6 --- wolfpack_it.ts 24 Sep 2004 15:33:37 -0000 1.7 *************** *** 792,795 **** --- 792,799 ---- </message> <message> + <source>The server is shutting down.</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Compiled for Qt %1 (Using: %2 %3) </source> *************** *** 797,801 **** </message> <message> ! <source>Compiled for Python %1 %2 (Using: %3 ) </source> <translation type="unfinished"></translation> --- 801,805 ---- </message> <message> ! <source>Compiled for Python %1 %2 (Using: %3) </source> <translation type="unfinished"></translation> --- NEW FILE: wolfpack_es.ts --- <!DOCTYPE TS><TS> <context> <name>@default</name> <message> <source>Usage: set <key> <value></source> <translation type="unfinished"></translation> </message> <message> <source>Please select a target to 'set %1 %2' </source> <translation type="unfinished"></translation> </message> <message> <source>Server time: %1</source> <translation type="unfinished"></translation> </message> <message> <source>Please select a target</source> <translation type="unfinished"></translation> </message> [...1204 lines suppressed...] <translation type="unfinished"></translation> </message> <message> <source>WORLDSAVE IN PROGRESS</source> <translation type="unfinished"></translation> </message> <message> <source>Saving %1 items.</source> <translation type="unfinished"></translation> </message> <message> <source>Saving %1 characters.</source> <translation type="unfinished"></translation> </message> <message> <source>Worldsave Completed In %1ms</source> <translation type="unfinished"></translation> </message> </context> </TS> Index: wolfpack_nl.ts =================================================================== RCS file: /cvsroot/wpdev/wolfpack/languages/wolfpack_nl.ts,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wolfpack_nl.ts 24 Sep 2004 04:47:38 -0000 1.6 --- wolfpack_nl.ts 24 Sep 2004 15:33:37 -0000 1.7 *************** *** 792,795 **** --- 792,799 ---- </message> <message> + <source>The server is shutting down.</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Compiled for Qt %1 (Using: %2 %3) </source> *************** *** 797,801 **** </message> <message> ! <source>Compiled for Python %1 %2 (Using: %3 ) </source> <translation type="unfinished"></translation> --- 801,805 ---- </message> <message> ! <source>Compiled for Python %1 %2 (Using: %3) </source> <translation type="unfinished"></translation> --- NEW FILE: wolfpack_ge.ts --- <!DOCTYPE TS><TS> <context> <name>@default</name> <message> <source>Usage: set <key> <value></source> <translation type="unfinished"></translation> </message> <message> <source>Please select a target to 'set %1 %2' </source> <translation type="unfinished"></translation> </message> <message> <source>Server time: %1</source> <translation type="unfinished"></translation> </message> <message> <source>Please select a target</source> <translation type="unfinished"></translation> </message> [...1204 lines suppressed...] <translation type="unfinished"></translation> </message> <message> <source>WORLDSAVE IN PROGRESS</source> <translation type="unfinished"></translation> </message> <message> <source>Saving %1 items.</source> <translation type="unfinished"></translation> </message> <message> <source>Saving %1 characters.</source> <translation type="unfinished"></translation> </message> <message> <source>Worldsave Completed In %1ms</source> <translation type="unfinished"></translation> </message> </context> </TS> --- NEW FILE: wolfpack_de.ts --- <!DOCTYPE TS><TS> <context> <name>@default</name> <message> <source>Usage: set <key> <value></source> <translation type="unfinished"></translation> </message> <message> <source>Please select a target to 'set %1 %2' </source> <translation type="unfinished"></translation> </message> <message> <source>Server time: %1</source> <translation type="unfinished"></translation> </message> <message> <source>Please select a target</source> <translation type="unfinished"></translation> </message> [...1204 lines suppressed...] <translation type="unfinished"></translation> </message> <message> <source>WORLDSAVE IN PROGRESS</source> <translation type="unfinished"></translation> </message> <message> <source>Saving %1 items.</source> <translation type="unfinished"></translation> </message> <message> <source>Saving %1 characters.</source> <translation type="unfinished"></translation> </message> <message> <source>Worldsave Completed In %1ms</source> <translation type="unfinished"></translation> </message> </context> </TS> Index: wolfpack_pt_br.ts =================================================================== RCS file: /cvsroot/wpdev/wolfpack/languages/wolfpack_pt_br.ts,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wolfpack_pt_br.ts 24 Sep 2004 04:47:39 -0000 1.1 --- wolfpack_pt_br.ts 24 Sep 2004 15:33:37 -0000 1.2 *************** *** 740,748 **** </message> <message> ! <source><byte value="x9"/>Lady %1<byte value="x9"/>%2</source> <translation type="unfinished"></translation> </message> <message> ! <source><byte value="x9"/>Lord %1<byte value="x9"/>%2</source> <translation type="unfinished"></translation> </message> --- 740,748 ---- </message> <message> ! <source> <byte value="x9"/>Lady %1<byte value="x9"/>%2</source> <translation type="unfinished"></translation> </message> <message> ! <source> <byte value="x9"/>Lord %1<byte value="x9"/>%2</source> <translation type="unfinished"></translation> </message> *************** *** 785,821 **** <message> <source>Unknown Worldsave Database Driver '%1', check your wolfpack.xml</source> ! <translation>Driver de banco de dados '%1' de worldsave desconhecido, verifique o arquivo wolfpack.xml</translation> </message> <message> <source>Unknown Account Database Driver '%1', check your wolfpack.xml</source> ! <translation>Driver de banco de dados '%1' de contas desconhecido, verifique o arquivo wolfpack.xml</translation> </message> <message> <source>Compiled for Qt %1 (Using: %2 %3) </source> ! <translation>Compilado para Qt %1 ( Usando: %2 %3 )</translation> </message> <message> ! <source>Compiled for Python %1 %2 (Using: %3 ) </source> ! <translation>Compilado para Python %1 %2 (Usando %3) ! </translation> </message> <message> <source>Compiled for MySQL %1 (Using: %2) </source> ! <translation>Compilado para MySQL %1 (Usando: %2)\n</translation> </message> <message> <source>Loading %1</source> ! <translation>Carregando %1</translation> </message> <message> <source>Unloading %1</source> ! <translation>Descarregando %1</translation> </message> <message> <source>Reloading %1</source> ! <translation>Recarregando %1</translation> </message> </context> --- 785,824 ---- <message> <source>Unknown Worldsave Database Driver '%1', check your wolfpack.xml</source> ! <translation type="unfinished"></translation> </message> <message> <source>Unknown Account Database Driver '%1', check your wolfpack.xml</source> ! <translation type="unfinished"></translation> ! </message> ! <message> ! <source>The server is shutting down.</source> ! <translation type="unfinished"></translation> </message> <message> <source>Compiled for Qt %1 (Using: %2 %3) </source> ! <translation type="unfinished"></translation> </message> <message> ! <source>Compiled for Python %1 %2 (Using: %3) </source> ! <translation type="unfinished"></translation> </message> <message> <source>Compiled for MySQL %1 (Using: %2) </source> ! <translation type="unfinished"></translation> </message> <message> <source>Loading %1</source> ! <translation type="unfinished"></translation> </message> <message> <source>Unloading %1</source> ! <translation type="unfinished"></translation> </message> <message> <source>Reloading %1</source> ! <translation type="unfinished"></translation> </message> </context> *************** *** 824,828 **** <message> <source>Better do not try that!</source> ! <translation>Melhor não tentar isso!</translation> </message> </context> --- 827,831 ---- <message> <source>Better do not try that!</source> ! <translation type="unfinished"></translation> </message> </context> *************** *** 831,839 **** <message> <source>Please select a valid character or item</source> ! <translation>Por favor selecione um personagem ou item válido</translation> </message> <message> <source>Better do not try that!</source> ! <translation>Melhor não tentar isso!</translation> </message> </context> --- 834,842 ---- <message> <source>Please select a valid character or item</source> ! <translation type="unfinished"></translation> </message> <message> <source>Better do not try that!</source> ! <translation type="unfinished"></translation> </message> </context> --- NEW FILE: wolfpack_fr.ts --- <!DOCTYPE TS><TS> <context> <name>@default</name> <message> <source>Usage: set <key> <value></source> <translation type="unfinished"></translation> </message> <message> <source>Please select a target to 'set %1 %2' </source> <translation type="unfinished"></translation> </message> <message> <source>Server time: %1</source> <translation type="unfinished"></translation> </message> <message> <source>Please select a target</source> <translation type="unfinished"></translation> </message> [...1204 lines suppressed...] <translation type="unfinished"></translation> </message> <message> <source>WORLDSAVE IN PROGRESS</source> <translation type="unfinished"></translation> </message> <message> <source>Saving %1 items.</source> <translation type="unfinished"></translation> </message> <message> <source>Saving %1 characters.</source> <translation type="unfinished"></translation> </message> <message> <source>Worldsave Completed In %1ms</source> <translation type="unfinished"></translation> </message> </context> </TS> |
|
From: spddmn <xxx...@us...> - 2004-09-24 15:19:16
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31240 Modified Files: server.cpp Log Message: allows server to startup without a lang file Index: server.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/server.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** server.cpp 24 Sep 2004 04:47:37 -0000 1.26 --- server.cpp 24 Sep 2004 15:19:06 -0000 1.27 *************** *** 287,292 **** if ( !translator->load( languageFile, "." ) ) { ! Console::instance()->log( LOG_ERROR, "Couldn't load translator.\n" ); ! return false; } else --- 287,292 ---- if ( !translator->load( languageFile, "." ) ) { ! Console::instance()->log( LOG_WARNING, "Couldn't load translator.\n" ); ! // return false; } else |
|
From: Sebastian H. <dar...@us...> - 2004-09-24 11:07:59
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4425/webroot Modified Files: ChangeLog.wolfpack Log Message: kindling fix Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.113 retrieving revision 1.114 diff -C2 -d -r1.113 -r1.114 *** ChangeLog.wolfpack 23 Sep 2004 19:16:41 -0000 1.113 --- ChangeLog.wolfpack 24 Sep 2004 11:07:47 -0000 1.114 *************** *** 56,59 **** --- 56,61 ---- - Removed spell cast animation while mounted. - Fixed a lumberjacking bug. + - Fixed a bug with kindlings. + - Fixed a bug with canceling a magery target not canceling the spell. * Misc. Changes: - Fixed configure.py for FreeBSD 5 |
