[wpdev-commits] wolfpack commands.cpp,1.216,1.217 wolfpack.vcproj,1.5,1.6

[<dar...@pr...>]

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

Modified Files:
	commands.cpp wolfpack.vcproj 
Log Message:
Slightly modified the confirmations for the reload command.

Index: commands.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v
retrieving revision 1.216
retrieving revision 1.217
diff -C2 -d -r1.216 -r1.217
*** commands.cpp	22 Jan 2004 05:59:46 -0000	1.216
--- commands.cpp	22 Jan 2004 22:34:39 -0000	1.217
***************
*** 873,877 ****
  	if( args.count() == 0 )
  	{
! 		socket->sysMessage( tr( "Usage: reload <accounts|scripts|all>" ) );
  		return;
  	}
--- 873,877 ----
  	if( args.count() == 0 )
  	{
! 		socket->sysMessage( tr( "Usage: reload <accounts|scripts|python|all>" ) );
  		return;
  	}
***************
*** 883,899 ****
  	{
  		Accounts::instance()->reload();
! 		socket->sysMessage( tr("Accounts reloaded") );
  	}
  	if( subCommand == "python" )
  	{
- 		Console::instance()->send( "Reloading python scripts\n" );
  		ScriptManager::instance()->reload();
  		ContextMenus::instance()->reload();
! 		Console::instance()->send( "Python scripts reloaded\n" );
  	}
  	if( subCommand == "scripts" )
  	{
- 		Console::instance()->send( "Reloading definitions, scripts and wolfpack.xml\n" );
- 
  		SrvParams->reload(); // Reload wolfpack.xml
  
--- 883,896 ----
  	{
  		Accounts::instance()->reload();
! 		socket->sysMessage("The accounts have been reloaded.");
  	}
  	if( subCommand == "python" )
  	{
  		ScriptManager::instance()->reload();
  		ContextMenus::instance()->reload();
!     socket->sysMessage("The python scripts have been reloaded.");
  	}
  	if( subCommand == "scripts" )
  	{
  		SrvParams->reload(); // Reload wolfpack.xml
  
***************
*** 921,925 ****
  
  		cNetwork::instance()->reload(); // This will be integrated into the normal definition system soon
! 		socket->sysMessage( tr("Definitions, scripts and wolfpack.xml reloaded") );
  	}
  	if( subCommand == "all" )
--- 918,922 ----
  
  		cNetwork::instance()->reload(); // This will be integrated into the normal definition system soon
! 		socket->sysMessage("The configuration, definitions and python scripts have been reloaded.");
  	}
  	if( subCommand == "all" )
***************
*** 951,955 ****
  
  		cNetwork::instance()->reload(); // This will be integrated into the normal definition system soon
! 		socket->sysMessage( tr("Accounts, definitions, scripts and wolfpack.xml reloaded") );
  	}
  }
--- 948,952 ----
  
  		cNetwork::instance()->reload(); // This will be integrated into the normal definition system soon
! 		socket->sysMessage("The accounts, configuration, definitions and python scripts have been reloaded.");
  	}
  }

Index: wolfpack.vcproj
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.vcproj,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wolfpack.vcproj	26 Nov 2003 03:53:53 -0000	1.5
--- wolfpack.vcproj	22 Jan 2004 22:34:41 -0000	1.6
***************
*** 1,3 ****
! <?xml version="1.0" encoding = "Windows-1252"?>
  <VisualStudioProject
  	ProjectType="Visual C++"
--- 1,3 ----
! <?xml version="1.0" encoding="Windows-1252"?>
  <VisualStudioProject
  	ProjectType="Visual C++"
***************
*** 31,49 ****
  				WarningLevel="1"
[...1170 lines suppressed...]
  			<File
! 				RelativePath=".\multiscache.cpp">
! 			</File>
  			<File
! 				RelativePath=".\multiscache.h">
! 			</File>
  			<File
! 				RelativePath=".\tilecache.cpp">
! 			</File>
  			<File
! 				RelativePath=".\tilecache.h">
! 			</File>
  			<File
! 				RelativePath=".\tileflags.h">
! 			</File>
  		</Filter>
  	</Files>
! 	<Globals>
! 	</Globals>
  </VisualStudioProject>