[wpdev-commits] wolfpack ChangeLog,1.133,1.134 commands.cpp,1.271,1.272 inlines.h,1.36,1.37 spawnregions.cpp,1.84,1.85

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

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

Modified Files:
	ChangeLog commands.cpp inlines.h spawnregions.cpp 
Log Message:
Fixes for reloads and the makeascii function

Index: ChangeLog
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** ChangeLog	3 Nov 2004 18:23:58 -0000	1.133
--- ChangeLog	4 Nov 2004 18:54:36 -0000	1.134
***************
*** 36,39 ****
--- 36,40 ----
  	- Fixed movement not correctly being sent to other characters.
  	- Fixed Multi Update range.
+ 	- Added .reload muls and added a broadcast message to the reload commands.
  
  Wolfpack 12.9.12 Beta (18. October 2004)

Index: commands.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v
retrieving revision 1.271
retrieving revision 1.272
diff -C2 -d -r1.271 -r1.272
*** commands.cpp	3 Nov 2004 02:09:24 -0000	1.271
--- commands.cpp	4 Nov 2004 18:54:36 -0000	1.272
***************
*** 45,48 ****
--- 45,49 ----
  #include "pythonscript.h"
  #include "network/network.h"
+ #include "muls/multiscache.h"
  #include "walking.h"
  #include "dbdriver.h"
***************
*** 530,543 ****
  	else if ( subCommand == "python" )
  	{
  		Server::instance()->reload( "scripts" );
  	}
  	else if ( subCommand == "scripts" )
  	{
  		Server::instance()->reload( "definitions" );
  	}
! 
! 	if ( subCommand == "all" )
  	{
  		Server::instance()->reload( "configuration" ); // This will reload nearly everything
  	}
  }
--- 531,557 ----
  	else if ( subCommand == "python" )
  	{
+ 		Network::instance()->broadcast(tr("Reloading python scripts."));
  		Server::instance()->reload( "scripts" );
+ 		Network::instance()->broadcast(tr("Finished reloading python scripts."));
  	}
  	else if ( subCommand == "scripts" )
  	{
+ 		Network::instance()->broadcast(tr("Reloading definitions."));
  		Server::instance()->reload( "definitions" );
+ 		Network::instance()->broadcast(tr("Finished reloading definitions."));
  	}
! 	else if ( subCommand == "muls" )
! 	{
! 		Network::instance()->broadcast(tr("Reloading mul files."));
! 		Maps::instance()->reload();
! 		TileCache::instance()->reload();
! 		MultiCache::instance()->reload();
! 		Network::instance()->broadcast(tr("Finished reloading mul files."));
! 	}
! 	else if ( subCommand == "all" )
  	{
+ 		Network::instance()->broadcast(tr("Reloading server configuration."));
  		Server::instance()->reload( "configuration" ); // This will reload nearly everything
+ 		Network::instance()->broadcast(tr("Finished reloading server configuration."));
  	}
  }

Index: spawnregions.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/spawnregions.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** spawnregions.cpp	3 Nov 2004 14:45:47 -0000	1.84
--- spawnregions.cpp	4 Nov 2004 18:54:37 -0000	1.85
***************
*** 366,369 ****
--- 366,370 ----
  				return;
  			}
+ 			fixedZ = true;
  		}
  

Index: inlines.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/inlines.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** inlines.h	3 Nov 2004 03:41:35 -0000	1.36
--- inlines.h	4 Nov 2004 18:54:37 -0000	1.37
***************
*** 100,122 ****
  		// German umlauts can be represented differently
  		switch (c) {
! 			case 'ü':
  				result.append("ue");
  				continue;
! 			case 'ä':
  				result.append("ae");
  				continue;
! 			case 'ö':
  				result.append("oe");
  				continue;
! 			case 'ß':
  				result.append("ss");
  				continue;
! 			case 'Ü':
  				result.append("Ue");
  				continue;
! 			case 'Ä':
  				result.append("Ae");
  				continue;
! 			case 'Ö':
  				result.append("Oe");
  				continue;
--- 100,122 ----
  		// German umlauts can be represented differently
  		switch (c) {
! 			case 129: // ü
  				result.append("ue");
  				continue;
! 			case 132: // ä
  				result.append("ae");
  				continue;
! 			case 148: // ö
  				result.append("oe");
  				continue;
! 			case 225: // ß
  				result.append("ss");
  				continue;
! 			case 154: // Ü
  				result.append("Ue");
  				continue;
! 			case 142: // Ä
  				result.append("Ae");
  				continue;
! 			case 153: // Ö
  				result.append("Oe");
  				continue;