ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/bin/pclient

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.156 by elmex, Fri Apr 21 12:27:20 2006 UTC vs.
Revision 1.225 by root, Wed May 17 16:17:01 2006 UTC

1	#!/opt/bin/perl	1	#!/opt/bin/perl
2		2
3	use strict;	3	use strict;
4	use utf8;	4	use utf8;
5		5
		6	# do things only needed for single-binary version (par)
		7	BEGIN {
		8	if (%PAR::LibCache) {
		9	@INC = grep ref, @INC; # weed out all paths except pars loader refs
		10
		11	while (my ($filename, $zip) = each %PAR::LibCache) {
		12	for ($zip->memberNames) {
		13	next unless /^\/root\/(.*)/;
		14	$zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
		15	unless -e "$ENV{PAR_TEMP}/$1";
		16	}
		17	}
		18
		19	# TODO: pango-rc file, anybody?
		20
		21	unshift @INC, $ENV{PAR_TEMP};
		22	}
		23	}
		24
		25	# need to do it again because that pile of garbage called PAR nukes it before main
		26	unshift @INC, $ENV{PAR_TEMP}
		27	if %PAR::LibCache;
		28
6	use Time::HiRes 'time';	29	use Time::HiRes 'time';
		30	use Pod::POM;
7	use Event;	31	use Event;
8		32
9	use Crossfire;	33	use Crossfire;
10	use Crossfire::Protocol;	34	use Crossfire::Protocol;
11		35
…		…
13		37
14	use CFClient;	38	use CFClient;
15	use CFClient::UI;	39	use CFClient::UI;
16	use CFClient::MapWidget;	40	use CFClient::MapWidget;
17		41
		42	$Event::DIED = sub {
		43	# TODO: display dialog box or so
		44	CFClient::error $_[1];
		45	};
		46
		47	#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
		48
18	our $VERSION = '0.1';	49	our $VERSION = '0.1';
19		50
20	my $MAX_FPS = 60;	51	my $MAX_FPS = 60;
21	my $MIN_FPS = 5; # unused as of yet	52	my $MIN_FPS = 5; # unused as of yet
22		53
…		…
30	our $NOW;	61	our $NOW;
31		62
32	our $CFG;	63	our $CFG;
33	our $CONN;	64	our $CONN;
34	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	65	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
		66
		67	our $WANT_REFRESH;
		68	our $CAN_REFRESH;
35		69
36	our @SDL_MODES;	70	our @SDL_MODES;
37	our $WIDTH;	71	our $WIDTH;
38	our $HEIGHT;	72	our $HEIGHT;
39	our $FULLSCREEN;	73	our $FULLSCREEN;
40	our $FONTSIZE;	74	our $FONTSIZE;
41		75
		76	our $FONT_PROP;
		77	our $FONT_FIXED;
		78
42	our $MAP;	79	our $MAP;
		80	our $MAPMAP;
43	our $MAPWIDGET;	81	our $MAPWIDGET;
44	our $BUTTONBAR;	82	our $BUTTONBAR;
45	our $LOGVIEW;	83	our $LOGVIEW;
46	our $CONSOLE;	84	our $CONSOLE;
47	our $METASERVER;	85	our $METASERVER;
		86	our $LOGIN_BUTTON;
48		87
		88	our $FLOORBOX;
49	our $GAUGES;	89	our $GAUGES;
50	our $STATWIDS;	90	our $STATWIDS;
51		91
52	our $SDL_ACTIVE;	92	our $SDL_ACTIVE;
53	our %SDL_CB;	93	our %SDL_CB;
…		…
55	our $SDL_MIXER;	95	our $SDL_MIXER;
56	our @SOUNDS; # event => file mapping	96	our @SOUNDS; # event => file mapping
57	our %AUDIO_CHUNKS; # audio files	97	our %AUDIO_CHUNKS; # audio files
58		98
59	our $ALT_ENTER_MESSAGE;	99	our $ALT_ENTER_MESSAGE;
60	our $STATUS_LINE;	100	our $STATUSBOX;
61	our $DEBUG_STATUS;	101	our $DEBUG_STATUS;
62		102
		103	our $INVWIN;
		104	our $INV;
		105	our $INVR;
		106	our $INVR_LBL;
		107	our $OPENCONT;
		108
63	sub status {	109	sub status {
64	$STATUS_LINE->set_text ($_[0]);	110	$STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
65	$STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
66	}	111	}
67		112
68	sub debug {	113	sub debug {
69	$DEBUG_STATUS->set_text ($_[0]);	114	$DEBUG_STATUS->set_text ($_[0]);
70	$DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h});	115	my ($w, $h) = $DEBUG_STATUS->size_request;
		116	$DEBUG_STATUS->move ($WIDTH - $w, 0);
71	}	117	}
72		118
73	sub start_game {	119	sub start_game {
74	status "logging in...";	120	status "logging in...";
75		121
76	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	122	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
77		123
78	$MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";	124	$MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
79
80	$MAP = new CFClient::Map $mapsize, $mapsize;	125	$MAP = new CFClient::Map $mapsize, $mapsize;
81		126
82	my ($host, $port) = split /:/, $CFG->{host};	127	my ($host, $port) = split /:/, $CFG->{host};
83		128
84	$CONN = new conn	129	$CONN = eval {
		130	new conn
85	host => $host,	131	host => $host,
86	port => $port || 13327,	132	port => $port || 13327,
87	user => $CFG->{user},	133	user => $CFG->{user},
88	pass => $CFG->{password},	134	pass => $CFG->{password},
89	mapw => $mapsize,	135	mapw => $mapsize,
90	maph => $mapsize,	136	maph => $mapsize,
		137	;
91	;	138	};
92		139
93	status "login successful";	140	if ($CONN) {
94
95	CFClient::lowdelay fileno $CONN->{fh};	141	CFClient::lowdelay fileno $CONN->{fh};
		142
		143	$LOGIN_BUTTON->set_text ("Logout");
		144	status "login successful";
		145
		146	$BUTTONBAR->{children}[1]->emit ("activate")
		147	if $BUTTONBAR->{children}[1]->{state};
		148
		149	} else {
		150	status "unable to connect";
		151	stop_game();
		152	}
96	}	153	}
97		154
98	sub stop_game {	155	sub stop_game {
		156	return unless $CONN;
		157
		158	status "connection closed";
		159	$LOGIN_BUTTON->set_text ("Login");
		160	$CONN->destroy;
		161	$CONN = 0; # false, does not autovivify
		162
		163	$BUTTONBAR->{children}[1]->emit ("activate")
		164	unless $BUTTONBAR->{children}[1]->{state};
		165
		166	undef $MAPCACHE;
99	undef $CONN;	167	undef $MAP;
100	}	168	}
101		169
102	sub client_setup {	170	sub client_setup {
103	my $dialog = new CFClient::UI::FancyFrame	171	my $dialog = new CFClient::UI::FancyFrame
104	title => "Client Setup",	172	title => "Client Setup",
…		…
106	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	174	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
107		175
108	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	176	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
109	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	177	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
110		178
111	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);	179	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
112	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	180	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
113		181
114	$mode_slider->connect (changed => sub {	182	$mode_slider->connect (changed => sub {
115	my ($self, $value) = @_;	183	my ($self, $value) = @_;
116		184
117	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	185	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
118	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});	186	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
119	});	187	});
120	$mode_slider->emit (changed => $mode_slider->{range}[0]);	188	$mode_slider->emit (changed => $mode_slider->{range}[0]);
121		189
		190	my $row = 1;
		191
122	$table->add (0, 1, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	192	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
123	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {	193	$table->add (1, $row++, new CFClient::UI::CheckBox
		194	state => $CFG->{fullscreen},
		195	tooltip => "Bring the client into fullscreen mode",
		196	connect_changed => sub {
124	my ($self, $value) = @_;	197	my ($self, $value) = @_;
125	$CFG->{fullscreen} = $value;	198	$CFG->{fullscreen} = $value;
		199	}
126	});	200	);
127		201
128	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	202	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
129	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {	203	$table->add (1, $row++, new CFClient::UI::CheckBox
		204	state => $CFG->{fast},
		205	tooltip => "Lower the visual quality considerably to speed up rendering.",
		206	connect_changed => sub {
130	my ($self, $value) = @_;	207	my ($self, $value) = @_;
131	$CFG->{fast} = $value;	208	$CFG->{fast} = $value;
		209	}
132	});	210	);
133		211
		212	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
		213	$table->add (1, $row++, new CFClient::UI::Slider
		214	range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05],
		215	tooltip => "Enlarge or shrink the displayed map",
		216	connect_changed => sub {
		217	my ($self, $value) = @_;
		218	$CFG->{map_scale} = $value;
		219	}
		220	);
		221
134	$table->add (0, 3, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	222	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
135	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {	223	$table->add (1, $row++, new CFClient::UI::CheckBox
		224	state => $CFG->{fow_enable},
		225	tooltip => "Fog-of-War marks areas that cannot be seen by the player",
		226	connect_changed => sub {
136	my ($self, $value) = @_;	227	my ($self, $value) = @_;
137	$CFG->{fow_enable} = $value;	228	$CFG->{fow_enable} = $value;
		229	}
138	});	230	);
139		231
140	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	232	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
141	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {	233	$table->add (1, $row++, new CFClient::UI::Slider
		234	range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001],
		235	tooltip => "The higher the intensity, the lighter the Fog-of-War color",
		236	connect_changed => sub {
142	my ($self, $value) = @_;	237	my ($self, $value) = @_;
143	$CFG->{fow_intensity} = $value;	238	$CFG->{fow_intensity} = $value;
		239	}
144	});	240	);
145		241
146	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	242	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
147	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {	243	$table->add (1, $row++, new CFClient::UI::CheckBox
		244	state => $CFG->{fow_smooth},
		245	tooltip => "Smooth the Fog-of-War a bit to make it more realistic",
		246	connect_changed => sub {
148	my ($self, $value) = @_;	247	my ($self, $value) = @_;
149	$CFG->{fow_smooth} = $value;	248	$CFG->{fow_smooth} = $value;
150	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;	249	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
		250	}
151	});	251	);
152		252
153	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	253	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
154	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {	254	$table->add (1, $row++, new CFClient::UI::Slider
155	$CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;	255	range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
156	# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	256	tooltip => "The font size used by most GUI elements",
		257	connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
157	});	258	);
158		259
159	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");	260	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
160	$table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {	261	$table->add (1, $row++, new CFClient::UI::Slider
161	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);	262	range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
		263	tooltip => "The font size used by the server log window only",
		264	connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
162	});	265	);
163		266
164	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	267	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
		268
		269	$table->add (1, $row++, new CFClient::UI::Slider
		270	range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
		271	tooltip => "The font size used by the statistics window only",
		272	connect_changed => sub {
		273	$CFG->{stat_fontsize} = $_[1];
		274	&set_stats_window_fontsize;
		275	}
		276	);
		277
		278	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
		279	$table->add (1, $row++, new CFClient::UI::Slider
		280	range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
		281	tooltip => "Adjust the size of the stats gauges at the bottom right",
		282	connect_changed => sub {
		283	$CFG->{gauge_size} = $_[1];
		284	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
		285	}
		286	);
		287
		288	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
		289	$table->add (1, $row++, new CFClient::UI::Slider
		290	range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
		291	tooltip => "Adjusts the fontsize of the gauges at the bottom right",
		292	connect_changed => sub {
		293	$CFG->{gauge_fontsize} = $_[1];
		294	&set_gauge_window_fontsize;
		295	}
		296	);
		297
		298	$table->add (1, $row++, new CFClient::UI::Button
		299	expand => 1, align => 0, text => "Apply",
		300	tooltip => "Apply the video settings",
		301	connect_activate => sub {
165	video_shutdown ();	302	video_shutdown ();
166	video_init ();	303	video_init ();
		304	}
167	});	305	);
168		306
169	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	307	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
170	$table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {	308	$table->add (1, $row++, new CFClient::UI::CheckBox
		309	state => $CFG->{audio_enable},
		310	tooltip => "If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
		311	connect_changed => sub {
171	$CFG->{audio_enable} = $_[1];	312	$CFG->{audio_enable} = $_[1];
		313	}
172	});	314	);
173	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	315	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
174	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {	316	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
175	# $CFG->{effects_volume} = $_[1];	317	# $CFG->{effects_volume} = $_[1];
176	# });	318	# });
177	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	319	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
178	$table->add (1, 10, my $hbox = new CFClient::UI::HBox);	320	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
179	$hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {	321	$hbox->add (new CFClient::UI::CheckBox
		322	expand => 1, state => $CFG->{bgm_enable},
		323	tooltip => "Enable background music playing",
		324	connect_changed => sub {
180	$CFG->{bgm_enable} = $_[1];	325	$CFG->{bgm_enable} = $_[1];
		326	}
181	});	327	);
182	$hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub {	328	$hbox->add (new CFClient::UI::Slider
		329	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1],
		330	tooltip => "The volume of the background music",
		331	connect_changed => sub {
183	$CFG->{bgm_volume} = $_[1];	332	$CFG->{bgm_volume} = $_[1];
184	CFClient::MixMusic::volume $_[1] * 128;	333	CFClient::MixMusic::volume $_[1] * 128;
		334	}
185	});	335	);
186		336
187	$table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	337	$table->add (1, $row++, new CFClient::UI::Button
		338	expand => 1, align => 0, text => "Apply",
		339	tooltip => "Apply the audio settings",
		340	connect_activate => sub {
188	audio_shutdown ();	341	audio_shutdown ();
189	audio_init ();	342	audio_init ();
		343	}
190	});	344	);
		345
		346	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Communication cmd");
		347	$table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
		348	text => $CFG->{say_command},
		349	tooltip => "This is the command that will be used if you write a line in the message window entry. "
		350	."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
		351	."But you could also set it to 'tell &lt;playername&gt;' to only chat with that user.",
		352	connect_changed => sub {
		353	my ($self, $value) = @_;
		354	$CFG->{say_command} = $value;
		355	}
		356	);
191		357
192	$dialog	358	$dialog
193	}	359	}
194		360
		361	sub set_stats_window_fontsize {
		362	for (values %{$STATWIDS}) {
		363	$_->set_fontsize ($::CFG->{stat_fontsize});
		364	}
		365	}
		366
		367	sub set_gauge_window_fontsize {
		368	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
		369	$_->set_fontsize ($::CFG->{gauge_fontsize});
		370	}
		371
		372	# local $GAUGES->{win}{parent};#d#
		373	# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
		374	}
		375
		376	sub make_gauge_window {
		377	my $gh = int $HEIGHT * $CFG->{gauge_size};
		378
		379	my $win = new CFClient::UI::Frame (
		380	req_y => -1,
		381	user_w => $WIDTH,
		382	user_h => $gh,
		383	);
		384
		385	$win->add (my $hbox = new CFClient::UI::HBox
		386	children => [
		387	(new CFClient::UI::HBox expand => 1),
		388	(new CFClient::UI::VBox children => [
		389	(new CFClient::UI::Empty expand => 1),
		390	(new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)),
		391	]),
		392	(my $vbox = new CFClient::UI::VBox),
		393	],
		394	);
		395
		396	$vbox->add (new CFClient::UI::HBox
		397	expand => 1,
		398	children => [
		399	(new CFClient::UI::Empty expand => 1),
		400	(my $hb = new CFClient::UI::HBox),
		401	],
		402	);
		403
		404	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
		405	tooltip => "Health points. 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.");
		406	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
		407	tooltip => "Spell points. 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.");
		408	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
		409	tooltip => "Grace points - 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.");
		410	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
		411	tooltip => "Food. 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.");
		412
		413	$vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
		414	tooltip => "Experience points and overall level - 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.");
		415	$vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
		416	tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
		417
		418	$GAUGES = {
		419	exp => $exp, win => $win, range => $rng,
		420	food => $fg, mana => $mg, hp => $hg, grace => $gg
		421	};
		422
		423	&set_gauge_window_fontsize;
		424
		425	$win
		426	}
		427
195	sub make_stats_window {	428	sub make_stats_window {
196	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");	429	my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats";
197		430
198	$tgw->add (my $vb = new CFClient::UI::VBox);	431	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
199	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:");	432	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
200	$vb->add (my $lhb = new CFClient::UI::HBox);
201	$lhb->add ($STATWIDS->{exp} = new CFClient::UI::Label valign => 0, align => -1, text => "Exp:", expand => 1);	433	$vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
202	$lhb->add ($STATWIDS->{lvl} = new CFClient::UI::Label valign => 0, align => -1, text => "Level:", expand => 1);
203		434
204	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	435	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
205	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', expand => 1);
206	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', expand => 1);
207	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', expand => 1);
208	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food', expand => 1);
209	$GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
210		436
211	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	437	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);
212		438
213	if (0) { # this code can vanish, just wanted to preserver it for a checkin	439	my $black = [0, 0, 0];
214	$tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => -1, text => "S");
215	$tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => -1, text => "D");
216	$tbl->add (0, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => -1, text => "Co");
217	$tbl->add (0, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => -1, text => "I");
218	$tbl->add (0, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => -1, text => "W");
219	$tbl->add (0, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => -1, text => "P");
220	$tbl->add (0, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => -1, text => "Ch");
221		440
222	$tbl->add (1, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => -1, text => "Wc");	441	for (
223	$tbl->add (1, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => -1, text => "Ac");	442	[0, 0, st_str => "Str", 30, "Physical Strength, determines damage dealt with weapons, how much you can carry, and how often you can attack"],
224	$tbl->add (1, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => -1, text => "Dam");	443	[0, 1, st_dex => "Dex", 30, "Dexterity, your physical agility. Determines chance of being hit and affects armor class and speed"],
225	$tbl->add (1, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => -1, text => "Arm");	444	[0, 2, st_con => "Con", 30, "Constitution, physical health and toughness. Determines how many healthpoints you can have"],
226	$tbl->add (1, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => -1, text => "Sp");	445	[0, 3, st_int => "Int", 30, "Intelligence, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"],
227	$tbl->add (1, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => -1, text => "WSp");	446	[0, 4, st_wis => "Wis", 30, "Wisdom, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"],
228	} else {	447	[0, 5, st_pow => "Pow", 30, "Power, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"],
229	$tbl->add (0, 0, new CFClient::UI::Label valign => 0, align => +1, text => "S");	448	[0, 6, st_cha => "Cha", 30, "Charisma, how well you are received by NPCs. Affects buying and selling prices in shops."],
230	$tbl->add (0, 1, new CFClient::UI::Label valign => 0, align => +1, text => "D");
231	$tbl->add (0, 2, new CFClient::UI::Label valign => 0, align => +1, text => "Co");
232	$tbl->add (0, 3, new CFClient::UI::Label valign => 0, align => +1, text => "I");
233	$tbl->add (0, 4, new CFClient::UI::Label valign => 0, align => +1, text => "W");
234	$tbl->add (0, 5, new CFClient::UI::Label valign => 0, align => +1, text => "P");
235	$tbl->add (0, 6, new CFClient::UI::Label valign => 0, align => +1, text => "Ch");
236		449
237	$tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => -1, text => "");	450	[2, 0, st_wc => "Wc", -120, "Weapon Class, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],
238	$tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => -1, text => "");	451	[2, 1, st_ac => "Ac", -120, "Armour Class, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],
239	$tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => -1, text => "");	452	[2, 2, st_dam => "Dam", 120, "Damage, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],
240	$tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => -1, text => "");	453	[2, 3, st_arm => "Arm", 120, "Armour, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."],
241	$tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => -1, text => "");	454	[2, 4, st_spd => "Spd", 10.54, "Speed, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],
242	$tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => -1, text => "");	455	[2, 5, st_wspd => "WSp", 10.54, "Weapon Speed, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],
243	$tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => -1, text => "");	456	) {
		457	my ($col, $row, $id, $label, $template, $tooltip) = @$_;
244		458
245	$tbl->add (2, 0, new CFClient::UI::Label valign => 0, align => +1, text => "Wc");	459	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
246	$tbl->add (2, 1, new CFClient::UI::Label valign => 0, align => +1, text => "Ac");	460	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
247	$tbl->add (2, 2, new CFClient::UI::Label valign => 0, align => +1, text => "Dam");	461	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
248	$tbl->add (2, 3, new CFClient::UI::Label valign => 0, align => +1, text => "Arm");	462	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $black, valign => 0, align => -1, text => $label, tooltip => $tooltip);
249	$tbl->add (2, 4, new CFClient::UI::Label valign => 0, align => +1, text => "Sp");
250	$tbl->add (2, 5, new CFClient::UI::Label valign => 0, align => +1, text => "WSp");
251
252	$tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => -1, text => "");
253	$tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => -1, text => "");
254	$tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => -1, text => "");
255	$tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => -1, text => "");
256	$tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
257	$tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
258	}	463	}
259		464
260	$hb->add (my $tbl2 = new CFClient::UI::Table);	465	$hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
261		466
262	my $row = 0;	467	my $row = 0;
263	my $col = 0;	468	my $col = 0;
264		469
		470	my %resist_names = (
		471	slow => "Slow (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)",
		472	holyw => "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",
		473	conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)",
		474	fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
		475	depl => "Depletion (some monsters and other effects can cause stats depletion)",
		476	magic => "Magic (resistance to magic spells like magic missile or similar)",
		477	drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)",
		478	acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
		479	pois => "Poison (resistance to getting poisoned)",
		480	para => "Paralysation (this resistance affects the chance you get paralysed)",
		481	deat => "Death (resistance against death spells)",
		482	phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
		483	blind => "Blind (blind resistance affects the chance of a successful blinding attack)",
		484	fear => "Fear (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
		485	tund => "Turn undead",
		486	elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)",
		487	cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)",
		488	ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)",
		489	);
265	for (qw/slow holyw conf fire depl magic	490	for (qw/slow holyw conf fire depl magic
266	drain acid pois para deat phys	491	drain acid pois para deat phys
267	blind fear tund elec cold ghit/)	492	blind fear tund elec cold ghit/)
268	{	493	{
269	$tbl2->add ($col, $row, new CFClient::UI::Image image => "ui/resist/resist_$_.png");
270	$tbl2->add ($col + 1, $row,	494	$tbl2->add ($col, $row,
271	$STATWIDS->{"res_$_"} =	495	$STATWIDS->{"res_$_"} =
272	new CFClient::UI::Label text => "0", align => -1, valign => 0	496	new CFClient::UI::Label
		497	font => $FONT_FIXED,
		498	template => "-100%",
		499	align => +1,
		500	valign => 0,
		501	can_events => 1,
		502	can_hover => 1,
		503	tooltip => $resist_names{$_},
		504	);
		505	$tbl2->add ($col + 1, $row, new CFClient::UI::Image
		506	font => $FONT_FIXED,
		507	can_hover => 1,
		508	can_events => 1,
		509	image => "ui/resist/resist_$_.png",
		510	tooltip => $resist_names{$_},
273	);	511	);
274		512
275	$row++;	513	$row++;
276	if ($row % 6 == 0) {	514	if ($row % 6 == 0) {
277	$col += 2;	515	$col += 2;
278	$row = 0;	516	$row = 0;
279	}	517	}
280	}	518	}
281		519
		520	&set_stats_window_fontsize;
282	update_stats_window ({});	521	update_stats_window ({});
283		522
284	$tgw	523	$tgw
		524	}
		525
		526	sub formsep {
		527	reverse join ",", grep length, split /(...)/, reverse $_[0] * 1
285	}	528	}
286		529
287	sub update_stats_window {	530	sub update_stats_window {
288	my ($stats) = @_;	531	my ($stats) = @_;
289		532
290	# i love text protocols!!!	533	# i love text protocols!!!
291	my $hp = $stats->{1};	534	my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1;
292	my $hp_m = $stats->{2};	535	my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1;
293	my $sp = $stats->{3};	536	my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1;
294	my $sp_m = $stats->{4};	537	my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1;
295	my $fo = $stats->{18};	538	my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1;
296	my $fo_m = 999;	539	my $fo_m = 999;
297	my $gr = $stats->{23};	540	my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1;
298	my $gr_m = $stats->{24};	541	my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1;
299		542
300	$GAUGES->{hp} ->set_value ($hp, $hp_m);	543	$GAUGES->{hp} ->set_value ($hp, $hp_m);
301	$GAUGES->{mana} ->set_value ($sp, $sp_m);	544	$GAUGES->{mana} ->set_value ($sp, $sp_m);
302	$GAUGES->{food} ->set_value ($fo, $fo_m);	545	$GAUGES->{food} ->set_value ($fo, $fo_m);
303	$GAUGES->{grace} ->set_value ($gr, $gr_m);	546	$GAUGES->{grace} ->set_value ($gr, $gr_m);
		547	$GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64})
		548	. " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")");
		549	my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE};
		550	$rng =~ s/^Range: //; # thank you so much dear server
		551	$GAUGES->{range} ->set_text ("Rng: " . $rng);
		552	my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE};
		553	$title =~ s/^Player: //;
304	$STATWIDS->{title} ->set_text ("Title: " . $stats->{21});	554	$STATWIDS->{title} ->set_text ("Title: " . $title);
305	$STATWIDS->{exp} ->set_text ("Exp.: " . ($stats->{11} || $stats->{28}));
306	$STATWIDS->{lvl} ->set_text ("Level: " . $stats->{12});
307		555
308	if (0) { # this code can vanish, just wanted to preserver it for a checkin
309	$STATWIDS->{st_str} ->set_text (sprintf "S%d", $stats->{5});
310	$STATWIDS->{st_dex} ->set_text (sprintf "D%d", $stats->{8});
311	$STATWIDS->{st_con} ->set_text (sprintf "Co%d", $stats->{9});
312	$STATWIDS->{st_int} ->set_text (sprintf "I%d", $stats->{6});
313	$STATWIDS->{st_wis} ->set_text (sprintf "W%d", $stats->{7});
314	$STATWIDS->{st_pow} ->set_text (sprintf "P%d", $stats->{22});
315	$STATWIDS->{st_cha} ->set_text (sprintf "Ch%d", $stats->{10});
316	$STATWIDS->{st_wc} ->set_text (sprintf "Wc%d", $stats->{13});
317	$STATWIDS->{st_ac} ->set_text (sprintf "Ac%d", $stats->{14});
318	$STATWIDS->{st_dam} ->set_text (sprintf "Dam%d", $stats->{15});
319	$STATWIDS->{st_arm} ->set_text (sprintf "Arm%d", $stats->{16});
320	$STATWIDS->{st_spd} ->set_text (sprintf "Sp%.1f", $stats->{17});
321	$STATWIDS->{st_wspd}->set_text (sprintf "WSp%.1f", $stats->{19});
322	} else {
323	$STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});	556	$STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
324	$STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});	557	$STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
325	$STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});	558	$STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
326	$STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});	559	$STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
327	$STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});	560	$STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
328	$STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});	561	$STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
329	$STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});	562	$STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
330	$STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});	563	$STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
331	$STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});	564	$STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
332	$STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});	565	$STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
333	$STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});	566	$STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
334	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});	567	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_SPEED});
335	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});	568	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_WEAP_SP});
336	}
337		569
338	my %tbl = (	570	my %tbl = (
339	phys => 100,	571	phys => 100,
340	magic => 101,	572	magic => 101,
341	fire => 102,	573	fire => 102,
…		…
348	pois => 109,	580	pois => 109,
349	slow => 110,	581	slow => 110,
350	para => 111,	582	para => 111,
351	tund => 112,	583	tund => 112,
352	fear => 113,	584	fear => 113,
		585	depl => 113,
353	deat => 115,	586	deat => 115,
354	holyw => 116,	587	holyw => 116,
355	blind => 117	588	blind => 117
356	);	589	);
357		590
…		…
361		594
362	}	595	}
363		596
364	sub metaserver_dialog {	597	sub metaserver_dialog {
365	my $dialog = new CFClient::UI::FancyFrame	598	my $dialog = new CFClient::UI::FancyFrame
366	title => "Metaserver",	599	title => "Server List",
367	child => (my $vbox = new CFClient::UI::VBox);	600	child => (my $vbox = new CFClient::UI::VBox);
368		601
369	$vbox->add ($dialog->{table} = new CFClient::UI::Table);	602	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
370		603
371	$dialog	604	$dialog
372	}	605	}
		606
		607	my $METASERVER_ATIME;
373		608
374	sub update_metaserver {	609	sub update_metaserver {
375	my ($HOST) = @_;	610	my ($HOST) = @_;
376		611
377	status "fetching metaserver list...";	612	return if $METASERVER_ATIME > time;
		613	$METASERVER_ATIME = time + 60;
		614
		615	my $table = $METASERVER->{table};
		616	$table->clear;
		617	$table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
378		618
379	my $buf;	619	my $buf;
380		620
381	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	621	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
		622
		623	unless ($fh) {
		624	$label->set_text ("unable to contact metaserver: $!");
		625	return;
		626	}
382		627
383	Event->io (fd => $fh, poll => 'r', cb => sub {	628	Event->io (fd => $fh, poll => 'r', cb => sub {
384	my $res = sysread $fh, $buf, 8192, length $buf;	629	my $res = sysread $fh, $buf, 8192, length $buf;
385		630
386	if (!defined $res) {	631	if (!defined $res) {
387	$_[0]->w->cancel;	632	$_[0]->w->cancel;
388	status "metaserver: $!";	633	$label->set_text ("error while retrieving server list: $!");
389	} elsif ($res == 0) {	634	} elsif ($res == 0) {
390	$_[0]->w->cancel;	635	$_[0]->w->cancel;
391	status "server list retrieved";	636	status "server list retrieved";
392		637
393	my $table = $METASERVER->{table};	638	utf8::decode $buf if utf8::valid $buf;
394		639
395	$table->clear;	640	$table->clear;
396		641
397	my @col = qw(Use #Users Host Uptime Version Description);	642	my @col = qw(Use #Users Host Uptime Version Description);
398	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])	643	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
…		…
422	$m = [$users, $host, $uptime, $version, $desc];	667	$m = [$users, $host, $uptime, $version, $desc];
423		668
424	$y++;	669	$y++;
425		670
426	$table->add (0, $y, new CFClient::UI::VBox children => [	671	$table->add (0, $y, new CFClient::UI::VBox children => [
427	(new CFClient::UI::Button text => " ", connect_activate => sub {	672	(new CFClient::UI::Button text => "Use", connect_activate => sub {
428	$HOST->set_text ($CFG->{host} = $host);	673	$HOST->set_text ($CFG->{host} = $host);
429	}),	674	}),
430	(new CFClient::UI::Empty expand => 1),	675	(new CFClient::UI::Empty expand => 1),
431	]);	676	]);
432		677
433	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8)	678	$table->add ($_ + 1, $y, new CFClient::UI::Label
		679	ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)
434	for 0 .. $#$m;	680	for 0 .. $#$m;
435	}	681	}
436	}	682	}
437	});	683	});
438	}	684	}
…		…
446	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	692	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
447		693
448	{	694	{
449	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	695	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
450		696
451	$vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub {	697	$vbox->add (
		698	my $HOST = new CFClient::UI::Entry
		699	expand => 1,
		700	text => $CFG->{host},
		701	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
		702	connect_changed => sub {
		703	my ($self, $value) = @_;
		704	$CFG->{host} = $value;
		705	}
		706	);
		707
		708	$METASERVER = metaserver_dialog;
		709
		710	$vbox->add (new CFClient::UI::Flopper
		711	expand => 1,
		712	text => "Server List",
		713	other => $METASERVER,
		714	tooltip => "Show a list of available crossfire servers",
		715	connect_open => sub {
		716	update_metaserver $HOST;
		717	}
		718	);
		719	}
		720
		721	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
		722	$table->add (1, 4, new CFClient::UI::Entry
		723	text => $CFG->{user},
		724	tooltip => "The name of your character on the server",
		725	connect_changed => sub {
452	my ($self, $value) = @_;	726	my ($self, $value) = @_;
453	$CFG->{host} = $value;
454	});
455
456	$METASERVER = metaserver_dialog;
457
458	$vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
459	update_metaserver $HOST;
460	});
461	}
462
463	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
464	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
465	my ($self, $value) = @_;
466	$CFG->{user} = $value;	727	$CFG->{user} = $value;
		728	}
467	});	729	);
468		730
469	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	731	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
470	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {	732	$table->add (1, 5, new CFClient::UI::Entry
		733	text => $CFG->{password},
		734	hidden => 1,
		735	tooltip => "The password for your character",
		736	connect_changed => sub {
471	my ($self, $value) = @_;	737	my ($self, $value) = @_;
472	$CFG->{password} = $value;	738	$CFG->{password} = $value;
		739	}
473	});	740	);
474
475	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
476	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
477	my ($self, $value) = @_;
478	$CFG->{say_command} = $value;
479	});
480		741
481	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	742	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
482	$table->add (1, 7, new CFClient::UI::Slider	743	$table->add (1, 7, new CFClient::UI::Slider
483	req_w => 100,	744	req_w => 100,
484	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	745	range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1],
		746	tooltip => "This is the size of the portion of the map update the server sends you. "
		747	."If you set this to a high value you will be able to see further for example.",
485	connect_changed => sub {	748	connect_changed => sub {
486	my ($self, $value) = @_;	749	my ($self, $value) = @_;
487		750
488	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	751	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
489	},	752	},
490	);	753	);
491		754
492	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {	755	$table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button
		756	expand => 1,
		757	align => 0,
		758	text => "Login",
		759	connect_activate => sub {
		760	$CONN ? stop_game
493	start_game;	761	: start_game;
		762	},
494	});	763	);
495		764
496	$dialog	765	$dialog
497	}	766	}
498		767
499	sub message_window {	768	sub message_window {
500	my $window = new CFClient::UI::FancyFrame	769	my $window = new CFClient::UI::FancyFrame
501	title => "Messages",	770	title => "Messages",
502	border_bg => [1, 1, 1, 0.5],	771	border_bg => [1, 1, 1, 1],
503	bg => [0.3, 0.3, 0.3, 0.8],	772	bg => [0, 0, 0, 0.5],
504	user_w => int $::WIDTH / 3,	773	user_w => int $::WIDTH / 3,
505	user_h => int $::HEIGHT / 5,	774	user_h => int $::HEIGHT / 5,
506	child => (my $vbox = new CFClient::UI::VBox);	775	child => (my $vbox = new CFClient::UI::VBox);
507		776
508	$vbox->add ($LOGVIEW = new CFClient::UI::TextView	777	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
509	expand => 1,	778	expand => 1,
		779	font => $FONT_FIXED,
510	fontsize => $::CFG->{log_fontsize},	780	fontsize => $::CFG->{log_fontsize},
511	);	781	);
512		782
513	$vbox->add (my $input = new CFClient::UI::Entry	783	$vbox->add (my $input = new CFClient::UI::Entry
514	connect_focus_in => sub {	784	connect_focus_in => sub {
…		…
547	};	817	};
548		818
549	$window	819	$window
550	}	820	}
551		821
		822	sub make_inventory_window {
		823	my $invwin = new CFClient::UI::FancyFrame
		824	user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory";
		825
		826	$invwin->add (my $hb = new CFClient::UI::HBox);
		827
		828	$hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
		829	$vb1->add (my $lbl = new CFClient::UI::Label);
		830	$lbl->set_text ("Player");
		831	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
		832
		833	$hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
		834	$vb2->add ($INVR_LBL = new CFClient::UI::Label);
		835	$INVR_LBL->set_text ("Floor");
		836	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
		837
		838	$invwin
		839	}
		840
552	sub sdl_init {	841	sub sdl_init {
553	CFClient::SDL_Init	842	CFClient::SDL_Init
554	and die "SDL::Init failed!\n";	843	and die "SDL::Init failed!\n";
555	}	844	}
556		845
557	sub video_init {	846	sub video_init {
558	sdl_init;	847	sdl_init;
559		848
		849	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
		850
560	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	851	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
561	$FULLSCREEN = $CFG->{fullscreen};	852	$FULLSCREEN = $CFG->{fullscreen};
562	$FAST = $CFG->{fast};	853	$FAST = $CFG->{fast};
563		854
564	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	855	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
565	or die "SDL_SetVideoMode failed!\n";	856	or die "SDL_SetVideoMode failed!\n";
566		857
567	$SDL_ACTIVE = 1;	858	$SDL_ACTIVE = 1;
568
569	$LAST_REFRESH = time - 0.01;	859	$LAST_REFRESH = time - 0.01;
570		860
571	CFClient::gl_init;	861	CFClient::gl_init;
572		862
573	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	863	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
574		864
		865	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
		866
575	#############################################################################	867	#############################################################################
576		868
		869	unless ($DEBUG_STATUS) {
		870	# create the widgets
		871
577	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;	872	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
578	$DEBUG_STATUS->show;	873	$DEBUG_STATUS->show;
579		874
580	$STATUS_LINE = new CFClient::UI::Label	875	$STATUSBOX = new CFClient::UI::Statusbox;
581	padding => 0,	876	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
582	y => $HEIGHT - $FONTSIZE * 1.8;
583	$STATUS_LINE->show;
584		877
585	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	878	(new CFClient::UI::Frame
586	padding => 0,	879	bg => [0, 0, 0, 0.4],
587	fontsize => 0.8,	880	req_y => -1,
588	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	881	child => $STATUSBOX,
589	$ALT_ENTER_MESSAGE->show;	882	)->show;
590	$ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
591		883
592	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);	884	CFClient::UI::FancyFrame->new (
593	$MAPWIDGET->focus_in;	885	border_bg => [1, 1, 1, 192/255],
		886	bg => [1, 1, 1, 0],
		887	child => ($MAPMAP = new CFClient::MapWidget::MapMap),
		888	)->show;
		889
		890	$MAPWIDGET = new CFClient::MapWidget;
594	$MAPWIDGET->connect (activate_console => sub {	891	$MAPWIDGET->connect (activate_console => sub {
595	my ($mapwidget, $preset) = @_;	892	my ($mapwidget, $preset) = @_;
596		893
597	if ($CONSOLE) {	894	if ($CONSOLE) {
598	$CONSOLE->{input}->{auto_activated} = 1;	895	$CONSOLE->{input}->{auto_activated} = 1;
599	$CONSOLE->{input}->focus_in;	896	$CONSOLE->{input}->focus_in;
600		897
601	if ($preset && $CONSOLE->{input}->get_text eq '') {	898	if ($preset && $CONSOLE->{input}->get_text eq '') {
602	$CONSOLE->{input}->set_text ($preset);	899	$CONSOLE->{input}->set_text ($preset);
		900	}
603	}	901	}
604	}	902	});
605	});	903	$MAPWIDGET->show;
		904	$MAPWIDGET->focus_in;
606		905
607	$CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);	906	$BUTTONBAR = new CFClient::UI::HBox;
608		907
609	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);	908	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
610	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);	909	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
611	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);	910	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
612		911
		912	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
		913
		914	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
		915	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
		916
613	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {	917	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
614	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	918	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
615	status "Configuration Saved";	919	status "Configuration Saved";
616	});	920	});
617		921
		922	$BUTTONBAR->show;
		923
		924	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
		925
		926	# delay till geometry is constant
		927	$CFClient::UI::ROOT->on_post_alloc (startup => sub {
618	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup	928	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
619		929	my $widget = $GAUGES->{win};
620		930	$widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
621	$CFClient::UI::ROOT->add (make_stats_window);	931	});
		932	force_refresh ();
		933	}
622	}	934	}
623		935
624	sub video_shutdown {	936	sub video_shutdown {
625	$CFClient::UI::ROOT->{children} = [];
626	undef $SDL_ACTIVE;	937	undef $SDL_ACTIVE;
627	}	938	}
628		939
629	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#	940	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
630	my $bgmusic;#TODO#hack#d#	941	my $bgmusic;#TODO#hack#d#
		942
		943	sub audio_channel_finished {
		944	my ($channel) = @_;
		945
		946	warn "channel $channel finished\n";#d#
		947	}
631		948
632	sub audio_music_finished {	949	sub audio_music_finished {
633	return unless $CFG->{bgm_enable};	950	return unless $CFG->{bgm_enable};
634		951
635	# TODO: hack, do play loop and mood music	952	# TODO: hack, do play loop and mood music
…		…
639	push @bgmusic, shift @bgmusic;	956	push @bgmusic, shift @bgmusic;
640	}	957	}
641		958
642	sub audio_init {	959	sub audio_init {
643	if ($CFG->{audio_enable}) {	960	if ($CFG->{audio_enable}) {
644	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {	961	if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
645	$SDL_MIXER = !CFClient::Mix_OpenAudio;	962	$SDL_MIXER = !CFClient::Mix_OpenAudio;
646	CFClient::Mix_AllocateChannels 8;	963	CFClient::Mix_AllocateChannels 8;
647	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;	964	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
648		965
649	audio_music_finished;	966	audio_music_finished;
…		…
676	}	993	}
677		994
678	my %animate_object;	995	my %animate_object;
679	my $animate_timer;	996	my $animate_timer;
680		997
681	my $want_refresh;
682	my $can_refresh;
683
684	my $fps = 9;	998	my $fps = 9;
685		999
686	sub force_refresh {	1000	sub force_refresh {
687	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;	1001	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
688	debug sprintf "%3.2f", $fps;	1002	debug sprintf "%3.2f", $fps;
689		1003
690	$want_refresh = 0;
691	$can_refresh = 0;
692
693	$CFClient::UI::ROOT->draw;	1004	$CFClient::UI::ROOT->draw;
694
695	CFClient::SDL_GL_SwapBuffers;	1005	CFClient::SDL_GL_SwapBuffers;
696		1006
		1007	$WANT_REFRESH = 0;
		1008	$CAN_REFRESH = 0;
697	$LAST_REFRESH = $NOW;	1009	$LAST_REFRESH = $NOW;
698	}	1010	}
699		1011
700	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {	1012	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
701	$NOW = time;	1013	$NOW = time;
…		…
703	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	1015	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
704	for CFClient::SDL_PollEvent;	1016	for CFClient::SDL_PollEvent;
705		1017
706	if (%animate_object) {	1018	if (%animate_object) {
707	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	1019	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
708	$want_refresh++;	1020	$WANT_REFRESH++;
709	}	1021	}
710		1022
711	if ($want_refresh) {	1023	if ($WANT_REFRESH) {
712	force_refresh;	1024	force_refresh;
713	} else {	1025	} else {
714	$can_refresh = 1;	1026	$CAN_REFRESH = 1;
715	}	1027	}
716	});	1028	});
717
718	sub refresh {
719	$want_refresh++;
720	}
721		1029
722	sub animation_start {	1030	sub animation_start {
723	my ($widget) = @_;	1031	my ($widget) = @_;
724	$animate_object{$widget} = $widget;	1032	$animate_object{$widget} = $widget;
725	}	1033	}
…		…
731		1039
732	@conn::ISA = Crossfire::Protocol::;	1040	@conn::ISA = Crossfire::Protocol::;
733		1041
734	sub conn::stats_update {	1042	sub conn::stats_update {
735	my ($self, $stats) = @_;	1043	my ($self, $stats) = @_;
		1044
		1045	if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
		1046	my $diff = $exp - $self->{prev_exp};
		1047	$STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
		1048	if exists $self->{prev_exp} && $diff;
		1049	$self->{prev_exp} = $exp;
		1050	}
736		1051
737	update_stats_window ($stats);	1052	update_stats_window ($stats);
738	}	1053	}
739		1054
740	sub conn::user_send {	1055	sub conn::user_send {
…		…
804	# at worst.	1119	# at worst.
805	sub conn::flood_fill {	1120	sub conn::flood_fill {
806	my ($self, $gx, $gy, $path, $hash, $flags) = @_;	1121	my ($self, $gx, $gy, $path, $hash, $flags) = @_;
807		1122
808	# the server does not allow map paths > 6	1123	# the server does not allow map paths > 6
809	return if 6 <= length $path;	1124	return if 7 <= length $path;
810		1125
811	my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};	1126	my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
812		1127
813	for (	1128	for (
814	[1, 0, -1],	1129	[1, 0, -1],
…		…
857		1172
858	$self->flush_map;	1173	$self->flush_map;
859		1174
860	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	1175	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
861		1176
862	my $mapmapw = 250;	1177	my $mapmapw = $MAPMAP->{w};
863	my $mapmaph = 250;	1178	my $mapmaph = $MAPMAP->{h};
864		1179
865	$self->{neigh_rect} = [	1180	$self->{neigh_rect} = [
866	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,	1181	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
867	$ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,	1182	$ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
868	];	1183	];
…		…
872		1187
873	$x += $ox;	1188	$x += $ox;
874	$y += $oy;	1189	$y += $oy;
875		1190
876	$self->{map_info} = [$hash, $x, $y, $w, $h];	1191	$self->{map_info} = [$hash, $x, $y, $w, $h];
		1192
		1193	my $map = $self->{map_info}[0];
		1194	$map =~ s/^.*?\/([^\/]+)$/\1/;
		1195	$STATWIDS->{map}->set_text ("Map: " . $map);
877		1196
878	$self->load_map ($hash, $x, $y);	1197	$self->load_map ($hash, $x, $y);
879	}	1198	}
880		1199
881	sub conn::face_find {	1200	sub conn::face_find {
…		…
907	}	1226	}
908		1227
909	gotid:	1228	gotid:
910	$face->{id} = $id;	1229	$face->{id} = $id;
911	$MAP->set_face ($facenum => $id);	1230	$MAP->set_face ($facenum => $id);
		1231	$self->{faceid}[$facenum] = $id;#d#
912	$TILECACHE->get ($id)	1232	$TILECACHE->get ($id)
913	}	1233	}
914		1234
915	sub conn::face_update {	1235	sub conn::face_update {
916	my ($self, $facenum, $face) = @_;	1236	my ($self, $facenum, $face) = @_;
…		…
924	my ($self, $id, $data) = @_;	1244	my ($self, $id, $data) = @_;
925		1245
926	$self->{texture}[$id] ||= do {	1246	$self->{texture}[$id] ||= do {
927	my $tex =	1247	my $tex =
928	new_from_image CFClient::Texture	1248	new_from_image CFClient::Texture
929	$data, minify => 1;	1249	$data, minify => 1, mipmap => 1;
930		1250
931	$MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	1251	$MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
932	$MAPWIDGET->update;	1252	$MAPWIDGET->update;
933		1253
934	$tex	1254	$tex
…		…
946		1266
947	$chunk->play;	1267	$chunk->play;
948	# warn "sound $x,$y,$soundnum,$type\n";#d#	1268	# warn "sound $x,$y,$soundnum,$type\n";#d#
949	}	1269	}
950		1270
		1271	my $LAST_QUERY; # server is stupid, stupid, stupid
		1272
951	sub conn::query {	1273	sub conn::query {
952	my ($self, $flags, $prompt) = @_;	1274	my ($self, $flags, $prompt) = @_;
953		1275
954	#TODO, display dialog with relevant information	1276	$prompt = $LAST_QUERY unless length $prompt;
955	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	1277	$LAST_QUERY = $prompt;
		1278
		1279	my $dialog = new CFClient::UI::FancyFrame
		1280	title => "Query",
		1281	child => my $vbox = new CFClient::UI::VBox;
		1282
		1283	$vbox->add (new CFClient::UI::Label
		1284	max_w => $::WIDTH * 0.4,
		1285	text => $prompt);
		1286
		1287	if ($flags & Crossfire::Protocol::CS_QUERY_YESNO) {
		1288	$vbox->add (my $hbox = new CFClient::HBox);
		1289	$hbox->add (new CFClient::Button
		1290	text => "No",
		1291	connect_activate => sub {
		1292	$self->send ("reply n");
		1293	$dialog->destroy;
		1294	$MAPWIDGET->focus_in;
		1295	}
		1296	);
		1297	$hbox->add (new CFClient::Button
		1298	text => "Yes",
		1299	connect_activate => sub {
		1300	$self->send ("reply y");
		1301	$dialog->destroy;
		1302	$MAPWIDGET->focus_in;
		1303	},
		1304	);
		1305
		1306	$dialog->focus_in;
		1307
		1308	} elsif ($flags & Crossfire::Protocol::CS_QUERY_SINGLECHAR) {
		1309	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
		1310	$vbox->add (my $entry = new CFClient::UI::Entry
		1311	connect_changed => sub {
		1312	$self->send ("reply $_[1]");
		1313	$dialog->destroy;
		1314	$MAPWIDGET->focus_in;
		1315	},
		1316	);
		1317
		1318	$entry->focus_in;
		1319
		1320	} else {
		1321	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
		1322
		1323	$vbox->add (my $entry = new CFClient::UI::Entry
		1324	$flags & Crossfire::Protocol::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
		1325	connect_activate => sub {
		1326	$self->send ("reply $_[1]");
		1327	$dialog->destroy;
		1328	$MAPWIDGET->focus_in;
		1329	},
		1330	);
		1331
		1332	$entry->focus_in;
		1333	}
		1334
		1335	$dialog->show;
956	}	1336	}
957		1337
958	sub conn::drawinfo {	1338	sub conn::drawinfo {
959	my ($self, $color, $text) = @_;	1339	my ($self, $color, $text) = @_;
960		1340
…		…
972	[0.55, 0.41, 0.13],	1352	[0.55, 0.41, 0.13],
973	[0.99, 0.77, 0.26],	1353	[0.99, 0.77, 0.26],
974	[0.74, 0.65, 0.41],	1354	[0.74, 0.65, 0.41],
975	);	1355	);
976		1356
		1357	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
		1358
		1359	$text = CFClient::UI::Label::escape $text;
		1360	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
		1361	$text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
		1362
977	$LOGVIEW->add_paragraph ($color[$color], $text);	1363	$LOGVIEW->add_paragraph ($color[$color],
		1364	join "\n", map "$time $_", split /\n/, $text);
		1365
		1366	$STATUSBOX->add ($text,
		1367	group => $text,
		1368	fg => $color[$color],
		1369	timeout => 60,
		1370	tooltip_font => $::FONT_FIXED,
		1371	);
		1372	}
		1373
		1374	sub conn::drawextinfo {
		1375	my ($self, $color, $type, $subtype, $message) = @_;
		1376
		1377	$self->drawinfo ($color, $message);
978	}	1378	}
979		1379
980	sub conn::spell_add {	1380	sub conn::spell_add {
981	my ($self, $spell) = @_;	1381	my ($self, $spell) = @_;
982		1382
		1383	# TODO
		1384	# create a widget dynamically, using spell face (CF::Protocol downloads them)
983	$MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {	1385	$MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
984	});
985	$MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {	1386	$MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
986	});
987	}	1387	}
988		1388
989	sub conn::spell_delete {	1389	sub conn::spell_delete {
990	my ($self, $spell) = @_;	1390	my ($self, $spell) = @_;
991	}	1391	}
992		1392
993	sub conn::addme_success {	1393	sub conn::addme_success {
994	my ($self) = @_;	1394	my ($self) = @_;
995		1395
		1396	$MAPWIDGET->clr_commands;
		1397
996	for my $skill (values %{$self->{skill_info}}) {	1398	for my $skill (values %{$self->{skill_info}}) {
997	$MAPWIDGET->add_command ("ready_skill $skill", "", sub {	1399	$MAPWIDGET->add_command ("ready_skill $skill", CFClient::UI::Label::escape "Ready the skill '$skill'");
		1400	$MAPWIDGET->add_command ("use_skill $skill", CFClient::UI::Label::escape "Immediately use the skill '$skill'");
		1401	}
		1402
		1403	$MAPWIDGET->add_command ("petmode defend", "Tell pets to stay close to you and defend you");
		1404	$MAPWIDGET->add_command ("petmode arena", "Same as petmode sad, but also attack other players");
		1405	$MAPWIDGET->add_command ("petmode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
		1406	$MAPWIDGET->add_command ("killpets", "Kill your pets");
		1407	$MAPWIDGET->add_command ("chat", "chat TEXT\nChat with all other players");
		1408	$MAPWIDGET->add_command ("shout", "shout TEXT\nShout loudly, used for emergencies");
		1409	$MAPWIDGET->add_command ("tell", "tell USERNAME TEXT\nPrivately tell a specific player");
		1410
		1411	my $parser = new Pod::POM;
		1412	my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
		1413
		1414	for my $head2 ($pod->head2) {
		1415	$head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
		1416	or next;
		1417
		1418	my $cmd = $1;
		1419	my @args = split /\|/, $2;
		1420	@args = (".*") unless @args;
		1421
		1422	my $text = CFClient::pod_to_pango $head2->content;
		1423
		1424	for my $arg (@args) {
		1425	$arg = $arg eq ".*" ? "" : " $arg";
		1426
		1427	$MAPWIDGET->add_command ("$cmd$arg", $text);
998	});	1428	}
999	$MAPWIDGET->add_command ("use_skill $skill", "", sub {	1429	}
		1430	}
		1431
		1432	sub conn::eof {
		1433	$MAPWIDGET->clr_commands;
		1434
		1435	stop_game;
		1436	}
		1437
		1438	sub update_floorbox {
		1439	$CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
		1440	return unless $CONN;
		1441
		1442	$FLOORBOX->clear;
		1443	$FLOORBOX->add (new CFClient::UI::Empty expand => 1);
		1444
		1445	my $count = 4;
		1446	for (@{ $CONN->{container}{0} }) {
		1447	if (--$count) {
		1448	$FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
		1449	} else {
		1450	$FLOORBOX->add (new CFClient::UI::Label text => "More...");
		1451	last;
		1452	}
1000	});	1453	}
		1454	});
		1455
		1456	$WANT_REFRESH++;
		1457	}
		1458
		1459	sub conn::container_add {
		1460	my ($self, $tag, $items) = @_;
		1461
		1462	#d# print "container_add: container $tag ($self->{player}{tag})\n";
		1463
		1464	if ($tag == 0) {
		1465	update_floorbox;
		1466	$OPENCONT = 0;
		1467	$INVR_LBL->set_text ("Floor");
		1468	$INVR->set_items ($self->{container}{0});
		1469	} elsif ($tag == $self->{player}{tag}) {
		1470	$INVR_LBL->set_text ("Player");
		1471	$INV->set_items ($self->{container}{$self->{player}{tag}})
		1472	} else {
		1473	$OPENCONT = $tag;
		1474	$INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
		1475	$INVR->set_items ($self->{container}{$tag});
		1476	}
		1477
		1478	# $self-<{player}{tag} => player inv
		1479	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
		1480	}
		1481
		1482	sub conn::container_clear {
		1483	my ($self, $tag) = @_;
		1484
		1485	#d# print "container_clear: container $tag ($self->{player}{tag})\n";
		1486
		1487	if ($tag == 0) {
		1488	update_floorbox;
		1489	$OPENCONT = 0;
		1490	$INVR_LBL->set_text ("Floor");
		1491	$INVR->set_items ($self->{container}{0});
		1492	} elsif ($tag == $self->{player}{tag}) {
		1493	$INVR_LBL->set_text ("Player");
		1494	$INV->set_items ($self->{container}{$tag})
		1495	} else {
		1496	$OPENCONT = $tag;
		1497	$INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
		1498	$INVR->set_items ($self->{container}{$tag});
		1499	}
		1500
		1501	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
		1502	}
		1503
		1504	sub conn::item_delete {
		1505	my ($self, @items) = @_;
		1506
		1507	for (@items) {
		1508	#d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
		1509
		1510	if ($_->{container} == 0) {
		1511	update_floorbox;
		1512	$OPENCONT = 0;
		1513	$INVR_LBL->set_text ("Floor");
		1514	$INVR->set_items ($self->{container}{0});
		1515	} elsif ($_->{container} == $self->{player}{tag}) {
		1516	$INVR_LBL->set_text ("Player");
		1517	$INV->set_items ($self->{container}{$self->{player}{tag}})
		1518	} else {
		1519	$OPENCONT = $_->{container};
		1520	$INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
		1521	$INVR->set_items ($self->{container}{$_->{container}});
		1522	}
		1523	}
		1524	}
		1525
		1526	sub conn::item_update {
		1527	my ($self, $item) = @_;
		1528
		1529	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
		1530
		1531	if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
		1532	$OPENCONT = 0;
		1533	$INVR_LBL->set_text ("Floor");
		1534	$INVR->set_items ($self->{container}{0});
		1535
		1536	$item->{widget}->update_item
		1537	if $item->{widget};
		1538	} else {
		1539	if ($item->{container} == 0) {
		1540	update_floorbox;
		1541	$OPENCONT = 0;
		1542	$INVR_LBL->set_text ("Floor");
		1543	$INVR->set_items ($self->{container}{0});
		1544	} elsif ($item->{container} == $self->{player}{tag}) {
		1545	$INV->set_items ($self->{container}{$item->{container}})
		1546	}
1001	}	1547	}
1002	}	1548	}
1003		1549
1004	%SDL_CB = (	1550	%SDL_CB = (
1005	CFClient::SDL_QUIT => sub {	1551	CFClient::SDL_QUIT => sub {
1006	Event::unloop -1;	1552	Event::unloop -1;
1007	},	1553	},
1008	CFClient::SDL_VIDEORESIZE => sub {	1554	CFClient::SDL_VIDEORESIZE => sub {
1009	},	1555	},
1010	CFClient::SDL_VIDEOEXPOSE => \&refresh,	1556	CFClient::SDL_VIDEOEXPOSE => sub {
		1557	$WANT_REFRESH++;
		1558	},
1011	CFClient::SDL_ACTIVEEVENT => sub {	1559	CFClient::SDL_ACTIVEEVENT => sub {
1012	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	1560	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1013	},	1561	},
1014	CFClient::SDL_KEYDOWN => sub {	1562	CFClient::SDL_KEYDOWN => sub {
1015	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	1563	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
…		…
1019	video_init;	1567	video_init;
1020	} else {	1568	} else {
1021	CFClient::UI::feed_sdl_key_down_event ($_[0]);	1569	CFClient::UI::feed_sdl_key_down_event ($_[0]);
1022	}	1570	}
1023	},	1571	},
1024	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,	1572	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1025	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,	1573	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1026	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,	1574	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1027	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,	1575	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1028	CFClient::SDL_USEREVENT => \&audio_music_finished,	1576	CFClient::SDL_USEREVENT => sub {
		1577	if ($_[0]{code} == 1) {
		1578	audio_channel_finished $_[0]{data1};
		1579	} elsif ($_[0]{code} == 0) {
		1580	audio_music_finished;
		1581	}
		1582	},
1029	);	1583	);
1030		1584
1031	#############################################################################	1585	#############################################################################
1032		1586
1033	$SIG{INT} = $SIG{TERM} = sub { exit };	1587	$SIG{INT} = $SIG{TERM} = sub { exit };
1034		1588
1035	$TILECACHE = CFClient::db_table "tilecache";
1036	$FACEMAP = CFClient::db_table "facemap";
1037
1038	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1039
1040	my %DEF_CFG = (
1041	sdl_mode => 0,
1042	width => 640,
1043	height => 480,
1044	fullscreen => 0,
1045	fast => 0,
1046	fow_enable => 1,
1047	fow_intensity => 0.45,
1048	fow_smooth => 0,
1049	gui_fontsize => 1,
1050	log_fontsize => 14,
1051	mapsize => 100,
1052	host => "crossfire.schmorp.de",
1053	say_command => 'say',
1054	audio_enable => 1,
1055	bgm_enable => 1,
1056	bgm_volume => 0.25,
1057	);
1058
1059	while (my ($k, $v) = each %DEF_CFG) {
1060	$CFG->{$k} = $v unless exists $CFG->{$k};
1061	}
1062
1063	sdl_init;
1064
1065	@SDL_MODES = reverse
1066	grep $_->[0] >= 640 && $_->[1] >= 480,
1067	CFClient::SDL_ListModes;
1068
1069	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1070
1071	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1072
1073	{	1589	{
1074	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	1590	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1075		1591
		1592	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
		1593
		1594	$TILECACHE = CFClient::db_table "tilecache";
		1595	$FACEMAP = CFClient::db_table "facemap";
		1596
		1597	my %DEF_CFG = (
		1598	sdl_mode => 0,
		1599	width => 640,
		1600	height => 480,
		1601	fullscreen => 0,
		1602	fast => 0,
		1603	map_scale => 0.5,
		1604	fow_enable => 1,
		1605	fow_intensity => 0.45,
		1606	fow_smooth => 0,
		1607	gui_fontsize => 1,
		1608	log_fontsize => 1,
		1609	gauge_fontsize=> 1,
		1610	gauge_size => 0.35,
		1611	stat_fontsize => 1,
		1612	mapsize => 100,
		1613	host => "crossfire.schmorp.de",
		1614	say_command => 'say',
		1615	audio_enable => 1,
		1616	bgm_enable => 1,
		1617	bgm_volume => 0.25,
		1618	);
		1619
		1620	while (my ($k, $v) = each %DEF_CFG) {
		1621	$CFG->{$k} = $v unless exists $CFG->{$k};
		1622	}
		1623
		1624	sdl_init;
		1625
		1626	@SDL_MODES = reverse
		1627	grep $_->[0] >= 640 && $_->[1] >= 480,
		1628	CFClient::SDL_ListModes;
		1629
		1630	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		1631
		1632	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
		1633
		1634	{
		1635	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
		1636	DejaVuSans.ttf
		1637	DejaVuSansMono.ttf
		1638	DejaVuSans-Bold.ttf
		1639	DejaVuSansMono-Bold.ttf
		1640	DejaVuSans-Oblique.ttf
		1641	DejaVuSansMono-Oblique.ttf
		1642	DejaVuSans-BoldOblique.ttf
		1643	DejaVuSansMono-BoldOblique.ttf
		1644	);
		1645
1076	CFClient::add_font $_ for @fonts;	1646	CFClient::add_font $_ for @fonts;
1077	CFClient::set_font $fonts[0];	1647
1078	}	1648	CFClient::pango_init;
1079		1649
		1650	$FONT_PROP = new_from_file CFClient::Font $fonts[0];
		1651	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];
		1652
		1653	$FONT_PROP->make_default;
		1654	}
		1655
		1656	# compare mono (ft) vs. rgba (cairo)
		1657	# ft - 1.8s, cairo 3s, even in alpha-only mode
		1658	# for my $rgba (0..1) {
		1659	# my $t1 = Time::HiRes::time;
		1660	# for (1..1000) {
		1661	# my $layout = CFClient::Layout->new ($rgba);
		1662	# $layout->set_text ("hallo" x 100);
		1663	# $layout->render;
		1664	# }
		1665	# my $t2 = Time::HiRes::time;
		1666	# warn $t2-$t1;
		1667	# }
		1668
1080	video_init;	1669	video_init;
1081	audio_init;	1670	audio_init;
		1671	}
1082		1672
1083	Event::loop;	1673	Event::loop;
1084		1674
1085	END { CFClient::SDL_Quit }	1675	END { CFClient::SDL_Quit }
1086		1676
		1677	=head1 pclient - Crossfire+ and Crossfire game client
1087		1678
		1679	Pclient is a Crossfire+ and Crossfire game client.
		1680
		1681	=head2 Features
		1682
		1683	=over 4
		1684
		1685	=item Fullscreen Map
		1686
		1687	PClient can uses a fullscreen map, which greatly enhances how much of the
		1688	game world you can see.
		1689
		1690	=item Persistent Map Cache (Crossfire+ only)
		1691
		1692	PClient can persistently cache all map data it received from the
		1693	server. This not only allows it to display an overview map, but also
		1694	ensures that once-explored areas will be available the next time you want
		1695	to explore more.
		1696
		1697	=item Hardware acceleration
		1698
		1699	Unlike most Crossfire clients, PClient take advantage of OpenGL hardware
		1700	acceleration. Most modern graphics cards have difficulties with 2D
		1701	acceleration, while 3D graphics is accelerated well.
		1702
		1703	=item No arbitrary limits
		1704
		1705	Unlike other Crossfire clients, pclient does not suffer from arbitrary
		1706	limits (like a fixed amount of face numbers). There are still limits, but
		1707	they are not arbitrarily low :)
		1708
		1709	=back
		1710
		1711	=head1 USAGE
		1712
		1713	=head2 The Map
		1714
		1715	The map is always displayed in the background, behind all other windows and UI elements.
		1716
		1717	#TODO# middle-click scrolls
		1718	#
		1719	# keys:
		1720	#
		1721	# a apply
		1722	# keypad moves, kp_5 applies ranged attack to self
		1723
		1724	Starting to type enters the I<completion mode>. In that mode, you can type
		1725	abbreviations or commands and have them executed as soon as they match a
		1726	valid command. This is best explained by a few examples:
		1727
		1728	Typing B<climb> will display a list of commands with I<climb> in their
		1729	name, such as I<ready_skill climbing> and I<use_skill climbing>.
		1730
		1731	You can abbreviate commands by typing only the first character of every
		1732	word. For example, typing I<iwor> will likely select I<invoke word of
		1733	recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli>
		1734	will likely select I<ready_skill climbing> and I<usl> will give you
		1735	I<use_skill levitation>.
		1736
		1737	=head2 The map overview
		1738
		1739	#TODO#
		1740
		1741	=head2 The Status area in the lower right corner
		1742
		1743	#TODO#
		1744
		1745	=head2 The I<Statistics>/I>Stats> window
		1746
		1747	#TODO#
		1748
		1749	=head1 FAQ
		1750
		1751	=over 4
		1752
		1753	=item The client is very sluggish and slow, what can I do about this?
		1754
		1755	Most likely, you don't have accelerated OpenGL support. Try to find a
		1756	newer driver, or a driver from your hardware vendor, that features OpenGL
		1757	support.
		1758
		1759	If this is not an option, the following Setup options reduce the load and
		1760	will likely make the client playable with sofwtare rendering (it will
		1761	still be slow, though):
		1762
		1763	=over 4
		1764
		1765	=item B<Video Mode> should be set as low as possible (e.g. 640x480)
		1766
		1767	=item Enable B<Fast & Ugly> mode
		1768
		1769	=item Disable B<Fog of War>
		1770
		1771	=item Increase B<Map Scale>
		1772
		1773	=back
		1774
		1775	=back
		1776
		1777	=head1 AUTHOR
		1778
		1779	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
		1780
		1781
		1782

Diff Legend

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