ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.101 by elmex, Sun Jul 23 17:03:44 2006 UTC vs.
Revision 1.112 by root, Sun Aug 13 20:01:14 2006 UTC

…		…
32	use Crossfire;	32	use Crossfire;
33	use Crossfire::Protocol::Constants;	33	use Crossfire::Protocol::Constants;
34		34
35	use Compress::LZF;	35	use Compress::LZF;
36		36
37	use CFClient;	37	use CFPlus;
38	use CFClient::OpenGL ();	38	use CFPlus::OpenGL ();
39	use CFClient::Protocol;	39	use CFPlus::Protocol;
40	use CFClient::UI;	40	use CFPlus::UI;
41	use CFClient::Pod;	41	use CFPlus::Pod;
42	use CFClient::BindingEditor;	42	use CFPlus::BindingEditor;
43	use CFClient::MapWidget;	43	use CFPlus::MapWidget;
44		44
45	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	45	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46	$SIG{PIPE} = 'IGNORE';	46	$SIG{PIPE} = 'IGNORE';
47		47
		48	$Event::Eval = 0;
48	$Event::DIED = sub {	49	$Event::DIED = sub {
49	# TODO: display dialog box or so	50	# TODO: display dialog box or so
50	Carp::confess $_[1];#d#TODO: remove when stable	51	Carp::cluck $_[1];#d#TODO: remove when stable
51	CFClient::error $_[1];	52	CFPlus::error $_[1];
52	};	53	};
53		54
54	#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#	55	$SIG{__DIE__} = sub {
		56	return if CFPlus::in_destruct;
		57	Carp::cluck $_[0];
		58	CFPlus::error $_[0];
		59	return;#d#
		60	#return unless defined $^S && !$^S;
		61	$Event::DIED->(undef, $_[0]);
		62	};
55		63
56	our $VERSION = '0.1';	64	our $VERSION = '0.1';
57		65
58	my $MAX_FPS = 60;	66	my $MAX_FPS = 60;
59	my $MIN_FPS = 5; # unused as of yet	67	my $MIN_FPS = 5; # unused as of yet
…		…
131	our $BIND_UPD_CB;	139	our $BIND_UPD_CB;
132		140
133	our $PICKUP_CFG;	141	our $PICKUP_CFG;
134		142
135	sub status {	143	sub status {
136	$STATUSBOX->add (CFClient::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	144	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
137	}	145	}
138		146
139	sub debug {	147	sub debug {
140	$DEBUG_STATUS->set_text ($_[0]);	148	$DEBUG_STATUS->set_text ($_[0]);
141	}	149	}
…		…
147		155
148	# server query dialog	156	# server query dialog
149	sub server_query {	157	sub server_query {
150	my ($conn, $flags, $prompt) = @_;	158	my ($conn, $flags, $prompt) = @_;
151		159
152	$conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame	160	$conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame
153	x => "center",	161	x => "center",
154	y => "center",	162	y => "center",
155	title => "Server Query",	163	title => "Server Query",
156	child => my $vbox = new CFClient::UI::VBox,	164	child => my $vbox = new CFPlus::UI::VBox,
157	;	165	;
158		166
159	my @dialog = my $label = new CFClient::UI::Label	167	my @dialog = my $label = new CFPlus::UI::Label
160	max_w => $::WIDTH * 0.4,	168	max_w => $::WIDTH * 0.4,
161	ellipsise => 0,	169	ellipsise => 0,
162	text => $prompt;	170	text => $prompt;
163		171
164	if ($flags & CS_QUERY_YESNO) {	172	if ($flags & CS_QUERY_YESNO) {
165	push @dialog, my $hbox = new CFClient::UI::HBox;	173	push @dialog, my $hbox = new CFPlus::UI::HBox;
166		174
167	$hbox->add (new CFClient::UI::Button	175	$hbox->add (new CFPlus::UI::Button
168	text => "No",	176	text => "No",
169	on_activate => sub {	177	on_activate => sub {
170	$conn->send ("reply n");	178	$conn->send ("reply n");
171	$dialog->destroy;	179	$dialog->destroy;
172	0	180	0
173	}	181	}
174	);	182	);
175	$hbox->add (new CFClient::UI::Button	183	$hbox->add (new CFPlus::UI::Button
176	text => "Yes",	184	text => "Yes",
177	on_activate => sub {	185	on_activate => sub {
178	$conn->send ("reply y");	186	$conn->send ("reply y");
179	destroy_query_dialog $conn;	187	destroy_query_dialog $conn;
180	0	188	0
…		…
182	);	190	);
183		191
184	$dialog->grab_focus;	192	$dialog->grab_focus;
185		193
186	} elsif ($flags & CS_QUERY_SINGLECHAR) {	194	} elsif ($flags & CS_QUERY_SINGLECHAR) {
187	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";	195	$dialog->{tooltip} = "#charcreation_focus";
188		196
189	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {	197	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
190	$MESSAGE_WINDOW->show;	198	$MESSAGE_WINDOW->show;
191		199
192	unshift @dialog, new CFClient::UI::Label	200	unshift @dialog, new CFPlus::UI::Label
193	max_w => $::WIDTH * 0.4,	201	max_w => $::WIDTH * 0.4,
194	ellipsise => 0,	202	ellipsise => 0,
195	markup => "\nOr use your keyboard and the text entry below:\n";	203	markup => "\nOr use your keyboard and the text entry below:\n";
196		204
197	unshift @dialog, my $table = new CFClient::UI::Table;	205	unshift @dialog, my $table = new CFPlus::UI::Table;
198		206
199	$table->add (0, 0, new CFClient::UI::Button	207	$table->add (0, 0, new CFPlus::UI::Button
200	text => "Next Race",	208	text => "Next Race",
201	on_activate => sub {	209	on_activate => sub {
202	$conn->send ("reply n");	210	$conn->send ("reply n");
203	destroy_query_dialog $conn;	211	destroy_query_dialog $conn;
204	0	212	0
205	},	213	},
206	);	214	);
207	$table->add (2, 0, new CFClient::UI::Button	215	$table->add (2, 0, new CFPlus::UI::Button
208	text => "Accept",	216	text => "Accept",
209	on_activate => sub {	217	on_activate => sub {
210	$conn->send ("reply d");	218	$conn->send ("reply d");
211	destroy_query_dialog $conn;	219	destroy_query_dialog $conn;
212	0	220	0
213	},	221	},
214	);	222	);
215		223
216	unshift @dialog, new CFClient::UI::Label	224	unshift @dialog, new CFPlus::UI::Label
217	max_w => $::WIDTH * 0.4,	225	max_w => $::WIDTH * 0.4,
218	ellipsise => 0,	226	ellipsise => 0,
219	markup =>	227	markup => (CFPlus::Pod::section_label ui => "chargen_race"),
220	"<big><b>Character Creation: Race</b></big>\n\n"
221	. "Look at the <b>Messages</b> window to see a description of this race "
222	. "and the center of the screen to see how this race looks like "
223	. "(<small>below this dialog window: you may need to move the dialog away and "
224	. "click into the display area to make it visible</small>).\n\n"
225	. "You can look at another race, or accept this race (you will cycle back to "
226	. "this race eventually, so you can take your time making this important choice."
227	;	228	;
228		229
229	} elsif ($prompt =~ /roll new stats/) {	230	} elsif ($prompt =~ /roll new stats/) {
230	if (my $stat = delete $conn->{stat_change_with}) {	231	if (my $stat = delete $conn->{stat_change_with}) {
231	$conn->send ("reply $stat");	232	$conn->send ("reply $stat");
…		…
234	}	235	}
235		236
236	$STATS_PAGE->show;	237	$STATS_PAGE->show;
237	$MESSAGE_WINDOW->hide;	238	$MESSAGE_WINDOW->hide;
238		239
239	unshift @dialog, new CFClient::UI::Label	240	unshift @dialog, new CFPlus::UI::Label
240	max_w => $::WIDTH * 0.4,	241	max_w => $::WIDTH * 0.4,
241	ellipsise => 0,	242	ellipsise => 0,
242	markup => "\nOr use your keyboard and the text entry below:\n";	243	markup => "\nOr use your keyboard and the text entry below:\n";
243		244
244	unshift @dialog, my $table = new CFClient::UI::Table;	245	unshift @dialog, my $table = new CFPlus::UI::Table;
245		246
246	# left: re-roll	247	# left: re-roll
247	$table->add (0, 0, new CFClient::UI::Button	248	$table->add (0, 0, new CFPlus::UI::Button
248	text => "Roll Again",	249	text => "Roll Again",
249	on_activate => sub {	250	on_activate => sub {
250	$conn->send ("reply y");	251	$conn->send ("reply y");
251	destroy_query_dialog $conn;	252	destroy_query_dialog $conn;
252	0	253	0
253	},	254	},
254	);	255	);
255		256
256	# center: swap stats	257	# center: swap stats
257	my ($sw1, $sw2) = map +(new CFClient::UI::Combobox	258	my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
258	expand => 1,	259	expand => 1,
259	value => $_,	260	value => $_,
260	options => [	261	options => [
261	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],	262	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
262	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],	263	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
…		…
266	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],	267	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
267	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],	268	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
268	],	269	],
269	), 1 .. 2;	270	), 1 .. 2;
270		271
271	$table->add (2, 0, new CFClient::UI::Button	272	$table->add (2, 0, new CFPlus::UI::Button
272	text => "Swap Stats",	273	text => "Swap Stats",
273	on_activate => sub {	274	on_activate => sub {
274	$conn->{stat_change_with} = $sw2->{value};	275	$conn->{stat_change_with} = $sw2->{value};
275	$conn->send ("reply $sw1->{value}");	276	$conn->send ("reply $sw1->{value}");
276	destroy_query_dialog $conn;	277	destroy_query_dialog $conn;
277	0	278	0
278	},	279	},
279	);	280	);
280	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);	281	$table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
281		282
282	# right: accept	283	# right: accept
283	$table->add (4, 0, new CFClient::UI::Button	284	$table->add (4, 0, new CFPlus::UI::Button
284	text => "Accept",	285	text => "Accept",
285	on_activate => sub {	286	on_activate => sub {
286	$conn->send ("reply n");	287	$conn->send ("reply n");
287	$STATS_PAGE->hide;	288	$STATS_PAGE->hide;
288	destroy_query_dialog $conn;	289	destroy_query_dialog $conn;
289	0	290	0
290	},	291	},
291	);	292	);
292		293
293	unshift @dialog, my $hbox = new CFClient::UI::HBox;	294	unshift @dialog, my $hbox = new CFPlus::UI::HBox;
294	for (	295	for (
295	[Str => CS_STAT_STR],	296	[Str => CS_STAT_STR],
296	[Dex => CS_STAT_DEX],	297	[Dex => CS_STAT_DEX],
297	[Con => CS_STAT_CON],	298	[Con => CS_STAT_CON],
298	[Int => CS_STAT_INT],	299	[Int => CS_STAT_INT],
299	[Wis => CS_STAT_WIS],	300	[Wis => CS_STAT_WIS],
300	[Pow => CS_STAT_POW],	301	[Pow => CS_STAT_POW],
301	[Cha => CS_STAT_CHA],	302	[Cha => CS_STAT_CHA],
302	) {	303	) {
303	my ($name, $id) = @$_;	304	my ($name, $id) = @$_;
304	$hbox->add (new CFClient::UI::Label	305	$hbox->add (new CFPlus::UI::Label
305	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",	306	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
306	align => 0,	307	align => 0,
307	expand => 1,	308	expand => 1,
308	can_events => 1,	309	can_events => 1,
309	can_hover => 1,	310	can_hover => 1,
310	tooltip => $CFClient::STAT_TOOLTIP{$name},	311	tooltip => "#stat_$name",
311	);	312	);
312	}	313	}
313		314
314	unshift @dialog, new CFClient::UI::Label	315	unshift @dialog, new CFPlus::UI::Label
315	max_w => $::WIDTH * 0.4,	316	max_w => $::WIDTH * 0.4,
316	ellipsise => 0,	317	ellipsise => 0,
317	markup =>	318	markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
318	"<big><b>Character Creation: Stats</b></big>\n\n"
319	. "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
320	. "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
321	. "They will be modified later by both the race and the class you choose.\n\n"
322	. "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
323	;	319	;
324	}	320	}
325		321
326	push @dialog, my $entry = new CFClient::UI::Entry	322	push @dialog, my $entry = new CFPlus::UI::Entry
327	on_changed => sub {	323	on_changed => sub {
328	$conn->send ("reply $_[1]");	324	$conn->send ("reply $_[1]");
329	destroy_query_dialog $conn;	325	destroy_query_dialog $conn;
330	0	326	0
331	},	327	},
…		…
334	$entry->grab_focus;	330	$entry->grab_focus;
335		331
336	} else {	332	} else {
337	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";	333	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
338		334
339	push @dialog, my $entry = new CFClient::UI::Entry	335	push @dialog, my $entry = new CFPlus::UI::Entry
340	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),	336	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
341	on_activate => sub {	337	on_activate => sub {
342	$conn->send ("reply $_[1]");	338	$conn->send ("reply $_[1]");
343	destroy_query_dialog $conn;	339	destroy_query_dialog $conn;
344	0	340	0
…		…
360		356
361	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	357	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
362		358
363	my ($host, $port) = split /:/, $CFG->{profile}{default}{host};	359	my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
364		360
365	$MAP = new CFClient::Map $mapsize, $mapsize;	361	$MAP = new CFPlus::Map $mapsize, $mapsize;
366		362
367	$CONN = eval {	363	$CONN = eval {
368	new CFClient::Protocol	364	new CFPlus::Protocol
369	host => $host,	365	host => $host,
370	port => $port || 13327,	366	port => $port || 13327,
371	user => $CFG->{profile}{default}{user},	367	user => $CFG->{profile}{default}{user},
372	pass => $CFG->{profile}{default}{password},	368	pass => $CFG->{profile}{default}{password},
373	mapw => $mapsize,	369	mapw => $mapsize,
…		…
392	$chunk->play;	388	$chunk->play;
393	},	389	},
394	};	390	};
395		391
396	if ($CONN) {	392	if ($CONN) {
397	CFClient::lowdelay fileno $CONN->{fh};	393	CFPlus::lowdelay fileno $CONN->{fh};
398		394
399	status "login successful";	395	status "login successful";
400	} else {	396	} else {
401	status "unable to connect";	397	status "unable to connect";
402	stop_game();	398	stop_game();
…		…
420		416
421	undef $MAP;	417	undef $MAP;
422	}	418	}
423		419
424	sub graphics_setup {	420	sub graphics_setup {
425	my $vbox = new CFClient::UI::VBox;	421	my $vbox = new CFPlus::UI::VBox;
426		422
427	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	423	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
428		424
429	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	425	$table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
430	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	426	$table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
431		427
432	$hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);	428	$hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
433	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	429	$hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
434		430
435	$mode_slider->connect (changed => sub {	431	$mode_slider->connect (changed => sub {
436	my ($self, $value) = @_;	432	my ($self, $value) = @_;
437		433
438	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	434	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
…		…
440	});	436	});
441	$mode_slider->emit (changed => $mode_slider->{range}[0]);	437	$mode_slider->emit (changed => $mode_slider->{range}[0]);
442		438
443	my $row = 1;	439	my $row = 1;
444		440
445	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	441	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
446	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox	442	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
447	state => $CFG->{fullscreen},	443	state => $CFG->{fullscreen},
448	tooltip => "Bring the client into fullscreen mode.",	444	tooltip => "Bring the client into fullscreen mode.",
449	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }	445	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
450	);	446	);
451		447
452	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	448	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
453	$table->add (1, $row++, new CFClient::UI::CheckBox	449	$table->add (1, $row++, new CFPlus::UI::CheckBox
454	state => $CFG->{fast},	450	state => $CFG->{fast},
455	tooltip => "Lower the visual quality considerably to speed up rendering.",	451	tooltip => "Lower the visual quality considerably to speed up rendering.",
456	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }	452	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
457	);	453	);
458		454
459	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");	455	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
460	$table->add (1, $row++, new CFClient::UI::Slider	456	$table->add (1, $row++, new CFPlus::UI::Slider
461	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	457	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
462	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	458	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
463	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }	459	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
464	);	460	);
465		461
466	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	462	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
467	$table->add (1, $row++, new CFClient::UI::CheckBox	463	$table->add (1, $row++, new CFPlus::UI::CheckBox
468	state => $CFG->{fow_enable},	464	state => $CFG->{fow_enable},
469	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	465	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
470	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }	466	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
471	);	467	);
472		468
473	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	469	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
474	$table->add (1, $row++, new CFClient::UI::Slider	470	$table->add (1, $row++, new CFPlus::UI::Slider
475	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	471	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
476	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	472	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
477	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }	473	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
478	);	474	);
479		475
480	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	476	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
481	$table->add (1, $row++, new CFClient::UI::CheckBox	477	$table->add (1, $row++, new CFPlus::UI::CheckBox
482	state => $CFG->{fow_smooth},	478	state => $CFG->{fow_smooth},
483	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",	479	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
484	on_changed => sub {	480	on_changed => sub {
485	my ($self, $value) = @_;	481	my ($self, $value) = @_;
486	$CFG->{fow_smooth} = $value;	482	$CFG->{fow_smooth} = $value;
487	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;	483	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
488	0	484	0
489	}	485	}
490	);	486	);
491		487
492	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	488	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
493	$table->add (1, $row++, new CFClient::UI::Slider	489	$table->add (1, $row++, new CFPlus::UI::Slider
494	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	490	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
495	tooltip => "The base font size used by most GUI elements that do not have their own setting.",	491	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
496	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },	492	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
497	);	493	);
498		494
499	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");	495	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
500	$table->add (1, $row++, new CFClient::UI::Slider	496	$table->add (1, $row++, new CFPlus::UI::Slider
501	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	497	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
502	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	498	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
503	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },	499	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
504	);	500	);
505		501
506	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	502	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
507	$table->add (1, $row++, new CFClient::UI::Slider	503	$table->add (1, $row++, new CFPlus::UI::Slider
508	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	504	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
509	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	505	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
510	on_changed => sub {	506	on_changed => sub {
511	$CFG->{gauge_fontsize} = $_[1];	507	$CFG->{gauge_fontsize} = $_[1];
512	&set_gauge_window_fontsize;	508	&set_gauge_window_fontsize;
513	0	509	0
514	}	510	}
515	);	511	);
516		512
517	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");	513	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
518	$table->add (1, $row++, new CFClient::UI::Slider	514	$table->add (1, $row++, new CFPlus::UI::Slider
519	range => [$CFG->{gauge_size}, 0.2, 0.8],	515	range => [$CFG->{gauge_size}, 0.2, 0.8],
520	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	516	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
521	on_changed => sub {	517	on_changed => sub {
522	$CFG->{gauge_size} = $_[1];	518	$CFG->{gauge_size} = $_[1];
523	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	519	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
524	0	520	0
525	}	521	}
526	);	522	);
527		523
528	$table->add (1, $row++, new CFClient::UI::Button	524	$table->add (1, $row++, new CFPlus::UI::Button
529	expand => 1, align => 0, text => "Apply",	525	expand => 1, align => 0, text => "Apply",
530	tooltip => "Apply the video settings",	526	tooltip => "Apply the video settings",
531	on_activate => sub {	527	on_activate => sub {
532	video_shutdown ();	528	video_shutdown ();
533	video_init ();	529	video_init ();
…		…
537		533
538	$vbox	534	$vbox
539	}	535	}
540		536
541	sub audio_setup {	537	sub audio_setup {
542	my $vbox = new CFClient::UI::VBox;	538	my $vbox = new CFPlus::UI::VBox;
543		539
544	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	540	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
545		541
546	my $row = 0;	542	my $row = 0;
547		543
548	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	544	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
549	$table->add (1, $row++, new CFClient::UI::CheckBox	545	$table->add (1, $row++, new CFPlus::UI::CheckBox
550	state => $CFG->{audio_enable},	546	state => $CFG->{audio_enable},
551	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.",	547	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.",
552	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }	548	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
553	);	549	);
554	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	550	# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
555	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	551	# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
556	# $CFG->{effects_volume} = $_[1];	552	# $CFG->{effects_volume} = $_[1];
557	# });	553	# });
558	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	554	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
559	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);	555	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
560	$hbox->add (new CFClient::UI::CheckBox	556	$hbox->add (new CFPlus::UI::CheckBox
561	expand => 1, state => $CFG->{bgm_enable},	557	expand => 1, state => $CFG->{bgm_enable},
562	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	558	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
563	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }	559	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
564	);	560	);
565	$hbox->add (new CFClient::UI::Slider	561	$hbox->add (new CFPlus::UI::Slider
566	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	562	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
567	tooltip => "The volume of the background music. Changes are instant.",	563	tooltip => "The volume of the background music. Changes are instant.",
568	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }	564	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
569	);	565	);
570		566
571	$table->add (1, $row++, new CFClient::UI::Button	567	$table->add (1, $row++, new CFPlus::UI::Button
572	expand => 1, align => 0, text => "Apply",	568	expand => 1, align => 0, text => "Apply",
573	tooltip => "Apply the audio settings",	569	tooltip => "Apply the audio settings",
574	on_activate => sub {	570	on_activate => sub {
575	audio_shutdown ();	571	audio_shutdown ();
576	audio_init ();	572	audio_init ();
…		…
588	}	584	}
589		585
590	sub make_gauge_window {	586	sub make_gauge_window {
591	my $gh = int $HEIGHT * $CFG->{gauge_size};	587	my $gh = int $HEIGHT * $CFG->{gauge_size};
592		588
593	my $win = new CFClient::UI::Frame (	589	my $win = new CFPlus::UI::Frame (
594	force_x => 0,	590	force_x => 0,
595	force_y => "max",	591	force_y => "max",
596	force_w => $WIDTH,	592	force_w => $WIDTH,
597	force_h => $gh,	593	force_h => $gh,
598	);	594	);
599		595
600	$win->add (my $hbox = new CFClient::UI::HBox	596	$win->add (my $hbox = new CFPlus::UI::HBox
601	children => [	597	children => [
602	(new CFClient::UI::HBox expand => 1),	598	(new CFPlus::UI::HBox expand => 1),
603	(new CFClient::UI::VBox children => [	599	(new CFPlus::UI::VBox children => [
604	(new CFClient::UI::Empty expand => 1),	600	(new CFPlus::UI::Empty expand => 1),
605	(new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)),	601	(new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
606	]),	602	]),
607	(my $vbox = new CFClient::UI::VBox),	603	(my $vbox = new CFPlus::UI::VBox),
608	],	604	],
609	);	605	);
610		606
611	$vbox->add (new CFClient::UI::HBox	607	$vbox->add (new CFPlus::UI::HBox
612	expand => 1,	608	expand => 1,
613	children => [	609	children => [
614	(new CFClient::UI::Empty expand => 1),	610	(new CFPlus::UI::Empty expand => 1),
615	(my $hb = new CFClient::UI::HBox),	611	(my $hb = new CFPlus::UI::HBox),
616	],	612	],
617	);	613	);
618		614
619	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',	615	$hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
620	tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
621	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',	616	$hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
622	tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
623	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',	617	$hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
624	tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
625	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food',	618	$hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
626	tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
627		619
628	$vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	620	$vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
629	tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
630	$vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	621	$vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
631	tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
632		622
633	$GAUGES = {	623	$GAUGES = {
634	exp => $exp, win => $win, range => $rng,	624	exp => $exp, win => $win, range => $rng,
635	food => $fg, mana => $mg, hp => $hg, grace => $gg	625	food => $fg, mana => $mg, hp => $hg, grace => $gg
636	};	626	};
…		…
639		629
640	$win	630	$win
641	}	631	}
642		632
643	sub debug_setup {	633	sub debug_setup {
644	my $table = new CFClient::UI::Table;	634	my $table = new CFPlus::UI::Table;
645		635
646	$table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");	636	$table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
647	$table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });	637	$table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
648	$table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");	638	$table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
649	$table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });	639	$table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
650	$table->add (0, 2, new CFClient::UI::Label text => "Show FPS");	640	$table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
651	$table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });	641	$table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
652	$table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");	642	$table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
653	$table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });	643	$table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
654		644
655	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);	645	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
656		646
657	for my $x (0..2) {	647	for my $x (0..2) {
658	for my $y (0 .. 2) {	648	for my $y (0 .. 2) {
659	$table->add ($x + 3, $y,	649	$table->add ($x + 3, $y,
660	new CFClient::UI::Entry	650	new CFPlus::UI::Entry
661	text => $default_smooth[$x * 3 + $y],	651	text => $default_smooth[$x * 3 + $y],
662	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },	652	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
663	);	653	);
664	}	654	}
665	}	655	}
…		…
667		657
668	$table	658	$table
669	}	659	}
670		660
671	sub stats_window {	661	sub stats_window {
672	my $r = new CFClient::UI::ScrolledWindow (	662	my $r = new CFPlus::UI::ScrolledWindow (
673	expand => 1,	663	expand => 1,
674	scroll_y => 1	664	scroll_y => 1
675	);	665	);
676	$r->add (my $vb = new CFClient::UI::VBox);	666	$r->add (my $vb = new CFPlus::UI::VBox);
677		667
678	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	668	$vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
679	can_hover => 1, can_events => 1,	669	can_hover => 1, can_events => 1,
680	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	670	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
681	$vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,	671	$vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
682	can_hover => 1, can_events => 1,	672	can_hover => 1, can_events => 1,
683	tooltip => "The map you are currently on (if supported by the server).");	673	tooltip => "The map you are currently on (if supported by the server).");
684		674
685	$vb->add (my $hb0 = new CFClient::UI::HBox);	675	$vb->add (my $hb0 = new CFPlus::UI::HBox);
686	$hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,	676	$hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
687	can_hover => 1, can_events => 1,	677	can_hover => 1, can_events => 1,
688	tooltip => "The weight of the player including all inventory items.");	678	tooltip => "The weight of the player including all inventory items.");
689	$hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,	679	$hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
690	can_hover => 1, can_events => 1,	680	can_hover => 1, can_events => 1,
691	tooltip => "The weight limit: you cannot carry more than this.");	681	tooltip => "The weight limit: you cannot carry more than this.");
692		682
693
694	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	683	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
695	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	684	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
696		685
697	my $color2 = [1, 1, 0];	686	my $color2 = [1, 1, 0];
698		687
699	for (	688	for (
700	[0, 0, st_str => "Str", 30],	689	[0, 0, st_str => "Str", 30],
…		…
712	[2, 4, st_spd => "Spd", 10.54],	701	[2, 4, st_spd => "Spd", 10.54],
713	[2, 5, st_wspd => "WSp", 10.54],	702	[2, 5, st_wspd => "WSp", 10.54],
714	) {	703	) {
715	my ($col, $row, $id, $label, $template) = @$_;	704	my ($col, $row, $id, $label, $template) = @$_;
716		705
717	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label	706	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
718	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,	707	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
719	align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});	708	align => +1, template => $template, tooltip => "#stat_$label");
720	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label	709	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
721	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,	710	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
722	align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});	711	align => -1, text => $label, tooltip => "#stat_$label");
723	}	712	}
724		713
725	$vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);	714	$vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1);
726		715
727	my $row = 0;	716	my $row = 0;
728	my $col = 0;	717	my $col = 0;
729		718
730	my %resist_names = (	719	my %resist_names = (
…		…
769	drain acid pois para deat phys	758	drain acid pois para deat phys
770	blind fear tund elec cold ghit/)	759	blind fear tund elec cold ghit/)
771	{	760	{
772	$tbl2->add ($col, $row,	761	$tbl2->add ($col, $row,
773	$STATWIDS->{"res_$_"} =	762	$STATWIDS->{"res_$_"} =
774	new CFClient::UI::Label	763	new CFPlus::UI::Label
775	font => $FONT_FIXED,	764	font => $FONT_FIXED,
776	template => "-100%",	765	template => "-100%",
777	align => +1,	766	align => +1,
778	valign => 0,	767	valign => 0,
779	can_events => 1,	768	can_events => 1,
780	can_hover => 1,	769	can_hover => 1,
781	tooltip => $resist_names{$_}->[1],	770	tooltip => $resist_names{$_}->[1],
782	);	771	);
783	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	772	$tbl2->add ($col + 1, $row, new CFPlus::UI::Image
784	font => $FONT_FIXED,	773	font => $FONT_FIXED,
785	can_hover => 1,	774	can_hover => 1,
786	can_events => 1,	775	can_events => 1,
787	path => "ui/resist/resist_$_.png",	776	path => "ui/resist/resist_$_.png",
788	tooltip => $resist_names{$_}->[1],	777	tooltip => $resist_names{$_}->[1],
789	);	778	);
790	$tbl2->add ($col + 2, $row, new CFClient::UI::Label	779	$tbl2->add ($col + 2, $row, new CFPlus::UI::Label
791	text => $resist_names{$_}->[0],	780	text => $resist_names{$_}->[0],
792	font => $FONT_FIXED,	781	font => $FONT_FIXED,
793	can_hover => 1,	782	can_hover => 1,
794	can_events => 1,	783	can_events => 1,
795	tooltip => $resist_names{$_}->[1],	784	tooltip => $resist_names{$_}->[1],
…		…
806		795
807	$r	796	$r
808	}	797	}
809		798
810	sub skill_window {	799	sub skill_window {
811	my $sw = new CFClient::UI::ScrolledWindow (expand => 1);	800	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
812	$sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);	801	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
813	$sw	802	$sw
814	}	803	}
815		804
816	sub formsep($) {	805	sub formsep($) {
817	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1	806	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
…		…
828	return if $METASERVER_ATIME > time;	817	return if $METASERVER_ATIME > time;
829	$METASERVER_ATIME = time + 60;	818	$METASERVER_ATIME = time + 60;
830		819
831	my $table = $METASERVER->{table};	820	my $table = $METASERVER->{table};
832	$table->clear;	821	$table->clear;
833	$table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	822	$table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
834		823
835	my $buf;	824	my $buf;
836		825
837	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	826	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
838		827
…		…
861	"The time this server has been running without being restarted.",	850	"The time this server has been running without being restarted.",
862	"The server software version - a '+' indicates a Crossfire+ server.",	851	"The server software version - a '+' indicates a Crossfire+ server.",
863	"Short information about this server provided by its admins.",	852	"Short information about this server provided by its admins.",
864	);	853	);
865	my @col = qw(#Users Host Uptime Version Description);	854	my @col = qw(#Users Host Uptime Version Description);
866	$table->add ($_, 0, new CFClient::UI::Label	855	$table->add ($_, 0, new CFPlus::UI::Label
867	can_hover => 1, can_events => 1,	856	can_hover => 1, can_events => 1,
868	align => 0, fg => [1, 1, 0],	857	align => 0, fg => [1, 1, 0],
869	text => $col[$_], tooltip => $tip[$_])	858	text => $col[$_], tooltip => $tip[$_])
870	for 0 .. $#col;	859	for 0 .. $#col;
871		860
…		…
892		881
893	$m = [$users, $host, $uptime, $version, $desc];	882	$m = [$users, $host, $uptime, $version, $desc];
894		883
895	$y++;	884	$y++;
896		885
897	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [	886	$table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
898	(new CFClient::UI::Button	887	(new CFPlus::UI::Button
899	text => "Use",	888	text => "Use",
900	tooltip => "Put this server into the <b>Host:Port</b> field",	889	tooltip => "Put this server into the <b>Host:Port</b> field",
901	on_activate => sub {	890	on_activate => sub {
902	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);	891	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
903	$METASERVER->hide;	892	$METASERVER->hide;
904	0	893	0
905	},	894	},
906	),	895	),
907	(new CFClient::UI::Empty expand => 1),	896	(new CFPlus::UI::Empty expand => 1),
908	]);	897	]);
909		898
910	$table->add ($_, $y, new CFClient::UI::Label	899	$table->add ($_, $y, new CFPlus::UI::Label
911	ellipsise => 0,	900	ellipsise => 0,
912	align => $align[$_],	901	align => $align[$_],
913	text => $m->[$_],	902	text => $m->[$_],
914	tooltip => $tip[$_],	903	tooltip => $tip[$_],
915	can_hover => 1,	904	can_hover => 1,
…		…
920	}	909	}
921	});	910	});
922	}	911	}
923		912
924	sub metaserver_dialog {	913	sub metaserver_dialog {
925	my $vbox = new CFClient::UI::VBox;	914	my $vbox = new CFPlus::UI::VBox;
926	my $table = new CFClient::UI::Table;	915	my $table = new CFPlus::UI::Table;
927	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);	916	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
928		917
929	my $dialog = new CFClient::UI::FancyFrame	918	my $dialog = new CFPlus::UI::FancyFrame
930	title => "Server List",	919	title => "Server List",
931	name => 'metaserver_dialog',	920	name => 'metaserver_dialog',
932	x => 'center',	921	x => 'center',
933	y => 'center',	922	y => 'center',
934	z => 3,	923	z => 3,
…		…
944		933
945	$dialog	934	$dialog
946	}	935	}
947		936
948	sub server_setup {	937	sub server_setup {
949	my $vbox = new CFClient::UI::VBox;	938	my $vbox = new CFPlus::UI::VBox;
950		939
951	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	940	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
952	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	941	$table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
953		942
954	{	943	{
955	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	944	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
956		945
957	$vbox->add (	946	$vbox->add (
958	$HOST_ENTRY = new CFClient::UI::Entry	947	$HOST_ENTRY = new CFPlus::UI::Entry
959	expand => 1,	948	expand => 1,
960	text => $CFG->{profile}{default}{host},	949	text => $CFG->{profile}{default}{host},
961	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	950	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
962	on_changed => sub {	951	on_changed => sub {
963	my ($self, $value) = @_;	952	my ($self, $value) = @_;
964	$CFG->{profile}{default}{host} = $value;	953	$CFG->{profile}{default}{host} = $value;
965	0	954	0
966	}	955	}
967	);	956	);
968		957
969	$vbox->add (new CFClient::UI::Button	958	$vbox->add (new CFPlus::UI::Button
970	expand => 1,	959	expand => 1,
971	text => "Server List",	960	text => "Server List",
972	other => $METASERVER,	961	other => $METASERVER,
973	tooltip => "Show a list of available crossfire servers",	962	tooltip => "Show a list of available crossfire servers",
974	on_activate => sub { $METASERVER->toggle_visibility; 0 },	963	on_activate => sub { $METASERVER->toggle_visibility; 0 },
975	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },	964	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
976	);	965	);
977	}	966	}
978		967
979	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	968	$table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
980	$table->add (1, 4, new CFClient::UI::Entry	969	$table->add (1, 4, new CFPlus::UI::Entry
981	text => $CFG->{profile}{default}{user},	970	text => $CFG->{profile}{default}{user},
982	tooltip => "The name of your character on the server",	971	tooltip => "The name of your character on the server",
983	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }	972	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
984	);	973	);
985		974
986	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	975	$table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
987	$table->add (1, 5, new CFClient::UI::Entry	976	$table->add (1, 5, new CFPlus::UI::Entry
988	text => $CFG->{profile}{default}{password},	977	text => $CFG->{profile}{default}{password},
989	hidden => 1,	978	hidden => 1,
990	tooltip => "The password for your character",	979	tooltip => "The password for your character",
991	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }	980	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
992	);	981	);
993		982
994	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	983	$table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
995	$table->add (1, 7, new CFClient::UI::Slider	984	$table->add (1, 7, new CFPlus::UI::Slider
996	force_w => 100,	985	force_w => 100,
997	range => [$CFG->{mapsize}, 10, 100, 0, 1],	986	range => [$CFG->{mapsize}, 10, 100, 0, 1],
998	tooltip => "This is the size of the portion of the map update the server sends you. "	987	tooltip => "This is the size of the portion of the map update the server sends you. "
999	. "If you set this to a high value you will be able to see further, "	988	. "If you set this to a high value you will be able to see further, "
1000	. "but you also increase bandwidth requirements and latency. "	989	. "but you also increase bandwidth requirements and latency. "
1001	. "This option is only used once at log-in.",	990	. "This option is only used once at log-in.",
1002	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },	991	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1003	);	992	);
1004		993
1005	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");	994	$table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1006	$table->add (1, 8, new CFClient::UI::CheckBox	995	$table->add (1, 8, new CFPlus::UI::CheckBox
1007	state => $CFG->{face_prefetch},	996	state => $CFG->{face_prefetch},
1008	tooltip => "<b>Background Image Prefetch</b>\n\n"	997	tooltip => "<b>Background Image Prefetch</b>\n\n"
1009	. "If enabled, the client automatically pre-fetches images from the server. "	998	. "If enabled, the client automatically pre-fetches images from the server. "
1010	. "This might increase or create lag, but increases the chances "	999	. "This might increase or create lag, but increases the chances "
1011	. "of faces being ready for display when you encounter them. "	1000	. "of faces being ready for display when you encounter them. "
…		…
1013	. "so only set it if you really need to prefetch images. "	1002	. "so only set it if you really need to prefetch images. "
1014	. "This option can be set and unset any time.",	1003	. "This option can be set and unset any time.",
1015	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },	1004	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1016	);	1005	);
1017		1006
1018	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	1007	$table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1019	$table->add (1, 9, new CFClient::UI::Entry	1008	$table->add (1, 9, new CFPlus::UI::Entry
1020	text => $CFG->{output_count},	1009	text => $CFG->{output_count},
1021	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1010	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1022	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },	1011	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1023	);	1012	);
1024		1013
1025	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	1014	$table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1026	$table->add (1, 10, new CFClient::UI::Entry	1015	$table->add (1, 10, new CFPlus::UI::Entry
1027	text => $CFG->{output_sync},	1016	text => $CFG->{output_sync},
1028	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1017	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1029	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },	1018	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1030	);	1019	);
1031		1020
1032	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1021	$table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1033	expand => 1,	1022	expand => 1,
1034	align => 0,	1023	align => 0,
1035	text => "Login",	1024	text => "Login",
1036	on_activate => sub {	1025	on_activate => sub {
1037	$CONN ? stop_game	1026	$CONN ? stop_game
1038	: start_game;	1027	: start_game;
1039	0	1028	0
1040	},	1029	},
1041	);	1030	);
1042		1031
1043	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	1032	$table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1044	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry	1033	$table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1045	text => $CFG->{say_command},	1034	text => $CFG->{say_command},
1046	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "	1035	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1047	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "	1036	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1048	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",	1037	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1049	on_changed => sub {	1038	on_changed => sub {
…		…
1051	$CFG->{say_command} = $value;	1040	$CFG->{say_command} = $value;
1052	0	1041	0
1053	}	1042	}
1054	);	1043	);
1055		1044
1056	$vbox->add (new CFClient::UI::Label	1045	$vbox->add (new CFPlus::UI::Label
1057	text => "Server Info",	1046	text => "Server Info",
1058	fontsize => 1.2,	1047	fontsize => 1.2,
1059	padding_y => 8,	1048	padding_y => 8,
1060	fg => [1, 1, 0, 1],	1049	fg => [1, 1, 0, 1],
1061	);	1050	);
1062		1051
1063	$vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);	1052	$vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0);
1064		1053
1065	$vbox	1054	$vbox
1066	}	1055	}
1067		1056
1068	sub message_window {	1057	sub message_window {
1069	my $window = new CFClient::UI::FancyFrame	1058	my $window = new CFPlus::UI::FancyFrame
1070	name => "message_window",	1059	name => "message_window",
1071	title => "Messages",	1060	title => "Messages",
1072	border_bg => [1, 1, 1, 1],	1061	border_bg => [1, 1, 1, 1],
1073	x => "max",	1062	x => "max",
1074	y => 0,	1063	y => 0,
1075	force_w => $::WIDTH * 0.4,	1064	force_w => $::WIDTH * 0.4,
1076	force_h => $::HEIGHT * 0.5,	1065	force_h => $::HEIGHT * 0.5,
1077	child => (my $vbox = new CFClient::UI::VBox),	1066	child => (my $vbox = new CFPlus::UI::VBox),
1078	has_close_button => 1;	1067	has_close_button => 1;
1079		1068
1080	$vbox->add ($LOGVIEW);	1069	$vbox->add ($LOGVIEW);
1081		1070
1082	$vbox->add (my $input = new CFClient::UI::Entry	1071	$vbox->add (my $input = new CFPlus::UI::Entry
1083	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "	1072	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1084	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "	1073	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1085	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "	1074	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1086	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",	1075	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1087	on_focus_in => sub {	1076	on_focus_in => sub {
…		…
1126	};	1115	};
1127		1116
1128	$window	1117	$window
1129	}	1118	}
1130		1119
		1120	sub open_string_query {
		1121	my $cb = $_[1];
		1122	my $dialog = new CFPlus::UI::FancyFrame
		1123	x => "center",
		1124	y => "center",
		1125	z => 50,
		1126	force_w => $WIDTH * 4/5,
		1127	title => $_[0];
		1128
		1129	$dialog->add (
		1130	my $e = new CFPlus::UI::Entry
		1131	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
		1132	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
		1133	);
		1134
		1135	$e->grab_focus;
		1136	$dialog->show;
		1137	}
		1138
1131	sub open_quit_dialog {	1139	sub open_quit_dialog {
1132	unless ($QUIT_DIALOG) {	1140	unless ($QUIT_DIALOG) {
1133	$QUIT_DIALOG = new CFClient::UI::FancyFrame	1141	$QUIT_DIALOG = new CFPlus::UI::FancyFrame
1134	x => "center",	1142	x => "center",
1135	y => "center",	1143	y => "center",
1136	z => 50,	1144	z => 50,
1137	title => "Really Quit?",	1145	title => "Really Quit?",
1138	on_key_down => sub {	1146	on_key_down => sub {
1139	my ($dialog, $ev) = @_;	1147	my ($dialog, $ev) = @_;
1140	$ev->{sym} == 27 and $dialog->hide;	1148	$ev->{sym} == 27 and $dialog->hide;
1141	}	1149	}
1142	;	1150	;
1143		1151
1144	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	1152	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1145		1153
1146	$vb->add (new CFClient::UI::Label	1154	$vb->add (new CFPlus::UI::Label
1147	text => "You should find a savebed and apply it first!",	1155	text => "You should find a savebed and apply it first!",
1148	max_w => $WIDTH * 0.25,	1156	max_w => $WIDTH * 0.25,
1149	ellipsize => 0,	1157	ellipsize => 0,
1150	);	1158	);
1151	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	1159	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1152	$hb->add (new CFClient::UI::Button	1160	$hb->add (new CFPlus::UI::Button
1153	text => "Ok",	1161	text => "Ok",
1154	expand => 1,	1162	expand => 1,
1155	on_activate => sub { $QUIT_DIALOG->hide; 0 },	1163	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1156	);	1164	);
1157	$hb->add (new CFClient::UI::Button	1165	$hb->add (new CFPlus::UI::Button
1158	text => "Quit anyway",	1166	text => "Quit anyway",
1159	expand => 1,	1167	expand => 1,
1160	on_activate => sub { exit },	1168	on_activate => sub { exit },
1161	);	1169	);
1162	}	1170	}
…		…
1164	$QUIT_DIALOG->show;	1172	$QUIT_DIALOG->show;
1165	$QUIT_DIALOG->grab_focus;	1173	$QUIT_DIALOG->grab_focus;
1166	}	1174	}
1167		1175
1168	sub autopickup_setup {	1176	sub autopickup_setup {
1169	my $table = new CFClient::UI::Table;	1177	my $table = new CFPlus::UI::Table;
1170		1178
1171	for (	1179	for (
1172	["General", 0, 0,	1180	["General", 0, 0,
1173	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],	1181	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1174	["Inhibit autopickup" => PICKUP_INHIBIT],	1182	["Inhibit autopickup" => PICKUP_INHIBIT],
…		…
1208	],	1216	],
1209	["Weight/Value ratio", 2, 17]	1217	["Weight/Value ratio", 2, 17]
1210	)	1218	)
1211	{	1219	{
1212	my ($title, $x, $y, @bits) = @$_;	1220	my ($title, $x, $y, @bits) = @$_;
1213	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1221	$table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1214		1222
1215	for (@bits) {	1223	for (@bits) {
1216	++$y;	1224	++$y;
1217		1225
1218	my $mask = $_->[1];	1226	my $mask = $_->[1];
1219	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1227	$table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1220	$table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox	1228	$table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1221	state => $::CFG->{pickup} & $mask,	1229	state => $::CFG->{pickup} & $mask,
1222	on_changed => sub {	1230	on_changed => sub {
1223	my ($box, $value) = @_;	1231	my ($box, $value) = @_;
1224		1232
1225	if ($value) {	1233	if ($value) {
…		…
1236		1244
1237	${$_->[2]} = $checkbox if $_->[2];	1245	${$_->[2]} = $checkbox if $_->[2];
1238	}	1246	}
1239	}	1247	}
1240		1248
1241	$table->add (2, 18, new CFClient::UI::ValSlider	1249	$table->add (2, 18, new CFPlus::UI::ValSlider
1242	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1250	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1243	template => ">= 99",	1251	template => ">= 99",
1244	to_value => sub { ">= " . 5 * $_[0] },	1252	to_value => sub { ">= " . 5 * $_[0] },
1245	on_changed => sub {	1253	on_changed => sub {
1246	my ($slider, $value) = @_;	1254	my ($slider, $value) = @_;
…		…
1249	$::CFG->{pickup} |= int $value	1257	$::CFG->{pickup} |= int $value
1250	if $value;	1258	if $value;
1251	1;	1259	1;
1252	});	1260	});
1253		1261
1254	$table->add (3, 18, new CFClient::UI::Button	1262	$table->add (3, 18, new CFPlus::UI::Button
1255	text => "set",	1263	text => "set",
1256	on_activate => sub {	1264	on_activate => sub {
1257	$::CONN->send_command ("pickup $::CFG->{pickup}")	1265	$::CONN->send_command ("pickup $::CFG->{pickup}")
1258	if defined $::CONN;	1266	if defined $::CONN;
1259	0	1267	0
1260	});	1268	});
1261		1269
1262	$table	1270	$table
1263	}	1271	}
1264		1272
		1273	my %SORT_ORDER = (
		1274	type => undef,
		1275	mtime => sub { sort {
		1276	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
		1277	or $b->{mtime} <=> $a->{mtime}
		1278	or $a->{type} <=> $b->{type}
		1279	} @_ },
		1280	weight => sub { sort {
		1281	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
		1282	or $a->{type} <=> $b->{type}
		1283	} @_ },
		1284	);
		1285
1265	sub inventory_widget {	1286	sub inventory_widget {
1266	my $hb = new CFClient::UI::HBox homogeneous => 1;	1287	my $hb = new CFPlus::UI::HBox homogeneous => 1;
1267		1288
1268	$hb->add (my $vb1 = new CFClient::UI::VBox);	1289	$hb->add (my $vb1 = new CFPlus::UI::VBox);
1269	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1290	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1270		1291
1271	$vb1->add (my $hb1 = new CFClient::UI::HBox);	1292	$vb1->add (my $hb1 = new CFPlus::UI::HBox);
1272		1293
1273	use sort 'stable';	1294	use sort 'stable';
1274		1295
1275	$hb1->add (new CFClient::UI::Combobox	1296	$hb1->add (new CFPlus::UI::Selector
1276	value => undef,	1297	value => $::CFG->{inv_sort},
1277	options => [	1298	options => [
1278	[undef, "Type/Name"],	1299	[type => "Type/Name"],
1279	[	1300	[mtime => "Recent/Normal/Locked"],
1280	sub { sort {
1281	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1282	or $a->{type} <=> $b->{type}
1283	} @_ },
1284	"Weight/Type",	1301	[weight => "Weight/Type"],
1285	],
1286	[sub { } => "#TODO#"],
1287	],	1302	],
1288	on_changed => sub {	1303	on_changed => sub {
		1304	$::CFG->{inv_sort} = $_[1];
1289	$INV->set_sort_order ($_[1]);	1305	$INV->set_sort_order ($SORT_ORDER{$_[1]});
1290	},	1306	},
1291	);	1307	);
1292	$hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);	1308	$hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1293	#TODO# update to weigh/maxweight	1309	#TODO# update to weigh/maxweight
1294	$hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);	1310	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1295		1311
1296	$vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1312	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1297	$sw1->add ($INV = new CFClient::UI::Inventory);	1313	$sw1->add ($INV = new CFPlus::UI::Inventory);
1298		1314
1299	$hb->add (my $vb2 = new CFClient::UI::VBox);	1315	$hb->add (my $vb2 = new CFPlus::UI::VBox);
1300		1316
1301	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);	1317	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1302		1318
1303	$vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1319	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1304	$sw2->add ($INVR = new CFClient::UI::Inventory);	1320	$sw2->add ($INVR = new CFPlus::UI::Inventory);
1305		1321
1306	# XXX: Call after $INVR = ... because set_opencont sets the items	1322	# XXX: Call after $INVR = ... because set_opencont sets the items
1307	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");	1323	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1308		1324
1309	$hb	1325	$hb
1310	}	1326	}
1311		1327
1312	sub toggle_player_page {	1328	sub toggle_player_page {
…		…
1319	$PL_WINDOW->show;	1335	$PL_WINDOW->show;
1320	}	1336	}
1321	}	1337	}
1322		1338
1323	sub player_window {	1339	sub player_window {
1324	my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame	1340	my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame
1325	x => "center",	1341	x => "center",
1326	y => "center",	1342	y => "center",
1327	force_w => $WIDTH * 9/10,	1343	force_w => $WIDTH * 9/10,
1328	force_h => $HEIGHT * 9/10,	1344	force_h => $HEIGHT * 9/10,
1329	title => "Player",	1345	title => "Player",
…		…
1331	has_close_button => 1	1347	has_close_button => 1
1332	;	1348	;
1333		1349
1334	my $ntb =	1350	my $ntb =
1335	$PL_NOTEBOOK =	1351	$PL_NOTEBOOK =
1336	new CFClient::UI::Notebook expand => 1, debug => 1;	1352	new CFPlus::UI::Notebook expand => 1, debug => 1;
1337		1353
1338	$ntb->add (	1354	$ntb->add (
1339	"Statistics (F2)" => $STATS_PAGE = stats_window,	1355	"Statistics (F2)" => $STATS_PAGE = stats_window,
1340	"Shows statistics, where all your Stats and Resistances are shown."	1356	"Shows statistics, where all your Stats and Resistances are shown."
1341	);	1357	);
1342	$ntb->add (	1358	$ntb->add (
1343	"Skills (F3)" => $SKILL_PAGE = skill_window,	1359	"Skills (F3)" => $SKILL_PAGE = skill_window,
1344	"Shows all your Skills."	1360	"Shows all your Skills."
1345	);	1361	);
1346		1362
1347	my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);	1363	my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1348	$spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);	1364	$spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
1349	$ntb->add (	1365	$ntb->add (
1350	"Spellbook (F4)" => $spellsw,	1366	"Spellbook (F4)" => $spellsw,
1351	"Displays all spells you have and lets you edit keyboard shortcuts for them."	1367	"Displays all spells you have and lets you edit keyboard shortcuts for them."
1352	);	1368	);
1353	$ntb->add (	1369	$ntb->add (
…		…
1365	sub update_bindings {	1381	sub update_bindings {
1366	$BIND_UPD_CB->() if $BIND_UPD_CB;	1382	$BIND_UPD_CB->() if $BIND_UPD_CB;
1367	}	1383	}
1368		1384
1369	sub keyboard_setup {	1385	sub keyboard_setup {
1370	my $binding_list = new CFClient::UI::VBox;	1386	my $binding_list = new CFPlus::UI::VBox;
1371		1387
1372	my $refresh;	1388	my $refresh;
1373	$refresh = $BIND_UPD_CB = sub {	1389	$refresh = $BIND_UPD_CB = sub {
1374	$binding_list->clear ();	1390	$binding_list->clear ();
1375		1391
…		…
1377	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {	1393	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1378	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};	1394	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1379	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;	1395	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1380		1396
1381	my $lbl = join "; ", @$cmds;	1397	my $lbl = join "; ", @$cmds;
1382	my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);	1398	my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1383	$binding_list->add (my $hb = new CFClient::UI::HBox);	1399	$binding_list->add (my $hb = new CFPlus::UI::HBox);
1384	$hb->add (new CFClient::UI::Button	1400	$hb->add (new CFPlus::UI::Button
1385	text => "delete",	1401	text => "delete",
1386	tooltip => "Deletes the binding",	1402	tooltip => "Deletes the binding",
1387	on_activate => sub {	1403	on_activate => sub {
1388	$binding_list->remove ($hb);	1404	$binding_list->remove ($hb);
1389	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};	1405	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1390	0	1406	0
1391	});	1407	});
1392		1408
1393	$hb->add (new CFClient::UI::Button	1409	$hb->add (new CFPlus::UI::Button
1394	text => "edit",	1410	text => "edit",
1395	tooltip => "Edits the binding",	1411	tooltip => "Edits the binding",
1396	on_activate => sub {	1412	on_activate => sub {
1397	$::BIND_EDITOR->set_binding (	1413	$::BIND_EDITOR->set_binding (
1398	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},	1414	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
…		…
1411	$::BIND_EDITOR->show;	1427	$::BIND_EDITOR->show;
1412	$SETUP_DIALOG->hide;	1428	$SETUP_DIALOG->hide;
1413	0	1429	0
1414	});	1430	});
1415		1431
1416	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");	1432	$hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1417	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);	1433	$hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1418	}	1434	}
1419	}	1435	}
1420	};	1436	};
1421		1437
1422	my $vb = new CFClient::UI::VBox;	1438	my $vb = new CFPlus::UI::VBox;
1423	$vb->add (my $hb = new CFClient::UI::HBox);	1439	$vb->add (my $hb = new CFPlus::UI::HBox);
1424	$hb->add (new CFClient::UI::Label text => "only shift-up stops fire");	1440	$hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1425	$hb->add (new CFClient::UI::CheckBox	1441	$hb->add (new CFPlus::UI::CheckBox
1426	expand => 1,	1442	expand => 1,
1427	state => $CFG->{shift_fire_stop},	1443	state => $CFG->{shift_fire_stop},
1428	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",	1444	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1429	on_changed => sub {	1445	on_changed => sub {
1430	my ($cbox, $value) = @_;	1446	my ($cbox, $value) = @_;
1431	$CFG->{shift_fire_stop} = $value;	1447	$CFG->{shift_fire_stop} = $value;
1432	0	1448	0
1433	});	1449	});
1434		1450
1435	$vb->add ($binding_list);	1451	$vb->add ($binding_list);
1436	$vb->add (my $hb = new CFClient::UI::HBox);	1452	$vb->add (my $hb = new CFPlus::UI::HBox);
1437		1453
1438	$hb->add (new CFClient::UI::Button	1454	$hb->add (new CFPlus::UI::Button
1439	text => "record new",	1455	text => "record new",
1440	expand => 1,	1456	expand => 1,
1441	tooltip => "This button opens the binding editor with an empty binding.",	1457	tooltip => "This button opens the binding editor with an empty binding.",
1442	on_activate => sub {	1458	on_activate => sub {
1443	$::BIND_EDITOR->set_binding (undef, undef, [],	1459	$::BIND_EDITOR->set_binding (undef, undef, [],
…		…
1457	$::BIND_EDITOR->show;	1473	$::BIND_EDITOR->show;
1458	0	1474	0
1459	},	1475	},
1460	);	1476	);
1461		1477
1462	$hb->add (new CFClient::UI::Button	1478	$hb->add (new CFPlus::UI::Button
1463	text => "close",	1479	text => "close",
1464	tooltip => "Closes the binding window",	1480	tooltip => "Closes the binding window",
1465	expand => 1,	1481	expand => 1,
1466	on_activate => sub {	1482	on_activate => sub {
1467	$SETUP_DIALOG->hide;	1483	$SETUP_DIALOG->hide;
…		…
1472	$refresh->();	1488	$refresh->();
1473		1489
1474	$vb	1490	$vb
1475	}	1491	}
1476		1492
1477	# just weirdness, pls. ignore
1478	sub load_html_page {
1479	my ($viewer, $base) = @_;
1480
1481	$viewer->clear;
1482
1483	require LWP::Simple;
1484	require HTML::Parser;
1485	require URI;
1486
1487	my $page = LWP::Simple::get ($base)
1488	or return;
1489
1490	my @s = { };
1491	my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1492
1493	my $parser = HTML::Parser->new (
1494	text_h => [sub {
1495	my ($text) = @_;
1496	$text =~ s/\s+/ /g;
1497	$s[-1]{text} .= CFClient::asxml $text;
1498	}, "dtext"],
1499	start_h => [sub {
1500	my ($tag, $attr) = @_;
1501	if ($passthrough{$tag}) {
1502	$s[-1]{text} .= "<$tag>";
1503	} elsif ($tag eq "h1") {
1504	push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1505	} elsif ($tag eq "h2") {
1506	push @s, { text => "<span foreground='#ccccff' size='large'>" };
1507	} elsif ($tag eq "h3") {
1508	push @s, { text => "<span size='large'>" };
1509	} elsif ($tag eq "a") {
1510	push @s, { text => "", url => $attr->{href} };
1511	} elsif ($tag eq "p") {
1512	push @s, { };
1513	} elsif ($tag eq "img") {
1514	eval {
1515	push @{$s[-1]{obj}}, new CFClient::UI::Image
1516	tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1517	$s[-1]{text} .= "\x{fffc}";
1518	};
1519	}
1520	}, "tagname, attr"],
1521	end_h => [sub {
1522	my ($tag) = @_;
1523	if ($passthrough{$tag}) {
1524	$s[-1]{text} .= "</$tag>";
1525	} elsif ($tag =~ /^h\d$/) {
1526	$s[-1]{text} .= "</span>";
1527	push @s, { };
1528	} elsif ($tag eq "a") {
1529	my $S = pop @s;
1530	$s[-1]{text} .= "\x{fffc}";
1531	push @{$s[-1]{obj}}, new CFClient::UI::Label
1532	fg => [0.8, 0.8, 1],
1533	markup => "<u>$S->{text}</u>",
1534	fontsize => 0.8,
1535	can_events => 1,
1536	can_focus => 1,
1537	on_button_up => sub {
1538	load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1539	},
1540	;
1541	}
1542	}, "tagname"],
1543	);
1544
1545	$parser->parse ($page);
1546	$parser->eof;
1547
1548	$viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1549	for @s;
1550
1551	$viewer->set_offset (0);
1552	}
1553
1554	sub help_window {	1493	sub help_window {
1555	my $win = new CFClient::UI::FancyFrame	1494	my $win = new CFPlus::UI::FancyFrame
1556	x => 'center',	1495	x => 'center',
1557	y => 'center',	1496	y => 'center',
1558	z => 2,	1497	z => 2,
1559	name => 'doc_browser',	1498	name => 'doc_browser',
1560	force_w => int $WIDTH * 7/8,	1499	force_w => int $WIDTH * 7/8,
1561	force_h => int $HEIGHT * 7/8,	1500	force_h => int $HEIGHT * 7/8,
1562	title => "Help Browser",	1501	title => "Help Browser",
1563	has_close_button => 1;	1502	has_close_button => 1;
1564		1503
1565	$win->add (my $vbox = new CFClient::UI::VBox);	1504	$win->add (my $vbox = new CFPlus::UI::VBox);
1566		1505
1567	$vbox->add (my $buttons = new CFClient::UI::HBox);	1506	$vbox->add (my $buttons = new CFPlus::UI::HBox);
1568	$vbox->add (my $viewer = new CFClient::UI::TextScroller	1507	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
1569	expand => 1, fontsize => 0.8, padding_x => 4);	1508	expand => 1, fontsize => 0.8, padding_x => 4);
1570		1509
1571	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");	1510	my @history;
1572	$buttons->add (my $combo = new CFClient::UI::Combobox	1511	my @future;
1573	value => undef,	1512	my $curnode;
1574	options => [	1513
1575	[intro => "Introduction"],	1514	my $load_node; $load_node = sub {
1576	[manual => "Main Manual"],
1577	[skill_help => "Skill Reference"],
1578	[command_help => "Command Reference"],
1579	[dmcommand_help => "DM Commands"],
1580	[COPYING => "License Terms"],
1581	[test => "test (do not select)"], #d#TODO
1582	],
1583	on_changed => sub {
1584	my ($self, $pod) = @_;	1515	my ($node) = @_;
1585		1516
1586	if ($pod eq "test") {#d#TODO	1517	$buttons->clear;
1587	eval {	1518
1588	load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";	1519	if (@history) {
1589	};	1520	$buttons->add (new CFPlus::UI::Button
1590	warn "$@" if $@;	1521	text => "<",
1591	return;	1522	tooltip => "back to " . CFPlus::Pod::full_path_of $history[-1],
		1523	on_activate => sub {
		1524	unshift @future, $curnode if $curnode;
		1525	$load_node->(pop @history);
1592	}	1526	});
		1527	}
1593		1528
1594	my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",	1529	if (@future) {
1595	doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };	1530	$buttons->add (new CFPlus::UI::Button
		1531	text => ">",
		1532	tooltip => "forward to " . CFPlus::Pod::full_path_of $future[0],
		1533	on_activate => sub {
		1534	push @history, $curnode;
		1535	$load_node->(shift @future);
		1536	});
		1537	}
1596		1538
1597	#use Data::Dumper; warn Dumper $pom;#d#	1539	$curnode = $node;
1598		1540
1599	$viewer->clear;	1541	$viewer->clear;
1600		1542	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1601	# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1602	# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1603	# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1604	# ]);#d#
1605
1606	$viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1607	for @$pom;
1608
1609	$viewer->set_offset (0);	1543	$viewer->set_offset (0);
1610
1611	0
1612	},
1613	on_visibility_change => sub {
1614	my ($self, $visible) = @_;
1615	return unless $visible;
1616	return if $self->{value};
1617	$self->set_value ("intro");
1618	0
1619	},
1620	);	1544	};
		1545
		1546	$load_node->(CFPlus::Pod::find pod => "mainpage");
		1547
		1548	$CFPlus::Pod::on_link = sub {
		1549	my (@path) = @_;
		1550
		1551	push @history, $curnode if $curnode;
		1552	@future = ();
		1553
		1554	$load_node->(CFPlus::Pod::find @path);
		1555	$win->show;
		1556	};
1621		1557
1622	$win	1558	$win
1623	}	1559	}
1624		1560
1625	sub sdl_init {	1561	sub sdl_init {
1626	CFClient::SDL_Init	1562	CFPlus::SDL_Init
1627	and die "SDL::Init failed!\n";	1563	and die "SDL::Init failed!\n";
1628	}	1564	}
1629		1565
1630	sub video_init {	1566	sub video_init {
1631	sdl_init;	1567	sdl_init;
…		…
1636		1572
1637	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1573	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1638	$FULLSCREEN = $CFG->{fullscreen};	1574	$FULLSCREEN = $CFG->{fullscreen};
1639	$FAST = $CFG->{fast};	1575	$FAST = $CFG->{fast};
1640		1576
1641	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1577	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1642	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";	1578	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1643		1579
1644	$SDL_ACTIVE = 1;	1580	$SDL_ACTIVE = 1;
1645	$LAST_REFRESH = time - 0.01;	1581	$LAST_REFRESH = time - 0.01;
1646		1582
1647	CFClient::OpenGL::init;	1583	CFPlus::OpenGL::init;
1648		1584
1649	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	1585	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1650		1586
1651	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	1587	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1652		1588
1653	#############################################################################	1589	#############################################################################
1654		1590
1655	if ($DEBUG_STATUS) {	1591	if ($DEBUG_STATUS) {
1656	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1592	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1657	} else {	1593	} else {
1658	# create the widgets	1594	# create the widgets
1659		1595
1660	$DEBUG_STATUS = new CFClient::UI::Label	1596	$DEBUG_STATUS = new CFPlus::UI::Label
1661	padding => 0,	1597	padding => 0,
1662	z => 100,	1598	z => 100,
1663	force_x => "max",	1599	force_x => "max",
1664	force_y => 0;	1600	force_y => 0;
1665	$DEBUG_STATUS->show;	1601	$DEBUG_STATUS->show;
1666		1602
1667	$BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);	1603	$BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1668		1604
1669	$STATUSBOX = new CFClient::UI::Statusbox;	1605	$STATUSBOX = new CFPlus::UI::Statusbox;
1670	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	1606	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1671		1607
1672	(new CFClient::UI::Frame	1608	(new CFPlus::UI::Frame
1673	bg => [0, 0, 0, 0.4],	1609	bg => [0, 0, 0, 0.4],
1674	force_x => 0,	1610	force_x => 0,
1675	force_y => "max",	1611	force_y => "max",
1676	child => $STATUSBOX,	1612	child => $STATUSBOX,
1677	)->show;	1613	)->show;
1678		1614
1679	CFClient::UI::FancyFrame->new (	1615	CFPlus::UI::FancyFrame->new (
1680	title => "Map",	1616	title => "Map",
1681	name => "mapmap",	1617	name => "mapmap",
1682	x => 0,	1618	x => 0,
1683	y => $FONTSIZE + 8,	1619	y => $FONTSIZE + 8,
1684	border_bg => [1, 1, 1, 192/255],	1620	border_bg => [1, 1, 1, 192/255],
1685	bg => [1, 1, 1, 0],	1621	bg => [1, 1, 1, 0],
1686	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1622	child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1687	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1623	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1688	),	1624	),
1689	)->show;	1625	)->show;
1690		1626
1691	$MAPWIDGET = new CFClient::MapWidget;	1627	$MAPWIDGET = new CFPlus::MapWidget;
1692	$MAPWIDGET->connect (activate_console => sub {	1628	$MAPWIDGET->connect (activate_console => sub {
1693	my ($mapwidget, $preset) = @_;	1629	my ($mapwidget, $preset) = @_;
1694		1630
1695	if ($CONSOLE) {	1631	if ($CONSOLE) {
1696	$CONSOLE->{input}->{auto_activated} = 1;	1632	$CONSOLE->{input}->{auto_activated} = 1;
…		…
1702	}	1638	}
1703	});	1639	});
1704	$MAPWIDGET->show;	1640	$MAPWIDGET->show;
1705	$MAPWIDGET->grab_focus;	1641	$MAPWIDGET->grab_focus;
1706		1642
1707	$LOGVIEW = new CFClient::UI::TextScroller	1643	$LOGVIEW = new CFPlus::UI::TextScroller
1708	expand => 1,	1644	expand => 1,
1709	font => $FONT_FIXED,	1645	font => $FONT_FIXED,
1710	fontsize => $::CFG->{log_fontsize},	1646	fontsize => $::CFG->{log_fontsize},
1711	indent => -4,	1647	indent => -4,
1712	can_hover => 1,	1648	can_hover => 1,
1713	can_events => 1,	1649	can_events => 1,
1714	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1650	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1715	;	1651	;
1716		1652
1717	$SETUP_DIALOG = new CFClient::UI::FancyFrame	1653	$SETUP_DIALOG = new CFPlus::UI::FancyFrame
1718	title => "Setup",	1654	title => "Setup",
1719	name => "setup_dialog",	1655	name => "setup_dialog",
1720	x => 'center',	1656	x => 'center',
1721	y => 'center',	1657	y => 'center',
1722	z => 2,	1658	z => 2,
…		…
1725	has_close_button => 1,	1661	has_close_button => 1,
1726	;	1662	;
1727		1663
1728	$METASERVER = metaserver_dialog;	1664	$METASERVER = metaserver_dialog;
1729		1665
1730	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1666	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1731	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1667	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1732		1668
1733	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1669	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1734	"Configure the server to play on, your username, password and other server-related options.");	1670	"Configure the server to play on, your username, password and other server-related options.");
1735	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1671	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1736	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	1672	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
…		…
1746	. "After pressing the combo the binding will be saved automatically and the "	1682	. "After pressing the combo the binding will be saved automatically and the "
1747	. "binding editor closes");	1683	. "binding editor closes");
1748	$SETUP_NOTEBOOK->add (Debug => debug_setup,	1684	$SETUP_NOTEBOOK->add (Debug => debug_setup,
1749	"Some debuggin' options. Do not ask.");	1685	"Some debuggin' options. Do not ask.");
1750		1686
1751	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	1687	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1752		1688
1753	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1689	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1754	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1690	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1755		1691
1756	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	1692	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1757	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1693	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1758		1694
1759	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D	1695	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1760		1696
1761	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,	1697	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1762	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");	1698	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1763		1699
1764	$BUTTONBAR->add (new CFClient::UI::Button	1700	$BUTTONBAR->add (new CFPlus::UI::Button
1765	text => "Save Config",	1701	text => "Save Config",
1766	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1702	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1767	on_activate => sub {	1703	on_activate => sub {
1768	$::CFG->{layout} = CFClient::UI::get_layout;	1704	$::CFG->{layout} = CFPlus::UI::get_layout;
1769	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1705	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1770	status "Configuration Saved";	1706	status "Configuration Saved";
1771	0	1707	0
1772	},	1708	},
1773	);	1709	);
1774		1710
1775	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,	1711	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1776	tooltip => "View Documentation");	1712	tooltip => "View Documentation");
1777		1713
1778	$BUTTONBAR->add (new CFClient::UI::Button	1714	$BUTTONBAR->add (new CFPlus::UI::Button
1779	text => "Quit",	1715	text => "Quit",
1780	tooltip => "Terminates the program",	1716	tooltip => "Terminates the program",
1781	on_activate => sub {	1717	on_activate => sub {
1782	if ($CONN) {	1718	if ($CONN) {
1783	open_quit_dialog;	1719	open_quit_dialog;
…		…
1794		1730
1795	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1731	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1796	}	1732	}
1797		1733
1798	sub video_shutdown {	1734	sub video_shutdown {
1799	CFClient::OpenGL::shutdown;	1735	CFPlus::OpenGL::shutdown;
1800		1736
1801	undef $SDL_ACTIVE;	1737	undef $SDL_ACTIVE;
1802	}	1738	}
1803		1739
1804	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#	1740	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
…		…
1812		1748
1813	sub audio_music_finished {	1749	sub audio_music_finished {
1814	return unless $CFG->{bgm_enable};	1750	return unless $CFG->{bgm_enable};
1815		1751
1816	# TODO: hack, do play loop and mood music	1752	# TODO: hack, do play loop and mood music
1817	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";	1753	$bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1818	$bgmusic->play (0);	1754	$bgmusic->play (0);
1819		1755
1820	push @bgmusic, shift @bgmusic;	1756	push @bgmusic, shift @bgmusic;
1821	}	1757	}
1822		1758
1823	sub audio_init {	1759	sub audio_init {
1824	if ($CFG->{audio_enable}) {	1760	if ($CFG->{audio_enable}) {
1825	if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {	1761	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1826	$SDL_MIXER = !CFClient::Mix_OpenAudio;	1762	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1827		1763
1828	unless ($SDL_MIXER) {	1764	unless ($SDL_MIXER) {
1829	status "Unable to open sound device: there will be no sound";	1765	status "Unable to open sound device: there will be no sound";
1830	return;	1766	return;
1831	}	1767	}
1832		1768
1833	CFClient::Mix_AllocateChannels 8;	1769	CFPlus::Mix_AllocateChannels 8;
1834	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;	1770	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1835		1771
1836	audio_music_finished;	1772	audio_music_finished;
1837		1773
1838	while (<$fh>) {	1774	while (<$fh>) {
1839	next if /^\s*#/;	1775	next if /^\s*#/;
…		…
1842	my ($file, $volume, $event) = split /\s+/, $_, 3;	1778	my ($file, $volume, $event) = split /\s+/, $_, 3;
1843		1779
1844	push @SOUNDS, "$volume,$file";	1780	push @SOUNDS, "$volume,$file";
1845		1781
1846	$AUDIO_CHUNKS{"$volume,$file"} ||= do {	1782	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
1847	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";	1783	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1848	$chunk->volume ($volume * 128 / 100);	1784	$chunk->volume ($volume * 128 / 100);
1849	$chunk	1785	$chunk
1850	};	1786	};
1851	}	1787	}
1852	} else {	1788	} else {
…		…
1854	}	1790	}
1855	}	1791	}
1856	}	1792	}
1857		1793
1858	sub audio_shutdown {	1794	sub audio_shutdown {
1859	CFClient::Mix_CloseAudio if $SDL_MIXER;	1795	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1860	undef $SDL_MIXER;	1796	undef $SDL_MIXER;
1861	@SOUNDS = ();	1797	@SOUNDS = ();
1862	%AUDIO_CHUNKS = ();	1798	%AUDIO_CHUNKS = ();
1863	}	1799	}
1864		1800
…		…
1871		1807
1872	sub force_refresh {	1808	sub force_refresh {
1873	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	1809	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1874	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	1810	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1875		1811
1876	$CFClient::UI::ROOT->draw;	1812	$CFPlus::UI::ROOT->draw;
1877		1813
1878	$WANT_REFRESH = 0;	1814	$WANT_REFRESH = 0;
1879	$CAN_REFRESH = 0;	1815	$CAN_REFRESH = 0;
1880	$LAST_REFRESH = $NOW;	1816	$LAST_REFRESH = $NOW;
1881		1817
1882	CFClient::SDL_GL_SwapBuffers;	1818	CFPlus::SDL_GL_SwapBuffers;
1883	}	1819	}
1884		1820
1885	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	1821	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1886	$NOW = time;	1822	$NOW = time;
1887		1823
1888	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	1824	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1889	for CFClient::SDL_PollEvent;	1825	for CFPlus::SDL_PollEvent;
1890		1826
1891	if (%animate_object) {	1827	if (%animate_object) {
1892	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	1828	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1893	$WANT_REFRESH++;	1829	$WANT_REFRESH++;
1894	}	1830	}
…		…
1918	$CONN->face_prefetch	1854	$CONN->face_prefetch
1919	if $CONN;	1855	if $CONN;
1920	});	1856	});
1921		1857
1922	%SDL_CB = (	1858	%SDL_CB = (
1923	CFClient::SDL_QUIT => sub {	1859	CFPlus::SDL_QUIT => sub {
1924	Event::unloop -1;	1860	Event::unloop -1;
1925	},	1861	},
1926	CFClient::SDL_VIDEORESIZE => sub {	1862	CFPlus::SDL_VIDEORESIZE => sub {
1927	},	1863	},
1928	CFClient::SDL_VIDEOEXPOSE => sub {	1864	CFPlus::SDL_VIDEOEXPOSE => sub {
1929	CFClient::UI::full_refresh;	1865	CFPlus::UI::full_refresh;
1930	},	1866	},
1931	CFClient::SDL_ACTIVEEVENT => sub {	1867	CFPlus::SDL_ACTIVEEVENT => sub {
1932	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	1868	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1933	},	1869	},
1934	CFClient::SDL_KEYDOWN => sub {	1870	CFPlus::SDL_KEYDOWN => sub {
1935	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	1871	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1936	# alt-enter	1872	# alt-enter
1937	$FULLSCREEN_ENABLE->toggle;	1873	$FULLSCREEN_ENABLE->toggle;
1938	video_shutdown;	1874	video_shutdown;
1939	video_init;	1875	video_init;
1940	} else {	1876	} else {
1941	CFClient::UI::feed_sdl_key_down_event ($_[0]);	1877	CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1942	}	1878	}
1943	},	1879	},
1944	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,	1880	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1945	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,	1881	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1946	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,	1882	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1947	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,	1883	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1948	CFClient::SDL_USEREVENT => sub {	1884	CFPlus::SDL_USEREVENT => sub {
1949	if ($_[0]{code} == 1) {	1885	if ($_[0]{code} == 1) {
1950	audio_channel_finished $_[0]{data1};	1886	audio_channel_finished $_[0]{data1};
1951	} elsif ($_[0]{code} == 0) {	1887	} elsif ($_[0]{code} == 0) {
1952	audio_music_finished;	1888	audio_music_finished;
1953	}	1889	}
…		…
1957	#############################################################################	1893	#############################################################################
1958		1894
1959	$SIG{INT} = $SIG{TERM} = sub { exit };	1895	$SIG{INT} = $SIG{TERM} = sub { exit };
1960		1896
1961	{	1897	{
1962	local $SIG{__DIE__} = sub {
1963	return unless defined $^S && !$^S;
1964	Carp::confess $_[0];#d#TODO: remove when stable
1965	CFClient::fatal $_[0];
1966	};
1967
1968	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	1898	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1969	CFClient::UI::set_layout ($::CFG->{layout});	1899	CFPlus::UI::set_layout ($::CFG->{layout});
1970		1900
1971	my %DEF_CFG = (	1901	my %DEF_CFG = (
1972	sdl_mode => 0,	1902	sdl_mode => 0,
1973	width => 640,	1903	width => 640,
1974	height => 480,	1904	height => 480,
…		…
1990	bgm_volume => 0.25,	1920	bgm_volume => 0.25,
1991	face_prefetch => 0,	1921	face_prefetch => 0,
1992	output_sync => 1,	1922	output_sync => 1,
1993	output_count => 1,	1923	output_count => 1,
1994	pickup => 0,	1924	pickup => 0,
		1925	inv_sort => "mtime",
1995	default => "profile", # default profile	1926	default => "profile", # default profile
1996	);	1927	);
1997		1928
1998	while (my ($k, $v) = each %DEF_CFG) {	1929	while (my ($k, $v) = each %DEF_CFG) {
1999	$CFG->{$k} = $v unless exists $CFG->{$k};	1930	$CFG->{$k} = $v unless exists $CFG->{$k};
…		…
2003		1934
2004	sdl_init;	1935	sdl_init;
2005		1936
2006	@SDL_MODES = reverse	1937	@SDL_MODES = reverse
2007	grep $_->[0] >= 640 && $_->[1] >= 480,	1938	grep $_->[0] >= 640 && $_->[1] >= 480,
2008	CFClient::SDL_ListModes;	1939	CFPlus::SDL_ListModes;
2009		1940
2010	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	1941	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2011		1942
2012	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	1943	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2013		1944
2014	{	1945	{
2015	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(	1946	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2016	DejaVuSans.ttf	1947	DejaVuSans.ttf
2017	DejaVuSansMono.ttf	1948	DejaVuSansMono.ttf
2018	DejaVuSans-Bold.ttf	1949	DejaVuSans-Bold.ttf
2019	DejaVuSansMono-Bold.ttf	1950	DejaVuSansMono-Bold.ttf
2020	DejaVuSans-Oblique.ttf	1951	DejaVuSans-Oblique.ttf
2021	DejaVuSansMono-Oblique.ttf	1952	DejaVuSansMono-Oblique.ttf
2022	DejaVuSans-BoldOblique.ttf	1953	DejaVuSans-BoldOblique.ttf
2023	DejaVuSansMono-BoldOblique.ttf	1954	DejaVuSansMono-BoldOblique.ttf
2024	);	1955	);
2025		1956
2026	CFClient::add_font $_ for @fonts;	1957	CFPlus::add_font $_ for @fonts;
2027		1958
2028	CFClient::pango_init;	1959	CFPlus::pango_init;
2029		1960
2030	$FONT_PROP = new_from_file CFClient::Font $fonts[0];	1961	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2031	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];	1962	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2032		1963
2033	$FONT_PROP->make_default;	1964	$FONT_PROP->make_default;
2034	}	1965	}
2035		1966
2036	# compare mono (ft) vs. rgba (cairo)	1967	# compare mono (ft) vs. rgba (cairo)
2037	# ft - 1.8s, cairo 3s, even in alpha-only mode	1968	# ft - 1.8s, cairo 3s, even in alpha-only mode
2038	# for my $rgba (0..1) {	1969	# for my $rgba (0..1) {
2039	# my $t1 = Time::HiRes::time;	1970	# my $t1 = Time::HiRes::time;
2040	# for (1..1000) {	1971	# for (1..1000) {
2041	# my $layout = CFClient::Layout->new ($rgba);	1972	# my $layout = CFPlus::Layout->new ($rgba);
2042	# $layout->set_text ("hallo" x 100);	1973	# $layout->set_text ("hallo" x 100);
2043	# $layout->render;	1974	# $layout->render;
2044	# }	1975	# }
2045	# my $t2 = Time::HiRes::time;	1976	# my $t2 = Time::HiRes::time;
2046	# warn $t2-$t1;	1977	# warn $t2-$t1;
…		…
2049	video_init;	1980	video_init;
2050	audio_init;	1981	audio_init;
2051	}	1982	}
2052		1983
2053	Event::loop;	1984	Event::loop;
2054	#CFClient::SDL_Quit;	1985	#CFPlus::SDL_Quit;
2055	#CFClient::_exit 0;	1986	#CFPlus::_exit 0;
2056		1987
2057	END { CFClient::SDL_Quit }	1988	END { CFPlus::SDL_Quit }
2058		1989
2059	=head1 NAME	1990	=head1 NAME
2060		1991
2061	cfplus - A Crossfire+ and Crossfire game client	1992	cfplus - A Crossfire+ and Crossfire game client
2062		1993

Diff Legend

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