timewarp-commit — Shows each and every CVS commit - high volume

[Timewarp-commit] source/games gflmelee.cpp,1.15,1.16

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

Update of /cvsroot/timewarp/source/games
In directory sc8-pr-cvs1:/tmp/cvs-serv17637/games

Modified Files:
	gflmelee.cpp 
Log Message:
netplay radar fix

Index: gflmelee.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gflmelee.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** gflmelee.cpp	14 Dec 2003 00:25:53 -0000	1.15
--- gflmelee.cpp	14 Dec 2003 00:51:59 -0000	1.16
***************
*** 714,718 ****
  	char txt[512];
  	sprintf(txt, "gflmelee%02i.dat", radarlayout+1);
! 	radar = new YRadar(playercontrols[0], radar_sizes[radar_mode], alliance[0], txt, 0, 2);
  	game->add(radar);
  	radar->location = Vector2(0, 0.5*window->surface->h - 100);
--- 714,725 ----
  	char txt[512];
  	sprintf(txt, "gflmelee%02i.dat", radarlayout+1);
! 
! 	if (log->type == Log::log_net1client)
! 		iplayer = remoteplayer;
! 	else
! 		iplayer = localplayer;
! 	c = playercontrols[iplayer];
! 
! 	radar = new YRadar(c, radar_sizes[radar_mode], alliance[iplayer], txt, 0, 2);
  	game->add(radar);
  	radar->location = Vector2(0, 0.5*window->surface->h - 100);

[Timewarp-commit] source/games gflmelee.cpp,1.14,1.15

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

Update of /cvsroot/timewarp/source/games
In directory sc8-pr-cvs1:/tmp/cvs-serv2989/games

Modified Files:
	gflmelee.cpp 
Log Message:
networking works

Index: gflmelee.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gflmelee.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** gflmelee.cpp	13 Dec 2003 14:29:56 -0000	1.14
--- gflmelee.cpp	14 Dec 2003 00:25:53 -0000	1.15
***************
*** 186,193 ****
  	TeamCode alliance[2];
  	Control *playercontrols[2];
! 	Control *oldcontrol;	// remember the original control when you take possession of a ship
  	ShipPanelBmp *player_panel[2];
  
! 	int		localplayer;	// which player number is "local" ... is this needed at all ?
  
  	int		toggle_showstats, toggle_playership, toggle_healthbars, toggle_fleetlist, toggle_radar, toggle_panel, toggle_radarpos;
--- 186,194 ----
  	TeamCode alliance[2];
  	Control *playercontrols[2];
! 	Control *oldcontrol[2];	// remember the original control when you take possession of a ship
  	ShipPanelBmp *player_panel[2];
  
! 	int		localplayer, remoteplayer;
! 	// which player number is "local" ... is this needed at all ?
  
  	int		toggle_showstats, toggle_playership, toggle_healthbars, toggle_fleetlist, toggle_radar, toggle_panel, toggle_radarpos;
***************
*** 506,515 ****
  	}
  	// send (or receive) ... channel_server is locally either the server, or the client.
  	log_int(channel_server, allyfleet[0]);
  	log_int(channel_server, allyfleet[1]);
  
  
  	// initialize server/client controls.
! 	localplayer = 0;
  
  	Control *c;
--- 507,532 ----
  	}
  	// send (or receive) ... channel_server is locally either the server, or the client.
+ 	// fleet numbers are fixed: fleet 0 vs fleet 1
  	log_int(channel_server, allyfleet[0]);
  	log_int(channel_server, allyfleet[1]);
  
+ 	// team-numbers are fixed : fleet 0 vs fleet 1.
+ 	alliance[0] = new_team();
+ 	alliance[1] = new_team();
+ 
  
  	// initialize server/client controls.
! 	// this is not fixed, game-host should have fleet 0, game-client fleet 1
! 	// note that channel_server/ channel_client are always local vs. remote,
! 	// log->type is host vs client.
! 	if (log->type == Log::log_net1server || log->type == Log::log_normal)
! 	{
! 		localplayer = 0;
! 		remoteplayer = 1;
! 	} else {
! 		localplayer = 0;
! 		remoteplayer = 1;
! 	}
! 	// it is ... identical !! WHY should it be this way ??
  
  	Control *c;
***************
*** 517,523 ****
  	// create the local player
  	c = create_control(channel_server, "Human");
! 	playercontrols[0] = c;
  	add_focus(c, c->channel);
  	
  	// create the remote player
  	if (log->type == Log::log_net1server || log->type == Log::log_net1client)
--- 534,541 ----
  	// create the local player
  	c = create_control(channel_server, "Human");
! 	playercontrols[localplayer] = c;
  	add_focus(c, c->channel);
  	
+ 	
  	// create the remote player
  	if (log->type == Log::log_net1server || log->type == Log::log_net1client)
***************
*** 525,532 ****
  		// it's "client" from local perspective ???
  		c  = create_control(channel_client, "Human");
! 		playercontrols[1] = c;
  		add_focus(c, c->channel);
  	} else
! 		playercontrols[1] = 0;
  
  	// player 0 = local ?
--- 543,554 ----
  		// it's "client" from local perspective ???
  		c  = create_control(channel_client, "Human");
! 		playercontrols[remoteplayer] = c;
  		add_focus(c, c->channel);
  	} else
! 		playercontrols[remoteplayer] = 0;	// computer player.
! 
! 	// add a focus ?
! //	if (playercontrols[localplayer])
! //		add_focus(playercontrols[localplayer], playercontrols[localplayer]->channel);
  
  	// player 0 = local ?
***************
*** 540,551 ****
  
  
- 	alliance[0] = new_team();
- 	alliance[1] = new_team();
- 
  //	if (!playercontrols[0])
  
  //	playercontrols[1] = 0;
  
! 	Ship *takeovership = 0;
  
  	for ( iplayer = 0; iplayer < 2; ++iplayer )
--- 562,570 ----
  
  
  //	if (!playercontrols[0])
  
  //	playercontrols[1] = 0;
  
! 	//Ship *takeovership = 0;
  
  	for ( iplayer = 0; iplayer < 2; ++iplayer )
***************
*** 609,624 ****
  			Ship *s;
  
! 			/*
! 			if ( iplayer == 0 && iship == 0 )
! 			{
! 				Control *c  = create_control(channel_server, "Human");
! 				playercontrols[iplayer] = c;
! 				// see gsample - this tracks the player position, whatever ship
! 				// he controls ;)
! 				add_focus(c, c->channel);
! 			}
! 			*/
! 
! 
  			//s = create_ship(shipname, "Wussiebot", P, a, alliance[iplayer]);
  			s = create_ship(channel_none, shipname, "WussieBot", P, a, alliance[iplayer]);
--- 628,632 ----
  			Ship *s;
  
! 			
  			//s = create_ship(shipname, "Wussiebot", P, a, alliance[iplayer]);
  			s = create_ship(channel_none, shipname, "WussieBot", P, a, alliance[iplayer]);
***************
*** 631,636 ****
  			statsmanager->addship(s, 1);
  
! 			if ( iplayer == 0 && iship == 0 )
! 				takeovership = s;
  			
  			
--- 639,649 ----
  			statsmanager->addship(s, 1);
  
! 			if ( iship == 0 && playercontrols[iplayer] )
! 			{
! 				// take over a ship with the human controls (overriding the AI)
! 				//takeovership = s;
! 				oldcontrol[iplayer] = s->control;	// remember :)
! 				playercontrols[iplayer]->select_ship(s, "none");
! 			}
  			
  			
***************
*** 642,654 ****
  
  		}
  	}
  
- 	playercontrols[0]->set_target(-1);
  	
! 	if(	takeovership == NULL )		
! 		tw_error("takeovership is used without initialization");
  	
- 	oldcontrol = takeovership->control;	// remember :)
- 	playercontrols[0]->select_ship(takeovership, "none");
  
  	healthbartoggle = 1;	// show health bars for the ships.
--- 655,667 ----
  
  		}
+ 
+ 		if (playercontrols[iplayer])
+ 			playercontrols[iplayer]->set_target(-1);
  	}
  
  	
! 	//if(	takeovership == NULL )		
! 	//	tw_error("takeovership is used without initialization");
  	
  
  	healthbartoggle = 1;	// show health bars for the ships.
***************
*** 940,1022 ****
  	Game::calculate();
  
! 	Control *c = playercontrols[0];
! 
! 
! 	// check death ...
! 
! 	// not if the player is captain of one fixed vessel: a command ship
! 	int PlayerIsCaptain = 0;
! 	if ( !(c->exists() && c->ship && c->ship->exists()) && !PlayerIsCaptain )
  	{
! 		c->state = 1;
  
! 		for ( int itarget = 0; itarget < num_targets; ++itarget )
  		{
! 			SpaceObject *o = game->target[itarget];
  			
! 			if ( o->isShip() && o != c->ship && is_in_team(o, alliance[0]) )
  			{
! 				Ship *shp = (Ship*) o;
! 
! 				// the name doesn't really matter
! 				oldcontrol = shp->control;
! 				c->select_ship(shp, "none");	// also takes care of the ship's pointer :)
! 
! 				break;
  			}
  		}
! 	}
! 	// if you're still dead after this check, the game ends
! 	if ( !(c->exists() && c->ship && c->ship->exists()) )
! 	{
! 		show_ending(0);
  	}
  
! 	// check if the target has changed:
  
! 	if ( (c->target && c->target->exists()) )
  	{
  
! 		if ( !target_indicator )
! 		{
! 			target_indicator = new ImIndicator(c->target);
! 			game->add(target_indicator);
! 		}
  
! 		if ( c->target != target_indicator->showme )
! 		{
! 			target_indicator->newtarget(c->target);
! 		}
  
! 	} else {
! 		// choose a new target !
! 		int i;
! 		for ( i = 0; i < num_targets; ++i )
! 		{
! 			if (c->valid_target(game->target[i]))
! 			{
! 				c->set_target(i);
! 				break;
! 			}
! 		}
  
! 		SpaceObject *s = c->target;
! 		if ( s )
  		{
! 			if ( !target_indicator )
  			{
! 				target_indicator = new ImIndicator(s);
! 				game->add(target_indicator);
  			}
! 			target_indicator->newtarget(c->target);
  		}
  	}
- 	if ( !c->target)
- 	{
- //		{tw_error("what the ...?! We won! Hurray !");}
- 		// I guess you win ;)
- 		show_ending(1);
- 	}
- 
  
  	// jump to the next available ship if your ship dies
--- 953,1131 ----
  	Game::calculate();
  
! 	Control *c;
! 	
! 	
! 	int iplayer;
! 	
! 	for ( iplayer = 0; iplayer < 2; ++iplayer )
  	{
! 		c = playercontrols[iplayer];
  
! 		if (!c)
! 			continue;
! 		
! 		
! 		// check death ...
! 		
! 		// not if the player is captain of one fixed vessel: a command ship
! 		int PlayerIsCaptain = 0;
! 		if ( !(c->exists() && c->ship && c->ship->exists()) && !PlayerIsCaptain )
  		{
! 			c->state = 1;
  			
! 			for ( int itarget = 0; itarget < num_targets; ++itarget )
  			{
! 				SpaceObject *o = game->target[itarget];
! 				
! 				if ( o->isShip() && o != c->ship && is_in_team(o, alliance[iplayer]) )
! 				{
! 					Ship *shp = (Ship*) o;
! 					
! 					// the name doesn't really matter
! 					oldcontrol[iplayer] = shp->control;
! 					c->select_ship(shp, "none");	// also takes care of the ship's pointer :)
! 					
! 					break;
! 				}
  			}
  		}
! 		// if you're still dead after this check, the game ends
! 		if ( !(c->exists() && c->ship && c->ship->exists()) )
! 		{
! 			// but only if you're the local player
! 			if (iplayer == localplayer)
! 				show_ending(0);
! 			else
! 				show_ending(1);	// cause if the local player loses, the remote player wins.
! 		}
! 		
! 		// check if the target has changed:
! 		
! 		if ( (c->target && c->target->exists()) )
! 		{
! 			
! 			if ( !target_indicator )
! 			{
! 				target_indicator = new ImIndicator(c->target);
! 				game->add(target_indicator);
! 			}
! 			
! 			if ( c->target != target_indicator->showme )
! 			{
! 				target_indicator->newtarget(c->target);
! 			}
! 			
! 		} else {
! 			// choose a new target !
! 			int i;
! 			for ( i = 0; i < num_targets; ++i )
! 			{
! 				if (c->valid_target(game->target[i]))
! 				{
! 					c->set_target(i);
! 					break;
! 				}
! 			}
! 			
! 			SpaceObject *s = c->target;
! 			if ( s )
! 			{
! 				if ( !target_indicator )
! 				{
! 					target_indicator = new ImIndicator(s);
! 					game->add(target_indicator);
! 				}
! 				target_indicator->newtarget(c->target);
! 			}
! 		}
! 		if ( !c->target)
! 		{
! 			//		{tw_error("what the ...?! We won! Hurray !");}
! 			// I guess you win ;)
! 			// but only if you're the local player
! 			if (iplayer == localplayer)
! 				show_ending(1);
! 			else
! 				show_ending(0);	// cause if the local player wins, the remote player loses.
! 		}
  	}
  
! 	// player control of the ships... jumping to another ship, or not ...
  
! 	for ( iplayer = 0; iplayer < 2; ++iplayer )
  	{
+ 		if (!playercontrols[iplayer])
+ 			continue;
  
! 		int k = playercontrols[iplayer]->keys;
! 		
! 		// next player ship
! 		if (!lastkey_playership[iplayer] && (k & keyflag::extra1) )
! 			toggle_playership = 1;
  
! 		// previous player ship
! 		else if (!lastkey_playership[iplayer] && (k & keyflag::extra2) )
! 			toggle_playership = -1;
  
! 		else
! 			toggle_playership = 0;
  
! 		lastkey_playership[iplayer] = k & (keyflag::extra1 | keyflag::extra2);
! 		
! 		
! 		if ( playercontrols[iplayer]->ship && toggle_playership )
  		{
! 			c = playercontrols[iplayer];
! 
! 			// jump to the ship in this list:
! 			int itarget, lastitarget;
! 			
! 			itarget = 0;
! 			while ( game->target[itarget] != c->ship && itarget < num_targets-1 )
! 				++itarget;
! 			
! 			lastitarget = itarget;
! 			
! 			// then start searching for the next entry;
! 			itarget = lastitarget + toggle_playership;
! 			while ( itarget != lastitarget )
  			{
! 				
! 				if ( itarget > num_targets-1 )
! 					itarget -= num_targets;
! 				if ( itarget < 0 )
! 					itarget += num_targets;
! 				
! 				SpaceObject *o = game->target[itarget];
! 				
! 				//			Control *c = playercontrols[0];	// is already done earlier
! 				
! 				if ( o->isShip() && is_in_team(o, alliance[iplayer]) )
! 				{
! 					Ship *shp = (Ship*) o;
! 					
! 					Control *c1, *c2;
! 					Ship *s1, *s2;
! 					
! 					c1 = shp->control;
! 					s1 = shp;
! 					
! 					c2 = playercontrols[iplayer];
! 					s2 = c2->ship;
! 					
! 					oldcontrol[iplayer]->select_ship(s2, "none");	// re-assign original control ai.
! 					oldcontrol[iplayer] = s1->control;		// remember control ai of the new ship
! 					playercontrols[iplayer]->select_ship(s1, "none");	// take over the new ship
! 					
! 					
! 					break;
! 				}
! 				
! 				itarget += toggle_playership;
  			}
! 			
  		}
+ 		
  	}
  
  	// jump to the next available ship if your ship dies
***************
*** 1024,1027 ****
--- 1133,1137 ----
  //	Control *c = playercontrols[0];
  
+ 	// LOCAL DISPLAY OPTIONS
  
  	if (key[KEY_S])
***************
*** 1132,1212 ****
  	lastkey_radarlayout = key[KEY_L];
  
  
- 	int iplayer;
- 	for ( iplayer = 0; iplayer < 2; ++iplayer )
- 	{
- 		if (!playercontrols[iplayer])
- 			continue;
- 
- 		int k = playercontrols[iplayer]->keys;
- 		
- 		// next player ship
- 		if (!lastkey_playership[iplayer] && (k & keyflag::extra1) )
- 			toggle_playership = 1;
  
- 		// previous player ship
- 		else if (!lastkey_playership[iplayer] && (k & keyflag::extra2) )
- 			toggle_playership = -1;
  
- 		else
- 			toggle_playership = 0;
- 
- 		lastkey_playership[iplayer] = k & (keyflag::extra1 | keyflag::extra2);
- 		
- 		
- 		if ( playercontrols[iplayer]->ship && toggle_playership )
- 		{
- 			c = playercontrols[iplayer];
- 
- 			// jump to the ship in this list:
- 			int itarget, lastitarget;
- 			
- 			itarget = 0;
- 			while ( game->target[itarget] != c->ship && itarget < num_targets-1 )
- 				++itarget;
- 			
- 			lastitarget = itarget;
- 			
- 			// then start searching for the next entry;
- 			itarget = lastitarget + toggle_playership;
- 			while ( itarget != lastitarget )
- 			{
- 				
- 				if ( itarget > num_targets-1 )
- 					itarget -= num_targets;
- 				if ( itarget < 0 )
- 					itarget += num_targets;
- 				
- 				SpaceObject *o = game->target[itarget];
- 				
- 				//			Control *c = playercontrols[0];	// is already done earlier
- 				
- 				if ( o->isShip() && is_in_team(o, alliance[iplayer]) )
- 				{
- 					Ship *shp = (Ship*) o;
- 					
- 					Control *c1, *c2;
- 					Ship *s1, *s2;
- 					
- 					c1 = shp->control;
- 					s1 = shp;
- 					
- 					c2 = playercontrols[iplayer];
- 					s2 = c2->ship;
- 					
- 					oldcontrol->select_ship(s2, "none");	// re-assign original control ai.
- 					oldcontrol = s1->control;		// remember control ai of the new ship
- 					playercontrols[iplayer]->select_ship(s1, "none");	// take over the new ship
- 					
- 					
- 					break;
- 				}
- 				
- 				itarget += toggle_playership;
- 			}
- 			
- 		}
- 		
- 	}
  
  	// check if the player panel(s) still exist (shouldn't be needed, since
--- 1242,1249 ----
  	lastkey_radarlayout = key[KEY_L];
  
+ 	// END OF LOCAL DISPLAY OPTIONS
  
  
  
  
  	// check if the player panel(s) still exist (shouldn't be needed, since
***************
*** 1270,1276 ****
  
  	// show the player ship
! 	if (playercontrols[0]->ship)
  	{
! 		SpaceSprite *s = playercontrols[0]->ship->data->spriteShip;
  		s->draw(Vector2(0,0), Vector2(dest->w, dest->h), 0, view->frame);
  	}
--- 1307,1313 ----
  
  	// show the player ship
! 	if (playercontrols[localplayer]->ship)
  	{
! 		SpaceSprite *s = playercontrols[localplayer]->ship->data->spriteShip;
  		s->draw(Vector2(0,0), Vector2(dest->w, dest->h), 0, view->frame);
  	}
***************
*** 1279,1289 ****
  	if ( didwewin )
  	{
! 		textprintf( dest, font, 50, 10, pallete_color[15], alliancename[0]);
  		textprintf( dest, font, 50, 25, pallete_color[14], "CRUSHED");
! 		textprintf( dest, font, 50, 40, pallete_color[15], alliancename[1]);
  	} else {
! 		textprintf( dest, font, 50, 10, pallete_color[15], alliancename[1]);
  		textprintf( dest, font, 50, 25, pallete_color[14], "CRUSHED");
! 		textprintf( dest, font, 50, 40, pallete_color[15], alliancename[0]);
  	}
  
--- 1316,1326 ----
  	if ( didwewin )
  	{
! 		textprintf( dest, font, 50, 10, pallete_color[15], alliancename[localplayer]);
  		textprintf( dest, font, 50, 25, pallete_color[14], "CRUSHED");
! 		textprintf( dest, font, 50, 40, pallete_color[15], alliancename[remoteplayer]);
  	} else {
! 		textprintf( dest, font, 50, 10, pallete_color[15], alliancename[remoteplayer]);
  		textprintf( dest, font, 50, 25, pallete_color[14], "CRUSHED");
! 		textprintf( dest, font, 50, 40, pallete_color[15], alliancename[localplayer]);
  	}
  

[Timewarp-commit] source/gamex/stuff backgr_stars.cpp,1.1.1.1,1.2

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

Update of /cvsroot/timewarp/source/gamex/stuff
In directory sc8-pr-cvs1:/tmp/cvs-serv4213/gamex/stuff

Modified Files:
	backgr_stars.cpp 
Log Message:
no message

Index: backgr_stars.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/stuff/backgr_stars.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** backgr_stars.cpp	18 Nov 2003 17:18:52 -0000	1.1.1.1
--- backgr_stars.cpp	13 Dec 2003 14:33:10 -0000	1.2
***************
*** 54,58 ****
  
  	Vector2 framesize;
! 	framesize = Vector2(frame->window->surface->w, frame->window->surface->h);
  
  
--- 54,61 ----
  
  	Vector2 framesize;
! 	if (frame->surface)
! 		framesize = Vector2(frame->surface->w, frame->surface->h);
! 	else
! 		framesize = Vector2(frame->window->surface->w, frame->window->surface->h);
  
  

[Timewarp-commit] source/melee moptions.cpp,1.10,1.11

[<you...@us...>]

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

Modified Files:
	moptions.cpp 
Log Message:
when setting video mode which is not valid on the current machine (can't switch into the specified mode), no longer asks to confirm the mode after trying to set it.

Index: moptions.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/moptions.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** moptions.cpp	25 Nov 2003 00:13:11 -0000	1.10
--- moptions.cpp	13 Dec 2003 04:07:44 -0000	1.11
***************
*** 292,316 ****
          {
              set_gamma(video_dialog[DIALOG_VIDEO_GAMMA_SLIDER].d2);
-             videosystem.set_resolution(x2, y2, bpp2, fs);
-             
-             if (confirmVideoChanges()) {
-                 set_config_file("client.ini");
-                 set_config_int("Video", "BitsPerPixel", bpp2);
-                 set_config_int("Video", "ScreenWidth", x2);
-                 set_config_int("Video", "ScreenHeight", y2);
-                 set_config_int("Video", "FullScreen", fs);
-                 set_config_int("Video", "Gamma", get_gamma());
-                 return;
-             }
-             else {
-                 set_config_file("client.ini");
-                 bpp2   = get_config_int("Video", "BitsPerPixel", 16);
-                 x2     = get_config_int("Video", "ScreenWidth", 640);
-                 y2     = get_config_int("Video", "ScreenHeight", 480);
-                 fs     = get_config_int("Video", "FullScreen", false);
-                 set_gamma(get_config_int("Video", "Gamma", 128));
  
!                 i = videosystem.set_resolution(x2, y2, bpp2, fs);
                  done = false;
              }
          }
--- 292,323 ----
          {
              set_gamma(video_dialog[DIALOG_VIDEO_GAMMA_SLIDER].d2);
  
!             //try to set video mode.  If it does not work, back out, and do not confirm
!             //the changes.
!             if ( ! videosystem.set_resolution(x2, y2, bpp2, fs))  {
                  done = false;
+             }
+             else {
+                 //if the video mode was actually set, confirm the changes
+                 if (confirmVideoChanges()) {
+                     set_config_file("client.ini");
+                     set_config_int("Video", "BitsPerPixel", bpp2);
+                     set_config_int("Video", "ScreenWidth", x2);
+                     set_config_int("Video", "ScreenHeight", y2);
+                     set_config_int("Video", "FullScreen", fs);
+                     set_config_int("Video", "Gamma", get_gamma());
+                     return;
+                 }
+                 else {
+                     set_config_file("client.ini");
+                     bpp2   = get_config_int("Video", "BitsPerPixel", 16);
+                     x2     = get_config_int("Video", "ScreenWidth", 640);
+                     y2     = get_config_int("Video", "ScreenHeight", 480);
+                     fs     = get_config_int("Video", "FullScreen", false);
+                     set_gamma(get_config_int("Video", "Gamma", 128));
+                     
+                     i = videosystem.set_resolution(x2, y2, bpp2, fs);
+                     done = false;
+                 }
              }
          }

[Timewarp-commit] source/games gmissions.cpp,1.17,1.18

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

Update of /cvsroot/timewarp/source/games
In directory sc8-pr-cvs1:/tmp/cvs-serv25702/games

Modified Files:
	gmissions.cpp 
Log Message:
changing fg-interface

Index: gmissions.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gmissions.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** gmissions.cpp	12 Dec 2003 16:41:43 -0000	1.17
--- gmissions.cpp	12 Dec 2003 16:49:19 -0000	1.18
***************
*** 683,689 ****
--- 683,695 ----
  
  		if ( i == 1 )
+ 		{
  			alertlose->show();
+ 			alertlose->focus();
+ 		}
  		if ( i == 2 )
+ 		{
  			alertwin->show();
+ 			alertwin->focus();
+ 		}
  
  		if ( chosenmission < Nmissions-1 && i == 2 )		// only advance if you win.

[Timewarp-commit] source/games gmissions.cpp,1.16,1.17

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

Update of /cvsroot/timewarp/source/games
In directory sc8-pr-cvs1:/tmp/cvs-serv23933/games

Modified Files:
	gmissions.cpp 
Log Message:
changing fg-interface

Index: gmissions.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gmissions.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** gmissions.cpp	12 Dec 2003 15:57:19 -0000	1.16
--- gmissions.cpp	12 Dec 2003 16:41:43 -0000	1.17
***************
*** 809,812 ****
--- 809,814 ----
  	missionselectmenu->tree_doneinit();
  
+ 	popupinfo->exclusive = false;
+ 
  	popupinfo->focus();
  
***************
*** 870,877 ****
--- 872,885 ----
  			// otherwise, make sure the other i/o possibility is activated
  			if (missionselectmenu->disabled)
+ 			{
  				missionselectmenu->show();
+ 				missionselectmenu->focus();
+ 			}
  
  			if (popupinfo->disabled)
+ 			{
  				popupinfo->show();
+ 				popupinfo->focus();
+ 			}
  		}
  		

[Timewarp-commit] twwin.dsp,1.43,1.44

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

Update of /cvsroot/timewarp
In directory sc8-pr-cvs1:/tmp/cvs-serv21833

Modified Files:
	twwin.dsp 
Log Message:
changing fg-interface

[Timewarp-commit] gamex/interface/planetview backgr.bmp,NONE,1.1 exit_default.bmp,NONE,1.1 info.txt,NONE,1.1 starname_backgr.bmp,NONE,1.1 zoomin_default.bmp,NONE,1.1 zoomout_default.bmp,NONE,1.1

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

Update of /cvsroot/timewarp/gamex/interface/planetview
In directory sc8-pr-cvs1:/tmp/cvs-serv18400

Added Files:
	backgr.bmp exit_default.bmp info.txt starname_backgr.bmp 
	zoomin_default.bmp zoomout_default.bmp 
Log Message:
adding fg-interface

--- NEW FILE: backgr.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: exit_default.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: info.txt ---
res = 800

--- NEW FILE: starname_backgr.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: zoomin_default.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: zoomout_default.bmp ---
(This appears to be a binary file; contents omitted.)

[Timewarp-commit] gamex/interface/planetview - New directory

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

Update of /cvsroot/timewarp/gamex/interface/planetview
In directory sc8-pr-cvs1:/tmp/cvs-serv18209/planetview

Log Message:
Directory /cvsroot/timewarp/gamex/interface/planetview added to the repository

[Timewarp-commit] gamex/interface/triggereditor/popup_list/text backgr.bmp,1.1.1.1,NONE

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

Update of /cvsroot/timewarp/gamex/interface/triggereditor/popup_list/text
In directory sc8-pr-cvs1:/tmp/cvs-serv17953/triggereditor/popup_list/text

Removed Files:
	backgr.bmp 
Log Message:
removing trigger editor

--- backgr.bmp DELETED ---

[Timewarp-commit] gamex/interface/triggereditor/popup_list/scroll/scrollbar_vert backgr.bmp,1.1.1.1,NONE

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

Update of /cvsroot/timewarp/gamex/interface/triggereditor/popup_list/scroll/scrollbar_vert
In directory sc8-pr-cvs1:/tmp/cvs-serv17953/triggereditor/popup_list/scroll/scrollbar_vert

Removed Files:
	backgr.bmp 
Log Message:
removing trigger editor

--- backgr.bmp DELETED ---

[Timewarp-commit] gamex/interface/triggereditor/popup_list/scroll/up default.bmp,1.1.1.1,NONE

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

Update of /cvsroot/timewarp/gamex/interface/triggereditor/popup_list/scroll/up
In directory sc8-pr-cvs1:/tmp/cvs-serv17953/triggereditor/popup_list/scroll/up

Removed Files:
	default.bmp 
Log Message:
removing trigger editor

--- default.bmp DELETED ---

[Timewarp-commit] gamex/interface/triggereditor/popup_list/scroll/down default.bmp,1.1.1.1,NONE

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

Update of /cvsroot/timewarp/gamex/interface/triggereditor/popup_list/scroll/down
In directory sc8-pr-cvs1:/tmp/cvs-serv17953/triggereditor/popup_list/scroll/down

Removed Files:
	default.bmp 
Log Message:
removing trigger editor

--- default.bmp DELETED ---

[Timewarp-commit] gamex/interface/triggereditor/popup_list/scroll/button default.bmp,1.1.1.1,NONE

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

Update of /cvsroot/timewarp/gamex/interface/triggereditor/popup_list/scroll/button
In directory sc8-pr-cvs1:/tmp/cvs-serv17953/triggereditor/popup_list/scroll/button

Removed Files:
	default.bmp 
Log Message:
removing trigger editor

--- default.bmp DELETED ---

[Timewarp-commit] gamex/interface/triggereditor/popup_list backgr.bmp,1.1.1.1,NONE backgr2.bmp,1.1.1.1,NONE

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

Update of /cvsroot/timewarp/gamex/interface/triggereditor/popup_list
In directory sc8-pr-cvs1:/tmp/cvs-serv17953/triggereditor/popup_list

Removed Files:
	backgr.bmp backgr2.bmp 
Log Message:
removing trigger editor

--- backgr.bmp DELETED ---

--- backgr2.bmp DELETED ---

[Timewarp-commit] gamex/interface/triggereditor/popup_list/scroll backgr.bmp,1.1.1.1,NONE

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

Update of /cvsroot/timewarp/gamex/interface/triggereditor/popup_list/scroll
In directory sc8-pr-cvs1:/tmp/cvs-serv17953/triggereditor/popup_list/scroll

Removed Files:
	backgr.bmp 
Log Message:
removing trigger editor

--- backgr.bmp DELETED ---

[Timewarp-commit] gamex/interface/triggereditor/main/argvalue backgr.bmp,1.1.1.1,NONE

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

Update of /cvsroot/timewarp/gamex/interface/triggereditor/main/argvalue
In directory sc8-pr-cvs1:/tmp/cvs-serv17953/triggereditor/main/argvalue

Removed Files:
	backgr.bmp 
Log Message:
removing trigger editor

--- backgr.bmp DELETED ---

[Timewarp-commit] gamex/interface/triggereditor/main/argdescr default.bmp,1.1.1.1,NONE

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

Update of /cvsroot/timewarp/gamex/interface/triggereditor/main/argdescr
In directory sc8-pr-cvs1:/tmp/cvs-serv17953/triggereditor/main/argdescr

Removed Files:
	default.bmp 
Log Message:
removing trigger editor

--- default.bmp DELETED ---

[Timewarp-commit] gamex/interface/triggereditor/main/tname default.bmp,1.1.1.1,NONE

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

Update of /cvsroot/timewarp/gamex/interface/triggereditor/main/tname
In directory sc8-pr-cvs1:/tmp/cvs-serv17953/triggereditor/main/tname

Removed Files:
	default.bmp 
Log Message:
removing trigger editor

--- default.bmp DELETED ---

[Timewarp-commit] gamex/interface/triggereditor/main backgr.bmp,1.1.1.1,NONE

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

Update of /cvsroot/timewarp/gamex/interface/triggereditor/main
In directory sc8-pr-cvs1:/tmp/cvs-serv17953/triggereditor/main

Removed Files:
	backgr.bmp 
Log Message:
removing trigger editor

--- backgr.bmp DELETED ---

[Timewarp-commit] gamex/interface/triggereditor/edit_box/text backgr.bmp,1.1.1.1,NONE

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

Update of /cvsroot/timewarp/gamex/interface/triggereditor/edit_box/text
In directory sc8-pr-cvs1:/tmp/cvs-serv17953/triggereditor/edit_box/text

Removed Files:
	backgr.bmp 
Log Message:
removing trigger editor

--- backgr.bmp DELETED ---

[Timewarp-commit] gamex/interface/triggereditor/edit_box backgr.bmp,1.1.1.1,NONE

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

Update of /cvsroot/timewarp/gamex/interface/triggereditor/edit_box
In directory sc8-pr-cvs1:/tmp/cvs-serv17953/triggereditor/edit_box

Removed Files:
	backgr.bmp 
Log Message:
removing trigger editor

--- backgr.bmp DELETED ---

[Timewarp-commit] gamex/interface/aliendialog info.txt,NONE,1.1

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

Update of /cvsroot/timewarp/gamex/interface/aliendialog
In directory sc8-pr-cvs1:/tmp/cvs-serv17692

Added Files:
	info.txt 
Log Message:
reorganizing interface files

--- NEW FILE: info.txt ---
gamex/interface/aliendialog/B/backgr_y = 430
gamex/interface/aliendialog/B/backgr_x = 146
gamex/interface/aliendialog/A/backgr_y = 38
gamex/interface/aliendialog/A/backgr_x = 9

[Timewarp-commit] gamex/interface/dialogeditor/text barver_backgr.bmp,NONE,1.1 barver_button.bmp,NONE,1.1 down_default.bmp,NONE,1.1 up_default.bmp,NONE,1.1

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

Update of /cvsroot/timewarp/gamex/interface/dialogeditor/text
In directory sc8-pr-cvs1:/tmp/cvs-serv17399/text

Added Files:
	barver_backgr.bmp barver_button.bmp down_default.bmp 
	up_default.bmp 
Log Message:
reorganizing interface files

--- NEW FILE: barver_backgr.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: barver_button.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: down_default.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: up_default.bmp ---
(This appears to be a binary file; contents omitted.)

[Timewarp-commit] gamex/interface/dialogeditor addbranch_default.bmp,NONE,1.1 prevbranch_default.bmp,NONE,1.1 race_backgr.bmp,NONE,1.1 refresh_default.bmp,NONE,1.1 state_off.bmp,NONE,1.1 state_on.bmp,NONE,1.1

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

Update of /cvsroot/timewarp/gamex/interface/dialogeditor
In directory sc8-pr-cvs1:/tmp/cvs-serv17399

Added Files:
	addbranch_default.bmp prevbranch_default.bmp race_backgr.bmp 
	refresh_default.bmp state_off.bmp state_on.bmp 
Log Message:
reorganizing interface files

--- NEW FILE: addbranch_default.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: prevbranch_default.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: race_backgr.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: refresh_default.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: state_off.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: state_on.bmp ---
(This appears to be a binary file; contents omitted.)