wpdev-commits Mailing List for Wolfpack Emu (Page 58)

Brought to you by: rip, thiagocorrea

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

Flat | Threaded

<< < 1 .. 56 57 58 59 60 .. 201 > >> (Page 58 of 201)

[wpdev-commits] xmlscripts/scripts/commands who.py,1.2,1.3

From: Sebastian H. <dar...@us...> - 2004-08-28 15:44:47

Update of /cvsroot/wpdev/xmlscripts/scripts/commands
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26336/commands

Modified Files:
	who.py 
Log Message:
Hopeful fix for the character region

Index: who.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/who.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** who.py	17 Jul 2004 12:56:22 -0000	1.2
--- who.py	28 Aug 2004 15:44:39 -0000	1.3
***************
*** 100,104 ****
  		gump.addText( 250, 100, unicode( "%i,%i,%i,%i" % ( pos.x, pos.y, pos.z, pos.map ) ), 0x834 )
  		gump.addText( 50, 120, unicode( "Region:" ), 0x834 )
! 		gump.addText( 250, 120, unicode( "%s" % player.region ), 0x834 )
  		gump.addText( 50, 140, unicode( "Account / ACL:" ), 0x834 )
  		gump.addText( 250, 140, unicode( "%s / %s" % ( account.name, account.acl) ), 0x834 )
--- 100,104 ----
  		gump.addText( 250, 100, unicode( "%i,%i,%i,%i" % ( pos.x, pos.y, pos.z, pos.map ) ), 0x834 )
  		gump.addText( 50, 120, unicode( "Region:" ), 0x834 )
! 		gump.addText( 250, 120, unicode( "%s" % unicode(player.region) ), 0x834 )
  		gump.addText( 50, 140, unicode( "Account / ACL:" ), 0x834 )
  		gump.addText( 250, 140, unicode( "%s / %s" % ( account.name, account.acl) ), 0x834 )

[wpdev-commits] xmlscripts/definitions/system access.xml,1.2,1.3

From: Sebastian H. <dar...@us...> - 2004-08-28 14:52:45

Update of /cvsroot/wpdev/xmlscripts/definitions/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18865/system

Modified Files:
	access.xml 
Log Message:
allowed allshow and allmove for gms

Index: access.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/system/access.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** access.xml	13 May 2004 07:03:55 -0000	1.2
--- access.xml	28 Aug 2004 14:52:32 -0000	1.3
***************
*** 27,32 ****
  			<action name="any" permit="true" />
  			<action name="ACCOUNT" permit="false" />
! 			<action name="ALLMOVE" permit="false" />
! 			<action name="ALLSHOW" permit="false" />
  			<action name="DECORATION" permit="false" />
  			<action name="DOORGEN" permit="false" />
--- 27,32 ----
  			<action name="any" permit="true" />
  			<action name="ACCOUNT" permit="false" />
! 			<!-- <action name="ALLMOVE" permit="false" /> -->
! 			<!-- <action name="ALLSHOW" permit="false" /> -->
  			<action name="DECORATION" permit="false" />
  			<action name="DOORGEN" permit="false" />

[wpdev-commits] wolfpack/network uosocket.cpp,1.399,1.400

From: Sebastian H. <dar...@us...> - 2004-08-28 14:42:28

Update of /cvsroot/wpdev/wolfpack/network
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17133/network

Modified Files:
	uosocket.cpp 
Log Message:
fixes for an annoying drop bug that occured with stackable items
fixes for missing maps.

Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.399
retrieving revision 1.400
diff -C2 -d -r1.399 -r1.400
*** uosocket.cpp	25 Aug 2004 17:01:33 -0000	1.399
--- uosocket.cpp	28 Aug 2004 14:42:05 -0000	1.400
***************
*** 661,664 ****
--- 661,673 ----
  	// d) Set the Game Time
  
+ 	if (!Maps::instance()->hasMap(pChar->pos().map)) {
+ 		Coord_cl pos;
+ 		pos.x = 0;
+ 		pos.y = 0;
+ 		pos.z = 0;
+ 		pos.map = 0;
+ 		pChar->moveTo(pos);
+ 	}
+ 
  	// We're now playing this char
  	pChar->setLogoutTime( 0 );
***************
*** 677,683 ****
  	cUOTxMapDiffs diffs;
  	diffs.addEntry( Maps::instance()->mapPatches( 0 ), Maps::instance()->staticPatches( 0 ) );
! 	diffs.addEntry( Maps::instance()->mapPatches( 1 ), Maps::instance()->staticPatches( 1 ) );
! 	diffs.addEntry( Maps::instance()->mapPatches( 2 ), Maps::instance()->staticPatches( 2 ) );
! 	diffs.addEntry( Maps::instance()->mapPatches( 3 ), Maps::instance()->staticPatches( 3 ) );
  	send( &diffs );
  
--- 686,698 ----
  	cUOTxMapDiffs diffs;
  	diffs.addEntry( Maps::instance()->mapPatches( 0 ), Maps::instance()->staticPatches( 0 ) );
! 	if (Maps::instance()->hasMap(1)) {
! 		diffs.addEntry( Maps::instance()->mapPatches( 1 ), Maps::instance()->staticPatches( 1 ) );
! 		if (Maps::instance()->hasMap(2)) {
! 			diffs.addEntry( Maps::instance()->mapPatches( 2 ), Maps::instance()->staticPatches( 2 ) );
! 			if (Maps::instance()->hasMap(3)) {
! 				diffs.addEntry( Maps::instance()->mapPatches( 3 ), Maps::instance()->staticPatches( 3 ) );
! 			}
! 		}		
! 	}
  	send( &diffs );

[wpdev-commits] wolfpack dragdrop.cpp,1.242,1.243 items.cpp,1.441,1.442

From: Sebastian H. <dar...@us...> - 2004-08-28 14:42:28

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17133

Modified Files:
	dragdrop.cpp items.cpp 
Log Message:
fixes for an annoying drop bug that occured with stackable items
fixes for missing maps.

Index: dragdrop.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dragdrop.cpp,v
retrieving revision 1.242
retrieving revision 1.243
diff -C2 -d -r1.242 -r1.243
*** dragdrop.cpp	22 Aug 2004 02:29:50 -0000	1.242
--- dragdrop.cpp	28 Aug 2004 14:42:04 -0000	1.243
***************
*** 743,747 ****
  	else if ( pCont->canStack( pItem ) )
  	{
! 		if ( pCont->amount() + pItem->amount() <= 60000 )
  		{
  			pCont->setAmount( pCont->amount() + pItem->amount() );
--- 743,747 ----
  	else if ( pCont->canStack( pItem ) )
  	{
! 		if ( pCont->amount() + pItem->amount() <= 65535 )
  		{
  			pCont->setAmount( pCont->amount() + pItem->amount() );
***************
*** 749,763 ****
  			pItem->remove();
  			pCont->update(); // Need to update the amount
  		}
  		else
  		{
! 			// The delta between 60000 and pCont->amount() sub our Amount is the
  			// new amount
! 			pItem->setAmount( pItem->amount() - ( 60000 - pCont->amount() ) );
  
! 			pCont->setAmount( 60000 ); // Max out the amount
  			pCont->update();
  		}
- 		return;
  	}
  
--- 749,766 ----
  			pItem->remove();
  			pCont->update(); // Need to update the amount
+ 			pCont->resendTooltip();
+ 			return;
  		}
  		else
  		{
! 			// The delta between 65535 and pCont->amount() sub our Amount is the
  			// new amount
! 			pItem->setAmount( pItem->amount() - ( 65535 - pCont->amount() ) );
! 			pItem->resendTooltip();
  
! 			pCont->setAmount( 65535 ); // Max out the amount
  			pCont->update();
+ 			pCont->resendTooltip();
  		}
  	}
  
***************
*** 781,784 ****
--- 784,788 ----
  	else
  	{
+ 		pItem->removeFromCont();
  		pItem->moveTo( pCont->pos() + Coord_cl( 0, 0, 2 ) );
  	}

Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.441
retrieving revision 1.442
diff -C2 -d -r1.441 -r1.442
*** items.cpp	27 Aug 2004 14:41:15 -0000	1.441
--- items.cpp	28 Aug 2004 14:42:04 -0000	1.442
***************
*** 97,101 ****
  	this->basedef_ = src.basedef_;
  	this->totalweight_ = amount_ * weight();
! 	moveTo( src.pos_ );
  }
  
--- 97,102 ----
  	this->basedef_ = src.basedef_;
  	this->totalweight_ = amount_ * weight();
! 	this->multi_ = 0;
! 	moveTo( src.pos_, true );
  }

[wpdev-commits] wolfpack basedef.cpp,1.11,1.12

From: Sebastian H. <dar...@us...> - 2004-08-28 12:15:45

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25299

Modified Files:
	basedef.cpp 
Log Message:
fix for script reload

Index: basedef.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basedef.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** basedef.cpp	27 Aug 2004 14:41:15 -0000	1.11
--- basedef.cpp	28 Aug 2004 12:15:35 -0000	1.12
***************
*** 126,129 ****
--- 126,130 ----
  		QStringList scripts = QStringList::split(",", baseScriptList_);
  		QStringList::const_iterator it;
+ 		baseScripts_.clear();
  		for (it = scripts.begin(); it != scripts.end(); ++it) {
  			cPythonScript *script = ScriptManager::instance()->find((*it).latin1());
***************
*** 228,231 ****
--- 229,233 ----
  		QStringList scripts = QStringList::split(",", baseScriptList_);
  		QStringList::const_iterator it;
+ 		baseScripts_.clear();
  		for (it = scripts.begin(); it != scripts.end(); ++it) {
  			cPythonScript *script = ScriptManager::instance()->find((*it).latin1());

[wpdev-commits] wolfpack scriptmanager.cpp,1.24,1.25

From: Sebastian H. <dar...@us...> - 2004-08-28 12:10:00

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24337

Modified Files:
	scriptmanager.cpp 
Log Message:
fix for script reload

Index: scriptmanager.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/scriptmanager.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** scriptmanager.cpp	27 Aug 2004 14:41:16 -0000	1.24
--- scriptmanager.cpp	28 Aug 2004 12:09:51 -0000	1.25
***************
*** 95,98 ****
--- 95,101 ----
  	for ( pChar = iter_chars.first(); pChar; pChar = iter_chars.next() )
  		pChar->unfreezeScriptChain();
+ 
+ 	CharBaseDefs::instance()->refreshScripts();
+ 	ItemBaseDefs::instance()->refreshScripts();
  }

[wpdev-commits] wolfpack world.cpp,1.118,1.119

From: Sebastian H. <dar...@us...> - 2004-08-27 23:59:09

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26184

Modified Files:
	world.cpp 
Log Message:
postload is now called for binary save objects.

Index: world.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** world.cpp	23 Aug 2004 21:37:39 -0000	1.118
--- world.cpp	27 Aug 2004 23:58:53 -0000	1.119
***************
*** 440,448 ****
  			unsigned int percent = 0;
  			unsigned int loadStart = getNormalizedTime();
  
  			do
  			{
  				type = reader.readByte();
- 
  				if ( typemap.contains( type ) )
  				{
--- 440,448 ----
  			unsigned int percent = 0;
  			unsigned int loadStart = getNormalizedTime();
+ 			QPtrList<PersistentObject> objects;
  
  			do
  			{
  				type = reader.readByte();
  				if ( typemap.contains( type ) )
  				{
***************
*** 452,455 ****
--- 452,456 ----
  						try {
  							object->load( reader );
+ 							objects.append(object);
  						} catch (wpException e) {
  							Console::instance()->log( LOG_WARNING, e.error() + "\n" );
***************
*** 522,525 ****
--- 523,532 ----
  			reader.close();
  
+ 			QPtrList<PersistentObject>::const_iterator cit(objects.begin());
+ 			while (cit != objects.end()) {
+ 				(*cit)->postload(reader.version());
+ 				++cit;
+ 			}
+ 
  			unsigned int duration = getNormalizedTime() - loadStart;

[wpdev-commits] wolfpack ChangeLog,1.14,1.15 baseregion.h,1.25,1.26 spawnregions.cpp,1.67,1.68 walking.cpp,1.138,1.139

From: Sebastian H. <dar...@us...> - 2004-08-27 18:57:08

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7222

Modified Files:
	ChangeLog baseregion.h spawnregions.cpp walking.cpp 
Log Message:
fixes for walking

fixes for maps

fixes for spawnregions

Index: ChangeLog
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ChangeLog	27 Aug 2004 14:41:15 -0000	1.14
--- ChangeLog	27 Aug 2004 18:56:59 -0000	1.15
***************
*** 23,26 ****
--- 23,29 ----
  	- hasscript(a) will return true if a is in the basescripts.
  	- addscript now prepends a new script rather than appending it.
+ 	- the python .scripts property includes all script names, including the scripts in basescripts.
+ 	- added a new property .basescripts to get a comma separated list of all scripts in the
+ 	  basescripts list.
  	  
  

Index: walking.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v
retrieving revision 1.138
retrieving revision 1.139
diff -C2 -d -r1.138 -r1.139
*** walking.cpp	25 Aug 2004 17:01:24 -0000	1.138
--- walking.cpp	27 Aug 2004 18:56:59 -0000	1.139
***************
*** 80,84 ****
  #define P_M_MAX_Z_INFLUENCE	15
  #define P_M_MAX_Z_FALL		20 // You can fall 20 tiles ofcourse !!
! #define P_M_MAX_Z_BLOCKS	15
  
  // These are the debugging defines
--- 80,84 ----
  #define P_M_MAX_Z_INFLUENCE	15
  #define P_M_MAX_Z_FALL		20 // You can fall 20 tiles ofcourse !!
! #define P_M_MAX_Z_BLOCKS	14
  
  // These are the debugging defines
***************
*** 111,116 ****
  	Q_UINT8 height;
  	bool walkable;
  
! 	stBlockItem() : z( -128 ), height( 0 ), walkable( false )
  	{
  	}
--- 111,117 ----
  	Q_UINT8 height;
  	bool walkable;
+ 	bool maptile;
  
! 	stBlockItem() : z( -128 ), height( 0 ), walkable( false ), maptile( false )
  	{
  	}
***************
*** 143,146 ****
--- 144,148 ----
  	// Process the map at that position
  	stBlockItem mapBlock;
+ 	mapBlock.maptile = true;
  	mapBlock.z = Maps::instance()->mapAverageElevation( pos );
  	mapBlock.height = 0;
***************
*** 148,152 ****
  	// TODO: Calculate the REAL average Z Value of that Map Tile here! Otherwise clients will have minor walking problems.
  	map_st mapCell = Maps::instance()->seekMap( pos );
! 	mapBlock.z = mapCell.z;
  	land_st mapTile = TileCache::instance()->getLand( mapCell.id );
  
--- 150,154 ----
  	// TODO: Calculate the REAL average Z Value of that Map Tile here! Otherwise clients will have minor walking problems.
  	map_st mapCell = Maps::instance()->seekMap( pos );
! 	//mapBlock.z = mapCell.z;*/
  	land_st mapTile = TileCache::instance()->getLand( mapCell.id );
  
***************
*** 187,191 ****
  		// If we are a stair only the half height counts (round up)
  		if ( tTile.flag2 & 0x04 )
! 			staticBlock.height = ( Q_UINT8 ) ( tTile.height + 1 / 2 );
  		else
  			staticBlock.height = tTile.height;
--- 189,193 ----
  		// If we are a stair only the half height counts (round up)
  		if ( tTile.flag2 & 0x04 )
! 			staticBlock.height = ( Q_UINT8 ) ( ( tTile.height + 1 ) / 2 );
  		else
  			staticBlock.height = tTile.height;
***************
*** 283,286 ****
--- 285,289 ----
  	Q_UINT32 i;
  	bool priviledged = false;
+ 	Q_INT32 oldz = pos.z;
  
  	P_PLAYER player = dynamic_cast<P_PLAYER>( pChar );
***************
*** 299,312 ****
  			return false;
  
! 		// If the top of the item is within our max-climb reach
! 		// then the first check passed. in addition we need to
! 		// check if the "bottom" of the item is reachable
! 		// I would say 2 is a good "reach" value for the bottom
! 		// of any item
! 		if ( ( item.walkable || priviledged ) && ( itemTop <= pos.z + P_M_MAX_Z_CLIMB ) && ( itemTop >= pos.z - P_M_MAX_Z_FALL ) /*&& ( item.z <= pos.z + 2 )*/ )
! 		{
! 			pos.z = itemTop;
! 			found = true;
! 			break;
  		}
  	}
--- 302,321 ----
  			return false;
  
! 		if ( item.walkable || priviledged ) {
! 			// If the top of the item is within our max-climb reach
! 			// then the first check passed. in addition we need to
! 			// check if the "bottom" of the item is reachable
! 			// I would say 2 is a good "reach" value for the bottom
! 			// of any item
! 			if ( itemTop < pos.z + P_M_MAX_Z_CLIMB && itemTop >= pos.z - P_M_MAX_Z_FALL ) {
! 				pos.z = itemTop;
! 				found = true;
! 				break;
! 			// Climbing maptiles is 5 tiles easier
! 			} else if ( item.maptile && itemTop < pos.z + P_M_MAX_Z_CLIMB + 5 && itemTop >= pos.z - P_M_MAX_Z_FALL ) {
! 				pos.z = itemTop;
! 				found = true;
! 				break;
! 			}
  		}
  	}
***************
*** 331,351 ****
  		Q_INT8 itemTop = ( item.z + item.height );
  
  		// Does the top of the item looms into our space
  		// Like before 15 is the assumed height of ourself
  		if ( ( itemTop > pos.z ) && ( itemTop < pos.z + P_M_MAX_Z_BLOCKS ) )
  			return false;
  
  		// Or the bottom ?
! 		if ( ( item.z > pos.z ) && ( item.z < pos.z + P_M_MAX_Z_BLOCKS ) )
  			return false;
  
  		// Or does it spread the whole range ?
! 		if ( ( item.z <= pos.z ) && ( itemTop >= pos.z + P_M_MAX_Z_BLOCKS ) )
  			return false;
- 
- 		// If the Item Tops are already below our current position exit the
- 		// loop, we're sorted by those !
- 		if ( itemTop <= pos.z )
- 			break;
  	}
  
--- 340,361 ----
  		Q_INT8 itemTop = ( item.z + item.height );
  
+ 		// If the item is below what we step on, ignore it
+ 		if (itemTop <= pos.z) {
+ 			continue;
+ 		}
+ 
  		// Does the top of the item looms into our space
  		// Like before 15 is the assumed height of ourself
+ 		// Use the new position here.
  		if ( ( itemTop > pos.z ) && ( itemTop < pos.z + P_M_MAX_Z_BLOCKS ) )
  			return false;
  
  		// Or the bottom ?
! 		if ( ( item.z > oldz ) && ( item.z < oldz + P_M_MAX_Z_BLOCKS ) )
  			return false;
  
  		// Or does it spread the whole range ?
! 		if ( ( item.z <= oldz ) && ( itemTop >= oldz + P_M_MAX_Z_BLOCKS ) )
  			return false;
  	}
  

Index: spawnregions.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/spawnregions.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** spawnregions.cpp	10 Aug 2004 03:15:57 -0000	1.67
--- spawnregions.cpp	27 Aug 2004 18:56:59 -0000	1.68
***************
*** 210,216 ****
  bool cSpawnRegion::findValidSpot( Coord_cl& pos )
  {
! 	// Try up to 100 times.
! 	for ( unsigned int i = 0; i < 100; ++i )
! 	{
  		int rndRectNum = RandomNum( 0, this->rectangles_.size() - 1 );
  		pos.x = RandomNum( this->rectangles_[rndRectNum].x1, this->rectangles_[rndRectNum].x2 );
--- 210,215 ----
  bool cSpawnRegion::findValidSpot( Coord_cl& pos )
  {
! 	// Try up to 25 times.
! 	for ( unsigned int i = 0; i < 25; ++i ) {
  		int rndRectNum = RandomNum( 0, this->rectangles_.size() - 1 );
  		pos.x = RandomNum( this->rectangles_[rndRectNum].x1, this->rectangles_[rndRectNum].x2 );

Index: baseregion.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/baseregion.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** baseregion.h	27 Jul 2004 04:15:08 -0000	1.25
--- baseregion.h	27 Aug 2004 18:56:59 -0000	1.26
***************
*** 164,167 ****
--- 164,176 ----
  			toinsert_.y2 = Tag->getAttribute( "y2" ).toUShort();
  			toinsert_.map = Tag->getAttribute( "map" ).toUShort();
+ 
+ 			if (toinsert_.y1 > toinsert_.y2) {
+ 				std::swap(toinsert_.y1, toinsert_.y2);
+ 			}
+ 
+ 			if (toinsert_.x1 > toinsert_.x2) {
+ 				std::swap(toinsert_.x1, toinsert_.x2);
+ 			}
+ 
  			this->rectangles_.push_back( toinsert_ );
  		}

[wpdev-commits] wolfpack/muls maps.cpp,1.9,1.10

From: Sebastian H. <dar...@us...> - 2004-08-27 18:57:08

Update of /cvsroot/wpdev/wolfpack/muls
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7222/muls

Modified Files:
	maps.cpp 
Log Message:
fixes for walking

fixes for maps

fixes for spawnregions

Index: maps.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/muls/maps.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** maps.cpp	19 Aug 2004 01:55:56 -0000	1.9
--- maps.cpp	27 Aug 2004 18:56:59 -0000	1.10
***************
*** 32,35 ****
--- 32,37 ----
  #include "../defines.h"
  #include "../items.h"
+ #include "../console.h"
+ #include "../log.h"
  #include "../serverconfig.h"
  
***************
*** 115,118 ****
--- 117,121 ----
  	if ( !staticsfile.open( IO_ReadOnly ) )
  		throw wpFileNotFoundException( QString( "Couldn't open file %1" ).arg( statics ) );
+ 
  	staticsCache.setAutoDelete( true );
  	mapCache.setAutoDelete( true );
***************
*** 319,326 ****
  		d.insert( id, p );
  		return true;
! 	}
! 	catch ( wpFileNotFoundException& e )
! 	{
! 		qWarning( e.error() );
  		return false;
  	}
--- 322,327 ----
  		d.insert( id, p );
  		return true;
! 	} catch ( wpFileNotFoundException& e ) {
! 		Console::instance()->log(LOG_WARNING, e.error());
  		return false;
  	}
***************
*** 568,573 ****
  {
  	const_iterator it = d.find( id );
! 	if ( it == d.end() )
! 		throw wpException( QString( "[cMaps::staticsIterator line %1] map id(%2) not registered!" ).arg( __LINE__ ).arg( id ) );
  	return StaticsIterator( x, y, it.data(), exact );
  }
--- 569,576 ----
  {
  	const_iterator it = d.find( id );
! 	if ( it == d.end() ) {
! 		Console::instance()->log(LOG_ERROR, QString( "[cMaps::staticsIterator line %1] map id(%2) not registered!\n" ).arg( __LINE__ ).arg( id ) );
! 		return StaticsIterator( x, y, 0, true );
! 	}		
  	return StaticsIterator( x, y, it.data(), exact );
  }
***************
*** 606,611 ****
  	baseY = y / 8;
  	pos = 0;
! 
! 	if ( baseX < d->width && baseY < d->height )
  		load( d, x, y, exact );
  }
--- 609,614 ----
  	baseY = y / 8;
  	pos = 0;
! 	
! 	if ( d && baseX < d->width && baseY < d->height )
  		load( d, x, y, exact );
  }

[wpdev-commits] xmlscripts/documentation/webroot ChangeLog.wolfpack,1.47,1.48

From: Richard M. <dr...@us...> - 2004-08-27 17:27:37

Update of /cvsroot/wpdev/xmlscripts/documentation/webroot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22023/documentation/webroot

Modified Files:
	ChangeLog.wolfpack 
Log Message:
More up to date.


Index: ChangeLog.wolfpack
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** ChangeLog.wolfpack	27 Aug 2004 17:19:24 -0000	1.47
--- ChangeLog.wolfpack	27 Aug 2004 17:27:26 -0000	1.48
***************
*** 3,12 ****
  Wolfpack 12.9.9 Beta (CVS)
  	* Core Changes:
! 		- Added an email field for accounts.
! 		- Timer fixes.
! 		- Changes to event/script functions. ( See Python changes. )
! 		- Fixes for walking and ladders
! 		- Added support for basescripts, read-only assigned scripts.
! 		- Added compression support for binary saves.
  	* Definition Changes:
  		- Tag Changes:
--- 3,30 ----
  Wolfpack 12.9.9 Beta (CVS)
  	* Core Changes:
! 		- Allowed viewing and setting account properties via .set and .show.
! 			Replace <property> with the name of the account property and <value>
! 			with the value you want to set:
! 			set account.<property> <value>
! 			show account.<property>
! 		- Moved the account property getters and setters into the cAccount class.
! 		- Added an e-mail field to the account database.
! 		- Added the "email" property for accounts to the python interface.
! 		- .exportdefinitions now exports data about NPCs and their equipment to the
! 			categories.db database.
! 		- .exportdefinitions now exports data about multis to the
! 			categories.db database.
! 		- Backup functionality for the binary save driver.
! 		- Binary backups can automatically be compressed using gzip.
! 		- The number of backups kept can be limited.
! 		- Allowed scripts to be attached to base definitions by using
! 			<basescripts>a,b,c</basescripts>.
! 			Those scripts are attached to objects by using their baseid property.
! 			If you change the <basescripts> tags in the definition, all objects using
! 			that definition will use the new scripts automatically.
! 		- onDetach and onAttach are not called for those scripts.
! 		- hasscript(a) will return true if a is in the basescripts.
! 		- addscript now prepends a new script rather than appending it.
! 		- Fix for spawnregions where y1 > y2.
  	* Definition Changes:
  		- Tag Changes:

[wpdev-commits] xmlscripts/documentation/webroot ChangeLog.wolfpack,1.46,1.47

From: Richard M. <dr...@us...> - 2004-08-27 17:19:34

Update of /cvsroot/wpdev/xmlscripts/documentation/webroot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20531/documentation/webroot

Modified Files:
	ChangeLog.wolfpack 
Log Message:
More updates, and more verbose.


Index: ChangeLog.wolfpack
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** ChangeLog.wolfpack	26 Aug 2004 21:11:30 -0000	1.46
--- ChangeLog.wolfpack	27 Aug 2004 17:19:24 -0000	1.47
***************
*** 6,16 ****
--- 6,22 ----
  		- Timer fixes.
  		- Changes to event/script functions. ( See Python changes. )
+ 		- Fixes for walking and ladders
+ 		- Added support for basescripts, read-only assigned scripts.
+ 		- Added compression support for binary saves.
  	* Definition Changes:
  		- Tag Changes:
  			<events></events> is now <scripts></scripts>
+ 		- Basescripts added to many scripts. Read only assigned scripts.
+ 			Format is: <basescripts></basescripts>
  	* Python Script Changes:
  		- Function Changes:
  			Old: addevent() hasevent() removeevent()
  			New: addscript() hasscript() removescript()
+ 			Note: hasevent still exists, but has another purpose.
  		- Added the bolt command, just lightnings the target.
  		- Added the email command, changes your account's email.
***************
*** 18,28 ****
  		- Fixes for the account command:
  			Fixed a few typos.
! 			Fixed a bug in updating the password
  			Added support for the email field.
! 			Fixed a bug with updating passwords. ( Dreoth was tired. :P )
! 		- Tweaked the hunger script.
! 		- Fixed an update bug with npcs and the dye command.
  		- Fixed a bug with the dupe command.
  	* Misc. Changes:
  	* Known Issues, Bugs, and Missing Features:
  		- Some skills are still incomplete.
--- 24,34 ----
  		- Fixes for the account command:
  			Fixed a few typos.
! 			Fixed a bug in updating the passwords of accounts.
  			Added support for the email field.
! 		- Tweaked the hunger script to affect hunger less often.
! 		- Fixed an update bug with NPCs and the dye command.
  		- Fixed a bug with the dupe command.
  	* Misc. Changes:
+ 		- Experimental Mac OSX Support
  	* Known Issues, Bugs, and Missing Features:
  		- Some skills are still incomplete.

[wpdev-commits] xmlscripts/definitions/items/buildings dungeon.xml,1.12,1.13

From: Sebastian H. <dar...@us...> - 2004-08-27 14:55:27

Update of /cvsroot/wpdev/xmlscripts/definitions/items/buildings
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26421/items/buildings

Modified Files:
	dungeon.xml 
Log Message:
some fixes

Index: dungeon.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/buildings/dungeon.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** dungeon.xml	27 Aug 2004 14:43:26 -0000	1.12
--- dungeon.xml	27 Aug 2004 14:55:17 -0000	1.13
***************
*** 376,380 ****
  		<id>0xEE3</id>
  		<category>Dungeon\Spiderwebs\Spiderweb 1</category>
! 		<basescripts>spiderweb</basescripts>
  		<maxhealth>100</maxhealth>
  		<health>100</health>
--- 376,380 ----
  		<id>0xEE3</id>
  		<category>Dungeon\Spiderwebs\Spiderweb 1</category>
! 		<scripts>spiderweb</scripts>
  		<maxhealth>100</maxhealth>
  		<health>100</health>

[wpdev-commits] xmlscripts/definitions/items/armory/hats bandana.xml,1.4,1.5 bear_mask.xml,1.5,1.6 bonnet.xml,1.3,1.4 cap.xml,1.3,1.4 deer_mask.xml,1.5,1.6 feathered_hat.xml,1.3,1.4 floppy_hat.xml,1.4,1.5 jester_hat.xml,1.3,1.4 jesters_cap.xml,1.3,1.4 orc_masks.xml,1.4,1.5 skull_cap.xml,1.4,1.5 straw_hat.xml,1.3,1.4 tall_straw_hat.xml,1.3,1.4 tribal_masks.xml,1.4,1.5 tricorne_hat.xml,1.3,1.4 wide-brim_hat.xml,1.3,1.4 wizards_hat.xml,1.3,1.4