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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.60 by root, Tue Jun 6 02:55:50 2006 UTC vs.
Revision 1.77 by elmex, Wed Jun 21 12:59:23 2006 UTC

…		…
84	our $CONSOLE;	84	our $CONSOLE;
85	our $METASERVER;	85	our $METASERVER;
86	our $LOGIN_BUTTON;	86	our $LOGIN_BUTTON;
87	our $QUIT_DIALOG;	87	our $QUIT_DIALOG;
88	our $HOST_ENTRY;	88	our $HOST_ENTRY;
		89	our $SERVER_INFO;
89		90
90	our $SETUP_DIALOG;	91	our $SETUP_DIALOG;
91	our $SETUP_NOTEBOOK;	92	our $SETUP_NOTEBOOK;
92	our $SETUP_SERVER;	93	our $SETUP_SERVER;
93	our $SETUP_KEYBOARD;	94	our $SETUP_KEYBOARD;
…		…
114	our $INV;	115	our $INV;
115	our $INVR;	116	our $INVR;
116	our $INV_RIGHT_HB;	117	our $INV_RIGHT_HB;
117		118
118	our $BIND_EDITOR;	119	our $BIND_EDITOR;
		120	our $BIND_UPD_CB;
119		121
120	our $PICKUP_CFG;	122	our $PICKUP_CFG;
121		123
122	sub status {	124	sub status {
123	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	125	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
…		…
154	$hbox->add (new CFClient::UI::Button	156	$hbox->add (new CFClient::UI::Button
155	text => "No",	157	text => "No",
156	on_activate => sub {	158	on_activate => sub {
157	$conn->send ("reply n");	159	$conn->send ("reply n");
158	$dialog->destroy;	160	$dialog->destroy;
		161	0
159	}	162	}
160	);	163	);
161	$hbox->add (new CFClient::UI::Button	164	$hbox->add (new CFClient::UI::Button
162	text => "Yes",	165	text => "Yes",
163	on_activate => sub {	166	on_activate => sub {
164	$conn->send ("reply y");	167	$conn->send ("reply y");
165	destroy_query_dialog $conn;	168	destroy_query_dialog $conn;
		169	0
166	},	170	},
167	);	171	);
168		172
169	$dialog->focus_in;	173	$dialog->grab_focus;
170		174
171	} elsif ($flags & CS_QUERY_SINGLECHAR) {	175	} elsif ($flags & CS_QUERY_SINGLECHAR) {
172	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";	176	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
173		177
174	if ($prompt =~ /Now choose a character\|Press any key for the next race/i) {	178	if ($prompt =~ /Now choose a character\|Press any key for the next race/i) {
…		…
184	$table->add (0, 0, new CFClient::UI::Button	188	$table->add (0, 0, new CFClient::UI::Button
185	text => "Next Race",	189	text => "Next Race",
186	on_activate => sub {	190	on_activate => sub {
187	$conn->send ("reply n");	191	$conn->send ("reply n");
188	destroy_query_dialog $conn;	192	destroy_query_dialog $conn;
		193	0
189	},	194	},
190	);	195	);
191	$table->add (2, 0, new CFClient::UI::Button	196	$table->add (2, 0, new CFClient::UI::Button
192	text => "Accept",	197	text => "Accept",
193	on_activate => sub {	198	on_activate => sub {
194	$conn->send ("reply d");	199	$conn->send ("reply d");
195	destroy_query_dialog $conn;	200	destroy_query_dialog $conn;
		201	0
196	},	202	},
197	);	203	);
198		204
199	unshift @dialog, new CFClient::UI::Label	205	unshift @dialog, new CFClient::UI::Label
200	max_w => $::WIDTH * 0.4,	206	max_w => $::WIDTH * 0.4,
…		…
230	$table->add (0, 0, new CFClient::UI::Button	236	$table->add (0, 0, new CFClient::UI::Button
231	text => "Roll Again",	237	text => "Roll Again",
232	on_activate => sub {	238	on_activate => sub {
233	$conn->send ("reply y");	239	$conn->send ("reply y");
234	destroy_query_dialog $conn;	240	destroy_query_dialog $conn;
		241	0
235	},	242	},
236	);	243	);
237		244
238	# center: swap stats	245	# center: swap stats
239	my ($sw1, $sw2) = map +(new CFClient::UI::Combobox	246	my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
240	value => $_,	247	value => $_,
241	options => [	248	options => [
242	[Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"],	249	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
243	[Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],	250	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244	[Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"],	251	[3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
245	[Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"],	252	[4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
246	[Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],	253	[5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
247	[Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"],	254	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
248	[Cha => 7, "Charisma ($conn->{stat}{+CS_STAT_CHA})"],	255	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
249	],	256	],
250	), 1 .. 2;	257	), 1 .. 2;
251		258
252	$table->add (2, 0, new CFClient::UI::Button	259	$table->add (2, 0, new CFClient::UI::Button
253	text => "Swap Stats",	260	text => "Swap Stats",
254	on_activate => sub {	261	on_activate => sub {
255	$conn->{stat_change_with} = $sw2->{value};	262	$conn->{stat_change_with} = $sw2->{value};
256	$conn->send ("reply $sw1->{value}");	263	$conn->send ("reply $sw1->{value}");
257	destroy_query_dialog $conn;	264	destroy_query_dialog $conn;
		265	0
258	},	266	},
259	);	267	);
260	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);	268	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
261		269
262	# right: accept	270	# right: accept
…		…
264	text => "Accept",	272	text => "Accept",
265	on_activate => sub {	273	on_activate => sub {
266	$conn->send ("reply n");	274	$conn->send ("reply n");
267	$STATS_WINDOW->hide;	275	$STATS_WINDOW->hide;
268	destroy_query_dialog $conn;	276	destroy_query_dialog $conn;
		277	0
269	},	278	},
270	);	279	);
271		280
272	unshift @dialog, new CFClient::UI::Label	281	unshift @dialog, new CFClient::UI::Label
273	max_w => $::WIDTH * 0.4,	282	max_w => $::WIDTH * 0.4,
…		…
283		292
284	push @dialog, my $entry = new CFClient::UI::Entry	293	push @dialog, my $entry = new CFClient::UI::Entry
285	on_changed => sub {	294	on_changed => sub {
286	$conn->send ("reply $_[1]");	295	$conn->send ("reply $_[1]");
287	destroy_query_dialog $conn;	296	destroy_query_dialog $conn;
		297	0
288	},	298	},
289	;	299	;
290		300
291	$entry->focus_in;	301	$entry->grab_focus;
292		302
293	} else {	303	} else {
294	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";	304	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
295		305
296	push @dialog, my $entry = new CFClient::UI::Entry	306	push @dialog, my $entry = new CFClient::UI::Entry
297	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),	307	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298	on_activate => sub {	308	on_activate => sub {
299	$conn->send ("reply $_[1]");	309	$conn->send ("reply $_[1]");
300	destroy_query_dialog $conn;	310	destroy_query_dialog $conn;
		311	0
301	},	312	},
302	;	313	;
303		314
304	$entry->focus_in;	315	$entry->grab_focus;
305	}	316	}
306		317
307	$vbox->add (@dialog);	318	$vbox->add (@dialog);
308	$dialog->show;	319	$dialog->show;
309	}	320	}
…		…
314	$LOGIN_BUTTON->set_text ("Logout");	325	$LOGIN_BUTTON->set_text ("Logout");
315	$SETUP_DIALOG->hide;	326	$SETUP_DIALOG->hide;
316		327
317	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	328	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
318		329
319	my ($host, $port) = split /:/, $CFG->{host};	330	my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
320		331
321	$MAP = new CFClient::Map $mapsize, $mapsize;	332	$MAP = new CFClient::Map $mapsize, $mapsize;
322		333
323	$CONN = eval {	334	$CONN = eval {
324	new CFClient::Protocol	335	new CFClient::Protocol
325	host => $host,	336	host => $host,
326	port => $port \|\| 13327,	337	port => $port \|\| 13327,
327	user => $CFG->{user},	338	user => $CFG->{profile}{default}{user},
328	pass => $CFG->{password},	339	pass => $CFG->{profile}{default}{password},
329	mapw => $mapsize,	340	mapw => $mapsize,
330	maph => $mapsize,	341	maph => $mapsize,
331		342
332	map_widget => $MAPWIDGET,	343	map_widget => $MAPWIDGET,
333	logview => $LOGVIEW,	344	logview => $LOGVIEW,
…		…
362	sub stop_game {	373	sub stop_game {
363	$LOGIN_BUTTON->set_text ("Login");	374	$LOGIN_BUTTON->set_text ("Login");
364	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);	375	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365	$SETUP_DIALOG->show;	376	$SETUP_DIALOG->show;
366	$INV_WINDOW->hide;	377	$INV_WINDOW->hide;
		378	$SETUP_SPELLS->clear_spells;
367		379
368	return unless $CONN;	380	return unless $CONN;
369		381
370	status "connection closed";	382	status "connection closed";
371		383
372	destroy_query_dialog $CONN;	384	destroy_query_dialog $CONN;
373	$CONN->destroy;	385	$CONN->destroy;
374	$CONN = 0; # false, does not autovivify	386	$CONN = 0; # false, does not autovivify
		387
		388	undef $MAP;
375	}	389	}
376		390
377	sub graphics_setup {	391	sub graphics_setup {
378	my $vbox = new CFClient::UI::VBox;	392	my $vbox = new CFClient::UI::VBox;
379		393
…		…
397		411
398	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	412	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
399	$table->add (1, $row++, new CFClient::UI::CheckBox	413	$table->add (1, $row++, new CFClient::UI::CheckBox
400	state => $CFG->{fullscreen},	414	state => $CFG->{fullscreen},
401	tooltip => "Bring the client into fullscreen mode.",	415	tooltip => "Bring the client into fullscreen mode.",
402	on_changed => sub {	416	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
403	my ($self, $value) = @_;
404	$CFG->{fullscreen} = $value;
405	}
406	);	417	);
407		418
408	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	419	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
409	$table->add (1, $row++, new CFClient::UI::CheckBox	420	$table->add (1, $row++, new CFClient::UI::CheckBox
410	state => $CFG->{fast},	421	state => $CFG->{fast},
411	tooltip => "Lower the visual quality considerably to speed up rendering.",	422	tooltip => "Lower the visual quality considerably to speed up rendering.",
412	on_changed => sub {	423	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
413	my ($self, $value) = @_;
414	$CFG->{fast} = $value;
415	}
416	);	424	);
417		425
418	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");	426	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
419	$table->add (1, $row++, new CFClient::UI::Slider	427	$table->add (1, $row++, new CFClient::UI::Slider
420	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	428	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
421	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	429	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
422	on_changed => sub {	430	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
423	my ($self, $value) = @_;
424	$CFG->{map_scale} = 2 ** $value;
425	}
426	);	431	);
427		432
428	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	433	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
429	$table->add (1, $row++, new CFClient::UI::CheckBox	434	$table->add (1, $row++, new CFClient::UI::CheckBox
430	state => $CFG->{fow_enable},	435	state => $CFG->{fow_enable},
431	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	436	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
432	on_changed => sub {	437	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
433	my ($self, $value) = @_;
434	$CFG->{fow_enable} = $value;
435	}
436	);	438	);
437		439
438	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	440	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
439	$table->add (1, $row++, new CFClient::UI::Slider	441	$table->add (1, $row++, new CFClient::UI::Slider
440	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	442	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
441	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	443	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
442	on_changed => sub {	444	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
443	my ($self, $value) = @_;
444	$CFG->{fow_intensity} = $value;
445	}
446	);	445	);
447		446
448	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	447	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
449	$table->add (1, $row++, new CFClient::UI::CheckBox	448	$table->add (1, $row++, new CFClient::UI::CheckBox
450	state => $CFG->{fow_smooth},	449	state => $CFG->{fow_smooth},
451	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",	450	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
452	on_changed => sub {	451	on_changed => sub {
453	my ($self, $value) = @_;	452	my ($self, $value) = @_;
454	$CFG->{fow_smooth} = $value;	453	$CFG->{fow_smooth} = $value;
455	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;	454	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
		455	0
456	}	456	}
457	);	457	);
458		458
459	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	459	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
460	$table->add (1, $row++, new CFClient::UI::Slider	460	$table->add (1, $row++, new CFClient::UI::Slider
461	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	461	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
462	tooltip => "The base font size used by most GUI elements that do not have their own setting.",	462	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
463	on_changed => sub { $CFG->{gui_fontsize} = $_[1] },	463	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
464	);	464	);
465		465
466	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");	466	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
467	$table->add (1, $row++, new CFClient::UI::Slider	467	$table->add (1, $row++, new CFClient::UI::Slider
468	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	468	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
469	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	469	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
470	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },	470	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
471	);	471	);
472		472
473	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");	473	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
474		474
475	$table->add (1, $row++, new CFClient::UI::Slider	475	$table->add (1, $row++, new CFClient::UI::Slider
476	range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],	476	range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
477	tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",	477	tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
478	on_changed => sub {	478	on_changed => sub {
479	$CFG->{stat_fontsize} = $_[1];	479	$CFG->{stat_fontsize} = $_[1];
480	&set_stats_window_fontsize;	480	&set_stats_window_fontsize;
		481	0
481	}	482	}
482	);	483	);
483		484
484	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	485	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
485	$table->add (1, $row++, new CFClient::UI::Slider	486	$table->add (1, $row++, new CFClient::UI::Slider
486	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	487	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
487	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	488	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
488	on_changed => sub {	489	on_changed => sub {
489	$CFG->{gauge_fontsize} = $_[1];	490	$CFG->{gauge_fontsize} = $_[1];
490	&set_gauge_window_fontsize;	491	&set_gauge_window_fontsize;
		492	0
491	}	493	}
492	);	494	);
493		495
494	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");	496	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
495	$table->add (1, $row++, new CFClient::UI::Slider	497	$table->add (1, $row++, new CFClient::UI::Slider
496	range => [$CFG->{gauge_size}, 0.2, 0.8],	498	range => [$CFG->{gauge_size}, 0.2, 0.8],
497	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	499	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
498	on_changed => sub {	500	on_changed => sub {
499	$CFG->{gauge_size} = $_[1];	501	$CFG->{gauge_size} = $_[1];
500	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	502	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
		503	0
501	}	504	}
502	);	505	);
503		506
504	$table->add (1, $row++, new CFClient::UI::Button	507	$table->add (1, $row++, new CFClient::UI::Button
505	expand => 1, align => 0, text => "Apply",	508	expand => 1, align => 0, text => "Apply",
506	tooltip => "Apply the video settings",	509	tooltip => "Apply the video settings",
507	on_activate => sub {	510	on_activate => sub {
508	video_shutdown ();	511	video_shutdown ();
509	video_init ();	512	video_init ();
		513	0
510	}	514	}
511	);	515	);
512		516
513	$vbox	517	$vbox
514	}	518	}
…		…
522		526
523	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	527	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
524	$table->add (1, $row++, new CFClient::UI::CheckBox	528	$table->add (1, $row++, new CFClient::UI::CheckBox
525	state => $CFG->{audio_enable},	529	state => $CFG->{audio_enable},
526	tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",	530	tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
527	on_changed => sub {	531	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
528	$CFG->{audio_enable} = $_[1];
529	}
530	);	532	);
531	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	533	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
532	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	534	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
533	# $CFG->{effects_volume} = $_[1];	535	# $CFG->{effects_volume} = $_[1];
534	# });	536	# });
535	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	537	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
536	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);	538	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
537	$hbox->add (new CFClient::UI::CheckBox	539	$hbox->add (new CFClient::UI::CheckBox
538	expand => 1, state => $CFG->{bgm_enable},	540	expand => 1, state => $CFG->{bgm_enable},
539	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	541	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
540	on_changed => sub {	542	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
541	$CFG->{bgm_enable} = $_[1];
542	}
543	);	543	);
544	$hbox->add (new CFClient::UI::Slider	544	$hbox->add (new CFClient::UI::Slider
545	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	545	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
546	tooltip => "The volume of the background music. Changes are instant.",	546	tooltip => "The volume of the background music. Changes are instant.",
547	on_changed => sub {	547	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
548	$CFG->{bgm_volume} = $_[1];
549	CFClient::MixMusic::volume $_[1] * 128;
550	}
551	);	548	);
552		549
553	$table->add (1, $row++, new CFClient::UI::Button	550	$table->add (1, $row++, new CFClient::UI::Button
554	expand => 1, align => 0, text => "Apply",	551	expand => 1, align => 0, text => "Apply",
555	tooltip => "Apply the audio settings",	552	tooltip => "Apply the audio settings",
556	on_activate => sub {	553	on_activate => sub {
557	audio_shutdown ();	554	audio_shutdown ();
558	audio_init ();	555	audio_init ();
		556	0
559	}	557	}
560	);	558	);
561		559
562	$vbox	560	$vbox
563	}	561	}
…		…
625	&set_gauge_window_fontsize;	623	&set_gauge_window_fontsize;
626		624
627	$win	625	$win
628	}	626	}
629		627
		628	sub debug_setup {
		629	my $table = new CFClient::UI::Table;
		630
		631	$table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
		632	$table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
		633	$table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
		634	$table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
		635	$table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
		636	$table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
		637	$table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
		638	$table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
		639
		640	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
		641
		642	for my $x (0..2) {
		643	for my $y (0 .. 2) {
		644	$table->add ($x + 3, $y,
		645	new CFClient::UI::Entry
		646	text => $default_smooth[$x * 3 + $y],
		647	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
		648	);
		649	}
		650	}
		651
		652
		653	$table
		654	}
630		655
631	sub stats_window {	656	sub stats_window {
632	my $tgw = new CFClient::UI::FancyFrame	657	my $tgw = new CFClient::UI::FancyFrame
633	y => $HEIGHT * (2/8),	658	y => $HEIGHT * (2/8),
634	x => "max",	659	x => "max",
635	title => "Stats",	660	title => "Stats",
636	name => "stats_window";	661	name => "stats_window",
		662	has_close_button => 1;
637		663
638	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	664	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
639	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	665	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
640	can_hover => 1, can_events => 1,	666	can_hover => 1, can_events => 1,
641	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	667	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
787	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});	813	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
788	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});	814	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
789		815
790	$STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);	816	$STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
791		817
792	# TODO: replace by CS_STAT_RES_xxx constants
793	my %tbl = (	818	my %tbl = (
794	phys => 100,	819	phys => CS_STAT_RES_PHYS,
795	magic => 101,	820	magic => CS_STAT_RES_MAG,
796	fire => 102,	821	fire => CS_STAT_RES_FIRE,
797	elec => 103,	822	elec => CS_STAT_RES_ELEC,
798	cold => 104,	823	cold => CS_STAT_RES_COLD,
799	conf => 105,	824	conf => CS_STAT_RES_CONF,
800	acid => 106,	825	acid => CS_STAT_RES_ACID,
801	drain => 107,	826	drain => CS_STAT_RES_DRAIN,
802	ghit => 108,	827	ghit => CS_STAT_RES_GHOSTHIT,
803	pois => 109,	828	pois => CS_STAT_RES_POISON,
804	slow => 110,	829	slow => CS_STAT_RES_SLOW,
805	para => 111,	830	para => CS_STAT_RES_PARA,
806	tund => 112,	831	tund => CS_STAT_TURN_UNDEAD,
807	fear => 113,	832	fear => CS_STAT_RES_FEAR,
808	depl => 113,	833	depl => CS_STAT_RES_DEPLETE,
809	deat => 115,	834	deat => CS_STAT_RES_DEATH,
810	holyw => 116,	835	holyw => CS_STAT_RES_HOLYWORD,
811	blind => 117,	836	blind => CS_STAT_RES_BLIND,
812	);	837	);
813		838
814	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})	839	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
815	for keys %tbl;	840	for keys %tbl;
816	}	841	}
…		…
846		871
847	utf8::decode $buf if utf8::valid $buf;	872	utf8::decode $buf if utf8::valid $buf;
848		873
849	$table->clear;	874	$table->clear;
850		875
		876	my @tip = (
		877	"The current number of users logged in on the server.",
		878	"The hostname of the server.",
		879	"The time this server has been running without being restarted.",
		880	"The server software version - a '+' indicates a Crossfire+ server.",
		881	"Short information about this server provided by its admins.",
		882	);
851	my @col = qw(Use #Users Host Uptime Version Description);	883	my @col = qw(#Users Host Uptime Version Description);
852	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])	884	$table->add ($_, 0, new CFClient::UI::Label
		885	can_hover => 1, can_events => 1,
		886	align => 0, fg => [1, 1, 0],
		887	text => $col[$_], tooltip => $tip[$_])
853	for 0 .. $#col;	888	for 0 .. $#col;
854		889
855	my @align = qw(1 0 1 1 -1);	890	my @align = qw(1 0 1 1 -1);
856		891
857	my $y = 0;	892	my $y = 0;
858	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {	893	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {
…		…
875		910
876	$m = [$users, $host, $uptime, $version, $desc];	911	$m = [$users, $host, $uptime, $version, $desc];
877		912
878	$y++;	913	$y++;
879		914
880	$table->add (0, $y, new CFClient::UI::VBox children => [	915	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
881	(new CFClient::UI::Button text => "Use", on_activate => sub {	916	(new CFClient::UI::Button
		917	text => "Use",
		918	tooltip => "Put this server into the <b>Host:Port</b> field",
		919	on_activate => sub {
882	$HOST_ENTRY->set_text ($CFG->{host} = $host);	920	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
883	$METASERVER->toggle_visibility;	921	$METASERVER->hide;
		922	0
		923	},
884	}),	924	),
885	(new CFClient::UI::Empty expand => 1),	925	(new CFClient::UI::Empty expand => 1),
886	]);	926	]);
887		927
888	$table->add ($_ + 1, $y, new CFClient::UI::Label	928	$table->add ($_, $y, new CFClient::UI::Label
889	ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)	929	ellipsise => 0,
		930	align => $align[$_],
		931	text => $m->[$_],
		932	tooltip => $tip[$_],
		933	can_hover => 1,
		934	can_events => 1,
		935	fontsize => 0.8)
890	for 0 .. $#$m;	936	for 0 .. $#$m;
891	}	937	}
892	}	938	}
893	});	939	});
894	}	940	}
895		941
896	sub metaserver_dialog {	942	sub metaserver_dialog {
897	my $dialog = new CFClient::UI::FancyFrame	943	my $dialog = new CFClient::UI::FancyFrame
898	title => "Server List",	944	title => "Server List",
899	name => 'metaserver_dialog',	945	name => 'metaserver_dialog',
900	x => 'center',	946	x => 'center',
901	y => 'center',	947	y => 'center',
902	z => 3,	948	z => 3,
		949	force_h => $::HEIGHT * 0.4,
903	child => (my $vbox = new CFClient::UI::VBox),	950	child => (my $vbox = new CFClient::UI::VBox),
904	on_visibility_change => sub {	951	on_visibility_change => sub {
905	update_metaserver if $_[1];	952	update_metaserver if $_[1];
		953	0
906	},	954	},
907	;	955	;
908		956
909	$vbox->add ($dialog->{table} = new CFClient::UI::Table);	957	$dialog->{table} = new CFClient::UI::Table;
		958
		959	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
910		960
911	$dialog	961	$dialog
912	}	962	}
913		963
914	sub server_setup {	964	sub server_setup {
…		…
921	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	971	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
922		972
923	$vbox->add (	973	$vbox->add (
924	$HOST_ENTRY = new CFClient::UI::Entry	974	$HOST_ENTRY = new CFClient::UI::Entry
925	expand => 1,	975	expand => 1,
926	text => $CFG->{host},	976	text => $CFG->{profile}{default}{host},
927	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	977	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
928	on_changed => sub {	978	on_changed => sub {
929	my ($self, $value) = @_;	979	my ($self, $value) = @_;
930	$CFG->{host} = $value;	980	$CFG->{profile}{default}{host} = $value;
		981	0
931	}	982	}
932	);	983	);
933		984
934	$METASERVER = metaserver_dialog;	985	$METASERVER = metaserver_dialog;
935		986
936	$vbox->add (new CFClient::UI::Button	987	$vbox->add (new CFClient::UI::Button
937	expand => 1,	988	expand => 1,
938	text => "Server List",	989	text => "Server List",
939	other => $METASERVER,	990	other => $METASERVER,
940	tooltip => "Show a list of available crossfire servers",	991	tooltip => "Show a list of available crossfire servers",
941	on_activate => sub { $METASERVER->toggle_visibility },	992	on_activate => sub { $METASERVER->toggle_visibility; 0 },
		993	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
942	);	994	);
943	}	995	}
944		996
945	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	997	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
946	$table->add (1, 4, new CFClient::UI::Entry	998	$table->add (1, 4, new CFClient::UI::Entry
947	text => $CFG->{user},	999	text => $CFG->{profile}{default}{user},
948	tooltip => "The name of your character on the server",	1000	tooltip => "The name of your character on the server",
949	on_changed => sub {	1001	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
950	my ($self, $value) = @_;
951	$CFG->{user} = $value;
952	}
953	);	1002	);
954		1003
955	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	1004	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
956	$table->add (1, 5, new CFClient::UI::Entry	1005	$table->add (1, 5, new CFClient::UI::Entry
957	text => $CFG->{password},	1006	text => $CFG->{profile}{default}{password},
958	hidden => 1,	1007	hidden => 1,
959	tooltip => "The password for your character",	1008	tooltip => "The password for your character",
960	on_changed => sub {	1009	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
961	my ($self, $value) = @_;
962	$CFG->{password} = $value;
963	}
964	);	1010	);
965		1011
966	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	1012	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
967	$table->add (1, 7, new CFClient::UI::Slider	1013	$table->add (1, 7, new CFClient::UI::Slider
968	force_w => 100,	1014	force_w => 100,
969	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1015	range => [$CFG->{mapsize}, 10, 100, 0, 1],
970	tooltip => "This is the size of the portion of the map update the server sends you. "	1016	tooltip => "This is the size of the portion of the map update the server sends you. "
971	. "If you set this to a high value you will be able to see further, "	1017	. "If you set this to a high value you will be able to see further, "
972	. "but you also increase bandwidth requirements and latency. "	1018	. "but you also increase bandwidth requirements and latency. "
973	. "This option is only used once at log-in.",	1019	. "This option is only used once at log-in.",
974	on_changed => sub {	1020	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
975	my ($self, $value) = @_;
976
977	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
978	},
979	);	1021	);
980		1022
981	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1023	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
982	$table->add (1, 8, new CFClient::UI::CheckBox	1024	$table->add (1, 8, new CFClient::UI::CheckBox
983	state => $CFG->{face_prefetch},	1025	state => $CFG->{face_prefetch},
…		…
986	. "This might increase or create lag, but increases the chances "	1028	. "This might increase or create lag, but increases the chances "
987	. "of faces being ready for display when you encounter them. "	1029	. "of faces being ready for display when you encounter them. "
988	. "It also uses up server bandwidth on every connect, "	1030	. "It also uses up server bandwidth on every connect, "
989	. "so only set it if you really need to prefetch images. "	1031	. "so only set it if you really need to prefetch images. "
990	. "This option can be set and unset any time.",	1032	. "This option can be set and unset any time.",
991	on_changed => sub { $CFG->{face_prefetch} = $_[1] },	1033	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
992	);	1034	);
993		1035
994	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	1036	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
995	$table->add (1, 9, new CFClient::UI::Entry	1037	$table->add (1, 9, new CFClient::UI::Entry
996	text => $CFG->{output_count},	1038	text => $CFG->{output_count},
997	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1039	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
998	on_changed => sub { $CFG->{output_count} = $_[1] },	1040	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
999	);	1041	);
1000		1042
1001	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	1043	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
1002	$table->add (1, 10, new CFClient::UI::Entry	1044	$table->add (1, 10, new CFClient::UI::Entry
1003	text => $CFG->{output_sync},	1045	text => $CFG->{output_sync},
1004	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1046	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1005	on_changed => sub { $CFG->{output_sync} = $_[1] },	1047	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1006	);	1048	);
1007		1049
1008	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1050	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1009	expand => 1,	1051	expand => 1,
1010	align => 0,	1052	align => 0,
1011	text => "Login",	1053	text => "Login",
1012	on_activate => sub {	1054	on_activate => sub {
1013	$CONN ? stop_game	1055	$CONN ? stop_game
1014	: start_game;	1056	: start_game;
		1057	0
1015	},	1058	},
1016	);	1059	);
1017		1060
1018	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	1061	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1019	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry	1062	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry
…		…
1022	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "	1065	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1023	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",	1066	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1024	on_changed => sub {	1067	on_changed => sub {
1025	my ($self, $value) = @_;	1068	my ($self, $value) = @_;
1026	$CFG->{say_command} = $value;	1069	$CFG->{say_command} = $value;
		1070	0
1027	}	1071	}
1028	);	1072	);
		1073
		1074	$vbox->add (new CFClient::UI::Label
		1075	text => "Server Info",
		1076	fontsize => 1.2,
		1077	padding_y => 8,
		1078	fg => [1, 1, 0, 1],
		1079	);
		1080
		1081	$vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1029		1082
1030	$vbox	1083	$vbox
1031	}	1084	}
1032		1085
1033	sub message_window {	1086	sub message_window {
…		…
1038	bg => [0, 0, 0, 0.75],	1091	bg => [0, 0, 0, 0.75],
1039	x => "max",	1092	x => "max",
1040	y => 0,	1093	y => 0,
1041	force_w => $::WIDTH * 0.4,	1094	force_w => $::WIDTH * 0.4,
1042	force_h => $::HEIGHT * 0.5,	1095	force_h => $::HEIGHT * 0.5,
1043	child => (my $vbox = new CFClient::UI::VBox);	1096	child => (my $vbox = new CFClient::UI::VBox),
		1097	has_close_button => 1;
1044		1098
1045	$vbox->add ($LOGVIEW);	1099	$vbox->add ($LOGVIEW);
1046		1100
1047	$vbox->add (my $input = new CFClient::UI::Entry	1101	$vbox->add (my $input = new CFClient::UI::Entry
1048	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "	1102	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
…		…
1056		1110
1057	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {	1111	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1058	$input->{refocus_map} = 1;	1112	$input->{refocus_map} = 1;
1059	}	1113	}
1060	delete $input->{auto_activated};	1114	delete $input->{auto_activated};
		1115
		1116	0
1061	},	1117	},
1062	on_activate => sub {	1118	on_activate => sub {
1063	my ($input, $text) = @_;	1119	my ($input, $text) = @_;
1064	$input->set_text ('');	1120	$input->set_text ('');
1065		1121
…		…
1071	}	1127	}
1072	if ($input->{refocus_map}) {	1128	if ($input->{refocus_map}) {
1073	delete $input->{refocus_map};	1129	delete $input->{refocus_map};
1074	$MAPWIDGET->focus_in	1130	$MAPWIDGET->focus_in
1075	}	1131	}
		1132
		1133	0
1076	},	1134	},
1077	on_escape => sub {	1135	on_escape => sub {
1078	$MAPWIDGET->focus_in	1136	$MAPWIDGET->grab_focus;
		1137
		1138	0
1079	},	1139	},
1080	);	1140	);
1081		1141
1082	$CONSOLE = {	1142	$CONSOLE = {
1083	window => $window,	1143	window => $window,
…		…
1105	);	1165	);
1106	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	1166	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1107	$hb->add (new CFClient::UI::Button	1167	$hb->add (new CFClient::UI::Button
1108	text => "Ok",	1168	text => "Ok",
1109	expand => 1,	1169	expand => 1,
1110	on_activate => sub { $QUIT_DIALOG->hide },	1170	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1111	);	1171	);
1112	$hb->add (new CFClient::UI::Button	1172	$hb->add (new CFClient::UI::Button
1113	text => "Quit anyway",	1173	text => "Quit anyway",
1114	expand => 1,	1174	expand => 1,
1115	on_activate => sub { exit },	1175	on_activate => sub { exit },
…		…
1158	["Potions" => PICKUP_POTION],	1218	["Potions" => PICKUP_POTION],
1159	["Magic Devices" => PICKUP_MAGIC_DEVICE],	1219	["Magic Devices" => PICKUP_MAGIC_DEVICE],
1160	["Ignore cursed" => PICKUP_NOT_CURSED],	1220	["Ignore cursed" => PICKUP_NOT_CURSED],
1161	["Jewelery" => PICKUP_JEWELS],	1221	["Jewelery" => PICKUP_JEWELS],
1162	],	1222	],
		1223	["Weight/Value ratio", 2, 17]
1163	)	1224	)
1164	{	1225	{
1165	my ($title, $x, $y, @bits) = @$_;	1226	my ($title, $x, $y, @bits) = @$_;
1166	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1227	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1167		1228
…		…
1172	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1233	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1173	$table->add ($x+1, $y, new CFClient::UI::CheckBox	1234	$table->add ($x+1, $y, new CFClient::UI::CheckBox
1174	state => $CFG->{pickup} & $mask,	1235	state => $CFG->{pickup} & $mask,
1175	on_changed => sub {	1236	on_changed => sub {
1176	my ($box, $value) = @_;	1237	my ($box, $value) = @_;
		1238
1177	if ($value) {	1239	if ($value) {
1178	$::CFG->{pickup} \|= $mask;	1240	$::CFG->{pickup} \|= $mask;
1179	} else {	1241	} else {
1180	$::CFG->{pickup} = $::CFG->{pickup} & ~$mask;	1242	$::CFG->{pickup} &= ~$mask;
1181	}	1243	}
		1244
1182	$::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})	1245	$::CONN->send_command ("pickup $::CFG->{pickup}")
1183	if defined $::CONN;	1246	if defined $::CONN;
		1247
		1248	0
1184	});	1249	});
1185	}	1250	}
1186	}	1251	}
		1252
		1253	$table->add (2, 18, new CFClient::UI::ValSlider
		1254	range => [0, 0, 16, 1, 1],
		1255	to_value => sub { ">= " . 5 * $_[0] },
		1256	on_changed => sub {
		1257	my ($slider, $value) = @_;
		1258
		1259	$::CFG->{pickup} &= ~0x7;
		1260	$::CFG->{pickup} \|= int $value
		1261	if $value;
		1262	1;
		1263	});
		1264	$table->add (3, 18, new CFClient::UI::Button
		1265	text => "set",
		1266	on_activate => sub {
		1267	$::CONN->send_command ("pickup $::CFG->{pickup}")
		1268	if defined $::CONN;
		1269	0
		1270	});
1187		1271
1188	$table	1272	$table
1189	}	1273	}
1190		1274
1191	sub inventory_window {	1275	sub inventory_window {
…		…
1193	x => "center",	1277	x => "center",
1194	y => "center",	1278	y => "center",
1195	force_w => $WIDTH * 9/10,	1279	force_w => $WIDTH * 9/10,
1196	force_h => $HEIGHT * 9/10,	1280	force_h => $HEIGHT * 9/10,
1197	title => "Inventory",	1281	title => "Inventory",
		1282	has_close_button => 1,
1198	;	1283	;
1199		1284
1200	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	1285	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
1201		1286
1202	$hb->add (my $vb1 = new CFClient::UI::VBox);	1287	$hb->add (my $vb1 = new CFClient::UI::VBox);
…		…
1217		1302
1218	sub spell_setup {	1303	sub spell_setup {
1219	new CFClient::UI::SpellList	1304	new CFClient::UI::SpellList
1220	}	1305	}
1221		1306
		1307	sub update_bindings {
		1308	$BIND_UPD_CB->() if $BIND_UPD_CB;
		1309	}
		1310
1222	sub keyboard_setup {	1311	sub keyboard_setup {
1223	my $binding_list = new CFClient::UI::VBox;	1312	my $binding_list = new CFClient::UI::VBox;
1224		1313
1225	my $refresh;	1314	my $refresh;
1226	$refresh = sub {	1315	$refresh = $BIND_UPD_CB = sub {
1227	$binding_list->clear ();	1316	$binding_list->clear ();
1228		1317
1229	for my $mod (keys %{$::CFG->{bindings}}) {	1318	for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1230	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {	1319	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1231	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};	1320	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1232	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;	1321	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1233		1322
1234	my $lbl = join "; ", @$cmds;	1323	my $lbl = join "; ", @$cmds;
1235	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);	1324	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1236	$binding_list->add (my $hb = new CFClient::UI::HBox);	1325	$binding_list->add (my $hb = new CFClient::UI::HBox);
1237	$hb->add (new CFClient::UI::Button	1326	$hb->add (new CFClient::UI::Button
1238	text => "delete",	1327	text => "delete",
1239	tooltip => "Deletes the binding",	1328	tooltip => "Deletes the binding",
1240	on_activate => sub {	1329	on_activate => sub {
1241	$binding_list->remove ($hb);	1330	$binding_list->remove ($hb);
1242	delete $::CFG->{bindings}->{$mod}->{$sym};	1331	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
		1332	0
1243	});	1333	});
1244		1334
1245	$hb->add (new CFClient::UI::Button	1335	$hb->add (new CFClient::UI::Button
1246	text => "edit",	1336	text => "edit",
1247	tooltip => "Edits the binding",	1337	tooltip => "Edits the binding",
1248	on_activate => sub {	1338	on_activate => sub {
1249	$::BIND_EDITOR->set_binding (	1339	$::BIND_EDITOR->set_binding (
1250	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},	1340	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1251	sub {	1341	sub {
1252	my ($nmod, $nsym, $ncmds) = @_;	1342	my ($nmod, $nsym, $ncmds) = @_;
1253	delete $::CFG->{bindings}->{$mod}->{$sym};	1343	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1254	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;	1344	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1255	$refresh->();	1345	$refresh->();
1256	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1346	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1257	$SETUP_DIALOG->show;	1347	$SETUP_DIALOG->show;
1258	},	1348	},
1259	sub {	1349	sub {
1260	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1350	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1261	$SETUP_DIALOG->show;	1351	$SETUP_DIALOG->show;
1262	});	1352	});
1263	$::BIND_EDITOR->show;	1353	$::BIND_EDITOR->show;
1264	$SETUP_DIALOG->hide;	1354	$SETUP_DIALOG->hide;
		1355	0
1265	});	1356	});
1266		1357
1267	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");	1358	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1268	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);	1359	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1269	}	1360	}
1270	}	1361	}
1271	};	1362	};
1272		1363
1273	my $vb = new CFClient::UI::VBox;	1364	my $vb = new CFClient::UI::VBox;
		1365	$vb->add (my $hb = new CFClient::UI::HBox);
		1366	$hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
		1367	$hb->add (new CFClient::UI::CheckBox
		1368	expand => 1,
		1369	state => $CFG->{shift_fire_stop},
		1370	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
		1371	on_changed => sub {
		1372	my ($cbox, $value) = @_;
		1373	$CFG->{shift_fire_stop} = $value;
		1374	0
		1375	});
		1376
1274	$vb->add ($binding_list);	1377	$vb->add ($binding_list);
1275	$vb->add (my $hb = new CFClient::UI::HBox);	1378	$vb->add (my $hb = new CFClient::UI::HBox);
1276		1379
1277	$hb->add (new CFClient::UI::Button	1380	$hb->add (new CFClient::UI::Button
1278	text => "record new",	1381	text => "record new",
…		…
1280	tooltip => "This button opens the binding editor with an empty binding.",	1383	tooltip => "This button opens the binding editor with an empty binding.",
1281	on_activate => sub {	1384	on_activate => sub {
1282	$::BIND_EDITOR->set_binding (undef, undef, [],	1385	$::BIND_EDITOR->set_binding (undef, undef, [],
1283	sub {	1386	sub {
1284	my ($mod, $sym, $cmds) = @_;	1387	my ($mod, $sym, $cmds) = @_;
1285	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;	1388	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1286	$refresh->();	1389	$refresh->();
1287	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1390	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1288	$SETUP_DIALOG->show;	1391	$SETUP_DIALOG->show;
1289	},	1392	},
1290	sub {	1393	sub {
…		…
1292	$SETUP_DIALOG->show;	1395	$SETUP_DIALOG->show;
1293	},	1396	},
1294	);	1397	);
1295	$SETUP_DIALOG->hide;	1398	$SETUP_DIALOG->hide;
1296	$::BIND_EDITOR->show;	1399	$::BIND_EDITOR->show;
		1400	0
1297	},	1401	},
1298	);	1402	);
1299		1403
1300	$hb->add (new CFClient::UI::Button	1404	$hb->add (new CFClient::UI::Button
1301	text => "close",	1405	text => "close",
1302	tooltip => "Closes the binding window",	1406	tooltip => "Closes the binding window",
1303	expand => 1,	1407	expand => 1,
1304	on_activate => sub {	1408	on_activate => sub {
1305	$SETUP_DIALOG->hide;	1409	$SETUP_DIALOG->hide;
		1410	0
1306	}	1411	}
1307	);	1412	);
1308		1413
1309	$refresh->();	1414	$refresh->();
1310		1415
1311	$vb	1416	$vb
1312	}	1417	}
1313		1418
1314	sub make_help_window {	1419	sub help_window {
1315	my $win = new CFClient::UI::FancyFrame	1420	my $win = new CFClient::UI::FancyFrame
1316	x => 'center',	1421	x => 'center',
1317	y => 'center',	1422	y => 'center',
1318	z => 2,	1423	z => 2,
1319	name => 'doc_browser',	1424	name => 'doc_browser',
…		…
1322	title => "Documentation";	1427	title => "Documentation";
1323		1428
1324	$win->add (my $vbox = new CFClient::UI::VBox);	1429	$win->add (my $vbox = new CFClient::UI::VBox);
1325		1430
1326	$vbox->add (my $buttons = new CFClient::UI::HBox);	1431	$vbox->add (my $buttons = new CFClient::UI::HBox);
1327	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1432	$vbox->add (my $viewer = new CFClient::UI::TextScroller
		1433	expand => 1, fontsize => 0.8, padding_x => 4);
1328		1434
1329	for (	1435	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
		1436	$buttons->add (my $combo = new CFClient::UI::Combobox
		1437	value => undef,
		1438	options => [
1330	[intro => "Introduction"],	1439	[intro => "Introduction"],
1331	[manual => "Manual"],	1440	[manual => "Manual"],
		1441	[skill_help => "Skills"],
1332	[command_help => "Commands"],	1442	[command_help => "Commands"],
1333	[skill_help => "Skills"],	1443	[dmcommand_help => "DM Commands"],
1334	) {	1444	[COPYING => "License Terms"],
1335	my ($pod, $label) = @$_;	1445	],
		1446	on_changed => sub {
		1447	my ($self, $pod) = @_;
1336		1448
1337	$buttons->add (new CFClient::UI::Button
1338	text => $label,
1339	on_activate => sub {
1340	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",	1449	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1341	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };	1450	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1342		1451
1343	$viewer->clear;	1452	$viewer->clear;
1344		1453
1345	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])	1454	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1346	for @$pom;	1455	for @$pom;
1347		1456
1348	$viewer->set_offset (0);	1457	$viewer->set_offset (0);
1349	},	1458	0
		1459	},
		1460	on_visibility_change => sub {
		1461	my ($self, $visible) = @_;
		1462	return unless $visible;
		1463	return if $self->{value};
		1464	$self->set_value ("intro");
		1465	0
		1466	},
1350	);	1467	);
1351	}
1352
1353	$viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1354		1468
1355	$win	1469	$win
1356	}	1470	}
1357		1471
1358	sub sdl_init {	1472	sub sdl_init {
…		…
1425	$MAPWIDGET->connect (activate_console => sub {	1539	$MAPWIDGET->connect (activate_console => sub {
1426	my ($mapwidget, $preset) = @_;	1540	my ($mapwidget, $preset) = @_;
1427		1541
1428	if ($CONSOLE) {	1542	if ($CONSOLE) {
1429	$CONSOLE->{input}->{auto_activated} = 1;	1543	$CONSOLE->{input}->{auto_activated} = 1;
1430	$CONSOLE->{input}->focus_in;	1544	$CONSOLE->{input}->grab_focus;
1431		1545
1432	if ($preset && $CONSOLE->{input}->get_text eq '') {	1546	if ($preset && $CONSOLE->{input}->get_text eq '') {
1433	$CONSOLE->{input}->set_text ($preset);	1547	$CONSOLE->{input}->set_text ($preset);
1434	}	1548	}
1435	}	1549	}
1436	});	1550	});
1437	$MAPWIDGET->show;	1551	$MAPWIDGET->show;
1438	$MAPWIDGET->focus_in;	1552	$MAPWIDGET->grab_focus;
1439		1553
1440	$LOGVIEW = new CFClient::UI::TextView	1554	$LOGVIEW = new CFClient::UI::TextScroller
1441	expand => 1,	1555	expand => 1,
1442	font => $FONT_FIXED,	1556	font => $FONT_FIXED,
1443	fontsize => $::CFG->{log_fontsize},	1557	fontsize => $::CFG->{log_fontsize},
		1558	indent => -4,
1444	can_hover => 1,	1559	can_hover => 1,
1445	can_events => 1,	1560	can_events => 1,
1446	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1561	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1447	;	1562	;
1448		1563
…		…
1452	x => 'center',	1567	x => 'center',
1453	y => 'center',	1568	y => 'center',
1454	z => 2,	1569	z => 2,
1455	force_w => $::WIDTH * 0.6,	1570	force_w => $::WIDTH * 0.6,
1456	force_h => $::HEIGHT * 0.6,	1571	force_h => $::HEIGHT * 0.6,
		1572	has_close_button => 1,
1457	;	1573	;
1458		1574
1459	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1575	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1460	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1576	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1461		1577
…		…
1466	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1582	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1467	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	1583	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1468	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1584	$SETUP_NOTEBOOK->add (Audio => audio_setup,
1469	"Configure the use of audio, sound effects and background music.");	1585	"Configure the use of audio, sound effects and background music.");
1470	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	1586	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1471	"Lets you define, edit and delete bindings."	1587	"Lets you define, edit and delete key bindings."
1472	. "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "	1588	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1473	. "with nothing set and the recording started. After doing the actions you "	1589	. "with nothing set and the recording started. After doing the actions you "
1474	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "	1590	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1475	. "After pressing the combo the binding will be saved automatically and the "	1591	. "After pressing the combo the binding will be saved automatically and the "
1476	. "binding editor closes");	1592	. "binding editor closes");
1477	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,	1593	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1478	"Displays all spells you have and lets you edit keyboard shortcuts for them.");	1594	"Displays all spells you have and lets you edit keyboard shortcuts for them.");
		1595	$SETUP_NOTEBOOK->add (Debug => debug_setup,
		1596	"Some debuggin' options. Do not ask.");
1479		1597
1480	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	1598	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1481		1599
1482	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1600	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1483	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1601	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
…		…
1498	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1616	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1499	on_activate => sub {	1617	on_activate => sub {
1500	$::CFG->{layout} = CFClient::UI::get_layout;	1618	$::CFG->{layout} = CFClient::UI::get_layout;
1501	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1619	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1502	status "Configuration Saved";	1620	status "Configuration Saved";
		1621	0
1503	},	1622	},
1504	);	1623	);
1505		1624
1506	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1625	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1507	tooltip => "View Documentation");	1626	tooltip => "View Documentation");
1508		1627
1509	$BUTTONBAR->add (new CFClient::UI::Button	1628	$BUTTONBAR->add (new CFClient::UI::Button
1510	text => "Quit",	1629	text => "Quit",
1511	tooltip => "Terminates the program",	1630	tooltip => "Terminates the program",
…		…
1513	if ($CONN) {	1632	if ($CONN) {
1514	open_quit_dialog;	1633	open_quit_dialog;
1515	} else {	1634	} else {
1516	exit;	1635	exit;
1517	}	1636	}
		1637	0
1518	},	1638	},
1519	);	1639	);
1520		1640
1521	$BUTTONBAR->show;	1641	$BUTTONBAR->show;
1522	$SETUP_DIALOG->show;	1642	$SETUP_DIALOG->show;
…		…
1524		1644
1525	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1645	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1526	}	1646	}
1527		1647
1528	sub video_shutdown {	1648	sub video_shutdown {
		1649	CFClient::OpenGL::shutdown;
		1650
1529	undef $SDL_ACTIVE;	1651	undef $SDL_ACTIVE;
1530	}	1652	}
1531		1653
1532	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#	1654	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1533	my $bgmusic;#TODO#hack#d#	1655	my $bgmusic;#TODO#hack#d#
…		…
1749		1871
1750	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	1872	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1751	CFClient::UI::set_layout ($::CFG->{layout});	1873	CFClient::UI::set_layout ($::CFG->{layout});
1752		1874
1753	my %DEF_CFG = (	1875	my %DEF_CFG = (
1754	sdl_mode => 0,	1876	sdl_mode => 0,
1755	width => 640,	1877	width => 640,
1756	height => 480,	1878	height => 480,
1757	fullscreen => 0,	1879	fullscreen => 0,
1758	fast => 0,	1880	fast => 0,
1759	map_scale => 1,	1881	map_scale => 1,
1760	fow_enable => 1,	1882	fow_enable => 1,
1761	fow_intensity => 0.45,	1883	fow_intensity => 0.45,
1762	fow_smooth => 0,	1884	fow_smooth => 0,
1763	gui_fontsize => 1,	1885	gui_fontsize => 1,
1764	log_fontsize => 0.7,	1886	log_fontsize => 0.7,
1765	gauge_fontsize=> 1,	1887	gauge_fontsize => 1,
1766	gauge_size => 0.35,	1888	gauge_size => 0.35,
1767	stat_fontsize => 0.7,	1889	stat_fontsize => 0.7,
1768	mapsize => 100,	1890	mapsize => 100,
1769	host => "crossfire.schmorp.de",
1770	say_command => 'say',	1891	say_command => 'say',
1771	audio_enable => 1,	1892	audio_enable => 1,
1772	bgm_enable => 1,	1893	bgm_enable => 1,
1773	bgm_volume => 0.25,	1894	bgm_volume => 0.25,
1774	face_prefetch => 0,	1895	face_prefetch => 0,
1775	output_sync => 1,	1896	output_sync => 1,
1776	output_count => 1,	1897	output_count => 1,
		1898	pickup => 0,
		1899	default => "profile", # default profile
		1900	);
1777	);	1901
1778
1779	while (my ($k, $v) = each %DEF_CFG) {	1902	while (my ($k, $v) = each %DEF_CFG) {
1780	$CFG->{$k} = $v unless exists $CFG->{$k};	1903	$CFG->{$k} = $v unless exists $CFG->{$k};
1781	}	1904	}
		1905
		1906	$CFG->{profile}{default}{host} \|\|= "crossfire.schmorp.de";
1782		1907
1783	sdl_init;	1908	sdl_init;
1784		1909
1785	@SDL_MODES = reverse	1910	@SDL_MODES = reverse
1786	grep $_->[0] >= 640 && $_->[1] >= 480,	1911	grep $_->[0] >= 640 && $_->[1] >= 480,
…		…
1828	video_init;	1953	video_init;
1829	audio_init;	1954	audio_init;
1830	}	1955	}
1831		1956
1832	Event::loop;	1957	Event::loop;
		1958	#CFClient::SDL_Quit;
		1959	#CFClient::_exit 0;
1833		1960
1834	END { CFClient::SDL_Quit }	1961	END { CFClient::SDL_Quit }
1835		1962
1836	=head1 NAME	1963	=head1 NAME
1837		1964

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.60 by root, Tue Jun 6 02:55:50 2006 UTC vs. Revision 1.77 by elmex, Wed Jun 21 12:59:23 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.60 by root, Tue Jun 6 02:55:50 2006 UTC vs.
Revision 1.77 by elmex, Wed Jun 21 12:59:23 2006 UTC