[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.22 by root, Sun May 28 01:37:45 2006 UTC vs.
Revision 1.30 by root, Tue May 30 01:42:16 2006 UTC

…		…
81	our $LOGVIEW;	81	our $LOGVIEW;
82	our $CONSOLE;	82	our $CONSOLE;
83	our $METASERVER;	83	our $METASERVER;
84	our $LOGIN_BUTTON;	84	our $LOGIN_BUTTON;
85	our $QUIT_DIALOG;	85	our $QUIT_DIALOG;
		86	our $SERVER_SETUP;
86		87
87	our $FLOORBOX;	88	our $FLOORBOX;
88	our $GAUGES;	89	our $GAUGES;
89	our $STATWIDS;	90	our $STATWIDS;
90		91
…		…
97		98
98	our $ALT_ENTER_MESSAGE;	99	our $ALT_ENTER_MESSAGE;
99	our $STATUSBOX;	100	our $STATUSBOX;
100	our $DEBUG_STATUS;	101	our $DEBUG_STATUS;
101		102
		103	our $INV_WINDOW;
102	our $INV;	104	our $INV;
103	our $INVR;	105	our $INVR;
104	our $INVR_LBL;	106	our $INV_RIGHT_HB;
		107
		108	our $BIND_WINDOW;
105		109
106	sub status {	110	sub status {
107	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	111	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108	}	112	}
109		113
110	sub debug {	114	sub debug {
111	$DEBUG_STATUS->set_text ($_[0]);	115	$DEBUG_STATUS->set_text ($_[0]);
112	my ($w, $h) = $DEBUG_STATUS->size_request;
113	$DEBUG_STATUS->move ($WIDTH - $w, 0);
114	}	116	}
115		117
116	sub start_game {	118	sub start_game {
117	status "logging in...";	119	status "logging in...";
		120
		121	$LOGIN_BUTTON->set_text ("Logout");
		122	$SERVER_SETUP->hide;
118		123
119	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	124	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120		125
121	my ($host, $port) = split /:/, $CFG->{host};	126	my ($host, $port) = split /:/, $CFG->{host};
122		127
…		…
151	};	156	};
152		157
153	if ($CONN) {	158	if ($CONN) {
154	CFClient::lowdelay fileno $CONN->{fh};	159	CFClient::lowdelay fileno $CONN->{fh};
155		160
156	$LOGIN_BUTTON->set_text ("Logout");
157	status "login successful";	161	status "login successful";
158
159	$BUTTONBAR->{children}[1]->emit ("activate")
160	if $BUTTONBAR->{children}[1]->{state};
161
162	} else {	162	} else {
163	status "unable to connect";	163	status "unable to connect";
164	stop_game();	164	stop_game();
165	}	165	}
166	}	166	}
167		167
168	sub stop_game {	168	sub stop_game {
		169	$LOGIN_BUTTON->set_text ("Login");
		170	$SERVER_SETUP->show;
		171	$INV_WINDOW->hide;
		172	$LOGVIEW->hide;
		173
169	return unless $CONN;	174	return unless $CONN;
170		175
171	status "connection closed";	176	status "connection closed";
172	$LOGIN_BUTTON->set_text ("Login");	177
173	$CONN->destroy;	178	$CONN->destroy;
174	$CONN = 0; # false, does not autovivify	179	$CONN = 0; # false, does not autovivify
175
176	$BUTTONBAR->{children}[1]->emit ("activate")
177	unless $BUTTONBAR->{children}[1]->{state};
178	}	180	}
179		181
180	sub client_setup {	182	sub client_setup {
181	my $dialog = new CFClient::UI::FancyFrame	183	my $dialog = new CFClient::UI::FancyFrame
182	req_x => 1,	184	x => 1,
183	req_y => $HEIGHT * (1/8),	185	y => $HEIGHT * (1/8),
184	name => "client_setup",	186	name => "client_setup",
185	title => "Client Setup",	187	title => "Client Setup",
186	child => (my $vbox = new CFClient::UI::VBox);	188	child => (my $vbox = new CFClient::UI::VBox);
		189
187	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	190	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
188		191
189	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	192	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
190	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	193	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
191		194
192	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);	195	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, force_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
193	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	196	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
194		197
195	$mode_slider->connect (changed => sub {	198	$mode_slider->connect (changed => sub {
196	my ($self, $value) = @_;	199	my ($self, $value) = @_;
197		200
…		…
385		388
386	sub make_gauge_window {	389	sub make_gauge_window {
387	my $gh = int $HEIGHT * $CFG->{gauge_size};	390	my $gh = int $HEIGHT * $CFG->{gauge_size};
388		391
389	my $win = new CFClient::UI::Frame (	392	my $win = new CFClient::UI::Frame (
390	req_x => 0,	393	force_x => 0,
391	req_y => -1,	394	force_y => "max",
392	def_w => $WIDTH,	395	force_w => $WIDTH,
393	def_h => $gh,	396	force_h => $gh,
394	);	397	);
395		398
396	$win->add (my $hbox = new CFClient::UI::HBox	399	$win->add (my $hbox = new CFClient::UI::HBox
397	children => [	400	children => [
398	(new CFClient::UI::HBox expand => 1),	401	(new CFClient::UI::HBox expand => 1),
…		…
434	&set_gauge_window_fontsize;	437	&set_gauge_window_fontsize;
435		438
436	$win	439	$win
437	}	440	}
438		441
		442
439	sub make_stats_window {	443	sub make_stats_window {
440	my $tgw = new CFClient::UI::FancyFrame	444	my $tgw = new CFClient::UI::FancyFrame
441	req_y => $HEIGHT * (2/8),	445	y => $HEIGHT * (2/8),
442	req_x => -1,	446	x => "max",
443	title => "Stats",	447	title => "Stats",
444	name => "stats_window";	448	name => "stats_window";
445		449
446	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	450	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
447	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	451	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
448	can_hover => 1, can_events => 1,	452	can_hover => 1, can_events => 1,
449	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	453	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
711	}	715	}
712	});	716	});
713	}	717	}
714		718
715	sub server_setup {	719	sub server_setup {
716	my $dialog = new CFClient::UI::FancyFrame	720	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
717	x => $WIDTH * (1/3),	721	x => "center",
718	y => $HEIGHT * (1/8),	722	y => "center",
719	name => "server_setup",	723	name => "server_setup",
720	title => "Server Setup",	724	title => "Server Setup",
721	child => (my $vbox = new CFClient::UI::VBox),	725	child => (my $vbox = new CFClient::UI::VBox),
722	on_visibility_change => sub {
723	my ($self, $visible) = @_;
724	$self->center if $visible;
725	},
726	;	726	;
727		727
728	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	728	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
729	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	729	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
730		730
…		…
776	}	776	}
777	);	777	);
778		778
779	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	779	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
780	$table->add (1, 7, new CFClient::UI::Slider	780	$table->add (1, 7, new CFClient::UI::Slider
781	req_w => 100,	781	force_w => 100,
782	range => [$CFG->{mapsize}, 10, 100, 0, 1],	782	range => [$CFG->{mapsize}, 10, 100, 0, 1],
783	tooltip => "This is the size of the portion of the map update the server sends you. "	783	tooltip => "This is the size of the portion of the map update the server sends you. "
784	. "If you set this to a high value you will be able to see further, "	784	. "If you set this to a high value you will be able to see further, "
785	. "but you also increase bandwidth requirements and latency. "	785	. "but you also increase bandwidth requirements and latency. "
786	. "This option is only used once at log-in.",	786	. "This option is only used once at log-in.",
…		…
835	my $window = new CFClient::UI::FancyFrame	835	my $window = new CFClient::UI::FancyFrame
836	name => "message_window",	836	name => "message_window",
837	title => "Messages",	837	title => "Messages",
838	border_bg => [1, 1, 1, 1],	838	border_bg => [1, 1, 1, 1],
839	bg => [0, 0, 0, 0.75],	839	bg => [0, 0, 0, 0.75],
840	req_x => -1,	840	x => "max",
841	req_y => 0,	841	y => 0,
842	def_w => int $::WIDTH / 3,	842	force_w => $::WIDTH / 3,
843	def_h => int $::HEIGHT / 5,	843	force_h => $::HEIGHT / 5,
844	child => (my $vbox = new CFClient::UI::VBox);	844	child => (my $vbox = new CFClient::UI::VBox);
845		845
846	$vbox->add ($LOGVIEW);	846	$vbox->add ($LOGVIEW);
847		847
848	$vbox->add (my $input = new CFClient::UI::Entry	848	$vbox->add (my $input = new CFClient::UI::Entry
…		…
862	},	862	},
863	on_activate => sub {	863	on_activate => sub {
864	my ($input, $text) = @_;	864	my ($input, $text) = @_;
865	$input->set_text ('');	865	$input->set_text ('');
866		866
		867	if ($text =~ /^\/bind\s+(.*)$/) {
		868	CFClient::Recorder::open_binding_dialog ([$1]);
867	if ($text =~ /^\/(.*)/) {	869	} elsif ($text =~ /^\/(.*)/) {
868	$::CONN->user_send ($1);	870	$::CONN->user_send ($1);
869	} else {	871	} else {
870	my $say_cmd = $::CFG->{say_command} \|\| 'say';	872	my $say_cmd = $::CFG->{say_command} \|\| 'say';
871	$::CONN->user_send ("$say_cmd $text");	873	$::CONN->user_send ("$say_cmd $text");
872	}	874	}
…		…
880	},	882	},
881	);	883	);
882		884
883	$CONSOLE = {	885	$CONSOLE = {
884	window => $window,	886	window => $window,
885	input => $input	887	input => $input,
886	};	888	};
887		889
888	$window	890	$window
889	}	891	}
890		892
891	sub open_quit_dialog {	893	sub open_quit_dialog {
892	unless ($QUIT_DIALOG) {	894	unless ($QUIT_DIALOG) {
893	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";	895	$QUIT_DIALOG = new CFClient::UI::FancyFrame
		896	x => "center",
		897	y => "center",
		898	title => "Really Quit?",
		899	;
894		900
895	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	901	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
896		902
897	$vb->add (new CFClient::UI::Label	903	$vb->add (new CFClient::UI::Label
898	text => "You should find a savebed and apply it first!",	904	text => "You should find a savebed and apply it first!",
…		…
911	on_activate => sub { exit },	917	on_activate => sub { exit },
912	);	918	);
913	}	919	}
914		920
915	$QUIT_DIALOG->show;	921	$QUIT_DIALOG->show;
916	$QUIT_DIALOG->center;
917	}	922	}
918		923
919	sub make_inventory_window {	924	sub make_inventory_window {
920	my $invwin = new CFClient::UI::FancyFrame	925	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
		926	x => "center",
		927	y => "center",
921	def_w => $WIDTH * 7/8,	928	def_w => $WIDTH * 9/10,
922	def_h => $HEIGHT * 7/8,	929	def_h => $HEIGHT * 9/10,
923	title => "Inventory",	930	title => "Inventory",
924	name => "inventory_window",	931	name => "inventory_window",
925	on_visibility_change => sub {
926	my ($self, $visible) = @_;
927	$self->center if $visible;
928	},
929	;	932	;
930		933
931	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	934	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
932		935
933	$hb->add (my $vb1 = new CFClient::UI::VBox);	936	$hb->add (my $vb1 = new CFClient::UI::VBox);
934	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	937	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
935	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	938	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
936		939
937	$hb->add (my $vb2 = new CFClient::UI::VBox);	940	$hb->add (my $vb2 = new CFClient::UI::VBox);
938		941
939	$vb2->add (my $hb2 = new CFClient::UI::HBox);	942	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
940	$hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");
941	$hb2->add (new CFClient::UI::Button
942	text => "Close",
943	tooltip => "Close the currently open container (if one is open)",
944	on_activate => sub {
945	$CONN->send ("apply $CONN->{open_container}")
946	if $CONN->{open_container} != 0;
947	},
948	);
949		943
950	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	944	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
951		945
		946	# XXX: Call after $INVR = ... because set_opencont sets the items
		947	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
		948
952	$invwin	949	$invwin
		950	}
		951
		952	sub make_binding_window {
		953	my $binding_list = new CFClient::UI::VBox;
		954
		955	my $refresh = sub {
		956	$binding_list->clear ();
		957
		958	for my $mod (keys %{$::CFG->{bindings}}) {
		959	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
		960	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
		961	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
		962
		963	my $lbl = join "; ", @$cmds;
		964	my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym);
		965	$binding_list->add (my $hb = new CFClient::UI::HBox);
		966	$hb->add (new CFClient::UI::Button
		967	text => "delete",
		968	on_activate => sub {
		969	$binding_list->remove ($hb);
		970	delete $::CFG->{bindings}->{$mod}->{$sym};
		971	});
		972	$hb->add (new CFClient::UI::Label text => "($nam)");
		973	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
		974	}
		975	}
		976	};
		977
		978	$BIND_WINDOW = new CFClient::UI::FancyFrame
		979	title => "Bindings",
		980	x => "center",
		981	y => "center",
		982	def_w => int $WIDTH * 9/10,
		983	def_h => int $HEIGHT * 9/10,
		984	on_visibility_change => sub {
		985	my ($self, $visible) = @_;
		986	$refresh->() if $visible;
		987	};
		988
		989	$BIND_WINDOW->add ($binding_list);
		990	$refresh->();
		991	$BIND_WINDOW
953	}	992	}
954		993
955	sub make_help_window {	994	sub make_help_window {
956	my $win = new CFClient::UI::FancyFrame	995	my $win = new CFClient::UI::FancyFrame
957	def_w => int $WIDTH * 7/8,	996	def_w => int $WIDTH * 7/8,
…		…
1025	if ($DEBUG_STATUS) {	1064	if ($DEBUG_STATUS) {
1026	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1065	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1027	} else {	1066	} else {
1028	# create the widgets	1067	# create the widgets
1029		1068
1030	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;	1069	$DEBUG_STATUS = new CFClient::UI::Label
		1070	padding => 0,
		1071	z => 100,
		1072	force_x => "max",
		1073	force_y => 0;
1031	$DEBUG_STATUS->show;	1074	$DEBUG_STATUS->show;
1032		1075
1033	$STATUSBOX = new CFClient::UI::Statusbox;	1076	$STATUSBOX = new CFClient::UI::Statusbox;
1034	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);	1077	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1035		1078
1036	(new CFClient::UI::Frame	1079	(new CFClient::UI::Frame
1037	bg => [0, 0, 0, 0.4],	1080	bg => [0, 0, 0, 0.4],
1038	req_y => -1,	1081	force_x => 0,
		1082	force_y => "max",
1039	child => $STATUSBOX,	1083	child => $STATUSBOX,
1040	)->show;	1084	)->show;
1041		1085
1042	CFClient::UI::FancyFrame->new (	1086	CFClient::UI::FancyFrame->new (
		1087	x => 0,
		1088	y => $FONTSIZE + 8,
1043	border_bg => [1, 1, 1, 192/255],	1089	border_bg => [1, 1, 1, 192/255],
1044	bg => [1, 1, 1, 0],	1090	bg => [1, 1, 1, 0],
1045	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1091	child => ($MAPMAP = new CFClient::MapWidget::MapMap
1046	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1092	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1047	),	1093	),
…		…
1070	can_hover => 1,	1116	can_hover => 1,
1071	can_events => 1,	1117	can_events => 1,
1072	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1118	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1073	;	1119	;
1074		1120
1075	$BUTTONBAR = new CFClient::UI::HBox;	1121	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1076		1122
1077	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1123	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1078	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");	1124	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
1079	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,	1125	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1080	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");	1126	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
…		…
1091	$BUTTONBAR->add (new CFClient::UI::Button	1137	$BUTTONBAR->add (new CFClient::UI::Button
1092	text => "Save Config",	1138	text => "Save Config",
1093	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1139	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1094	on_activate => sub {	1140	on_activate => sub {
1095	$::CFG->{layout} = CFClient::UI::get_layout;	1141	$::CFG->{layout} = CFClient::UI::get_layout;
1096	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1142	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1097	status "Configuration Saved";	1143	status "Configuration Saved";
1098	},	1144	},
1099	);	1145	);
1100		1146
1101	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1147	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1102	tooltip => "View Documentation");	1148	tooltip => "View Documentation");
		1149
		1150	$BUTTONBAR->add (new CFClient::UI::Flopper
		1151	text => "Bindings",
		1152	other => make_binding_window,
		1153	tooltip => "Lets you delete bindings you have made with the recorder"
		1154	);
		1155	$BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window,
		1156	tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys");
1103		1157
1104	$BUTTONBAR->add (new CFClient::UI::Button	1158	$BUTTONBAR->add (new CFClient::UI::Button
1105	text => "Quit",	1159	text => "Quit",
1106	tooltip => "Terminates the program",	1160	tooltip => "Terminates the program",
1107	on_activate => sub {	1161	on_activate => sub {
…		…
1112	}	1166	}
1113	},	1167	},
1114	);	1168	);
1115		1169
1116	$BUTTONBAR->show;	1170	$BUTTONBAR->show;
		1171	$SERVER_SETUP->show;
1117		1172
1118	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1173	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1119
1120	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1121	}	1174	}
1122	}	1175	}
1123		1176
1124	sub video_shutdown {	1177	sub video_shutdown {
1125	undef $SDL_ACTIVE;	1178	undef $SDL_ACTIVE;
…		…
1335	#############################################################################	1388	#############################################################################
1336		1389
1337	$SIG{INT} = $SIG{TERM} = sub { exit };	1390	$SIG{INT} = $SIG{TERM} = sub { exit };
1338		1391
1339	{	1392	{
1340	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1393	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1341		1394
1342	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1395	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1343	CFClient::UI::set_layout ($::CFG->{layout});	1396	CFClient::UI::set_layout ($::CFG->{layout});
1344		1397
1345	my %DEF_CFG = (	1398	my %DEF_CFG = (
1346	sdl_mode => 0,	1399	sdl_mode => 0,
1347	width => 640,	1400	width => 640,
…		…
1425		1478
1426	END { CFClient::SDL_Quit }	1479	END { CFClient::SDL_Quit }
1427		1480
1428	=head1 NAME	1481	=head1 NAME
1429		1482
1430	pclient - A Crossfire+ and Crossfire game client	1483	cfplus - A Crossfire+ and Crossfire game client
1431		1484
1432	=head1 SYNOPSIS	1485	=head1 SYNOPSIS
1433		1486
1434	Just run it - no commandline arguments are supported.	1487	Just run it - no commandline arguments are supported.
1435		1488
1436	=head1 USAGE	1489	=head1 USAGE
1437		1490
1438	Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used	1491	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1439	fullscreen and interactively.	1492	fullscreen and interactively.
1440		1493
1441	=head1 AUTHOR	1494	=head1 AUTHOR
1442		1495
1443	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1496	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.22 by root, Sun May 28 01:37:45 2006 UTC vs. Revision 1.30 by root, Tue May 30 01:42:16 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.22 by root, Sun May 28 01:37:45 2006 UTC vs.
Revision 1.30 by root, Tue May 30 01:42:16 2006 UTC