[opendemo-cvs] CVS: opendemo/tools/odcut odcutgui.pm,1.44,1.45

[Uwe G. <gi...@us...>]

Update of /cvsroot/opendemo/opendemo/tools/odcut
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23808

Modified Files:
	odcutgui.pm 
Log Message:
don't use pwrap any more. Simply use xterm.
Start the game with a given rcon password.


Index: odcutgui.pm
===================================================================
RCS file: /cvsroot/opendemo/opendemo/tools/odcut/odcutgui.pm,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** odcutgui.pm	26 Oct 2004 17:53:11 -0000	1.44
--- odcutgui.pm	27 Oct 2004 17:19:27 -0000	1.45
***************
*** 30,34 ****
  use Wx::Event qw(EVT_MENU EVT_SLIDER EVT_BUTTON EVT_TIMER EVT_CHECKBOX EVT_SPINCTRL EVT_NOTEBOOK_PAGE_CHANGED EVT_IDLE EVT_END_PROCESS);
  use Wx qw(:filedialog);
! use Wx qw(wxSIGTERM);
  use Wx::Html;
  
--- 30,34 ----
  use Wx::Event qw(EVT_MENU EVT_SLIDER EVT_BUTTON EVT_TIMER EVT_CHECKBOX EVT_SPINCTRL EVT_NOTEBOOK_PAGE_CHANGED EVT_IDLE EVT_END_PROCESS);
  use Wx qw(:filedialog);
! use Wx qw(wxSIGTERM wxEXEC_ASYNC);
  use Wx::Html;
  
***************
*** 612,615 ****
--- 612,618 ----
  		$self->{"game_opendemo"} = "od";
  	}
+ 	if (!exists $self->{"game_password"}) {
+ 		$self->{"game_password"} = "odcut";
+ 	}
  
  	# Clean up.
***************
*** 630,636 ****
  #		$self->{"game_opendemo"};
  	my @command = [
! 			Cwd::getcwd() . "/../pwrap.pl",
  			$self->{"game_executable"},
! 			"+set", "fs_game", $self->{"game_opendemo"}
  			];
  
--- 633,641 ----
  #		$self->{"game_opendemo"};
  	my @command = [
! #			Cwd::getcwd() . "/../pwrap.pl",
! 			"xterm", "-e",
  			$self->{"game_executable"},
! 			"+set", "fs_game", $self->{"game_opendemo"},
! 			"+set", "rconPassword", $self->{"game_password"}
  			];
  
***************
*** 640,644 ****
  	my $prevdir=Cwd::getcwd();
  	chdir $self->{"game_dir"};
! 	$self->{"odgame_pid"} = Wx::ExecuteArgs( @command, 0, $self->{"odgame"} );
  	# Go back to the old directory.
  	chdir $prevdir;
--- 645,650 ----
  	my $prevdir=Cwd::getcwd();
  	chdir $self->{"game_dir"};
! 	$self->{"odgame_pid"} = Wx::ExecuteArgs( @command, wxEXEC_ASYNC,
! 		$self->{"odgame"} );
  	# Go back to the old directory.
  	chdir $prevdir;