[Timewarp-commit] source/melee mmain.cpp,1.37,1.38

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5369/melee

Modified Files:
	mmain.cpp 
Log Message:
disabled ship-file-check cause it can cause a network error

Index: mmain.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mmain.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** mmain.cpp	24 Mar 2004 23:51:38 -0000	1.37
--- mmain.cpp	26 Mar 2004 16:53:59 -0000	1.38
***************
*** 809,812 ****
--- 809,815 ----
  	ShipType *type = shiptype(id);
  
+ 	// THIS CAN CAUSE A CRASH, cause this is a local value !!
+ 	// this should be under direct.set ... and should be shared ...
+ 	// actually, perhaps this should be checked for all players ...
  	if (type->data->islocked())
  		return;		// it is already loaded, doesn't make sense to compare anymore
***************
*** 878,881 ****
--- 881,886 ----
  	pause();
  
+ 	showshademaps = true;
+ 
  	
  	message.out("Selecting ships...", 1000);
***************
*** 956,960 ****
  
  		const char *id = fleet->getShipType(slot[i])->id;
! 		check_file(id, i);
  		
  
--- 961,969 ----
  
  		const char *id = fleet->getShipType(slot[i])->id;
! 
! 		// there's a desynch, caused by the locked() check which is a local property
! 		// also, it assumes 2 players, doesn't check all clients I think...
! 		// so, I'll just disable it for now (geo).
! //		check_file(id, i);