[wpdev-commits] wolfpack console.cpp,1.9,1.10 console_win.cpp,1.18,1.19 globals.cpp,1.105,1.106 globals.h,1.78,1.79 targetrequests.cpp,1.80,1.81 wolfpack.cpp,1.477,1.478

[<thi...@us...>]

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv12529

Modified Files:
	console.cpp console_win.cpp globals.cpp globals.h 
	targetrequests.cpp wolfpack.cpp 
Log Message:
some clean ups, and a possible thread locking issue between main thread and console thread fixed

Index: console.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** console.cpp	13 Oct 2003 00:11:47 -0000	1.9
--- console.cpp	7 Jan 2004 03:09:09 -0000	1.10
***************
*** 212,216 ****
  		break;
  	case 'A': //reload the accounts file
! 		Accounts::instance()->reload();
  		break;
  	case 'R':
--- 212,216 ----
  		break;
  	case 'A': //reload the accounts file
! 		queueAction( RELOAD_ACCOUNTS );
  		break;
  	case 'R':

Index: console_win.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console_win.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** console_win.cpp	29 Oct 2003 14:30:08 -0000	1.18
--- console_win.cpp	7 Jan 2004 03:09:09 -0000	1.19
***************
*** 92,96 ****
  }
  
! // Fill a rectangular on a specific context
  void paintRect( HDC dc, INT32 x, INT32 y, INT32 width, INT32 height, HBRUSH brush )
  {
--- 92,99 ----
  }
  
! /*!
! 	\internal
! 	Fill a rectangular on a specific context
! */
  void paintRect( HDC dc, INT32 x, INT32 y, INT32 width, INT32 height, HBRUSH brush )
  {
***************
*** 447,451 ****
  	if( hRiched == 0 )
  	{
! 		MessageBox( 0, "The riched20.dll library could not be found on your system.\nPlease install Microsoft Internet Explorer 4.0 or later.", "Riched missing", MB_OK|MB_ICONERROR );
  		return 1;
  	}
--- 450,454 ----
  	if( hRiched == 0 )
  	{
! 		MessageBox( 0, "The riched20.dll library could not be found on your system.\nPlease install Microsoft Internet Explorer 4.0 or later.", "Missing DLL", MB_OK|MB_ICONERROR );
  		return 1;
  	}

Index: globals.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/globals.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** globals.cpp	5 Jan 2004 06:25:37 -0000	1.105
--- globals.cpp	7 Jan 2004 03:09:09 -0000	1.106
***************
*** 65,68 ****
  PersistentBroker* persistentBroker;
  
- char temp[1024];
  
--- 65,67 ----

Index: globals.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/globals.h,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** globals.h	23 Sep 2003 12:40:18 -0000	1.78
--- globals.h	7 Jan 2004 03:09:09 -0000	1.79
***************
*** 67,72 ****
  extern unsigned int hungerdamagetimer; // Used for hunger damage
  
- extern char temp[1024];
- 
  class cSrvParams;
  class cBoat;
--- 67,70 ----

Index: targetrequests.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/targetrequests.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** targetrequests.cpp	26 Nov 2003 01:12:20 -0000	1.80
--- targetrequests.cpp	7 Jan 2004 03:09:09 -0000	1.81
***************
*** 193,196 ****
--- 193,197 ----
  	int i, skill;
  	char temp2[512];
+ 	char temp[512];
  	tile_st tile;
  	P_PLAYER pc_currchar = socket->player();

Index: wolfpack.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.cpp,v
retrieving revision 1.477
retrieving revision 1.478
diff -C2 -d -r1.477 -r1.478
*** wolfpack.cpp	26 Nov 2003 03:59:39 -0000	1.477
--- wolfpack.cpp	7 Jan 2004 03:09:09 -0000	1.478
***************
*** 254,260 ****
  void queueAction( eActionType type )
  {
! 	actionMutex.lock();
  	actionQueue.push_back( type );
- 	actionMutex.unlock();
  }
  
--- 254,259 ----
  void queueAction( eActionType type )
  {
! 	QMutexLocker lock( &actionMutex );
  	actionQueue.push_back( type );
  }
  
***************
*** 529,532 ****
--- 528,532 ----
  			default: niceLevel.wait(10); break;
  		}
+ 		qApp->processEvents( 40 );
  
  		// Python threading - end
***************
*** 579,584 ****
  
  		checkauto();
- 
- 		qApp->processEvents( 40 );
  	}
  
--- 579,582 ----