wpdev-commits Mailing List for Wolfpack Emu (Page 52)
Brought to you by:
rip,
thiagocorrea
Menu
▾
▴
wpdev-commits — Wolfpack CVS commit info
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(121) |
Sep
(256) |
Oct
(59) |
Nov
(73) |
Dec
(120) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(259) |
Feb
(381) |
Mar
(501) |
Apr
(355) |
May
(427) |
Jun
(270) |
Jul
(394) |
Aug
(412) |
Sep
(724) |
Oct
(578) |
Nov
(65) |
Dec
|
|
From: Sebastian H. <dar...@us...> - 2004-09-04 21:19:13
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23652 Modified Files: shrink.py Log Message: update version db script. Index: shrink.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/shrink.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shrink.py 26 May 2004 13:07:20 -0000 1.4 --- shrink.py 4 Sep 2004 21:19:02 -0000 1.5 *************** *** 8,15 **** # Shrink import wolfpack def onUse( char, item ): if not item.hastag( "npc_id" ): - char.socket.clilocmessage( 0, 500, 312 ) # You can't reach... item.delete() return 1 --- 8,15 ---- # Shrink import wolfpack + from wolfpack.consts import * def onUse( char, item ): if not item.hastag( "npc_id" ): item.delete() return 1 *************** *** 17,36 **** # Needs to be on ourself if item.getoutmostchar() != char: ! char.socket.clilocmessage( 0, 500, 312 ) # You can't reach... return 1 ! npcid = item.gettag( "npc_id" ) ! npctype = item.gettag( "npc_type" ) ! pos = char.pos ! npc = wolfpack.addnpc( npcid, pos ) ! if npctype == 'mount': ! char.mount(npc) ! item.delete() ! elif npctype == 'follow': ! npc.tamed = 1 ! npc.npcwander = 0 ! npc.follow(char) ! item.delete() ! else: ! item.delete() ! return 1 --- 17,40 ---- # Needs to be on ourself if item.getoutmostchar() != char: ! char.socket.clilocmessage( 500312 ) # You can't reach... return 1 ! npcid = item.gettag("npc_id") ! npc = wolfpack.addnpc(npcid, char.pos) ! ! if npc: ! if item.hastag('npc_type') and char.gettag('npc_type') == 'mount': ! char.mount(npc) ! else: ! npc.owner = char ! npc.tamed = True ! npc.wandertype = 0 ! npc.direction = char.direction ! npc.update() ! ! npc.sound(SND_IDLE) ! npc.action(ANIM_CASTDIRECTED) ! ! item.delete() ! return True ! |
|
From: Sebastian H. <dar...@us...> - 2004-09-04 21:19:12
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23652/wolfpack Modified Files: consts.py Log Message: update version db script. Index: consts.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/consts.py,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** consts.py 3 Sep 2004 01:31:06 -0000 1.75 --- consts.py 4 Sep 2004 21:19:03 -0000 1.76 *************** *** 388,391 **** --- 388,393 ---- EVENT_CONTEXTCHECKVISIBLE = 41 EVENT_CONTEXTCHECKENABLED = 42 + EVENT_SPAWN = 43 + EVENT_UPDATEDATABASE = 44 EVENT_COUNT = 43 """ |
|
From: Sebastian H. <dar...@us...> - 2004-09-04 21:18:51
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23611/webroot Modified Files: ChangeLog.wolfpack Log Message: update version db script. Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** ChangeLog.wolfpack 4 Sep 2004 19:59:30 -0000 1.59 --- ChangeLog.wolfpack 4 Sep 2004 21:18:41 -0000 1.60 *************** *** 5,8 **** --- 5,12 ---- * Definition Changes: * Python Script Changes: + - Added a script for database structure updates (system/dbupdate.py). + - Added an event for database updates (onUpdateDatabase). + - The system.trading event is now removed on login from the characters who + have it. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
|
From: Sebastian H. <dar...@us...> - 2004-09-04 20:33:29
|
Update of /cvsroot/wpdev/xmlscripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16778 Modified Files: wolfpack.sql Log Message: insert db version. Index: wolfpack.sql =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/wolfpack.sql,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** wolfpack.sql 4 Sep 2004 20:32:45 -0000 1.57 --- wolfpack.sql 4 Sep 2004 20:33:21 -0000 1.58 *************** *** 1,3 **** --- 1,7 ---- + # MAKE SURE TO CHANGE THE DATABASE VERSION AT THE END OF THIS SCRIPT + # IF YOU CHANGE THE LAYOUT + # ALSO SEE world.cpp FOR THE SERVER DATABASE VERSION! + CREATE TABLE `characters` ( `serial` int(10) unsigned NOT NULL default '0', |
|
From: Sebastian H. <dar...@us...> - 2004-09-04 20:32:58
|
Update of /cvsroot/wpdev/xmlscripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16675 Modified Files: wolfpack.sql Log Message: insert db version. Index: wolfpack.sql =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/wolfpack.sql,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** wolfpack.sql 4 Sep 2004 20:03:30 -0000 1.56 --- wolfpack.sql 4 Sep 2004 20:32:45 -0000 1.57 *************** *** 208,209 **** --- 208,211 ---- PRIMARY KEY (`serial`) ); + + INSERT INTO `settings` VALUES('db_version', '8'); |
|
From: Sebastian H. <dar...@us...> - 2004-09-04 20:03:39
|
Update of /cvsroot/wpdev/xmlscripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11072 Modified Files: wolfpack.sql Log Message: maxcontrolslots for players Index: wolfpack.sql =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/wolfpack.sql,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** wolfpack.sql 14 Aug 2004 03:41:36 -0000 1.55 --- wolfpack.sql 4 Sep 2004 20:03:30 -0000 1.56 *************** *** 157,160 **** --- 157,161 ---- `dexlock` tinyint(4) NOT NULL default '0', `intlock` tinyint(4) NOT NULL default '0', + `maxcontrolslots` tinyint(4) NOT NULL default '5', PRIMARY KEY (`serial`) ); |
|
From: Sebastian H. <dar...@us...> - 2004-09-04 19:59:41
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10285/webroot Modified Files: ChangeLog.wolfpack Log Message: Started 12.9.10 Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** ChangeLog.wolfpack 4 Sep 2004 18:59:48 -0000 1.58 --- ChangeLog.wolfpack 4 Sep 2004 19:59:30 -0000 1.59 *************** *** 1,33 **** Wolfpack 13.0.0 ChangeLog ! Wolfpack 12.9.9 Beta (CVS) * Core Changes: - Allowed viewing and setting account properties via .set and .show. ! Replace <property> with the name of the account property and <value> ! with the value you want to set: ! .set account.<property> <value> ! .show account.<property> - Moved the account property getters and setters into the cAccount class. - Added an e-mail field to the account database. - Added the "email" property for accounts to the python interface. - .exportdefinitions now exports data about NPCS and their equipment to the ! categories.db database. - .exportdefinitions now exports data about multis to the ! categories.db database. - Backup functionality for the binary save driver. - Binary backups can automatically be compressed using gzip. - The number of backups kept can be limited. ! - Allowed scripts to be attached to base definitions by using ! <basescripts>a,b,c</basescripts>. Those scripts are attached to objects by ! using their baseid property. If you change the <basescripts> tags in the ! definition, all objects using that definition will use the new scripts ! automatically. - onDetach and onAttach are not called for those scripts. - hasscript(a) will return true if a is in the basescripts. - addscript now prepends a new script rather than appending it. ! - The python .scripts property includes all script names, including the ! scripts in basescripts. ! - Added a new property .basescripts to get a comma separated list of all ! scripts in the basescripts list. - New property: char.overweight Returns true if the character is overloaded. - New property: char.maxweight Returns the maximum stones a character can carry. --- 1,49 ---- Wolfpack 13.0.0 ChangeLog ! Wolfpack 12.9.10 Beta (CVS) ! * Core Changes: ! * Definition Changes: ! * Python Script Changes: ! * Misc. Changes: ! * Known Issues, Bugs, and Missing Features: ! - Some skills are still incomplete. ! - Spawn regions are incomplete. ! We welcome donated OSI-like spawn scripts! ! - Town/World regions are incomplete. ! We welcome donated OSI-like region scripts! ! - Teleport Scripts are incomplete. ! We welcome donated OSI-like teleport scripts! ! - Possible that a few monsters are missing and/or incomplete. ! - Reloading Python too many times can crash the server. ! - There are still some memory leaks. ! - Large gumps can potentially crash remote clients. ! - Multis (Houses/Boats) are not currently supported. ! ! Wolfpack 12.9.9 Beta (4. September 2004) * Core Changes: - Allowed viewing and setting account properties via .set and .show. ! Replace <property> with the name of the account property and <value> ! with the value you want to set: ! .set account.<property> <value> ! .show account.<property> - Moved the account property getters and setters into the cAccount class. - Added an e-mail field to the account database. - Added the "email" property for accounts to the python interface. - .exportdefinitions now exports data about NPCS and their equipment to the ! categories.db database. - .exportdefinitions now exports data about multis to the ! categories.db database. - Backup functionality for the binary save driver. - Binary backups can automatically be compressed using gzip. - The number of backups kept can be limited. ! - Allowed scripts to be attached to base definitions by using <basescripts>a,b,c</basescripts>. ! Those scripts are attached to objects by using their baseid property. If you change the <basescripts> ! tags in the definition, all objects using that definition will use the new scripts automatically. - onDetach and onAttach are not called for those scripts. - hasscript(a) will return true if a is in the basescripts. - addscript now prepends a new script rather than appending it. ! - the python .scripts property includes all script names, including the scripts in basescripts. ! - added a new property .basescripts to get a comma separated list of all scripts in the ! basescripts list. - New property: char.overweight Returns true if the character is overloaded. - New property: char.maxweight Returns the maximum stones a character can carry. *************** *** 39,44 **** --- 55,67 ---- - Fixed an issue with walking/running not being sent to other cliens. - Added wolfpack.queuecode to queue a python function for the next mainloop iteration. + - Ignore a 4.0.4a multi purpose packet that doesn't make sense. + - Fixed a bug related to serverlists duplication on configuration reload. - Documentation fixes for item.addtimer. - Item Base Definitions are now reloaded correctly. + - Fixed bug #0000267 (Max. falling height is now infinite). + - Fixed bug #0000268 (coord.validspawnspot() now corrects the z value of coordinates) + - Made startup more fault tolerant. + - Fixed a bug where the skin hue of mobiles was not being sent to clients in range. + - Fix for the unix console crashing if a QString::null was sent. * Definition Changes: - Tag Changes: |
|
From: Sebastian H. <dar...@us...> - 2004-09-04 19:59:22
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10237 Modified Files: ChangeLog res.rc verinfo.h Log Message: Started 12.9.10 Index: verinfo.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/verinfo.h,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** verinfo.h 2 Sep 2004 17:25:02 -0000 1.43 --- verinfo.h 4 Sep 2004 19:59:10 -0000 1.44 *************** *** 36,40 **** inline const char* productVersion() { ! return "12.9.9"; } --- 36,40 ---- inline const char* productVersion() { ! return "12.9.10"; } Index: res.rc =================================================================== RCS file: /cvsroot/wpdev/wolfpack/res.rc,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** res.rc 19 Aug 2004 19:17:08 -0000 1.32 --- res.rc 4 Sep 2004 19:59:10 -0000 1.33 *************** *** 36,40 **** 1 VERSIONINFO ! FILEVERSION 12,9,9,0 PRODUCTVERSION 13,0,0,0 FILEFLAGSMASK 0x3fL --- 36,40 ---- 1 VERSIONINFO ! FILEVERSION 12,9,10,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.9 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.10 Beta" VALUE "LegalCopyright", "© 2001-2004 Wolfpack Dev. Team" VALUE "OriginalFilename", "wolfpack.exe" Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** ChangeLog 4 Sep 2004 15:19:39 -0000 1.26 --- ChangeLog 4 Sep 2004 19:59:10 -0000 1.27 *************** *** 1,4 **** --- 1,6 ---- Wolfpack ChangeLog + Wolfpack 12.9.10 Beta (4. September 2004) + Wolfpack 12.9.9 Beta (CVS) - Allowed viewing and setting account properties via .set and .show. |
|
From: Sebastian H. <dar...@us...> - 2004-09-04 19:11:22
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1254/webroot Removed Files: Thumbs.db Log Message: Fix for bug #0000258 --- Thumbs.db DELETED --- |
|
From: Sebastian H. <dar...@us...> - 2004-09-04 19:00:00
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31206/webroot Modified Files: ChangeLog.wolfpack Log Message: Fix for bug #0000258 Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** ChangeLog.wolfpack 4 Sep 2004 18:40:19 -0000 1.57 --- ChangeLog.wolfpack 4 Sep 2004 18:59:48 -0000 1.58 *************** *** 47,50 **** --- 47,51 ---- Format is: <basescripts></basescripts> - Removed the last occurances of <inherit id="" /> + - Fix for bug #0000258 (Stablemaster doesn't sell horses) * Python Script Changes: - Function Changes: |
|
From: Sebastian H. <dar...@us...> - 2004-09-04 18:59:30
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31135/npcs/humans/vendors Modified Files: stablemaster.xml Log Message: Fix for bug #0000258 Index: stablemaster.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/stablemaster.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** stablemaster.xml 3 Feb 2004 18:19:12 -0000 1.3 --- stablemaster.xml 4 Sep 2004 18:59:20 -0000 1.4 *************** *** 8,11 **** --- 8,40 ---- --> <definitions> + <npc id="stablemaster_inventory"> + <shopkeeper> + <restockable> + <!-- Horse (Gray) --> + <item id="shrink_horse_1"> + <name>Horse</name> + <amount>10</amount> + </item> + + <!-- Horse (Gray/Brown) --> + <item id="shrink_horse_2"> + <name>Horse</name> + <amount>10</amount> + </item> + + <!-- Horse (Light Brown) --> + <item id="shrink_horse_3"> + <name>Horse</name> + <amount>10</amount> + </item> + + <!-- Horse (Brown) --> + <item id="shrink_horse_4"> + <name>Horse</name> + <amount>10</amount> + </item> + </restockable> + </shopkeeper> + </npc> <!-- Stablemaster (no real vendor) --> *************** *** 16,20 **** <animaltaming><random min="900" max="1000"/></animaltaming> <veterinary><random min="650" max="880"/></veterinary> ! <category>Vendors\Stablemaster (Male)</category> </npc> --- 45,50 ---- <animaltaming><random min="900" max="1000"/></animaltaming> <veterinary><random min="650" max="880"/></veterinary> ! <category>Vendors\Stablemaster (Male)</category> ! <inherit>stablemaster_inventory</inherit> </npc> *************** *** 26,29 **** --- 56,60 ---- <veterinary><random min="650" max="880"/></veterinary> <category>Vendors\Stablemaster (Female)</category> + <inherit>stablemaster_inventory</inherit> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-09-04 18:59:29
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/shrink In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31135/items/shrink Modified Files: shrink.xml Log Message: Fix for bug #0000258 Index: shrink.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/shrink/shrink.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shrink.xml 27 Aug 2004 14:43:28 -0000 1.4 --- shrink.xml 4 Sep 2004 18:59:19 -0000 1.5 *************** *** 28,31 **** --- 28,32 ---- <name>shrink llama</name> <weight>0.1</weight> + <tag name="npc_id" value="ridable_llama" /> </item> *************** *** 56,59 **** --- 57,62 ---- <name>shrink horse 1</name> <weight>0.1</weight> + <tag name="npc_id" value="horse_1" /> + <buyprice>602</buyprice> </item> *************** *** 63,66 **** --- 66,71 ---- <name>shrink horse 2</name> <weight>0.1</weight> + <tag name="npc_id" value="horse_2" /> + <buyprice>602</buyprice> </item> *************** *** 70,73 **** --- 75,80 ---- <name>shrink horse 3</name> <weight>0.1</weight> + <tag name="npc_id" value="horse_3" /> + <buyprice>602</buyprice> </item> *************** *** 75,80 **** <id>0x2124</id> <basescripts>shrink</basescripts> ! <name>shrink horse 4</name> <weight>0.1</weight> </item> --- 82,89 ---- <id>0x2124</id> <basescripts>shrink</basescripts> ! <name>shrink horse 4</name> <weight>0.1</weight> + <tag name="npc_id" value="horse_4" /> + <buyprice>602</buyprice> </item> |
|
From: Sebastian H. <dar...@us...> - 2004-09-04 18:40:31
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27912/webroot Modified Files: ChangeLog.wolfpack Log Message: Updates for trading Fix for bug #0000128 Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** ChangeLog.wolfpack 4 Sep 2004 15:16:25 -0000 1.56 --- ChangeLog.wolfpack 4 Sep 2004 18:40:19 -0000 1.57 *************** *** 73,76 **** --- 73,77 ---- - Fix for bug #0000266 (summoned npcs had loot) - Fix for bug #0000256 (Not checking for second submaterial in craftmenus) + - Fix for bug #0000128 (Trademenu leading to client crash) * Misc. Changes: - Experimental Mac OSX Support |
|
From: Sebastian H. <dar...@us...> - 2004-09-04 18:39:18
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27656/system Modified Files: trading.py Log Message: Updates for trading Fix for bug #0000128 Index: trading.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/trading.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** trading.py 4 Sep 2004 16:44:50 -0000 1.7 --- trading.py 4 Sep 2004 18:39:08 -0000 1.8 *************** *** 23,26 **** --- 23,68 ---- return True + # + # Disallow using items in trade containers + # + def onUse(char, item): + if item.container and item.container.container == char and item.container.layer == LAYER_TRADING: + return True + else: + return False + + def onPickup(player1, item): + box1 = player1.itemonlayer(LAYER_TRADING) + if not box1: + return False + + if item.container != box1: + return False + + if not player1.hastag('trade_partner'): + return False + + player2 = wolfpack.findchar(int(player1.gettag('trade_partner'))) + if not player2: + return False + box2 = player2.itemonlayer(LAYER_TRADING) + + if not box2: + return False + + player1.settag( 'trade_button', 0 ) + player2.settag( 'trade_button', 0 ) + + # Reset the trading status and resend it + # To me + sendtradepacket( player1.socket, 2, box1.serial, 0, 0, "" ) + + # To partner + sendtradepacket( player2.socket, 2, box2.serial, 0, 0, "" ) + + item.removefromview(True) + + return False + def onTradeAdd( player, item ): #not implemented yet in code *************** *** 40,43 **** --- 82,109 ---- return True + + def onDropOnItem( item, box1 ): + player1 = box1.container + if not player1.hastag('trade_partner'): + return False + player2 = wolfpack.findchar(int(player1.gettag('trade_partner'))) + if not player2: + return False + box2 = player2.itemonlayer(LAYER_TRADING) + + if not box2: + return False + + player1.settag( 'trade_button', 0 ) + player2.settag( 'trade_button', 0 ) + + # Reset the trading status and resend it + # To me + sendtradepacket( player1.socket, 2, box1.serial, 0, 0, "" ) + + # To partner + sendtradepacket( player2.socket, 2, box2.serial, 0, 0, "" ) + + return False # *************** *** 74,77 **** --- 140,146 ---- player1.additem( LAYER_TRADING, box1 ) box1.update() + box1new = 1 + else: + box1new = 0 # Same operation for partner *************** *** 82,85 **** --- 151,157 ---- player2.additem( LAYER_TRADING, box2 ) box2.update() + box2new = 1 + else: + box2new = 0 # Unable to create trade containers *************** *** 89,101 **** return False ! #onLogout event should be executed for tradewindow disposing player1.addscript( 'system.trading' ) player2.addscript( 'system.trading' ) ! #We want to know serial of partner in future player1.settag( 'trade_partner', player2.serial ) player2.settag( 'trade_partner', player1.serial ) ! #We need to store button state of each player player1.settag( 'trade_button', 0 ) player2.settag( 'trade_button', 0 ) --- 161,173 ---- return False ! # onLogout event should be executed for tradewindow disposing player1.addscript( 'system.trading' ) player2.addscript( 'system.trading' ) ! # We want to know serial of partner in future player1.settag( 'trade_partner', player2.serial ) player2.settag( 'trade_partner', player1.serial ) ! # We need to store button state of each player player1.settag( 'trade_button', 0 ) player2.settag( 'trade_button', 0 ) *************** *** 103,118 **** #Send trade window to both players #To me ! sendtradepacket( player1.socket, 0, player2.serial, box1.serial, box2.serial, player2.name ) #To partner ! sendtradepacket( player2.socket, 0, player1.serial, box2.serial, box1.serial, player1.name ) #Send buttons state #To me ! sendtradepacket( player1.socket, 2, box1.serial, 0, 0, "" ) #To partner ! sendtradepacket( player2.socket, 2, box2.serial, 0, 0, "" ) box1.additem( firstitem ) firstitem.update() return True --- 175,196 ---- #Send trade window to both players #To me ! if box1new: ! sendtradepacket( player1.socket, 0, player2.serial, box1.serial, box2.serial, player2.name ) ! #To partner ! if box2new: ! sendtradepacket( player2.socket, 0, player1.serial, box2.serial, box1.serial, player1.name ) #Send buttons state #To me ! sendtradepacket( player1.socket, 2, box1.serial, 0, 0, "" ) #To partner ! sendtradepacket( player2.socket, 2, box2.serial, 0, 0, "" ) box1.additem( firstitem ) firstitem.update() + + box1.addscript('system.trading') + box2.addscript('system.trading') return True *************** *** 169,172 **** --- 247,251 ---- sendclosetrade( player.socket, box1.serial ) box1.delete() + if box2: back2 = partner.getbackpack() |
|
From: spddmn <xxx...@us...> - 2004-09-04 18:28:58
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25808 Modified Files: potions.py Log Message: just a few fixes Index: potions.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/potions.py,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** potions.py 2 Sep 2004 00:44:27 -0000 1.45 --- potions.py 4 Sep 2004 18:28:44 -0000 1.46 *************** *** 16,29 **** POTIONS = \ { ! 0: [ True, 0, 0, '#1044542', '#1041620', 'potion_nightsight' ], # nightsight ! 1: [ True, 0, 0, '#1044543', '#1041634', 'potion_lesserheal' ], # lesser heal ! 2: [ True, 0, 0, '#1044544', '#1041635', 'potion_heal' ], # heal ! 3: [ True, 0, 0, '#1044545', '#1041636', 'potion_greaterheal' ], # greater heal ! 4: [ True, 0, 0, '#1044552', '#1041621', 'potion_lessercure' ], # lesser cure ! 5: [ True, 0, 0, '#1044553', '#1041622', 'potion_cure' ], # cure ! 6: [ True, 0, 0, '#1044554', '#1041623', 'potion_greatercure' ], # greater cure ! 7: [ True, 0, 0, '#1044540', '#1041624', 'potion_agility' ], # agility ! 8: [ True, 0, 0, '#1044541', '#1041625', 'potion_greateragility' ], # greater agility ! 9: [ True, 0, 0, '#1044546', '#1041626', 'potion_strength' ], # strength 10: [ True, 0, 0, '#1044547', '#1041627', 'potion_greaterstrength' ], # greater strength 11: [ False, 1, 1, '#1044555', '#1041637', 'potion_lesserexplosion' ], # lesser explosion --- 16,29 ---- POTIONS = \ { ! 0: [ True, 0, 0, '#1044542', '#1041620', 'potion_nightsight' ], # nightsight ! 1: [ True, 0, 0, '#1044543', '#1041634', 'potion_lesserheal' ], # lesser heal ! 2: [ True, 0, 0, '#1044544', '#1041635', 'potion_heal' ], # heal ! 3: [ True, 0, 0, '#1044545', '#1041636', 'potion_greaterheal' ], # greater heal ! 4: [ True, 0, 0, '#1044552', '#1041621', 'potion_lessercure' ], # lesser cure ! 5: [ True, 0, 0, '#1044553', '#1041622', 'potion_cure' ], # cure ! 6: [ True, 0, 0, '#1044554', '#1041623', 'potion_greatercure' ], # greater cure ! 7: [ True, 0, 0, '#1044540', '#1041624', 'potion_agility' ], # agility ! 8: [ True, 0, 0, '#1044541', '#1041625', 'potion_greateragility' ], # greater agility ! 9: [ True, 0, 0, '#1044546', '#1041626', 'potion_strength' ], # strength 10: [ True, 0, 0, '#1044547', '#1041627', 'potion_greaterstrength' ], # greater strength 11: [ False, 1, 1, '#1044555', '#1041637', 'potion_lesserexplosion' ], # lesser explosion *************** *** 50,54 **** POT_DEF = 5 ! explosions = [ 0x36b0, 0x36bd, 0x36cb] explodables = [ 'potion_greaterexplosion', 'potion_explosion', 'potion_lesserexplosion', 'f0d' ] --- 50,54 ---- POT_DEF = 5 ! explosions = [ 0x36b0, 0x36bd, 0x36cb ] explodables = [ 'potion_greaterexplosion', 'potion_explosion', 'potion_lesserexplosion', 'f0d' ] *************** *** 76,82 **** # char, potion, counter value if not item.hastag('exploding'): ! potionexplosion( [ char.serial, item.serial, 4, item.amount ] ) item.settag('exploding', 'true') ! socket.sysmessage( 'Please select a target...', RED ) socket.attachtarget( "potions.targetexplosionpotion", [ item ] ) --- 76,82 ---- # char, potion, counter value if not item.hastag('exploding'): ! potionexplosion( item, [ char.serial, 4] ) item.settag('exploding', 'true') ! socket.sysmessage( 'You should throw this now!', RED ) socket.attachtarget( "potions.targetexplosionpotion", [ item ] ) *************** *** 120,123 **** --- 120,124 ---- return 0 if target.char: + # i dont think we need some of these... if target.char.invulnerable: return 0 *************** *** 152,158 **** return ! throwobject(char, potion, pos, 1, 3, 5) ! # char, potion, counter value ! #potionexplosion( [ char.serial, potion.serial, 4, potion.amount ] ) return --- 153,160 ---- return ! #verify the potion still exists to be thrown... ! if potion: ! throwobject(char, potion, pos, 1, 3, 5) ! return *************** *** 160,165 **** def potionexplosion( potion, args ): char = wolfpack.findchar(args[0]) ! counter = args[2] ! bonus = args[3] if not bonus: bonus = 1 --- 162,167 ---- def potionexplosion( potion, args ): char = wolfpack.findchar(args[0]) ! counter = args[1] ! bonus = potion.amount if not bonus: bonus = 1 |
|
From: Sebastian H. <dar...@us...> - 2004-09-04 16:45:02
|
Update of /cvsroot/wpdev/xmlscripts/scripts/skills In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5753/skills Modified Files: tailoring.py Log Message: Small updates to trading. Index: tailoring.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/tailoring.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tailoring.py 16 May 2004 22:04:23 -0000 1.7 --- tailoring.py 4 Sep 2004 16:44:49 -0000 1.8 *************** *** 17,21 **** # Leather types used by tailoring. LEATHERS = [ ! ['Leather', TAILORING, 0, ['leather_cut', 'leather_hides'], 0x0, 'leather'], ['Spined Leather', TAILORING, 650, ['spined_leather_cut', 'spined_leather_hides'], 0x283, 'spined_leather'], ['Horned Leather', TAILORING, 800, ['horned_leather_cut', 'horned_leather_hides'], 0x227, 'horned_leather'], --- 17,21 ---- # Leather types used by tailoring. LEATHERS = [ ! ['Leather', TAILORING, 0, ['leather_cut', 'leather_hides'], 0x0, 'leather'], ['Spined Leather', TAILORING, 650, ['spined_leather_cut', 'spined_leather_hides'], 0x283, 'spined_leather'], ['Horned Leather', TAILORING, 800, ['horned_leather_cut', 'horned_leather_hides'], 0x227, 'horned_leather'], |
|
From: Sebastian H. <dar...@us...> - 2004-09-04 16:45:02
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5753/system Modified Files: trading.py Log Message: Small updates to trading. Index: trading.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/trading.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** trading.py 25 Aug 2004 17:03:06 -0000 1.6 --- trading.py 4 Sep 2004 16:44:50 -0000 1.7 *************** *** 15,20 **** def onLogout( player ): ! if player.hastag( 'partner' ): ! partner = wolfpack.findchar( player.gettag( 'partner' ) ) box2 = partner.itemonlayer( LAYER_TRADING ) box1 = player.itemonlayer( LAYER_TRADING ) --- 15,20 ---- def onLogout( player ): ! if player.hastag( 'trade_partner' ): ! partner = wolfpack.findchar( player.gettag( 'trade_partner' ) ) box2 = partner.itemonlayer( LAYER_TRADING ) box1 = player.itemonlayer( LAYER_TRADING ) *************** *** 41,66 **** return True def onTradeStart( player1, player2, firstitem ): #player1 : I am #player2 : Partner ! #Creating trade container for me box1 = player1.itemonlayer( LAYER_TRADING ) if not box1: box1 = wolfpack.additem( "e75" ) ! box1.owner = player1.serial player1.additem( LAYER_TRADING, box1 ) box1.update() ! ! #Same operation for partner box2 = player2.itemonlayer( LAYER_TRADING ) if not box2: box2 = wolfpack.additem("e75") ! box2.owner = player2.serial player2.additem( LAYER_TRADING, box2 ) box2.update() if not box1 or not box2: return False --- 41,90 ---- return True + # + # This event is called if an item is dropped on another character and + # he is a logged in player. + # def onTradeStart( player1, player2, firstitem ): + # If we are trading with someone else right now, + # trading should be denied + if player2.hastag('trade_partner'): + partner = wolfpack.findchar(int(player2.gettag('trade_partner'))) + if partner and partner != player1: + player1.socket.sysmessage('Your trading partner is currently busy.') + if not wolfpack.utilities.tobackpack(firstitem, player1): + firstitem.update() + return False + + if player1.hastag('trade_partner'): + partner = wolfpack.findchar(int(player1.gettag('trade_partner'))) + if partner and partner != player2: + player1.socket.sysmessage('You are trading with someone else right now.') + if not wolfpack.utilities.tobackpack(firstitem, player1): + firstitem.update() + return False + #player1 : I am #player2 : Partner ! # Creating trade container for me box1 = player1.itemonlayer( LAYER_TRADING ) if not box1: box1 = wolfpack.additem( "e75" ) ! box1.owner = player1 player1.additem( LAYER_TRADING, box1 ) box1.update() ! # Same operation for partner box2 = player2.itemonlayer( LAYER_TRADING ) if not box2: box2 = wolfpack.additem("e75") ! box2.owner = player2 player2.additem( LAYER_TRADING, box2 ) box2.update() + # Unable to create trade containers if not box1 or not box2: + if not wolfpack.utilities.tobackpack(firstitem, player1): + firstitem.update() return False *************** *** 70,79 **** #We want to know serial of partner in future ! player1.settag( 'partner', player2.serial ) ! player2.settag( 'partner', player1.serial ) #We need to store button state of each player ! player1.settag( 'button', 0 ) ! player2.settag( 'button', 0 ) #Send trade window to both players --- 94,103 ---- #We want to know serial of partner in future ! player1.settag( 'trade_partner', player2.serial ) ! player2.settag( 'trade_partner', player1.serial ) #We need to store button state of each player ! player1.settag( 'trade_button', 0 ) ! player2.settag( 'trade_button', 0 ) #Send trade window to both players *************** *** 94,97 **** --- 118,124 ---- return True + # + # This is called on trade events + # def onTrade( player, type, buttonstate, itemserial ): #Receiving button state, close request etc... *************** *** 104,109 **** #Check if we have a partner ! if player.hastag( 'partner' ): ! partner = wolfpack.findchar( player.gettag( 'partner' ) ) if not partner: return False --- 131,136 ---- #Check if we have a partner ! if player.hastag( 'trade_partner' ): ! partner = wolfpack.findchar( player.gettag( 'trade_partner' ) ) if not partner: return False *************** *** 121,125 **** #Button pressed ? if buttonstate == 1: ! player.settag( 'button', 1 ) #Execute handler of specified type --- 148,152 ---- #Button pressed ? if buttonstate == 1: ! player.settag( 'trade_button', 1 ) #Execute handler of specified type *************** *** 134,139 **** #Close partner tradewindow for p in [player, partner]: ! p.deltag( 'partner' ) ! p.deltag( 'button' ) if box1: --- 161,166 ---- #Close partner tradewindow for p in [player, partner]: ! p.deltag( 'trade_partner' ) ! p.deltag( 'trade_button' ) if box1: *************** *** 152,157 **** def pressbutton( player, partner, box1, box2 ): #Switch buttons on trade gump ! button1 = player.gettag( 'button' ) ! button2 = partner.gettag( 'button' ) sendtradepacket( player.socket, 2, box1.serial, button1, button2, "" ) sendtradepacket( partner.socket, 2, box2.serial, button2, button1, "" ) --- 179,184 ---- def pressbutton( player, partner, box1, box2 ): #Switch buttons on trade gump ! button1 = player.gettag( 'trade_button' ) ! button2 = partner.gettag( 'trade_button' ) sendtradepacket( player.socket, 2, box1.serial, button1, button2, "" ) sendtradepacket( partner.socket, 2, box2.serial, button2, button1, "" ) *************** *** 159,162 **** --- 186,191 ---- #To far away for trading ? if player.distanceto( partner ) > 2: + player.socket.sysmessage('You are too far away to do that.') + partner.socket.sysmessage('You are too far away to do that.') closetrade( player, partner, box1, box2 ) return True |
|
From: Sebastian H. <dar...@us...> - 2004-09-04 15:25:52
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22372 Modified Files: basechar.cpp Log Message: no idea what this was. Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.143 retrieving revision 1.144 diff -C2 -d -r1.143 -r1.144 *** basechar.cpp 4 Sep 2004 08:36:20 -0000 1.143 --- basechar.cpp 4 Sep 2004 15:25:40 -0000 1.144 *************** *** 2421,2430 **** unsigned short sound; ! if ( amount == 1 ) sound = 0x35; else if ( amount > 1 && amount < 6 ) sound = 0x36; else ! sound = 0x37; soundEffect( sound, hearall ); --- 2421,2436 ---- unsigned short sound; ! /*if ( amount == 1 ) sound = 0x35; else if ( amount > 1 && amount < 6 ) sound = 0x36; else ! sound = 0x37;*/ ! if (amount <= 1) ! sound = 0x2e4; ! else if (amount <= 5) ! sound = 0x2e5; ! else ! sound = 0x2e6; soundEffect( sound, hearall ); |
|
From: Sebastian H. <dar...@us...> - 2004-09-04 15:24:36
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22171 Modified Files: world.cpp Log Message: Likely fix for spddmn's change. Index: world.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v retrieving revision 1.122 retrieving revision 1.123 diff -C2 -d -r1.122 -r1.123 *** world.cpp 4 Sep 2004 08:36:22 -0000 1.122 --- world.cpp 4 Sep 2004 15:24:22 -0000 1.123 *************** *** 741,744 **** --- 741,754 ---- } + // post process all loaded objects + // Note from DarkStorm: I THINK it's important to do this before + // the deletion of objects, otherwise you might have items in this + // list that are already deleted. + QPtrList<PersistentObject>::const_iterator cit(objects.begin()); + + while (cit != objects.end()) { + (*cit)->postload(0); + ++cit; + } if ( deleteItems.count() > 0 ) *************** *** 780,791 **** PersistentBroker::instance()->disconnect(); - - // post process all loaded objects - QPtrList<PersistentObject>::const_iterator cit(objects.begin()); - - while (cit != objects.end()) { - (*cit)->postload(0); - ++cit; - } } --- 790,793 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-09-04 15:19:52
|
Update of /cvsroot/wpdev/wolfpack/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21422/unix Modified Files: console_unix.cpp Log Message: Fixed bug #0000256 Index: console_unix.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/unix/console_unix.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** console_unix.cpp 10 Aug 2004 03:18:48 -0000 1.12 --- console_unix.cpp 4 Sep 2004 15:19:39 -0000 1.13 *************** *** 227,230 **** --- 227,234 ---- void cConsole::send( const QString& sMessage ) { + if (sMessage.isNull() || sMessage.isEmpty()) { + return; + } + // If a progress message is waiting, remove it. if ( !progress.isEmpty() ) |
|
From: Sebastian H. <dar...@us...> - 2004-09-04 15:19:52
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21422 Modified Files: ChangeLog Log Message: Fixed bug #0000256 Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** ChangeLog 3 Sep 2004 19:19:59 -0000 1.25 --- ChangeLog 4 Sep 2004 15:19:39 -0000 1.26 *************** *** 43,46 **** --- 43,47 ---- - Made startup more fault tolerant. - Fixed a bug where the skin hue of mobiles was not being sent to clients in range. + - Fix for the unix console crashing if a QString::null was sent. Wolfpack 12.9.8 Beta (19. August 2004) |
|
From: Sebastian H. <dar...@us...> - 2004-09-04 15:16:33
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20893/webroot Modified Files: ChangeLog.wolfpack Log Message: Fixed bug #0000256 Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** ChangeLog.wolfpack 3 Sep 2004 16:03:21 -0000 1.55 --- ChangeLog.wolfpack 4 Sep 2004 15:16:25 -0000 1.56 *************** *** 72,75 **** --- 72,76 ---- - Fix for bug #0000260 (.tile now caps at 250 items if the acl doesn't allow unlimited items) - Fix for bug #0000266 (summoned npcs had loot) + - Fix for bug #0000256 (Not checking for second submaterial in craftmenus) * Misc. Changes: - Experimental Mac OSX Support |
|
From: Sebastian H. <dar...@us...> - 2004-09-04 15:16:00
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20792/system Modified Files: makemenus.py Log Message: Fix for second submaterial not being checked. Index: makemenus.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/makemenus.py,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** makemenus.py 21 Jul 2004 14:20:42 -0000 1.25 --- makemenus.py 4 Sep 2004 15:15:47 -0000 1.26 *************** *** 268,272 **** # Check the required amount of the material count = backpack.countitems(material[3]) ! if count < self.submaterial1: if not silent: if self.parent.submaterial2missing != 0: --- 268,272 ---- # Check the required amount of the material count = backpack.countitems(material[3]) ! if count < self.submaterial2: if not silent: if self.parent.submaterial2missing != 0: |
|
From: spddmn <xxx...@us...> - 2004-09-04 08:36:35
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30859 Modified Files: basechar.cpp npc.cpp world.cpp Log Message: final stuff for stables 1.0 Index: world.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v retrieving revision 1.121 retrieving revision 1.122 diff -C2 -d -r1.121 -r1.122 *** world.cpp 31 Aug 2004 22:40:20 -0000 1.121 --- world.cpp 4 Sep 2004 08:36:22 -0000 1.122 *************** *** 708,730 **** P_NPC pNPC = dynamic_cast<P_NPC>( pChar ); - // Find Owner - if ( pNPC && pNPC->owner() ) - { - SERIAL owner = pNPC->owner()->serial(); - - P_PLAYER pOwner = dynamic_cast<P_PLAYER>( FindCharBySerial( owner ) ); - if ( pOwner ) - { - pNPC->setOwner( pOwner ); - pOwner->addPet( pNPC, true ); - } - else - { - Console::instance()->send( QString( "The owner of Serial 0x%1 is invalid: %2" ).arg( pNPC->serial(), 0, 16 ).arg( owner, 0, 16 ) ); - pNPC->setOwner( NULL ); - } - } - // Find Guarding if ( pChar->guarding() ) { --- 708,713 ---- P_NPC pNPC = dynamic_cast<P_NPC>( pChar ); // Find Guarding + // this needs to move to postprocessing if ( pChar->guarding() ) { Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.142 retrieving revision 1.143 diff -C2 -d -r1.142 -r1.143 *** basechar.cpp 3 Sep 2004 19:23:14 -0000 1.142 --- basechar.cpp 4 Sep 2004 08:36:20 -0000 1.143 *************** *** 399,405 **** void cBaseChar::save() { - initSave; if ( changed_ ) { setTable( "characters" ); --- 399,405 ---- void cBaseChar::save() { if ( changed_ ) { + initSave; setTable( "characters" ); *************** *** 465,469 **** } PersistentBroker::instance()->unlockTable( "skills" ); - cUObject::save(); } --- 465,468 ---- Index: npc.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v retrieving revision 1.111 retrieving revision 1.112 diff -C2 -d -r1.111 -r1.112 *** npc.cpp 31 Aug 2004 22:04:39 -0000 1.111 --- npc.cpp 4 Sep 2004 08:36:22 -0000 1.112 *************** *** 170,175 **** summonTime_ += Server::instance()->time(); additionalFlags_ = atoi( result[offset++] ); ! ser = atoi( result[offset++] ); ! owner_ = dynamic_cast<P_PLAYER>( FindCharBySerial( ser ) ); stablemasterSerial_ = atoi( result[offset++] ); setAI( result[offset++] ); --- 170,174 ---- summonTime_ += Server::instance()->time(); additionalFlags_ = atoi( result[offset++] ); ! owner_ = reinterpret_cast<P_PLAYER>(atoi(result[offset++])); stablemasterSerial_ = atoi( result[offset++] ); setAI( result[offset++] ); *************** *** 186,190 **** void cNPC::save() ! { if ( changed_ ) { --- 185,189 ---- void cNPC::save() ! { if ( changed_ ) { *************** *** 208,211 **** --- 207,211 ---- saveFields; } + cBaseChar::save(); } *************** *** 1381,1384 **** --- 1381,1386 ---- MapObjects::instance()->remove( this ); } + + } |
|
From: spddmn <xxx...@us...> - 2004-09-04 08:32:47
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30412/ai Modified Files: ai_humans.cpp Log Message: stables 1.0 Index: ai_humans.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai_humans.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** ai_humans.cpp 13 Aug 2004 08:55:27 -0000 1.17 --- ai_humans.cpp 4 Sep 2004 08:32:38 -0000 1.18 *************** *** 35,38 **** --- 35,39 ---- #include "../timers.h" #include "../serverconfig.h" + #include "../console.h" #include "../sectors.h" *************** *** 110,113 **** --- 111,115 ---- int gold = pTalker->countBankGold() + pTalker->countGold(); P_ITEM pPack = m_npc->getBankbox(); + cItem::ContainerContent stableitems; if ( pPack ) *************** *** 137,140 **** --- 139,144 ---- { pPet->free = false; + // we need this for db saves + pPet->setStablemasterSerial( INVALID_SERIAL ); pPet->moveTo( m_npc->pos() ); pPet->resend(); *************** *** 184,188 **** // but will still be saved. P_ITEM pGem = new cItem(); ! pGem->Init( false ); pGem->setTag( "player", cVariant( player->serial() ) ); pGem->setTag( "pet", cVariant( pPet->serial() ) ); --- 188,192 ---- // but will still be saved. P_ITEM pGem = new cItem(); ! pGem->Init( true ); pGem->setTag( "player", cVariant( player->serial() ) ); pGem->setTag( "pet", cVariant( pPet->serial() ) ); *************** *** 193,201 **** pGem->update(); ! pPet->free = true; MapObjects::instance()->remove( pPet ); pPet->removeFromView(); ! m_npc->talk( tr( "Say release to get your pet back!" ) ); } --- 197,208 ---- pGem->update(); ! ! //pPet->free = true; MapObjects::instance()->remove( pPet ); + pPet->setStablemasterSerial( this->m_npc->serial() ); pPet->removeFromView(); ! // we need this for db saves ! m_npc->talk( tr( "Say release to get your pet back!" ) ); } |
