[Timewarp-commit] source/melee mgame.cpp,1.21,1.22 mship.cpp,1.13,1.14

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

Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1:/tmp/cvs-serv31619/melee

Modified Files:
	mgame.cpp mship.cpp 
Log Message:
added selection method for SC1 ships in fleet editor

Index: mgame.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mgame.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** mgame.cpp	12 Nov 2003 03:21:10 -0000	1.21
--- mgame.cpp	12 Nov 2003 20:33:33 -0000	1.22
***************
*** 460,464 ****
  	fprintf(f, "timewarp version = %s\n", tw_version());
  
! 	fprintf(f, "lag_frames = %i", game->lag_frames);
  
  	time_t t;
--- 460,467 ----
  	fprintf(f, "timewarp version = %s\n", tw_version());
  
! 	if (game)
! 		fprintf(f, "lag_frames = %i", game->lag_frames);
! 	else
! 		fprintf(f, "no game defined");
  
  	time_t t;

Index: mship.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mship.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** mship.cpp	8 Nov 2003 11:19:29 -0000	1.13
--- mship.cpp	12 Nov 2003 20:33:33 -0000	1.14
***************
*** 129,132 ****
--- 129,147 ----
  	shiptypes[i].id = strdup(tmp - 5);
  
+ 	int &ori = shiptypes[i].origin;
+ 	ori = 0;
+ 	const char *origname = get_config_string("Info", "Origin", NULL);
+ 	if (strcmp(origname, "SC1") == 0)
+ 		ori = 1;
+ 	if (strcmp(origname, "SC2") == 0)
+ 		ori = 2;
+ 	if (strcmp(origname, "SC3") == 0)
+ 		ori = 3;
+ 	if (strcmp(origname, "TWa") == 0)		// alpha ships
+ 		ori = 4;
+ 	if (strcmp(origname, "TWb") == 0)		// beta ships
+ 		ori = 5;
+ 
+ 
  	const char *name = get_config_string("Info", "Name", NULL);
  	if (!name) {