[wpdev-commits] wolfpack gumps.cpp,1.174,1.175 spawnregions.h,1.33,1.34

[Sebastian H. <dar...@us...>]

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

Modified Files:
	gumps.cpp spawnregions.h 
Log Message:
spawn fixes

Index: spawnregions.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/spawnregions.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** spawnregions.h	13 Oct 2004 14:45:20 -0000	1.33
--- spawnregions.h	14 Oct 2004 01:14:57 -0000	1.34
***************
*** 117,120 ****
--- 117,128 ----
  	}
  
+ 	inline unsigned int minTime() {
+ 		return minTime_;
+ 	}
+ 
+ 	inline unsigned int maxTime() {
+ 		return maxTime_;
+ 	}
+ 
  private:
  	virtual void processNode( const cElement* Tag );

Index: gumps.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/gumps.cpp,v
retrieving revision 1.174
retrieving revision 1.175
diff -C2 -d -r1.174 -r1.175
*** gumps.cpp	13 Oct 2004 14:45:20 -0000	1.174
--- gumps.cpp	14 Oct 2004 01:14:57 -0000	1.175
***************
*** 141,149 ****
  		addText( 50, 160, tr( "Items: %1 of %2" ).arg( region->items() ).arg( region->maxItems() ), 0x834 );
  		if (region->active()) {
! 			addText( 50, 180, tr( "Active" ), 0x834 );
  		} else {
! 			addText( 50, 180, tr( "Inactive" ), 0x834 );
  		}
  		addText( 50, 200, tr( "Groups: %1" ).arg(region->groups().join(", ")), 0x834 );
  		//addText( 50, 180, tr( "Coordinates: %1" ).arg( allrectangles.size() ), 0x834 );
  
--- 141,159 ----
  		addText( 50, 160, tr( "Items: %1 of %2" ).arg( region->items() ).arg( region->maxItems() ), 0x834 );
  		if (region->active()) {
! 			addText( 50, 180, tr( "Status: Active" ), 0x834 );
  		} else {
! 			addText( 50, 180, tr( "Status: Inactive" ), 0x834 );
  		}
  		addText( 50, 200, tr( "Groups: %1" ).arg(region->groups().join(", ")), 0x834 );
+ 
+ 		// Next Spawn		
+ 		unsigned int nextRespawn = 0;
+ 		if (region->nextTime() > Server::instance()->time()) {
+ 			(region->nextTime() - Server::instance()->time()) / 1000;
+ 		}
+ 		addText( 50, 220, tr("Next Respawn: %1 seconds").arg(nextRespawn), 0x834);
+ 		addText( 50, 240, tr("Total Points: %1").arg(region->countPoints()), 0x834);
+ 		addText( 50, 260, tr("Delay: %1 to %2 seconds").arg(region->minTime()).arg(region->maxTime()), 0x834);
+ 
  		//addText( 50, 180, tr( "Coordinates: %1" ).arg( allrectangles.size() ), 0x834 );