wpdev-commits Mailing List for Wolfpack Emu (Page 191)
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: <thi...@us...> - 2003-09-15 02:00:46
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv20079
Modified Files:
log.cpp log.h wolfpack.pro
Log Message:
Improved linux build
:
Index: log.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/log.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** log.cpp 8 Sep 2003 10:58:47 -0000 1.3
--- log.cpp 15 Sep 2003 02:00:41 -0000 1.4
***************
*** 69,74 ****
if ( !d.exists(path) )
{
! Console::instance()->send( QString("Warning: log path (%1) doesn't exist, creating\n").arg(path) );
! QDir d;
d.mkdir( path );
}
--- 69,76 ----
if ( !d.exists(path) )
{
! Console::instance()->ChangeColor( WPC_YELLOW );
! Console::instance()->send( "WARNING: " );
! Console::instance()->ChangeColor( WPC_NORMAL );
! Console::instance()->send( QString("log path (%1) doesn't exist, creating\n").arg(path) );
d.mkdir( path );
}
***************
*** 81,85 ****
if( !logfile.open( IO_WriteOnly | IO_Append | IO_Translate ) )
{
! Console::instance()->send( QString( "Couldn't open logfile '%1'\n" ).arg( path ) );
return false;
}
--- 83,90 ----
if( !logfile.open( IO_WriteOnly | IO_Append | IO_Translate ) )
{
! Console::instance()->ChangeColor( WPC_RED );
! Console::instance()->send( "ERROR: " );
! Console::instance()->ChangeColor( WPC_NORMAL );
! Console::instance()->send( QString( "Couldn't open logfile '%1'\n" ).arg( path + filename ) );
return false;
}
***************
*** 187,188 ****
--- 192,194 ----
Console::instance()->send( string );
}
+
Index: log.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/log.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** log.h 8 Sep 2003 10:58:47 -0000 1.2
--- log.h 15 Sep 2003 02:00:41 -0000 1.3
***************
*** 52,56 ****
public:
cLog(): loglevel( LOG_DEBUG ) {}
! virtual ~cLog();
// Prints to the logfile only
--- 52,56 ----
public:
cLog(): loglevel( LOG_DEBUG ) {}
! ~cLog();
// Prints to the logfile only
***************
*** 67,68 ****
--- 67,69 ----
#endif
+
Index: wolfpack.pro
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v
retrieving revision 1.162
retrieving revision 1.163
diff -C2 -d -r1.162 -r1.163
*** wolfpack.pro 13 Sep 2003 01:15:03 -0000 1.162
--- wolfpack.pro 15 Sep 2003 02:00:41 -0000 1.163
***************
*** 1,7 ****
! #
! # Wolfpack qmake project
! #
! #
! #
PROJECT = wolfpack
--- 1,8 ----
! #################################################################
! # ) (\_ # Wolfpack 13.0.0 Build Script #
! # (( _/{ "-; # Created by: Wolfpack Development Team #
! # )).-" {{ ;"` # Revised by: Wolfpack Development Team #
! # ( ( ;._ \\ ctr # Last Modification: check cvs logs #
! #################################################################
PROJECT = wolfpack
***************
*** 10,13 ****
--- 11,15 ----
CONFIG += qt console thread exceptions rtti
INCLUDEPATH += lib/Python/include
+ OPTIONS += mysql
unix {
***************
*** 17,39 ****
# MySQL includes first
! exists(/usr/include/mysql/mysql.h) {
! message("MySQL files found, support enabled")
! INCLUDEPATH += /usr/include/mysql
! DEFINES += MYSQL_DRIVER
! LIBS += -lmysqlclient
! } exists(/usr/local/lib/mysql/include/mysql/mysql.h) {
! message("MySQL files found, support enabled")
! INCLUDEPATH += /usr/local/lib/mysql/include/mysql
! DEFINES += MYSQL_DRIVER
! LIBS += -lmysqlclient
}
INCLUDEPATH += /usr/local/include/stlport lib/Python sqlite lib/Python/Include network
! LIBS += -L. -L/usr/local/lib/mysql/lib/mysql -L/usr/local/lib -Llib/Python -L/usr/lib/mysql -ldl -lpython2.3 -lutil
# we dont use those.
QMAKE_LIBS_X11 -= -lX11 -lXext -lm
# Optional compile modes
! release:debug:error(You cant have release and debug at the same time!)
release {
--- 19,62 ----
# MySQL includes first
! contains( OPTIONS, mysql ) {
! message("MySQL support specified, trying to locate required files")
! exists(/usr/include/mysql/mysql.h) {
! MYSQL_INCLUDE = /usr/include/mysql
! } exists(/usr/local/lib/mysql/include/mysql/mysql.h) {
! message("MySQL files found, support enabled")
! INCLUDEPATH += /usr/local/lib/mysql/include/mysql
! DEFINES += MYSQL_DRIVER
! LIBS += -lmysqlclient
! }
!
! !isEmpty(MYSQL_INCLUDE) {
! message("MySQL include path........: ($$MYSQL_INCLUDE)")
! INCLUDEPATH += $$MYSQL_INCLUDE
! DEFINES += MYSQL_DRIVER
!
! exists(/usr/lib/mysql/mysqlclient*) {
! MYSQL_LIB = /usr/lib/mysql
! } exists (/usr/local/lib/mysql/lib/mysql/mysqlclient*) {
! MYSQL_LIB = /usr/local/lib/mysql/lib/mysql
! } exists (/usr/local/lib/mysqlclient*) {
! MYSQL_LIB = /usr/local/lib
! }
!
! !isEmpty(MYSQL_LIB) {
! message("MySQL library path.........: ($$MYSQL_LIB)")
! LIBS += -L$$MYSQL_LIB
! }
! LIBS += -lmysqlclient
! }
}
INCLUDEPATH += /usr/local/include/stlport lib/Python sqlite lib/Python/Include network
! LIBS += -L. -L/usr/local/lib -Llib/Python -ldl -lpython2.3 -lutil
!
# we dont use those.
QMAKE_LIBS_X11 -= -lX11 -lXext -lm
# Optional compile modes
! # release:debug:error(You cant have release and debug at the same time!)
release {
***************
*** 58,61 ****
--- 81,85 ----
RC_FILE = res.rc
OBJECTS_DIR = obj
+ MOC_DIR = obj
win32:DEFINES += WIN32
***************
*** 285,286 ****
--- 309,314 ----
console_win.cpp
+ DISTFILES += AUTHORS.txt \
+ COPYING.txt \
+ LICENSE.GPL
+
|
|
From: <dar...@us...> - 2003-09-14 21:43:59
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1:/tmp/cvs-serv2043 Added Files: bandages.py Log Message: --- NEW FILE: bandages.py --- import wolfpack from wolfpack import additem from wolfpack.utilities import tobackpack from wolfpack.consts import * import random def onUse( char, item ): # Bandages have to be in backpack if item.getoutmostchar() != char: char.message( 'You have to have these bandages in your belongings in order to use them.' ) return 1 # Already Bandaging ?? if char.socket.hastag( 'using_bandages' ): char.message( 'You are already using bandages.' ) return 1 # Display Target if item.id == 0xe21 or item.id == 0xee9: char.message( 'What do you want to use these bandages on?' ) char.socket.attachtarget( 'bandages.bandage_response', [ item.serial ] ) elif item.id == 0xe20 or item.id == 0xe22: char.message( 'Where do you want to wash these bandages?' ) char.socket.attachtarget( 'bandages.wash_response', [ item.serial ] ) return 1 def wash_response( char, args, target ): bandages = wolfpack.finditem( args[0] ) if not bandages: return # Did we target something wet ? id = 0 if target.item: id = target.item.id else: id = target.model tiledata = wolfpack.tiledata( id ) if not tiledata[ 'flag1' ] & 0x80: char.message( 'You cannot wash your bandages here.' ) return char.message( 'You wash your bandages and put the clean bandages into your backpack.' ) if bandages.id == 0xe20: bandages.id = 0xe21 elif bandages.id == 0xe22: bandages.id = 0xee9 bandages.update() def validCorpseTarget( char, target ): if not target: return 0 if not char.canreach( target, 2 ): char.message( 'You can''t reach that.' ) return 0 if target.id != 0x2006: char.message( 'You have to target a living thing.' ) return 0 # Check Owner owner = wolfpack.findchar( target.owner ) if not owner or not owner.dead: char.message( 'You can''t help them anymore.' ) return 0 return 1 def validCharTarget( char, target ): # Do we have a valid target? Corpse Healing not done yet. if not target: char.message( 'You have to target a living thing.' ) return 0 if not char.canreach( target, 2 ): char.message( 'You are too far away to apply bandages on %s' % target.name ) return 0 # No resurrection feature in yet if target.dead: char.message( 'You can''t heal a ghost.' ) return 0 # Already at full health if target.health >= target.strength: if target.char == char: char.message( 'You are healthy.' ) else: char.message( '%s does not require you to heal or cure them!' % target.name ) return 0 return 1 def bandage_response( char, args, target ): corpse = None if target.item and validCorpseTarget( char, target ): corpse = target.item elif not validCharTarget( char, target.char ): return if corpse and ( char.skill[ HEALING ] < 800 or char.skill[ ANATOMY ] < 800 ): char.message( 'You are not skilled enough to resurrect.' ) return # Consume Bandages bandages = wolfpack.finditem( args[0] ) if not bandages: return baseid = bandages.id container = bandages.container if bandages.amount == 1: bandages.delete() else: bandages.amount -= 1 bandages.update() success = 0 # SkillCheck (0% to 80%) if not corpse: success = char.checkskill( HEALING, 0, 800 ) else: reschance = int( ( char.skill[ HEALING ] + char.skill[ ANATOMY ] ) * 0.17 ) rescheck = random.randint( 1, 100 ) if char.checkskill( HEALING, 800, 1000 ) and char.checkskill( ANATOMY, 800, 1000 ) and reschance < rescheck: success = 1 char.action( 0x09 ) if char == target.char: char.message( 'You start applying bandages on yourself' ) else: char.message( 'You start applying bandages on %s' % target.char.name ) char.turnto( target.char ) if corpse: char.addtimer( random.randint( 2500, 5000 ), 'bandages.bandage_timer', [ 1, success, target.item.serial, baseid ] ) # It takes 5 seconds to bandage else: char.addtimer( random.randint( 1500, 2500 ), 'bandages.bandage_timer', [ 0, success, target.char.serial, baseid ] ) # It takes 5 seconds to bandage char.socket.settag( 'using_bandages', 1 ) def bandage_timer( char, args ): char.socket.deltag( 'using_bandages' ) resurrect = args[0] success = args[1] target = wolfpack.findchar( args[2] ) baseid = args[3] if not target: return if not success: if resurrect: char.message( 'You fail to resurrect the target.' ) else: if target != char: char.message( 'You fail applying bandages to %s.' % target.name ) else: char.message( 'You fail applying bandages to yourself.' ) return else: # Create bloody bandages if baseid == 0xe21: item = additem( 'e20' ) if not tobackpack( item, char ): item.update() elif baseid == 0xee9: item = additem( 'e22' ) if not tobackpack( item, char ): item.update() if resurrecting: corpse_owner = wolfpack.findchar( target.owner ) if corpse_owner: corpse_owner.moveto( target.pos ) corpse_owner.update() corpse_owner.resurrect() char.message( 'You successfully resurrect ' + corpse_owner.name ) else: if not validCharTarget( char, target ): return # Human target ? is target.id == 0x190 or target.id == 0x191: firstskill = HEALING secondskill = ANATOMY: else: firstskill = VETERINARY secondskill = ANIMALLORE # Heal a bit # I'd say between 5 and 15 points. This can be adjusted later healmin = int( char.skill[ firstskill ] / 5 ) + int( char.skill[ secondskill ] / 5 ) + 3 healmax = int( char.skill[ firstskill ] / 5 ) + int( char.skill[ secondskill ] / 2 ) + 10 amount = random.randint( healmin, healmax ) target.health = min( target.maxhitpoints, target.health + amount ) target.updatehealth() if char == target: char.message( 'You successfully apply bandages on yourself.' ) else: char.message( 'You successfully apply bandages on %s' % target.name ) |
|
From: <dar...@us...> - 2003-09-14 21:41:40
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1:/tmp/cvs-serv1527 Modified Files: equipment.py Log Message: Index: equipment.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/equipment.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** equipment.py 27 Aug 2003 21:04:53 -0000 1.2 --- equipment.py 14 Sep 2003 21:41:36 -0000 1.3 *************** *** 30,65 **** def onEquip( char, item, layer ): # Boni? - changed = 0 - if item.hastag( 'boni_str' ): char.strength = char.strength + int( item.gettag( 'boni_str' ) ) - changed = 1 if item.hastag( 'boni_dex' ): char.dexterity = char.dexterity + int( item.gettag( 'boni_dex' ) ) - changed = 1 if item.hastag( 'boni_int' ): char.intelligence = char.intelligence + int( item.gettag( 'boni_int' ) ) - changed = 1 - - if changed and char.socket: - char.socket.resendstatus() def onUnequip( char, item, layer ): - changed = 0 - if item.hastag( 'boni_str' ): char.strength = char.strength - int( item.gettag( 'boni_str' ) ) - changed = 1 if item.hastag( 'boni_dex' ): char.dexterity = char.dexterity - int( item.gettag( 'boni_dex' ) ) - changed = 1 if item.hastag( 'boni_int' ): char.intelligence = char.intelligence - int( item.gettag( 'boni_int' ) ) - changed = 1 - - if changed and char.socket: - char.socket.resendstatus() --- 30,49 ---- |
|
From: <ri...@us...> - 2003-09-14 18:57:35
|
Update of /cvsroot/wpdev/xmlscripts/definitions/spawnregions In directory sc8-pr-cvs1:/tmp/cvs-serv27860/definitions/spawnregions Modified Files: britain_fel.xml britain_tram.xml Log Message: added more npc`s & spawnregions Index: britain_fel.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/britain_fel.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** britain_fel.xml 14 Sep 2003 17:52:27 -0000 1.3 --- britain_fel.xml 14 Sep 2003 18:57:31 -0000 1.4 *************** *** 63,66 **** --- 63,88 ---- <rectangle x1="1417" x2="1420" y1="1544" y2="1550" map="0" /> </spawnregion> + <spawnregion id="fel_weaponsmith1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>weaponsmith_female</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1422" x2="1426" y1="1547" y2="1550" map="0" /> + </spawnregion> + <spawnregion id="fel_bard1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>bard_male</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1436" x2="1445" y1="1550" y2="1563" map="0" /> + </spawnregion> <spawnregion id="fel_mage1"> <maxnpcamount>1</maxnpcamount> *************** *** 107,110 **** --- 129,143 ---- <rectangle x1="1491" x2="1496" y1="1548" y2="1554" map="0" /> </spawnregion> + <spawnregion id="fel_veterinarian1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>veterinarian_female</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1508" x2="1514" y1="1565" y2="1574" map="0" /> + </spawnregion> <spawnregion id="fel_stablemaster1"> <maxnpcamount>1</maxnpcamount> *************** *** 217,220 **** --- 250,264 ---- <rectangle x1="1632" x2="1634" y1="1689" y2="1691" map="0" /> </spawnregion> + <spawnregion id="fel_bowyer1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>bowyer_female</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1469" x2="1477" y1="1576" y2="1582" map="0" /> + </spawnregion> <spawnregion id="fel_baker1"> <maxnpcamount>1</maxnpcamount> *************** *** 228,231 **** --- 272,286 ---- <rectangle x1="1449" x2="1454" y1="1609" y2="1618" map="0" /> </spawnregion> + <spawnregion id="fel_leatherworker1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>leatherworker_male</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1429" x2="1434" y1="1609" y2="1614" map="0" /> + </spawnregion> <spawnregion id="fel_carpenter1"> <maxnpcamount>1</maxnpcamount> *************** *** 250,253 **** --- 305,319 ---- <rectangle x1="1434" x2="1438" y1="1593" y2="1598" map="0" /> </spawnregion> + <spawnregion id="fel_artist1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>artist_male</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1443" x2="1453" y1="1660" y2="1668" map="0" /> + </spawnregion> <spawnregion id="fel_jeweler1"> <maxnpcamount>1</maxnpcamount> *************** *** 305,308 **** --- 371,385 ---- <rectangle x1="1449" x2="1454" y1="1721" y2="1726" map="0" /> </spawnregion> + <spawnregion id="fel_cobbler1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>cobbler_female</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1465" x2="1468" y1="1665" y2="1670" map="0" /> + </spawnregion> <spawnregion id="fel_provisioner1"> <maxnpcamount>1</maxnpcamount> *************** *** 327,330 **** --- 404,429 ---- <rectangle x1="1604" x2="1606" y1="1712" y2="1715" map="0" /> </spawnregion> + <spawnregion id="fel_fisherlady1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>fisherlady_female</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1481" x2="1486" y1="1669" y2="1674" map="0" /> + </spawnregion> + <spawnregion id="fel_alchemist1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>alchemist_male</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1497" x2="1502" y1="1657" y2="1663" map="0" /> + </spawnregion> <spawnregion id="fel_tailor1"> <maxnpcamount>1</maxnpcamount> *************** *** 348,351 **** --- 447,461 ---- <npcspercycle>1</npcspercycle> <rectangle x1="1547" x2="1552" y1="1657" y2="1662" map="0" /> + </spawnregion> + <spawnregion id="fel_spinner1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>spinner_female</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1471" x2="1476" y1="1686" y2="1688" map="0" /> </spawnregion> <spawnregion id="fel_cook1"> Index: britain_tram.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/britain_tram.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** britain_tram.xml 14 Sep 2003 16:48:20 -0000 1.1 --- britain_tram.xml 14 Sep 2003 18:57:31 -0000 1.2 *************** *** 63,66 **** --- 63,88 ---- <rectangle x1="1417" x2="1420" y1="1544" y2="1550" map="1" /> </spawnregion> + <spawnregion id="tram_weaponsmith1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>weaponsmith_female</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1422" x2="1426" y1="1547" y2="1550" map="1" /> + </spawnregion> + <spawnregion id="tram_bard1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>bard_male</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1436" x2="1445" y1="1550" y2="1563" map="1" /> + </spawnregion> <spawnregion id="tram_mage1"> <maxnpcamount>1</maxnpcamount> *************** *** 107,110 **** --- 129,143 ---- <rectangle x1="1491" x2="1496" y1="1548" y2="1554" map="1" /> </spawnregion> + <spawnregion id="tram_veterinarian1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>veterinarian_female</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1508" x2="1514" y1="1565" y2="1574" map="1" /> + </spawnregion> <spawnregion id="tram_stablemaster1"> <maxnpcamount>1</maxnpcamount> *************** *** 217,220 **** --- 250,264 ---- <rectangle x1="1632" x2="1634" y1="1689" y2="1691" map="1" /> </spawnregion> + <spawnregion id="tram_bowyer1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>bowyer_female</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1469" x2="1477" y1="1576" y2="1582" map="1" /> + </spawnregion> <spawnregion id="tram_baker1"> <maxnpcamount>1</maxnpcamount> *************** *** 228,231 **** --- 272,286 ---- <rectangle x1="1449" x2="1454" y1="1609" y2="1618" map="1" /> </spawnregion> + <spawnregion id="tram_leatherworker1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>leatherworker_male</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1429" x2="1434" y1="1609" y2="1614" map="1" /> + </spawnregion> <spawnregion id="tram_carpenter1"> <maxnpcamount>1</maxnpcamount> *************** *** 250,253 **** --- 305,319 ---- <rectangle x1="1434" x2="1438" y1="1593" y2="1598" map="1" /> </spawnregion> + <spawnregion id="tram_artist1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>artist_male</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1443" x2="1453" y1="1660" y2="1668" map="1" /> + </spawnregion> <spawnregion id="tram_jeweler1"> <maxnpcamount>1</maxnpcamount> *************** *** 305,308 **** --- 371,385 ---- <rectangle x1="1449" x2="1454" y1="1721" y2="1726" map="1" /> </spawnregion> + <spawnregion id="tram_cobbler1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>cobbler_female</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1465" x2="1468" y1="1665" y2="1670" map="1" /> + </spawnregion> <spawnregion id="tram_provisioner1"> <maxnpcamount>1</maxnpcamount> *************** *** 327,330 **** --- 404,429 ---- <rectangle x1="1604" x2="1606" y1="1712" y2="1715" map="1" /> </spawnregion> + <spawnregion id="tram_fisherlady1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>fisherlady_female</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1481" x2="1486" y1="1669" y2="1674" map="1" /> + </spawnregion> + <spawnregion id="tram_alchemist1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>alchemist_male</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1497" x2="1502" y1="1657" y2="1663" map="1" /> + </spawnregion> <spawnregion id="tram_tailor1"> <maxnpcamount>1</maxnpcamount> *************** *** 348,351 **** --- 447,461 ---- <npcspercycle>1</npcspercycle> <rectangle x1="1547" x2="1552" y1="1657" y2="1662" map="1" /> + </spawnregion> + <spawnregion id="tram_spinner1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>spinner_female</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1471" x2="1476" y1="1686" y2="1688" map="1" /> </spawnregion> <spawnregion id="tram_cook1"> |
|
From: <ri...@us...> - 2003-09-14 18:57:35
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans In directory sc8-pr-cvs1:/tmp/cvs-serv27860/definitions/npcs/humans Modified Files: vendors.xml Log Message: added more npc`s & spawnregions Index: vendors.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** vendors.xml 7 Sep 2003 22:00:18 -0000 1.20 --- vendors.xml 14 Sep 2003 18:57:30 -0000 1.21 *************** *** 2097,2099 **** --- 2097,2301 ---- <category>Vendors\Stablemaster (Female)</category> </npc> + <!-- A weaponsmith vendor --> + <npc id="weaponsmith_male"> + <inherit>base_male</inherit> + <title>the Weaponsmith</title> + <ai>Human_Vendor</ai> + <shopkeeper> + <restockable> + </restockable> + <sellable> + </sellable> + </shopkeeper> + <category>Vendors\Weaponsmith (Male)</category> + </npc> + <npc id="weaponsmith_female"> + <inherit>base_female</inherit> + <title>the Weaponsmith</title> + <ai>Human_Vendor</ai> + <shopkeeper> + <restockable> + </restockable> + <sellable> + </sellable> + </shopkeeper> + <category>Vendors\Weaponsmith (Female)</category> + </npc> + <!-- A bard vendor --> + <npc id="bard_male"> + <inherit>base_male</inherit> + <title>the Bard</title> + <ai>Human_Vendor</ai> + <shopkeeper> + <restockable> + </restockable> + <sellable> + </sellable> + </shopkeeper> + <category>Vendors\Bard (Male)</category> + </npc> + <npc id="bard_female"> + <inherit>base_female</inherit> + <title>the Bard</title> + <ai>Human_Vendor</ai> + <shopkeeper> + <restockable> + </restockable> + <sellable> + </sellable> + </shopkeeper> + <category>Vendors\Bard (Female)</category> + </npc> + <!-- A veterinarian --> + <npc id="veterinarian_male"> + <inherit>base_male</inherit> + <title>the Veterinarian</title> + <ai>Human_Vendor</ai> + <category>Vendors\Veterinarian (Male)</category> + </npc> + <npc id="veterinarian_female"> + <inherit>base_female</inherit> + <title>the Veterinarian</title> + <ai>Human_Vendor</ai> + <category>Vendors\Veterinarian (Female)</category> + </npc> + <!-- A bowyer vendor --> + <npc id="bowyer_male"> + <inherit>base_male</inherit> + <title>the Bowyer</title> + <ai>Human_Vendor</ai> + <shopkeeper> + <restockable> + </restockable> + <sellable> + </sellable> + </shopkeeper> + <category>Vendors\Bowyer (Male)</category> + </npc> + <npc id="bowyer_female"> + <inherit>base_female</inherit> + <title>the Bowyer</title> + <ai>Human_Vendor</ai> + <shopkeeper> + <restockable> + </restockable> + <sellable> + </sellable> + </shopkeeper> + <category>Vendors\Bowyer (Female)</category> + </npc> + <!-- A leatherworker vendor --> + <npc id="leatherworker_male"> + <inherit>base_male</inherit> + <title>the Leatherworker</title> + <ai>Human_Vendor</ai> + <shopkeeper> + <restockable> + </restockable> + <sellable> + </sellable> + </shopkeeper> + <category>Vendors\Leatherworker (Male)</category> + </npc> + <npc id="leatherworker_female"> + <inherit>base_female</inherit> + <title>the Leatherworker</title> + <ai>Human_Vendor</ai> + <shopkeeper> + <restockable> + </restockable> + <sellable> + </sellable> + </shopkeeper> + <category>Vendors\Leatherworker (Female)</category> + </npc> + <!-- A artist --> + <npc id="artist_male"> + <inherit>base_male</inherit> + <title>the Artist</title> + <ai>Human_Vendor</ai> + <category>Vendors\Artist (Male)</category> + </npc> + <npc id="artist_female"> + <inherit>base_female</inherit> + <title>the Artist</title> + <ai>Human_Vendor</ai> + <category>Vendors\Artist (Female)</category> + </npc> + <!-- A cobbler vendor --> + <npc id="cobbler_male"> + <inherit>base_male</inherit> + <title>the Cobbler</title> + <ai>Human_Vendor</ai> + <shopkeeper> + <restockable> + </restockable> + <sellable> + </sellable> + </shopkeeper> + <category>Vendors\Cobbler (Male)</category> + </npc> + <npc id="cobbler_female"> + <inherit>base_female</inherit> + <title>the Cobbler</title> + <ai>Human_Vendor</ai> + <shopkeeper> + <restockable> + </restockable> + <sellable> + </sellable> + </shopkeeper> + <category>Vendors\Cobbler (Female)</category> + </npc> + <!-- A fisherman vendor --> + <npc id="fisherman_male"> + <inherit>base_male</inherit> + <title>the Fisherman</title> + <ai>Human_Vendor</ai> + <shopkeeper> + <restockable> + </restockable> + <sellable> + </sellable> + </shopkeeper> + <category>Vendors\Fisherman (Male)</category> + </npc> + <!-- A fisherlady vendor --> + <npc id="fisherlady_female"> + <inherit>base_female</inherit> + <title>the Fisherlady</title> + <ai>Human_Vendor</ai> + <shopkeeper> + <restockable> + </restockable> + <sellable> + </sellable> + </shopkeeper> + <category>Vendors\Fisherlady (Female)</category> + </npc> + <!-- A spinner vendor --> + <npc id="spinner_male"> + <inherit>base_male</inherit> + <title>the Spinner</title> + <ai>Human_Vendor</ai> + <shopkeeper> + <restockable> + </restockable> + <sellable> + </sellable> + </shopkeeper> + <category>Vendors\Spinner (Male)</category> + </npc> + <npc id="spinner_female"> + <inherit>base_female</inherit> + <title>the Spinner</title> + <ai>Human_Vendor</ai> + <shopkeeper> + <restockable> + </restockable> + <sellable> + </sellable> + </shopkeeper> + <category>Vendors\Spinner (Female)</category> + </npc> </definitions> |
|
From: <co...@us...> - 2003-09-14 17:52:32
|
Update of /cvsroot/wpdev/xmlscripts/definitions/spawnregions In directory sc8-pr-cvs1:/tmp/cvs-serv7620 Modified Files: britain_fel.xml Log Message: new spawn regions added Index: britain_fel.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/britain_fel.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** britain_fel.xml 14 Sep 2003 16:48:20 -0000 1.2 --- britain_fel.xml 14 Sep 2003 17:52:27 -0000 1.3 *************** *** 8,12 **** --> <definitions> ! <spawnregion id="bank1"> <maxnpcamount>1</maxnpcamount> <mintime>0</mintime> --- 8,12 ---- --> <definitions> ! <spawnregion id="fel_bank1"> <maxnpcamount>1</maxnpcamount> <mintime>0</mintime> |
|
From: <co...@us...> - 2003-09-14 16:48:25
|
Update of /cvsroot/wpdev/xmlscripts/definitions/spawnregions
In directory sc8-pr-cvs1:/tmp/cvs-serv26954
Modified Files:
britain_fel.xml
Added Files:
britain_tram.xml
Log Message:
new spawn regions added
--- NEW FILE: britain_tram.xml ---
<!--
=================================================================
| ) (\_ | WOLFPACK 13.0.0 Scripts |
| (( _/{ "-; | Created by: Ripper |
| )).-' {{ ;'` | Revised by: |
| ( ( ;._ \\ ctr | Last Modification: Created |
=================================================================
-->
<definitions>
<spawnregion id="tram_bank1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>banker_male</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1425" x2="1428" y1="1687" y2="1690" map="1" />
</spawnregion>
<spawnregion id="tram_bank2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>banker_female</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1434" x2="1440" y1="1683" y2="1687" map="1" />
</spawnregion>
<spawnregion id="tram_bank3">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>banker_male</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1425" x2="1428" y1="1677" y2="1679" map="1" />
</spawnregion>
<spawnregion id="tram_bank4">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>banker_male</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1648" x2="1653" y1="1601" y2="1614" map="1" />
</spawnregion>
<spawnregion id="tram_blacksmith1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>blacksmith_male</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1417" x2="1420" y1="1544" y2="1550" map="1" />
</spawnregion>
<spawnregion id="tram_mage1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>mage_male</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1486" x2="1491" y1="1547" y2="1550" map="1" />
</spawnregion>
<spawnregion id="tram_mage2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>mage_male</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1569" x2="1574" y1="1703" y2="1714" map="1" />
</spawnregion>
<spawnregion id="tram_mage3">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>mage_male</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1594" x2="1598" y1="1648" y2="1654" map="1" />
</spawnregion>
<spawnregion id="tram_herbalist1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>herbalist_female</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1491" x2="1496" y1="1548" y2="1554" map="1" />
</spawnregion>
<spawnregion id="tram_stablemaster1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>stablemaster_male</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1509" x2="1526" y1="1546" y2="1550" map="1" />
</spawnregion>
<spawnregion id="tram_stablemaster2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>stablemaster_male</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1289" x2="1298" y1="1757" y2="1771" map="1" />
</spawnregion>
<spawnregion id="tram_guard1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>standard_guard</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1510" x2="1516" y1="1611" y2="1616" map="1" />
</spawnregion>
<spawnregion id="tram_guard2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>standard_guard</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1409" x2="1414" y1="1714" y2="1718" map="1" />
</spawnregion>
<spawnregion id="tram_guard3">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>standard_guard</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1616" x2="1622" y1="1762" y2="1766" map="1" />
</spawnregion>
<spawnregion id="tram_healer1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>healer_male</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1470" x2="1477" y1="1608" y2="1614" map="1" />
</spawnregion>
<spawnregion id="tram_armorer1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>armorer_male</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1480" x2="1484" y1="1583" y2="1589" map="1" />
</spawnregion>
<spawnregion id="tram_armorer2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>armorer_male</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1445" x2="1450" y1="1646" y2="1651" map="1" />
</spawnregion>
<spawnregion id="tram_armorer3">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>armorer_male</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1340" x2="1345" y1="1731" y2="1735" map="1" />
</spawnregion>
<spawnregion id="tram_armorer4">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>armorer_male</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1632" x2="1634" y1="1689" y2="1691" map="1" />
</spawnregion>
<spawnregion id="tram_baker1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>baker_female</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1449" x2="1454" y1="1609" y2="1618" map="1" />
</spawnregion>
<spawnregion id="tram_carpenter1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>carpenter</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1429" x2="1432" y1="1593" y2="1598" map="1" />
</spawnregion>
<spawnregion id="tram_architect1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>architect</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1434" x2="1438" y1="1593" y2="1598" map="1" />
</spawnregion>
<spawnregion id="tram_jeweler1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>jeweler_female</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1417" x2="1423" y1="1576" y2="1582" map="1" />
</spawnregion>
<spawnregion id="tram_jeweler2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>jeweler_male</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1451" x2="1456" y1="1679" y2="1688" map="1" />
</spawnregion>
<spawnregion id="tram_jeweler3">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>jeweler_female</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1648" x2="1653" y1="1641" y2="1643" map="1" />
</spawnregion>
<spawnregion id="tram_tinker1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>tinker</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1422" x2="1429" y1="1648" y2="1663" map="1" />
</spawnregion>
<spawnregion id="tram_butcher1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>butcher</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1449" x2="1454" y1="1721" y2="1726" map="1" />
</spawnregion>
<spawnregion id="tram_provisioner1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>provisioner_male</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1465" x2="1470" y1="1672" y2="1674" map="1" />
</spawnregion>
<spawnregion id="tram_provisioner2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>provisioner_male</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1604" x2="1606" y1="1712" y2="1715" map="1" />
</spawnregion>
<spawnregion id="tram_tailor1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>tailor_female</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1467" x2="1471" y1="1684" y2="1689" map="1" />
</spawnregion>
<spawnregion id="tram_tailor2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>tailor_female</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1547" x2="1552" y1="1657" y2="1662" map="1" />
</spawnregion>
<spawnregion id="tram_cook1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
<maxtime>1</maxtime>
<npcs>
<npc>cook</npc>
</npcs>
<npcspercycle>1</npcspercycle>
<rectangle x1="1610" x2="1612" y1="1584" y2="1586" map="1" />
</spawnregion>
</definitions>
Index: britain_fel.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/britain_fel.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** britain_fel.xml 5 Apr 2003 20:32:54 -0000 1.1
--- britain_fel.xml 14 Sep 2003 16:48:20 -0000 1.2
***************
*** 19,23 ****
<rectangle x1="1425" x2="1428" y1="1687" y2="1690" map="0" />
</spawnregion>
! <spawnregion id="bank2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 19,23 ----
<rectangle x1="1425" x2="1428" y1="1687" y2="1690" map="0" />
</spawnregion>
! <spawnregion id="fel_bank2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 30,34 ****
<rectangle x1="1434" x2="1440" y1="1683" y2="1687" map="0" />
</spawnregion>
! <spawnregion id="bank3">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 30,34 ----
<rectangle x1="1434" x2="1440" y1="1683" y2="1687" map="0" />
</spawnregion>
! <spawnregion id="fel_bank3">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 41,45 ****
<rectangle x1="1425" x2="1428" y1="1677" y2="1679" map="0" />
</spawnregion>
! <spawnregion id="bank4">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 41,45 ----
<rectangle x1="1425" x2="1428" y1="1677" y2="1679" map="0" />
</spawnregion>
! <spawnregion id="fel_bank4">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 52,56 ****
<rectangle x1="1648" x2="1653" y1="1601" y2="1614" map="0" />
</spawnregion>
! <spawnregion id="blacksmith1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 52,56 ----
<rectangle x1="1648" x2="1653" y1="1601" y2="1614" map="0" />
</spawnregion>
! <spawnregion id="fel_blacksmith1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 63,67 ****
<rectangle x1="1417" x2="1420" y1="1544" y2="1550" map="0" />
</spawnregion>
! <spawnregion id="mage1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 63,67 ----
<rectangle x1="1417" x2="1420" y1="1544" y2="1550" map="0" />
</spawnregion>
! <spawnregion id="fel_mage1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 74,78 ****
<rectangle x1="1486" x2="1491" y1="1547" y2="1550" map="0" />
</spawnregion>
! <spawnregion id="mage2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 74,78 ----
<rectangle x1="1486" x2="1491" y1="1547" y2="1550" map="0" />
</spawnregion>
! <spawnregion id="fel_mage2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 85,89 ****
<rectangle x1="1569" x2="1574" y1="1703" y2="1714" map="0" />
</spawnregion>
! <spawnregion id="mage3">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 85,89 ----
<rectangle x1="1569" x2="1574" y1="1703" y2="1714" map="0" />
</spawnregion>
! <spawnregion id="fel_mage3">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 96,100 ****
<rectangle x1="1594" x2="1598" y1="1648" y2="1654" map="0" />
</spawnregion>
! <spawnregion id="herbalist1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 96,100 ----
<rectangle x1="1594" x2="1598" y1="1648" y2="1654" map="0" />
</spawnregion>
! <spawnregion id="fel_herbalist1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 107,111 ****
<rectangle x1="1491" x2="1496" y1="1548" y2="1554" map="0" />
</spawnregion>
! <spawnregion id="stablemaster1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 107,111 ----
<rectangle x1="1491" x2="1496" y1="1548" y2="1554" map="0" />
</spawnregion>
! <spawnregion id="fel_stablemaster1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 118,122 ****
<rectangle x1="1509" x2="1526" y1="1546" y2="1550" map="0" />
</spawnregion>
! <spawnregion id="stablemaster2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 118,122 ----
<rectangle x1="1509" x2="1526" y1="1546" y2="1550" map="0" />
</spawnregion>
! <spawnregion id="fel_stablemaster2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 129,133 ****
<rectangle x1="1289" x2="1298" y1="1757" y2="1771" map="0" />
</spawnregion>
! <spawnregion id="guard1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 129,133 ----
<rectangle x1="1289" x2="1298" y1="1757" y2="1771" map="0" />
</spawnregion>
! <spawnregion id="fel_guard1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 140,144 ****
<rectangle x1="1510" x2="1516" y1="1611" y2="1616" map="0" />
</spawnregion>
! <spawnregion id="guard2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 140,144 ----
<rectangle x1="1510" x2="1516" y1="1611" y2="1616" map="0" />
</spawnregion>
! <spawnregion id="fel_guard2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 151,155 ****
<rectangle x1="1409" x2="1414" y1="1714" y2="1718" map="0" />
</spawnregion>
! <spawnregion id="guard3">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 151,155 ----
<rectangle x1="1409" x2="1414" y1="1714" y2="1718" map="0" />
</spawnregion>
! <spawnregion id="fel_guard3">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 162,166 ****
<rectangle x1="1616" x2="1622" y1="1762" y2="1766" map="0" />
</spawnregion>
! <spawnregion id="healer1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 162,166 ----
<rectangle x1="1616" x2="1622" y1="1762" y2="1766" map="0" />
</spawnregion>
! <spawnregion id="fel_healer1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 173,177 ****
<rectangle x1="1470" x2="1477" y1="1608" y2="1614" map="0" />
</spawnregion>
! <spawnregion id="armorer1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 173,177 ----
<rectangle x1="1470" x2="1477" y1="1608" y2="1614" map="0" />
</spawnregion>
! <spawnregion id="fel_armorer1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 184,188 ****
<rectangle x1="1480" x2="1484" y1="1583" y2="1589" map="0" />
</spawnregion>
! <spawnregion id="armorer2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 184,188 ----
<rectangle x1="1480" x2="1484" y1="1583" y2="1589" map="0" />
</spawnregion>
! <spawnregion id="fel_armorer2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 195,199 ****
<rectangle x1="1445" x2="1450" y1="1646" y2="1651" map="0" />
</spawnregion>
! <spawnregion id="armorer3">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 195,199 ----
<rectangle x1="1445" x2="1450" y1="1646" y2="1651" map="0" />
</spawnregion>
! <spawnregion id="fel_armorer3">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 206,210 ****
<rectangle x1="1340" x2="1345" y1="1731" y2="1735" map="0" />
</spawnregion>
! <spawnregion id="armorer4">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 206,210 ----
<rectangle x1="1340" x2="1345" y1="1731" y2="1735" map="0" />
</spawnregion>
! <spawnregion id="fel_armorer4">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 217,221 ****
<rectangle x1="1632" x2="1634" y1="1689" y2="1691" map="0" />
</spawnregion>
! <spawnregion id="baker1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 217,221 ----
<rectangle x1="1632" x2="1634" y1="1689" y2="1691" map="0" />
</spawnregion>
! <spawnregion id="fel_baker1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 228,232 ****
<rectangle x1="1449" x2="1454" y1="1609" y2="1618" map="0" />
</spawnregion>
! <spawnregion id="carpenter1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 228,232 ----
<rectangle x1="1449" x2="1454" y1="1609" y2="1618" map="0" />
</spawnregion>
! <spawnregion id="fel_carpenter1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 239,243 ****
<rectangle x1="1429" x2="1432" y1="1593" y2="1598" map="0" />
</spawnregion>
! <spawnregion id="architect1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 239,243 ----
<rectangle x1="1429" x2="1432" y1="1593" y2="1598" map="0" />
</spawnregion>
! <spawnregion id="fel_architect1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 250,254 ****
<rectangle x1="1434" x2="1438" y1="1593" y2="1598" map="0" />
</spawnregion>
! <spawnregion id="jeweler1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 250,254 ----
<rectangle x1="1434" x2="1438" y1="1593" y2="1598" map="0" />
</spawnregion>
! <spawnregion id="fel_jeweler1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 261,265 ****
<rectangle x1="1417" x2="1423" y1="1576" y2="1582" map="0" />
</spawnregion>
! <spawnregion id="jeweler2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 261,265 ----
<rectangle x1="1417" x2="1423" y1="1576" y2="1582" map="0" />
</spawnregion>
! <spawnregion id="fel_jeweler2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 272,276 ****
<rectangle x1="1451" x2="1456" y1="1679" y2="1688" map="0" />
</spawnregion>
! <spawnregion id="jeweler3">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 272,276 ----
<rectangle x1="1451" x2="1456" y1="1679" y2="1688" map="0" />
</spawnregion>
! <spawnregion id="fel_jeweler3">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 283,287 ****
<rectangle x1="1648" x2="1653" y1="1641" y2="1643" map="0" />
</spawnregion>
! <spawnregion id="tinker1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 283,287 ----
<rectangle x1="1648" x2="1653" y1="1641" y2="1643" map="0" />
</spawnregion>
! <spawnregion id="fel_tinker1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 294,298 ****
<rectangle x1="1422" x2="1429" y1="1648" y2="1663" map="0" />
</spawnregion>
! <spawnregion id="butcher1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 294,298 ----
<rectangle x1="1422" x2="1429" y1="1648" y2="1663" map="0" />
</spawnregion>
! <spawnregion id="fel_butcher1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 305,309 ****
<rectangle x1="1449" x2="1454" y1="1721" y2="1726" map="0" />
</spawnregion>
! <spawnregion id="provisioner1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 305,309 ----
<rectangle x1="1449" x2="1454" y1="1721" y2="1726" map="0" />
</spawnregion>
! <spawnregion id="fel_provisioner1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 316,320 ****
<rectangle x1="1465" x2="1470" y1="1672" y2="1674" map="0" />
</spawnregion>
! <spawnregion id="provisioner2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 316,320 ----
<rectangle x1="1465" x2="1470" y1="1672" y2="1674" map="0" />
</spawnregion>
! <spawnregion id="fel_provisioner2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 327,331 ****
<rectangle x1="1604" x2="1606" y1="1712" y2="1715" map="0" />
</spawnregion>
! <spawnregion id="tailor1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 327,331 ----
<rectangle x1="1604" x2="1606" y1="1712" y2="1715" map="0" />
</spawnregion>
! <spawnregion id="fel_tailor1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 338,342 ****
<rectangle x1="1467" x2="1471" y1="1684" y2="1689" map="0" />
</spawnregion>
! <spawnregion id="tailor2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 338,342 ----
<rectangle x1="1467" x2="1471" y1="1684" y2="1689" map="0" />
</spawnregion>
! <spawnregion id="fel_tailor2">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
***************
*** 349,353 ****
<rectangle x1="1547" x2="1552" y1="1657" y2="1662" map="0" />
</spawnregion>
! <spawnregion id="cook1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
--- 349,353 ----
<rectangle x1="1547" x2="1552" y1="1657" y2="1662" map="0" />
</spawnregion>
! <spawnregion id="fel_cook1">
<maxnpcamount>1</maxnpcamount>
<mintime>0</mintime>
|
|
From: <co...@us...> - 2003-09-14 16:47:20
|
Update of /cvsroot/wpdev/xmlscripts In directory sc8-pr-cvs1:/tmp/cvs-serv26783 Modified Files: definitions.xml Log Message: new spawn regions added Index: definitions.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions.xml,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** definitions.xml 2 Sep 2003 02:15:25 -0000 1.53 --- definitions.xml 14 Sep 2003 16:47:15 -0000 1.54 *************** *** 66,69 **** --- 66,71 ---- <!--<include file="definitions/spawnregions/graveyards.xml" />--> <!--<include file="definitions/spawnregions/shops.xml" />--> + <include file="definitions/spawnregions/britain_fel.xml" /> + <include file="definitions/spawnregions/britain_tram.xml" /> <!-- Items --> |
|
From: <dar...@us...> - 2003-09-14 16:31:52
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv23467
Modified Files:
corpse.cpp items.cpp npc.cpp player.cpp
Log Message:
Fixed some tooltip bugs.
Index: corpse.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/corpse.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** corpse.cpp 13 Sep 2003 13:27:26 -0000 1.36
--- corpse.cpp 14 Sep 2003 16:31:48 -0000 1.37
***************
*** 202,208 ****
// Send corpse clothing
// Send content
mSock->send( &sendItem );
mSock->send( &corpseEquip );
! mSock->send( &corpseContent );
}
}
--- 202,209 ----
// Send corpse clothing
// Send content
+ sendTooltip( mSock );
mSock->send( &sendItem );
mSock->send( &corpseEquip );
! mSock->send( &corpseContent );
}
}
Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.351
retrieving revision 1.352
diff -C2 -d -r1.351 -r1.352
*** items.cpp 12 Sep 2003 15:39:55 -0000 1.351
--- items.cpp 14 Sep 2003 16:31:48 -0000 1.352
***************
*** 2376,2379 ****
--- 2376,2380 ----
( id >= 0xed4 && id <= 0xede ) || // Graves and Guildstones
( id >= 0x1165 && id <= 0x1184 ) || // More Gravestones
+ ( id == 0x2006 ) ||
!name_.isNull() // Non Default Name
)
Index: npc.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** npc.cpp 11 Sep 2003 15:33:58 -0000 1.44
--- npc.cpp 14 Sep 2003 16:31:48 -0000 1.45
***************
*** 635,638 ****
--- 635,640 ----
}
+ corpse->update();
+
cUOTxDeathAction dAction;
dAction.setSerial( serial() );
***************
*** 648,655 ****
mSock->send( &rObject );
}
-
- corpse->update();
-
- resend( true );
// trigger the event
--- 650,653 ----
Index: player.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** player.cpp 14 Sep 2003 16:09:01 -0000 1.40
--- player.cpp 14 Sep 2003 16:31:48 -0000 1.41
***************
*** 635,639 ****
// pi_j->setLayer( 0x1A );
}
! }
cUOTxDeathAction dAction;
--- 635,641 ----
// pi_j->setLayer( 0x1A );
}
! }
!
! corpse->update();
cUOTxDeathAction dAction;
***************
*** 650,657 ****
mSock->send( &rObject );
}
-
- corpse->update();
! #pragma message( "Deathshroud has to be defined as 204e in the scripts" )
P_ITEM pItem = cItem::createFromScript( "204e" );
if( pItem )
--- 652,658 ----
mSock->send( &rObject );
}
! resend( false );
!
P_ITEM pItem = cItem::createFromScript( "204e" );
if( pItem )
***************
*** 661,666 ****
}
- resend( true );
-
if( socket_ )
{
--- 662,665 ----
***************
*** 668,671 ****
--- 667,671 ----
socket_->send( &cDeath );
}
+
// trigger the event now
onDeath();
|
|
From: <dar...@us...> - 2003-09-14 16:31:52
|
Update of /cvsroot/wpdev/wolfpack/network
In directory sc8-pr-cvs1:/tmp/cvs-serv23467/network
Modified Files:
uosocket.cpp
Log Message:
Fixed some tooltip bugs.
Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.289
retrieving revision 1.290
diff -C2 -d -r1.289 -r1.290
*** uosocket.cpp 14 Sep 2003 16:09:01 -0000 1.289
--- uosocket.cpp 14 Sep 2003 16:31:48 -0000 1.290
***************
*** 1029,1034 ****
if( !pItem->onShowTooltip( this->player(), &tooltips ) ) // just for test if object haven't tooltip
{
! if( pItem->name().isNull() )
! tooltips.addLine( 0xF9060 + pItem->id(), "" );
else
tooltips.addLine( 0x1005bd, " \t" + pItem->name() + "\t " );
--- 1029,1039 ----
if( !pItem->onShowTooltip( this->player(), &tooltips ) ) // just for test if object haven't tooltip
{
! if( pItem->name().isNull() || pItem->name().isEmpty() )
! {
! if( pItem->amount() > 1 )
! tooltips.addLine( 0x1005bd, " \t#" + QString::number( 0xF9060 + pItem->id() ) + "\t: " + QString::number( pItem->amount() ) );
! else
! tooltips.addLine( 0xF9060 + pItem->id(), "" );
! }
else
tooltips.addLine( 0x1005bd, " \t" + pItem->name() + "\t " );
***************
*** 1591,1595 ****
--- 1596,1606 ----
for( P_ITEM pItem = tooltipItems.first(); pItem; pItem = tooltipItems.next() )
+ {
pItem->sendTooltip( this );
+
+ #if defined( _DEBUG )
+ log( QString( "Sending Tooltip for 0x%1 (%2).\n" ).arg( pItem->serial(), 0, 16 ).arg( pItem->name() ) );
+ #endif
+ }
}
}
|
|
From: <dar...@us...> - 2003-09-14 16:09:33
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv19012
Modified Files:
commands.cpp makemenus.cpp network.cpp player.cpp player.h
wolfpack.cpp
Log Message:
Revised idle logout behaviour.
Index: commands.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v
retrieving revision 1.202
retrieving revision 1.203
diff -C2 -d -r1.202 -r1.203
*** commands.cpp 13 Sep 2003 13:08:40 -0000 1.202
--- commands.cpp 14 Sep 2003 16:09:01 -0000 1.203
***************
*** 61,64 ****
--- 61,66 ----
void cCommands::process( cUOSocket *socket, const QString &command )
{
+ socket->log( QString( "Used command '%1'.\n" ).arg( command ) );
+
if( !socket->player() )
return;
Index: makemenus.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/makemenus.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** makemenus.cpp 8 Sep 2003 10:58:47 -0000 1.59
--- makemenus.cpp 14 Sep 2003 16:09:01 -0000 1.60
***************
*** 2067,2071 ****
}
else
! Console::instance()->send( tr("WARNING: Missing %1 menu definition!").arg(section) );
}
--- 2067,2071 ----
}
else
! Console::instance()->send( tr( "WARNING: Missing %1 menu definition!" ).arg( section ) );
}
Index: network.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network.cpp,v
retrieving revision 1.138
retrieving revision 1.139
diff -C2 -d -r1.138 -r1.139
*** network.cpp 8 Sep 2003 10:58:47 -0000 1.138
--- network.cpp 14 Sep 2003 16:09:01 -0000 1.139
***************
*** 150,157 ****
else
{
- if( uiCurrentTime % 100 == 0 ) // Just every 100 ticks
- uoSocket->poll();
-
uoSocket->recieve();
}
}
--- 150,157 ----
else
{
uoSocket->recieve();
+
+ if( uiCurrentTime % 500 == 0 ) // Once every 0.5 Seconds
+ uoSocket->poll();
}
}
Index: player.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** player.cpp 11 Sep 2003 15:33:58 -0000 1.39
--- player.cpp 14 Sep 2003 16:09:01 -0000 1.40
***************
*** 56,60 ****
account_ = NULL;
logoutTime_ = 0;
- clientIdleTime_ = 0;
muteTime_ = 0;
objectDelay_ = 0;
--- 56,59 ----
***************
*** 1579,1583 ****
}
else SET_INT_PROPERTY( "logouttime", logoutTime_ )
- else SET_INT_PROPERTY( "clientidletime", clientIdleTime_ )
else if( name == "muted" )
{
--- 1578,1581 ----
***************
*** 1619,1623 ****
GET_PROPERTY( "account", ( account_ != 0 ) ? account_->login() : QString( "" ) )
else GET_PROPERTY( "logouttime", (int)logoutTime_ )
- else GET_PROPERTY( "clientidletime", (int)clientIdleTime_ )
else GET_PROPERTY( "muted", isMuted() )
else GET_PROPERTY( "mutetime", (int)muteTime_ )
--- 1617,1620 ----
Index: player.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/player.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** player.h 9 Sep 2003 23:09:30 -0000 1.23
--- player.h 14 Sep 2003 16:09:01 -0000 1.24
***************
*** 118,122 ****
cAccount* account() const;
UINT32 additionalFlags() const;
- UINT32 clientIdleTime() const;
UINT32 logoutTime() const;
UINT32 muteTime() const;
--- 118,121 ----
***************
*** 144,148 ****
void setAccount(cAccount* data, bool moveFromAccToAcc = true);
void setAdditionalFlags(UINT32 data);
- void setClientIdleTime(UINT32 data);
void setLogoutTime(UINT32 data);
void setMuteTime(UINT32 data);
--- 143,146 ----
***************
*** 190,197 ****
UINT32 logoutTime_;
- // time till the char will be handled as idle.
- // compare with logoutTime! check it!
- UINT32 clientIdleTime_;
-
// Time till player will become unmuted again
// cOldChar::mutetime_
--- 188,191 ----
***************
*** 274,288 ****
{
additionalFlags_ = data;
- changed_ = true;
- }
-
- inline UINT32 cPlayer::clientIdleTime() const
- {
- return clientIdleTime_;
- }
-
- inline void cPlayer::setClientIdleTime(UINT32 data)
- {
- clientIdleTime_ = data;
changed_ = true;
}
--- 268,271 ----
Index: wolfpack.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.cpp,v
retrieving revision 1.466
retrieving revision 1.467
diff -C2 -d -r1.466 -r1.467
*** wolfpack.cpp 13 Sep 2003 15:37:06 -0000 1.466
--- wolfpack.cpp 14 Sep 2003 16:09:01 -0000 1.467
***************
*** 312,315 ****
--- 312,316 ----
Console::instance()->setAttributes( true, false, true, 60, 140, 70, 12, FONT_NOSERIF );
Console::instance()->send( QString( "\n%1 %2 %3\n\n" ).arg( wp_version.productstring.latin1() ).arg( wp_version.betareleasestring.latin1() ).arg( wp_version.verstring.latin1() ) );
+ Console::instance()->setAttributes( false, false, false, 0xAF, 0xAF, 0xAF, 0, FONT_FIXEDWIDTH );
Console::instance()->send( "Copyright (C) 1997, 98 Marcus Rating (Cironian)\n");
***************
*** 549,566 ****
cNetwork::instance()->poll();
- for( cUOSocket *mSock = cNetwork::instance()->first(); mSock; mSock = cNetwork::instance()->next() )
- {
- P_PLAYER player = mSock->player();
- if ( player && !player->isGM() && player->clientIdleTime() && player->clientIdleTime() < uiCurrentTime )
- {
- Console::instance()->send( tr("Player %1 disconnected due to inactivity !\n").arg( player->name() ) );
- cUOTxMessageWarning packet;
- packet.setReason( cUOTxMessageWarning::Idle );
- mSock->send( &packet );
- mSock->disconnect();
- }
- }
-
checkauto();
qApp->processEvents( 40 );
}
--- 550,555 ----
cNetwork::instance()->poll();
checkauto();
+
qApp->processEvents( 40 );
}
|
|
From: <dar...@us...> - 2003-09-14 16:09:33
|
Update of /cvsroot/wpdev/wolfpack/network
In directory sc8-pr-cvs1:/tmp/cvs-serv19012/network
Modified Files:
uosocket.cpp uosocket.h
Log Message:
Revised idle logout behaviour.
Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.288
retrieving revision 1.289
diff -C2 -d -r1.288 -r1.289
*** uosocket.cpp 13 Sep 2003 13:37:16 -0000 1.288
--- uosocket.cpp 14 Sep 2003 16:09:01 -0000 1.289
***************
*** 103,106 ****
--- 103,109 ----
_uniqueId = sDevice->socket();
tooltipscache_ = new QBitArray;
+
+ // Creation of a new socket counts as activity
+ _lastActivity = getNormalizedTime();
}
***************
*** 191,202 ****
Q_UINT8 packetId = (*packet)[0];
- // After two pings we idle-disconnect
- if( lastPacket == 0x73 && packetId == 0x73 )
- {
- log( "Disconnected idling socket.\n" );
- disconnect();
- return;
- }
-
// Disconnect harmful clients
if( ( _account < 0 ) && ( packetId != 0x80 ) && ( packetId != 0x91 ) )
--- 194,197 ----
***************
*** 217,223 ****
_state = LoggedIn;
- if( _player )
- _player->setClientIdleTime( uiCurrentTime + 120 * MY_CLOCKS_PER_SEC );
-
// Relay it to the handler functions
switch( packetId )
--- 212,215 ----
***************
*** 301,306 ****
default:
Console::instance()->send( packet->dump( packet->uncompressed() ) );
! break;
}
delete packet;
--- 293,302 ----
default:
Console::instance()->send( packet->dump( packet->uncompressed() ) );
! delete packet;
! return;
}
+
+ // We received a packet we know
+ _lastActivity = getNormalizedTime();
delete packet;
***************
*** 1269,1273 ****
}
- _player->setClientIdleTime( uiCurrentTime + 300 * 1000 );
_state = InGame;
}
--- 1265,1268 ----
***************
*** 1622,1626 ****
void cUOSocket::poll()
{
! // TODO: check for timed out target requests herei
if( targetRequest && targetRequest->timeout() > 1 && targetRequest->timeout() < uiCurrentTime )
{
--- 1617,1621 ----
void cUOSocket::poll()
{
! // Check for timed out target requests
if( targetRequest && targetRequest->timeout() > 1 && targetRequest->timeout() < uiCurrentTime )
{
***************
*** 1629,1632 ****
--- 1624,1634 ----
targetRequest = 0;
cancelTarget();
+ }
+
+ // Check for idling/silent sockets
+ if( _lastActivity + 180 * MY_CLOCKS_PER_SEC < uiCurrentTime )
+ {
+ log( QString( "Idle for %1 ms. Disconnecting.\n" ).arg( uiCurrentTime - _lastActivity ) );
+ disconnect();
}
}
Index: uosocket.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.h,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** uosocket.h 9 Sep 2003 23:09:31 -0000 1.95
--- uosocket.h 14 Sep 2003 16:09:01 -0000 1.96
***************
*** 71,75 ****
private:
QSocketDevice *_socket;
! UINT32 _rxBytes, _txBytes, _uniqueId;
cAccount* _account;
P_PLAYER _player;
--- 71,75 ----
private:
QSocketDevice *_socket;
! unsigned int _rxBytes, _txBytes, _uniqueId, _lastActivity;
cAccount* _account;
P_PLAYER _player;
***************
*** 119,127 ****
! Q_UINT32 rxBytes( void ) const;
! Q_UINT32 txBytes( void ) const;
! Q_UINT8 viewRange( void ) const;
! void setRxBytes( Q_UINT32 data );
! void setTxBytes( Q_UINT32 data );
Q_UINT32 uniqueId( void ) const;
--- 119,128 ----
! unsigned int lastActivity() const;
! unsigned int rxBytes() const;
! unsigned int txBytes() const;
! unsigned char viewRange() const;
! void setRxBytes( unsigned int data );
! void setTxBytes( unsigned int data );
Q_UINT32 uniqueId( void ) const;
***************
*** 268,272 ****
}
! inline Q_UINT32 cUOSocket::rxBytes( void ) const
{
return _rxBytes;
--- 269,278 ----
}
! inline unsigned int cUOSocket::lastActivity() const
! {
! return _lastActivity;
! }
!
! inline unsigned int cUOSocket::rxBytes( void ) const
{
return _rxBytes;
|
|
From: <dar...@us...> - 2003-09-13 18:47:29
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv23740
Modified Files:
console_win.cpp wolf.dsp
Log Message:
Reverted that change.
Index: console_win.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console_win.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** console_win.cpp 13 Sep 2003 15:47:01 -0000 1.9
--- console_win.cpp 13 Sep 2003 18:47:25 -0000 1.10
***************
*** 36,39 ****
--- 36,40 ----
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
+ #include <shellapi.h>
#include <richedit.h>
#include <qthread.h>
***************
*** 185,197 ****
// String contains the link
delete [] string;
-
- // Reset selection to the end
}
}
else if( notify->code == EN_MSGFILTER )
{
! MSGFILTER *msg = (MSGFILTER*)notify;
// Append to the Input Control
--- 186,197 ----
// String contains the link
+ ShellExecute( mainWindow, "open", string, 0, 0, SW_NORMAL );
delete [] string;
}
}
else if( notify->code == EN_MSGFILTER )
{
! /*MSGFILTER *msg = (MSGFILTER*)notify;
// Append to the Input Control
***************
*** 200,204 ****
SendMessage( inputWindow, WM_SETFOCUS, 0, 0 );
SendMessage( inputWindow, WM_CHAR, msg->wParam, msg->lParam );
! }
}
}
--- 200,204 ----
SendMessage( inputWindow, WM_SETFOCUS, 0, 0 );
SendMessage( inputWindow, WM_CHAR, msg->wParam, msg->lParam );
! }*/
}
}
***************
*** 404,408 ****
// Check for the caret
! PostMessage( logWindow, EM_SETSEL, ctrlLength, ctrlLength );
// Delete lines from the beginning if we exceed the maximum limit.
--- 404,408 ----
// Check for the caret
! SendMessage( logWindow, EM_SETSEL, ctrlLength, ctrlLength );
// Delete lines from the beginning if we exceed the maximum limit.
***************
*** 416,425 ****
char buffer[1024] = { 0, };
((short*)buffer)[0] = 1024;
! textcount += PostMessage( logWindow, EM_GETLINE, linecount++, (WPARAM)buffer );
}
while( textcount < ( ctrlLength + textLength ) - logLimit );
! PostMessage( logWindow, EM_SETSEL, 0, textcount );
! PostMessage( logWindow, EM_REPLACESEL, FALSE, (LPARAM)"" );
}
--- 416,425 ----
char buffer[1024] = { 0, };
((short*)buffer)[0] = 1024;
! textcount += SendMessage( logWindow, EM_GETLINE, linecount++, (WPARAM)buffer ); // We have to wait here.
}
while( textcount < ( ctrlLength + textLength ) - logLimit );
! SendMessage( logWindow, EM_SETSEL, 0, textcount );
! SendMessage( logWindow, EM_REPLACESEL, FALSE, (LPARAM)"" );
}
***************
*** 437,444 ****
{
CHARRANGE range;
! PostMessage( logWindow, EM_EXGETSEL, 0, (LPARAM)&range );
range.cpMin -= 1;
! PostMessage( logWindow, EM_EXSETSEL, 0, (LPARAM)&range );
! PostMessage( logWindow, EM_REPLACESEL, FALSE, 0 );
send( sMessage.left( sMessage.length() - 1 ) );
return;
--- 437,444 ----
{
CHARRANGE range;
! SendMessage( logWindow, EM_EXGETSEL, 0, (LPARAM)&range );
range.cpMin -= 1;
! SendMessage( logWindow, EM_EXSETSEL, 0, (LPARAM)&range );
! SendMessage( logWindow, EM_REPLACESEL, FALSE, 0 );
send( sMessage.left( sMessage.length() - 1 ) );
return;
***************
*** 447,458 ****
unsigned int tLength = GetWindowTextLength( logWindow );
! PostMessage( logWindow, EM_SETSEL, tLength, tLength );
// Now it will get right, even if the user had selected sth.
! PostMessage( logWindow, EM_REPLACESEL, FALSE, (LPARAM)sMessage.latin1() );
// And ofcourse if not some control is currently capturing the input
if( !GetCapture() )
! PostMessage( logWindow, WM_VSCROLL, SB_BOTTOM, 0 );
}
--- 447,458 ----
unsigned int tLength = GetWindowTextLength( logWindow );
! SendMessage( logWindow, EM_SETSEL, tLength, tLength );
// Now it will get right, even if the user had selected sth.
! SendMessage( logWindow, EM_REPLACESEL, FALSE, (LPARAM)sMessage.latin1() );
// And ofcourse if not some control is currently capturing the input
if( !GetCapture() )
! SendMessage( logWindow, WM_VSCROLL, SB_BOTTOM, 0 );
}
***************
*** 488,492 ****
};
! PostMessage( logWindow, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf );
}
--- 488,492 ----
};
! SendMessage( logWindow, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf );
}
***************
*** 503,507 ****
cf.cbSize = sizeof( CHARFORMAT );
! PostMessage( logWindow, EM_GETCHARFORMAT, SCF_SELECTION, (WPARAM)&cf );
if( bold )
--- 503,507 ----
cf.cbSize = sizeof( CHARFORMAT );
! SendMessage( logWindow, EM_GETCHARFORMAT, SCF_SELECTION, (WPARAM)&cf );
if( bold )
***************
*** 549,553 ****
}
! PostMessage( logWindow, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf );
}
--- 549,553 ----
}
! SendMessage( logWindow, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf );
}
Index: wolf.dsp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolf.dsp,v
retrieving revision 1.231
retrieving revision 1.232
diff -C2 -d -r1.231 -r1.232
*** wolf.dsp 13 Sep 2003 15:37:06 -0000 1.231
--- wolf.dsp 13 Sep 2003 18:47:25 -0000 1.232
***************
*** 43,47 ****
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /MD /GR /GX /O2 /Ob1 /I "lib/Python/PC" /I "sqlite" /I "lib/Python/include" /I "lib\ZThread\include" /I "$(QTDIR)\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "QT_DLL" /D "QT_THREAD_SUPPORT" /Fr /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
--- 43,47 ----
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /MD /GR /GX /O2 /I "lib/Python/PC" /I "sqlite" /I "lib/Python/include" /I "lib\ZThread\include" /I "$(QTDIR)\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "QT_DLL" /D "QT_THREAD_SUPPORT" /Fr /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
***************
*** 52,56 ****
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt320.lib /nologo /subsystem:windows /map /machine:I386 /out:"..\wolfpack.exe" /libpath:"lib\ZThread\lib" /libpath:"lib\Python\lib" /libpath:"lib\bugreport\lib" /libpath:"flatstore\Release" /opt:ref /opt:nowin98
# SUBTRACT LINK32 /pdb:none
--- 52,56 ----
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt320.lib shell32.lib /nologo /subsystem:windows /map /machine:I386 /out:"..\wolfpack.exe" /libpath:"lib\ZThread\lib" /libpath:"lib\Python\lib" /libpath:"lib\bugreport\lib" /libpath:"flatstore\Release" /opt:ref /opt:nowin98
# SUBTRACT LINK32 /pdb:none
***************
*** 77,81 ****
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt320.lib /nologo /version:12.9 /subsystem:windows /map /debug /machine:I386 /out:"..\wolfpack.exe" /pdbtype:sept /libpath:"lib\bugreport\lib" /libpath:"flatstore\Debug"
# SUBTRACT LINK32 /pdb:none
--- 77,81 ----
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt320.lib shell32.lib /nologo /version:12.9 /subsystem:windows /map /debug /machine:I386 /out:"..\wolfpack.exe" /pdbtype:sept /libpath:"lib\bugreport\lib" /libpath:"flatstore\Debug"
# SUBTRACT LINK32 /pdb:none
|
|
From: <dar...@us...> - 2003-09-13 15:47:12
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv22726
Modified Files:
console_win.cpp
Log Message:
Functions which could be called from different threads now use PostMessage instead of SendMessage to ensure ThreadSafety.
Index: console_win.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console_win.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** console_win.cpp 13 Sep 2003 15:37:06 -0000 1.8
--- console_win.cpp 13 Sep 2003 15:47:01 -0000 1.9
***************
*** 404,408 ****
// Check for the caret
! SendMessage( logWindow, EM_SETSEL, ctrlLength, ctrlLength );
// Delete lines from the beginning if we exceed the maximum limit.
--- 404,408 ----
// Check for the caret
! PostMessage( logWindow, EM_SETSEL, ctrlLength, ctrlLength );
// Delete lines from the beginning if we exceed the maximum limit.
***************
*** 416,425 ****
char buffer[1024] = { 0, };
((short*)buffer)[0] = 1024;
! textcount += SendMessage( logWindow, EM_GETLINE, linecount++, (WPARAM)buffer );
}
while( textcount < ( ctrlLength + textLength ) - logLimit );
! SendMessage( logWindow, EM_SETSEL, 0, textcount );
! SendMessage( logWindow, EM_REPLACESEL, FALSE, (LPARAM)"" );
}
--- 416,425 ----
char buffer[1024] = { 0, };
((short*)buffer)[0] = 1024;
! textcount += PostMessage( logWindow, EM_GETLINE, linecount++, (WPARAM)buffer );
}
while( textcount < ( ctrlLength + textLength ) - logLimit );
! PostMessage( logWindow, EM_SETSEL, 0, textcount );
! PostMessage( logWindow, EM_REPLACESEL, FALSE, (LPARAM)"" );
}
***************
*** 437,444 ****
{
CHARRANGE range;
! SendMessage( logWindow, EM_EXGETSEL, 0, (LPARAM)&range );
range.cpMin -= 1;
! SendMessage( logWindow, EM_EXSETSEL, 0, (LPARAM)&range );
! SendMessage( logWindow, EM_REPLACESEL, FALSE, 0 );
send( sMessage.left( sMessage.length() - 1 ) );
return;
--- 437,444 ----
{
CHARRANGE range;
! PostMessage( logWindow, EM_EXGETSEL, 0, (LPARAM)&range );
range.cpMin -= 1;
! PostMessage( logWindow, EM_EXSETSEL, 0, (LPARAM)&range );
! PostMessage( logWindow, EM_REPLACESEL, FALSE, 0 );
send( sMessage.left( sMessage.length() - 1 ) );
return;
***************
*** 447,458 ****
unsigned int tLength = GetWindowTextLength( logWindow );
! SendMessage( logWindow, EM_SETSEL, tLength, tLength );
// Now it will get right, even if the user had selected sth.
! SendMessage( logWindow, EM_REPLACESEL, FALSE, (LPARAM)sMessage.latin1() );
// And ofcourse if not some control is currently capturing the input
if( !GetCapture() )
! SendMessage( logWindow, WM_VSCROLL, SB_BOTTOM, 0 );
}
--- 447,458 ----
unsigned int tLength = GetWindowTextLength( logWindow );
! PostMessage( logWindow, EM_SETSEL, tLength, tLength );
// Now it will get right, even if the user had selected sth.
! PostMessage( logWindow, EM_REPLACESEL, FALSE, (LPARAM)sMessage.latin1() );
// And ofcourse if not some control is currently capturing the input
if( !GetCapture() )
! PostMessage( logWindow, WM_VSCROLL, SB_BOTTOM, 0 );
}
***************
*** 488,492 ****
};
! SendMessage( logWindow, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf );
}
--- 488,492 ----
};
! PostMessage( logWindow, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf );
}
***************
*** 503,507 ****
cf.cbSize = sizeof( CHARFORMAT );
! SendMessage( logWindow, EM_GETCHARFORMAT, SCF_SELECTION, (WPARAM)&cf );
if( bold )
--- 503,507 ----
cf.cbSize = sizeof( CHARFORMAT );
! PostMessage( logWindow, EM_GETCHARFORMAT, SCF_SELECTION, (WPARAM)&cf );
if( bold )
***************
*** 549,553 ****
}
! SendMessage( logWindow, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf );
}
--- 549,553 ----
}
! PostMessage( logWindow, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf );
}
|
|
From: <dar...@us...> - 2003-09-13 15:37:37
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv20608
Modified Files:
console_win.cpp persistentbroker.cpp wolf.dsp wolfpack.cpp
Log Message:
Made it easier to read the Shutdown Message.
Index: console_win.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console_win.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** console_win.cpp 9 Sep 2003 23:09:30 -0000 1.7
--- console_win.cpp 13 Sep 2003 15:37:06 -0000 1.8
***************
*** 63,66 ****
--- 63,67 ----
unsigned int inputHeight = 0; // For measuring the height of the input field
unsigned int logLimit = 0; // How many characters fit into the log window
+ bool canClose = false;
/*
***************
*** 206,209 ****
--- 207,214 ----
case WM_CLOSE:
keeprun = 0;
+
+ if( canClose )
+ DestroyWindow( mainWindow );
+
return 1;
***************
*** 283,289 ****
argv[argc] = 0;
! returnValue_ = main( argc, argv.data() );
! PostMessage( mainWindow, WM_QUIT, 0, 0 );
}
};
--- 288,302 ----
argv[argc] = 0;
! returnValue_ = main( argc, argv.data() );
! if( returnValue_ != 0 )
! {
! Console::instance()->send( "\nThe server has been shut down. You can close this window now.\n" );
! canClose = true;
! }
! else
! {
! PostMessage( mainWindow, WM_QUIT, 0, 0 );
! }
}
};
Index: persistentbroker.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/persistentbroker.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** persistentbroker.cpp 12 Sep 2003 20:02:44 -0000 1.28
--- persistentbroker.cpp 13 Sep 2003 15:37:06 -0000 1.29
***************
*** 71,76 ****
sqlite = false;
#else
! Log::instance()->print( LOG_ERROR, "Sorry, you have to define MYSQL_DRIVER to make wolfpack work with MySQL.\n" );
! exit( -1 );
#endif
}
--- 71,75 ----
sqlite = false;
#else
! throw QString( "Sorry, you have to define MYSQL_DRIVER to make wolfpack work with MySQL.\n" );
#endif
}
Index: wolf.dsp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolf.dsp,v
retrieving revision 1.230
retrieving revision 1.231
diff -C2 -d -r1.230 -r1.231
*** wolf.dsp 12 Sep 2003 20:02:44 -0000 1.230
--- wolf.dsp 13 Sep 2003 15:37:06 -0000 1.231
***************
*** 43,47 ****
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /MD /GR /GX /O2 /Ob0 /I "lib/Python/PC" /I "sqlite" /I "lib/Python/include" /I "lib\ZThread\include" /I "$(QTDIR)\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "QT_DLL" /D "QT_THREAD_SUPPORT" /Fr /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
--- 43,47 ----
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /MD /GR /GX /O2 /Ob1 /I "lib/Python/PC" /I "sqlite" /I "lib/Python/include" /I "lib\ZThread\include" /I "$(QTDIR)\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "QT_DLL" /D "QT_THREAD_SUPPORT" /Fr /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
Index: wolfpack.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.cpp,v
retrieving revision 1.465
retrieving revision 1.466
diff -C2 -d -r1.465 -r1.466
*** wolfpack.cpp 12 Sep 2003 15:29:00 -0000 1.465
--- wolfpack.cpp 13 Sep 2003 15:37:06 -0000 1.466
***************
*** 164,168 ****
}
! static void parseParameter( const QString ¶m )
{
// Add what ever paramters you want
--- 164,168 ----
}
! static bool parseParameter( const QString ¶m )
{
// Add what ever paramters you want
***************
*** 201,205 ****
PyErr_Print();
fprintf(stderr,"Call failed\n");
! return;
}
/* pDict and pFunc are borrowed and must not be Py_DECREF-ed */
--- 201,205 ----
PyErr_Print();
fprintf(stderr,"Call failed\n");
! return false;
}
/* pDict and pFunc are borrowed and must not be Py_DECREF-ed */
***************
*** 216,225 ****
}
stopPython();
! exit(0);
}
else
Console::instance()->send( QString("The specified python script [%1] doesn't exist.").arg(param) );
-
}
}
--- 216,226 ----
}
stopPython();
! return false;
}
else
Console::instance()->send( QString("The specified python script [%1] doesn't exist.").arg(param) );
}
+
+ return true;
}
***************
*** 331,335 ****
{
Console::instance()->log( LOG_ERROR, "Couldn't start up classes.\n" );
! exit( -1 );
}
--- 332,336 ----
{
Console::instance()->log( LOG_ERROR, "Couldn't start up classes.\n" );
! return 1;
}
***************
*** 347,351 ****
{
Console::instance()->log( LOG_ERROR, "Couldn't load translator.\n" );
! exit( -1 );
}
--- 348,352 ----
{
Console::instance()->log( LOG_ERROR, "Couldn't load translator.\n" );
! return 1;
}
***************
*** 358,362 ****
{
Console::instance()->log( LOG_ERROR, "Couldn't start up python.\n" );
! exit( -1 );
}
--- 359,363 ----
{
Console::instance()->log( LOG_ERROR, "Couldn't start up python.\n" );
! return 1;
}
***************
*** 364,368 ****
for( i = 1; i <= argc; ++i )
! parseParameter( QString( argv[ i ] ) );
// Load data
--- 365,370 ----
for( i = 1; i <= argc; ++i )
! if( !parseParameter( QString( argv[ i ] ) ) )
! return 1;
// Load data
***************
*** 423,432 ****
{
Console::instance()->log( LOG_ERROR, exception.error() );
! exit( -1 );
}
catch( ... )
{
Console::instance()->log( LOG_ERROR, "Unknown error while loading data files.\n" );
! exit( -1 );
}
--- 425,434 ----
{
Console::instance()->log( LOG_ERROR, exception.error() );
! return 1;
}
catch( ... )
{
Console::instance()->log( LOG_ERROR, "Unknown error while loading data files.\n" );
! return 1;
}
***************
*** 485,494 ****
{
Console::instance()->log( LOG_ERROR, error );
! exit( -1 );
}
catch( ... )
{
Console::instance()->log( LOG_ERROR, "An unknown error occured while loading the world.\n" );
! exit( -1 );
}
--- 487,496 ----
{
Console::instance()->log( LOG_ERROR, error );
! return 1;
}
catch( ... )
{
Console::instance()->log( LOG_ERROR, "An unknown error occured while loading the world.\n" );
! return 1;
}
|
|
From: <dar...@us...> - 2003-09-13 15:29:19
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1:/tmp/cvs-serv18688 Modified Files: door.py Log Message: Staff can always open doors. Index: door.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/door.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** door.py 23 Aug 2003 15:21:31 -0000 1.1 --- door.py 13 Sep 2003 15:29:16 -0000 1.2 *************** *** 291,300 **** # In Range? ! if not char.canreach( item, 2 ): char.message( "You cannot reach the handle from here." ) return 1 # The Door has no lock ! if not item.hastag( 'lock' ): return opendoor( char, item ) --- 291,300 ---- # In Range? ! if not char.gm and not char.canreach( item, 2 ): char.message( "You cannot reach the handle from here." ) return 1 # The Door has no lock ! if not item.hastag( 'lock' ) or char.gm: return opendoor( char, item ) |
Update of /cvsroot/wpdev/wolfpack/setup-db In directory sc8-pr-cvs1:/tmp/cvs-serv17399 Removed Files: Strlib.pas mysql.pas readme.txt setupdb.dof setupdb.dpr setupdb.res uMain.dfm uMain.pas Log Message: Deprecated --- Strlib.pas DELETED --- --- mysql.pas DELETED --- --- readme.txt DELETED --- --- setupdb.dof DELETED --- --- setupdb.dpr DELETED --- --- setupdb.res DELETED --- --- uMain.dfm DELETED --- --- uMain.pas DELETED --- |
|
From: <dar...@us...> - 2003-09-13 13:37:19
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv29987
Modified Files:
ai.cpp ai.h dragdrop.cpp dragdrop.h uobject.h
Log Message:
Removed all old singletons and changed dragdrop into a namespace.
Index: ai.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ai.cpp 8 Sep 2003 10:58:46 -0000 1.18
--- ai.cpp 13 Sep 2003 13:37:15 -0000 1.19
***************
*** 48,52 ****
#include <vector>
! void AIFactory::checkScriptAI( const QStringList &oldSections, const QStringList &newSections )
{
QStringList::const_iterator aiit = oldSections.begin();
--- 48,52 ----
#include <vector>
! void cAIFactory::checkScriptAI( const QStringList &oldSections, const QStringList &newSections )
{
QStringList::const_iterator aiit = oldSections.begin();
Index: ai.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ai.h 9 Sep 2003 17:22:55 -0000 1.17
--- ai.h 13 Sep 2003 13:37:15 -0000 1.18
***************
*** 40,43 ****
--- 40,44 ----
#include "factory.h"
#include "definable.h"
+ #include "singleton.h"
// library includes
***************
*** 129,143 ****
};
! class AIFactory : public Factory< AbstractAI, QString >
{
public:
- static AIFactory* instance()
- {
- static AIFactory factory;
- return &factory;
- }
-
void checkScriptAI( const QStringList &oldSections, const QStringList &newSections );
};
class Action_Wander : public AbstractAction
--- 130,140 ----
};
! class cAIFactory : public Factory< AbstractAI, QString >
{
public:
void checkScriptAI( const QStringList &oldSections, const QStringList &newSections );
};
+
+ typedef SingletonHolder< cAIFactory > AIFactory;
class Action_Wander : public AbstractAction
Index: dragdrop.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dragdrop.cpp,v
retrieving revision 1.199
retrieving revision 1.200
diff -C2 -d -r1.199 -r1.200
*** dragdrop.cpp 11 Sep 2003 15:33:58 -0000 1.199
--- dragdrop.cpp 13 Sep 2003 13:37:15 -0000 1.200
***************
*** 54,58 ****
// New Class implementation
! void cDragItems::grabItem( cUOSocket *socket, cUORxDragItem *packet )
{
// Get our character
--- 54,58 ----
// New Class implementation
! void DragAndDrop::grabItem( cUOSocket *socket, cUORxDragItem *packet )
{
// Get our character
***************
*** 253,257 ****
}
! void cDragItems::bounceItem( cUOSocket* socket, P_ITEM pItem, bool denyMove )
{
// Reject the move of the item
--- 253,257 ----
}
! void DragAndDrop::bounceItem( cUOSocket* socket, P_ITEM pItem, bool denyMove )
{
// Reject the move of the item
***************
*** 277,281 ****
}
! void cDragItems::equipItem( cUOSocket *socket, cUORxWearItem *packet )
{
P_ITEM pItem = FindItemBySerial( packet->serial() );
--- 277,281 ----
}
! void DragAndDrop::equipItem( cUOSocket *socket, cUORxWearItem *packet )
{
P_ITEM pItem = FindItemBySerial( packet->serial() );
***************
*** 419,423 ****
}
! void cDragItems::dropItem( cUOSocket *socket, cUORxDropItem *packet )
{
P_PLAYER pChar = socket->player();
--- 419,423 ----
}
! void DragAndDrop::dropItem( cUOSocket *socket, cUORxDropItem *packet )
{
P_PLAYER pChar = socket->player();
***************
*** 475,479 ****
}
! void cDragItems::dropOnChar( cUOSocket *socket, P_ITEM pItem, P_CHAR pOtherChar )
{
// Three possibilities:
--- 475,479 ----
}
! void DragAndDrop::dropOnChar( cUOSocket *socket, P_ITEM pItem, P_CHAR pOtherChar )
{
// Three possibilities:
***************
*** 585,589 ****
}
! void cDragItems::dropOnGround( cUOSocket *socket, P_ITEM pItem, const Coord_cl &pos )
{
P_PLAYER pChar = socket->player();
--- 585,589 ----
}
! void DragAndDrop::dropOnGround( cUOSocket *socket, P_ITEM pItem, const Coord_cl &pos )
{
P_PLAYER pChar = socket->player();
***************
*** 634,638 ****
}
! void cDragItems::dropOnItem( cUOSocket *socket, P_ITEM pItem, P_ITEM pCont, const Coord_cl &dropPos )
{
P_PLAYER pChar = socket->player();
--- 634,638 ----
}
! void DragAndDrop::dropOnItem( cUOSocket *socket, P_ITEM pItem, P_ITEM pCont, const Coord_cl &dropPos )
{
P_PLAYER pChar = socket->player();
***************
*** 795,799 ****
// Food was dropped on a pet
! void cDragItems::dropFoodOnChar( cUOSocket* socket, P_ITEM pItem, P_CHAR pChar )
{
// Feed our pets
--- 795,799 ----
// Food was dropped on a pet
! void DragAndDrop::dropFoodOnChar( cUOSocket* socket, P_ITEM pItem, P_CHAR pChar )
{
// Feed our pets
***************
*** 843,847 ****
}
! void cDragItems::dropOnBeggar( cUOSocket* socket, P_ITEM pItem, P_CHAR pBeggar )
{
int tempint;
--- 843,847 ----
}
! void DragAndDrop::dropOnBeggar( cUOSocket* socket, P_ITEM pItem, P_CHAR pBeggar )
{
int tempint;
***************
*** 917,921 ****
}
! void cDragItems::dropOnBroker( cUOSocket* socket, P_ITEM pItem, P_CHAR pBroker )
{
// For House and Boat deeds we should pay back 75% of the value
--- 917,921 ----
}
! void DragAndDrop::dropOnBroker( cUOSocket* socket, P_ITEM pItem, P_CHAR pBroker )
{
// For House and Boat deeds we should pay back 75% of the value
***************
*** 938,946 ****
}
! void cDragItems::dropOnBanker( cUOSocket* socket, P_ITEM pItem, P_CHAR pBanker )
{
}
! void cDragItems::dropOnTrainer( cUOSocket* socket, P_ITEM pItem, P_CHAR pTrainer )
{
}
--- 938,946 ----
}
! void DragAndDrop::dropOnBanker( cUOSocket* socket, P_ITEM pItem, P_CHAR pBanker )
{
}
! void DragAndDrop::dropOnTrainer( cUOSocket* socket, P_ITEM pItem, P_CHAR pTrainer )
{
}
Index: dragdrop.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dragdrop.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** dragdrop.h 19 May 2003 11:26:33 -0000 1.18
--- dragdrop.h 13 Sep 2003 13:37:15 -0000 1.19
***************
*** 40,46 ****
class cUORxWearItem;
! class cDragItems
{
- public:
void grabItem( cUOSocket*, cUORxDragItem* );
void equipItem( cUOSocket*, cUORxWearItem* );
--- 40,45 ----
class cUORxWearItem;
! namespace DragAndDrop
{
void grabItem( cUOSocket*, cUORxDragItem* );
void equipItem( cUOSocket*, cUORxWearItem* );
***************
*** 60,69 ****
void bounceItem( cUOSocket* socket, P_ITEM pi, bool denyMove = false );
-
- static cDragItems *getInstance( void )
- {
- static cDragItems instance;
- return &instance;
- }
};
--- 59,62 ----
Index: uobject.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.h,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** uobject.h 27 Aug 2003 20:35:10 -0000 1.74
--- uobject.h 13 Sep 2003 13:37:15 -0000 1.75
***************
*** 37,40 ****
--- 37,41 ----
#include "persistentobject.h"
#include "definable.h"
+ #include "singleton.h"
#include "customtags.h"
#include "factory.h"
***************
*** 177,189 ****
! class UObjectFactory : public Factory<cUObject, QString>
{
public:
- static UObjectFactory* instance()
- {
- static UObjectFactory factory;
- return &factory;
- }
-
void registerSqlQuery( const QString &type, const QString &query )
{
--- 178,184 ----
! class cUObjectFactory : public Factory<cUObject, QString>
{
public:
void registerSqlQuery( const QString &type, const QString &query )
{
***************
*** 212,215 ****
--- 207,211 ----
};
+ typedef SingletonHolder< cUObjectFactory > UObjectFactory;
struct stError
|
|
From: <dar...@us...> - 2003-09-13 13:37:19
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1:/tmp/cvs-serv29987/network Modified Files: uosocket.cpp Log Message: Removed all old singletons and changed dragdrop into a namespace. Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.287 retrieving revision 1.288 diff -C2 -d -r1.287 -r1.288 *** uosocket.cpp 13 Sep 2003 13:08:41 -0000 1.287 --- uosocket.cpp 13 Sep 2003 13:37:16 -0000 1.288 *************** *** 237,243 **** break; case 0x07: ! cDragItems::getInstance()->grabItem( this, dynamic_cast< cUORxDragItem* >( packet ) ); break; case 0x08: ! cDragItems::getInstance()->dropItem( this, dynamic_cast< cUORxDropItem* >( packet ) ); break; case 0x09: handleRequestLook( dynamic_cast< cUORxRequestLook* >( packet ) ); break; --- 237,243 ---- break; case 0x07: ! DragAndDrop::grabItem( this, dynamic_cast< cUORxDragItem* >( packet ) ); break; case 0x08: ! DragAndDrop::dropItem( this, dynamic_cast< cUORxDropItem* >( packet ) ); break; case 0x09: handleRequestLook( dynamic_cast< cUORxRequestLook* >( packet ) ); break; *************** *** 245,249 **** handleAction( dynamic_cast< cUORxAction* >( packet ) ); break; case 0x13: ! cDragItems::getInstance()->equipItem( this, dynamic_cast< cUORxWearItem* >( packet ) ); break; case 0x22: resync(); break; --- 245,249 ---- handleAction( dynamic_cast< cUORxAction* >( packet ) ); break; case 0x13: ! DragAndDrop::equipItem( this, dynamic_cast< cUORxWearItem* >( packet ) ); break; case 0x22: resync(); break; |
|
From: <dar...@us...> - 2003-09-13 13:27:29
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv28163
Modified Files:
corpse.cpp customtags.cpp multis.cpp pagesystem.h
persistentbroker.h
Log Message:
Fixed a release inlining and shutdown bug.
And changed INSERT INTO to REPLACE INTO
Index: corpse.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/corpse.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** corpse.cpp 11 Sep 2003 16:19:50 -0000 1.35
--- corpse.cpp 13 Sep 2003 13:27:26 -0000 1.36
***************
*** 115,119 ****
for( map< UINT8, SERIAL >::iterator it = equipment_.begin(); it != equipment_.end(); ++it )
! persistentBroker->executeQuery( QString( "INSERT INTO corpses_equipment VALUES(%1,%2,%3)" ).arg( serial() ).arg( it->first ).arg( it->second ) );
cItem::save();
--- 115,119 ----
for( map< UINT8, SERIAL >::iterator it = equipment_.begin(); it != equipment_.end(); ++it )
! persistentBroker->executeQuery( QString( "REPLACE INTO corpses_equipment VALUES(%1,%2,%3)" ).arg( serial() ).arg( it->first ).arg( it->second ) );
cItem::save();
Index: customtags.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/customtags.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** customtags.cpp 7 Sep 2003 19:07:46 -0000 1.30
--- customtags.cpp 13 Sep 2003 13:27:26 -0000 1.31
***************
*** 709,713 ****
QString value = it.data().toString();
! persistentBroker->executeQuery( QString( "INSERT INTO tags VALUES(%1,'%2','%3','%4')" ).arg( key ).arg( persistentBroker->quoteString( name ) ).arg( type ).arg( persistentBroker->quoteString( value ) ) );
}
--- 709,713 ----
QString value = it.data().toString();
! persistentBroker->executeQuery( QString( "REPLACE INTO tags VALUES(%1,'%2','%3','%4')" ).arg( key ).arg( persistentBroker->quoteString( name ) ).arg( type ).arg( persistentBroker->quoteString( value ) ) );
}
Index: multis.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/multis.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** multis.cpp 27 Aug 2003 16:06:12 -0000 1.33
--- multis.cpp 13 Sep 2003 13:27:26 -0000 1.34
***************
*** 132,139 ****
INT32 i;
for ( i = 0; i < bans_.size(); ++i )
! persistentBroker->executeQuery( QString( "INSERT INTO multis_bans VALUES(%1,%2)" ).arg( serial() ).arg( bans_[i] ) );
for ( i = 0; i < friends_.size(); ++i )
! persistentBroker->executeQuery( QString( "INSERT INTO multis_friends VALUES(%1,%2)" ).arg( serial() ).arg( friends_[i] ) );
cItem::save();
--- 132,139 ----
INT32 i;
for ( i = 0; i < bans_.size(); ++i )
! persistentBroker->executeQuery( QString( "REPLACE INTO multis_bans VALUES(%1,%2)" ).arg( serial() ).arg( bans_[i] ) );
for ( i = 0; i < friends_.size(); ++i )
! persistentBroker->executeQuery( QString( "REPLACE INTO multis_friends VALUES(%1,%2)" ).arg( serial() ).arg( friends_[i] ) );
cItem::save();
Index: pagesystem.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/pagesystem.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pagesystem.h 7 Sep 2003 19:07:47 -0000 1.11
--- pagesystem.h 13 Sep 2003 13:27:26 -0000 1.12
***************
*** 103,107 ****
cPage *page = *it;
! QString sql( "INSERT INTO pages SET charserial = '%1', pagetype = '%2', pagetime = '%3', pagepos = '%4', content = '%5', category = '%6', pageorder = '%7'" );
sql = sql.arg( page->charSerial() ).arg( page->pageType() ).arg( persistentBroker->quoteString( page->pageTime() ) ).arg( QString( "%1,%2,%3,%4" ).arg( page->pagePos().x ).arg( page->pagePos().y ).arg( page->pagePos().z ).arg( page->pagePos().map ) ).arg( persistentBroker->quoteString( page->content() ) ).arg( page->pageCategory() ).arg( i++ );
persistentBroker->executeQuery( sql );
--- 103,107 ----
cPage *page = *it;
! QString sql( "REPLACE INTO pages SET charserial = '%1', pagetype = '%2', pagetime = '%3', pagepos = '%4', content = '%5', category = '%6', pageorder = '%7'" );
sql = sql.arg( page->charSerial() ).arg( page->pageType() ).arg( persistentBroker->quoteString( page->pageTime() ) ).arg( QString( "%1,%2,%3,%4" ).arg( page->pagePos().x ).arg( page->pagePos().y ).arg( page->pagePos().z ).arg( page->pagePos().map ) ).arg( persistentBroker->quoteString( page->content() ) ).arg( page->pageCategory() ).arg( i++ );
persistentBroker->executeQuery( sql );
Index: persistentbroker.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/persistentbroker.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** persistentbroker.h 12 Sep 2003 20:02:44 -0000 1.24
--- persistentbroker.h 13 Sep 2003 13:27:26 -0000 1.25
***************
*** 124,128 ****
else \
{ \
! persistentBroker->executeQuery( QString( "INSERT INTO %1 VALUES(%3)" ).arg( table )/*.arg( fields.join( "," ) )*/.arg( values.join( "," ) ) ); \
}
--- 124,128 ----
else \
{ \
! persistentBroker->executeQuery( QString( "REPLACE INTO %1 VALUES(%3)" ).arg( table )/*.arg( fields.join( "," ) )*/.arg( values.join( "," ) ) ); \
}
|
|
From: <dar...@us...> - 2003-09-13 13:08:45
|
Update of /cvsroot/wpdev/wolfpack/python
In directory sc8-pr-cvs1:/tmp/cvs-serv24411/python
Modified Files:
char.cpp global.cpp
Log Message:
Fixed a release inlining and shutdown bug.
Index: char.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** char.cpp 11 Sep 2003 16:19:50 -0000 1.103
--- char.cpp 13 Sep 2003 13:08:41 -0000 1.104
***************
*** 150,156 ****
if( ( player->bodyID() == 0x3DB ) && message.startsWith( SrvParams->commandPrefix() ) )
! cCommands::instance()->process( player->socket(), message.right( message.length()-1 ) );
else if( message.startsWith( SrvParams->commandPrefix() ) )
! cCommands::instance()->process( player->socket(), message.right( message.length()-1 ) );
else if( PyTuple_Size( args ) == 2 && PyInt_Check( PyTuple_GetItem( args, 1 ) ) )
player->message( message, PyInt_AsLong( PyTuple_GetItem( args, 1 ) ) );
--- 150,156 ----
if( ( player->bodyID() == 0x3DB ) && message.startsWith( SrvParams->commandPrefix() ) )
! Commands::instance()->process( player->socket(), message.right( message.length()-1 ) );
else if( message.startsWith( SrvParams->commandPrefix() ) )
! Commands::instance()->process( player->socket(), message.right( message.length()-1 ) );
else if( PyTuple_Size( args ) == 2 && PyInt_Check( PyTuple_GetItem( args, 1 ) ) )
player->message( message, PyInt_AsLong( PyTuple_GetItem( args, 1 ) ) );
Index: global.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/global.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** global.cpp 11 Sep 2003 16:19:50 -0000 1.91
--- global.cpp 13 Sep 2003 13:08:41 -0000 1.92
***************
*** 1304,1309 ****
PyObject *list = PyList_New( 0 );
! QMap< QString, cAcl* >::const_iterator it = cCommands::instance()->aclbegin();
! while( it != cCommands::instance()->aclend() )
{
QString name = it.key();
--- 1304,1309 ----
PyObject *list = PyList_New( 0 );
! QMap< QString, cAcl* >::const_iterator it = Commands::instance()->aclbegin();
! while( it != Commands::instance()->aclend() )
{
QString name = it.key();
***************
*** 1328,1332 ****
}
! cAcl *acl = cCommands::instance()->getACL( getArgStr( 0 ) );
if( !acl )
{
--- 1328,1332 ----
}
! cAcl *acl = Commands::instance()->getACL( getArgStr( 0 ) );
if( !acl )
{
|
|
From: <dar...@us...> - 2003-09-13 13:08:45
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1:/tmp/cvs-serv24411/network Modified Files: uosocket.cpp Log Message: Fixed a release inlining and shutdown bug. Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.286 retrieving revision 1.287 diff -C2 -d -r1.286 -r1.287 *** uosocket.cpp 11 Sep 2003 16:19:50 -0000 1.286 --- uosocket.cpp 13 Sep 2003 13:08:41 -0000 1.287 *************** *** 1295,1301 **** // of the speech is = then it's always a command if( ( _player->bodyID() == 0x3DB ) && speech.startsWith( SrvParams->commandPrefix() ) ) ! cCommands::instance()->process( this, speech.right( speech.length()-1 ) ); else if( speech.startsWith( SrvParams->commandPrefix() ) ) ! cCommands::instance()->process( this, speech.right( speech.length()-1 ) ); else Speech->talking( _player, packet->language(), speech, keywords, color, font, type ); --- 1295,1301 ---- // of the speech is = then it's always a command if( ( _player->bodyID() == 0x3DB ) && speech.startsWith( SrvParams->commandPrefix() ) ) ! Commands::instance()->process( this, speech.right( speech.length()-1 ) ); else if( speech.startsWith( SrvParams->commandPrefix() ) ) ! Commands::instance()->process( this, speech.right( speech.length()-1 ) ); else Speech->talking( _player, packet->language(), speech, keywords, color, font, type ); |
|
From: <dar...@us...> - 2003-09-13 13:08:44
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv24411
Modified Files:
accounts.cpp commands.cpp commands.h world.cpp
wpdefmanager.cpp
Log Message:
Fixed a release inlining and shutdown bug.
Index: accounts.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/accounts.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** accounts.cpp 13 Sep 2003 01:46:58 -0000 1.68
--- accounts.cpp 13 Sep 2003 13:08:40 -0000 1.69
***************
*** 100,103 ****
--- 100,105 ----
}
+ //#include "console.h"
+
bool cAccount::authorized( const QString& group, const QString& value ) const
{
***************
*** 105,112 ****
if( !acl_ )
{// Let's try harder get one.
! acl_ = cCommands::instance()->getACL( aclName_ ); // loads if there was any specified.
if ( !acl_ )
{
! acl_ = cCommands::instance()->getACL( "player" );
if ( acl_ )
aclName_ = "player";
--- 107,114 ----
if( !acl_ )
{// Let's try harder get one.
! acl_ = Commands::instance()->getACL( aclName_ ); // loads if there was any specified.
if ( !acl_ )
{
! acl_ = Commands::instance()->getACL( "player" );
if ( acl_ )
aclName_ = "player";
***************
*** 115,118 ****
--- 117,121 ----
}
}
+
// No group? No Access!
QMap< QString, QMap< QString, bool > >::iterator groupIter = acl_->groups.find( group );
***************
*** 147,151 ****
void cAccount::refreshAcl()
{
! acl_ = cCommands::instance()->getACL( aclName_ );
}
--- 150,154 ----
void cAccount::refreshAcl()
{
! acl_ = Commands::instance()->getACL( aclName_ );
}
Index: commands.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v
retrieving revision 1.201
retrieving revision 1.202
diff -C2 -d -r1.201 -r1.202
*** commands.cpp 9 Sep 2003 23:09:30 -0000 1.201
--- commands.cpp 13 Sep 2003 13:08:40 -0000 1.202
***************
*** 179,182 ****
--- 179,183 ----
}
}
+
_acls.insert( ACLname, acl );
}
***************
*** 473,477 ****
else if( key == "acl" )
{
! if( !cCommands::instance()->getACL( value ) )
{
socket->sysMessage( tr( "You tried to specify an unknown acl '%1'" ).arg( value ) );
--- 474,478 ----
else if( key == "acl" )
{
! if( !Commands::instance()->getACL( value ) )
{
socket->sysMessage( tr( "You tried to specify an unknown acl '%1'" ).arg( value ) );
Index: commands.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/commands.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** commands.h 4 Jul 2003 16:30:47 -0000 1.13
--- commands.h 13 Sep 2003 13:08:40 -0000 1.14
***************
*** 33,36 ****
--- 33,38 ----
#define __COMMANDS_H__
+ #include "singleton.h"
+
// Library Includes
#include <qmap.h>
***************
*** 57,63 ****
// Group -> Command -> Permitted
! class cCommands : public QObject
{
- Q_OBJECT
private:
QMap< QString, cAcl* > _acls;
--- 59,64 ----
// Group -> Command -> Permitted
! class cCommands
{
private:
QMap< QString, cAcl* > _acls;
***************
*** 68,77 ****
void dispatch( cUOSocket *socket, const QString &command, QStringList &arguments );
- static cCommands *instance()
- {
- static cCommands instance_;
- return &instance_;
- }
-
QMap< QString, cAcl* >::const_iterator aclbegin() const { return _acls.begin(); }
QMap< QString, cAcl* >::const_iterator aclend() const { return _acls.end(); }
--- 69,72 ----
***************
*** 84,93 ****
inline cAcl *cCommands::getACL( const QString& key )
{
! if( _acls.find( key ) == _acls.end() )
! return 0;
else
! return _acls.find( key ).data();
}
#endif
--- 79,91 ----
inline cAcl *cCommands::getACL( const QString& key )
{
! QMap< QString, cAcl* >::iterator it = _acls.find( key );
!
! if( it != _acls.end() )
! return it.data();
else
! return 0;
}
+ typedef SingletonHolder< cCommands > Commands;
#endif
Index: world.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** world.cpp 12 Sep 2003 20:02:44 -0000 1.45
--- world.cpp 13 Sep 2003 13:08:41 -0000 1.46
***************
*** 736,739 ****
--- 736,742 ----
Console::instance()->log( LOG_ERROR, "Saving failed: " + e );
+
+ persistentBroker->disconnect();
+
return;
}
***************
*** 748,755 ****
Console::instance()->ChangeColor( WPC_NORMAL );
- persistentBroker->disconnect();
-
Console::instance()->send( QString( " [%1ms]\n" ).arg( uiCurrentTime - startTime ) );
}
--- 751,757 ----
Console::instance()->ChangeColor( WPC_NORMAL );
Console::instance()->send( QString( " [%1ms]\n" ).arg( uiCurrentTime - startTime ) );
+ persistentBroker->disconnect();
}
Index: wpdefmanager.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wpdefmanager.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** wpdefmanager.cpp 11 Sep 2003 16:19:50 -0000 1.65
--- wpdefmanager.cpp 13 Sep 2003 13:08:41 -0000 1.66
***************
*** 293,297 ****
Console::instance()->ProgressDone();
! cCommands::instance()->loadACLs();
BaseDefManager::instance()->load();
}
--- 293,297 ----
Console::instance()->ProgressDone();
! Commands::instance()->loadACLs();
BaseDefManager::instance()->load();
}
|
|
From: <dar...@us...> - 2003-09-13 02:03:06
|
Update of /cvsroot/wpdev/xmlscripts/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv12161
Modified Files:
webadmin.py
Log Message:
Fixed an issue related to Linux paths
Index: webadmin.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/webadmin.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** webadmin.py 9 Aug 2003 05:18:22 -0000 1.9
--- webadmin.py 13 Sep 2003 02:03:03 -0000 1.10
***************
*** 91,95 ****
"""
file = urllib.unquote(uri)
! file.replace('\\', '/')
words = file.split('/')
words = filter(None, words)
--- 91,95 ----
"""
file = urllib.unquote(uri)
! file.replace("\\", '/')
words = file.split('/')
words = filter(None, words)
***************
*** 127,130 ****
--- 127,132 ----
scriptname = dir + '/' + script
scriptfile = self.translate_path(scriptname)
+ scriptfile = os.path.normpath( scriptfile )
+
if not os.path.exists(scriptfile):
self.send_error(404, "No such CGI script (%s)" % `scriptname`)
***************
*** 239,243 ****
try:
! filepath = os.path.normpath(os.path.abspath('web\\'))
self.httpd = Webserver( ( '', self.port ), filepath )
except:
--- 241,245 ----
try:
! filepath = os.path.normpath( os.path.abspath( 'web/' ) )
self.httpd = Webserver( ( '', self.port ), filepath )
except:
|
|
From: <dar...@us...> - 2003-09-13 01:54:59
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv10799
Modified Files:
console_unix.cpp
Log Message:
Made the Linux console non-blocking and disabled the local echo.
Index: console_unix.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console_unix.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** console_unix.cpp 12 Sep 2003 22:11:47 -0000 1.7
--- console_unix.cpp 13 Sep 2003 01:54:55 -0000 1.8
***************
*** 45,48 ****
--- 45,62 ----
using namespace std;
+ void resetNonBlockingIo()
+ {
+ termios term_caps;
+
+ if( tcgetattr( STDIN_FILENO, &term_caps ) < 0 )
+ return;
+
+ term_caps.c_lflag |= ICANON;
+ term_caps.c_lflag |= ECHO;
+
+ if( tcsetattr( STDIN_FILENO, TCSANOW, &term_caps ) < 0 )
+ return;
+ }
+
void setNonBlockingIo()
{
***************
*** 53,56 ****
--- 67,71 ----
term_caps.c_lflag &= ~ICANON;
+ term_caps.c_lflag &= ~ECHO;
if( tcsetattr( STDIN_FILENO, TCSANOW, &term_caps ) < 0 )
***************
*** 58,61 ****
--- 73,78 ----
setbuf( stdin, NULL );
+
+ atexit( resetNonBlockingIo );
}
|
