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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.163 by root, Sun Apr 23 00:57:40 2006 UTC vs.
Revision 1.169 by root, Mon Apr 24 02:41:48 2006 UTC

…		…
36	our @SDL_MODES;	36	our @SDL_MODES;
37	our $WIDTH;	37	our $WIDTH;
38	our $HEIGHT;	38	our $HEIGHT;
39	our $FULLSCREEN;	39	our $FULLSCREEN;
40	our $FONTSIZE;	40	our $FONTSIZE;
		41
		42	our $FONT_PROP;
		43	our $FONT_FIXED;
41		44
42	our $MAP;	45	our $MAP;
43	our $MAPWIDGET;	46	our $MAPWIDGET;
44	our $BUTTONBAR;	47	our $BUTTONBAR;
45	our $LOGVIEW;	48	our $LOGVIEW;
…		…
120	$mode_slider->emit (changed => $mode_slider->{range}[0]);	123	$mode_slider->emit (changed => $mode_slider->{range}[0]);
121		124
122	my $row = 1;	125	my $row = 1;
123		126
124	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	127	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
125	$table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {	128	$table->add (1, $row++, new CFClient::UI::CheckBox
		129	state => $CFG->{fullscreen},
		130	tooltip => "Bring the client into fullscreen mode",
		131	connect_changed => sub {
126	my ($self, $value) = @_;	132	my ($self, $value) = @_;
127	$CFG->{fullscreen} = $value;	133	$CFG->{fullscreen} = $value;
		134	}
128	});	135	);
129		136
130	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	137	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
131	$table->add (1, $row++, new CFClient::UI::CheckBox	138	$table->add (1, $row++, new CFClient::UI::CheckBox
132	state => $CFG->{fast},	139	state => $CFG->{fast},
133	tooltip => "Lower the visual quality considerably to speed up rendering.",	140	tooltip => "Lower the visual quality considerably to speed up rendering.",
…		…
135	my ($self, $value) = @_;	142	my ($self, $value) = @_;
136	$CFG->{fast} = $value;	143	$CFG->{fast} = $value;
137	}	144	}
138	);	145	);
139		146
		147	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
		148	$table->add (1, $row++, new CFClient::UI::Slider
		149	range => [$CFG->{map_scale}, 0.25, 2, 0.05],
		150	tooltip => "Enlarge or shrink the displayed map",
		151	connect_changed => sub {
		152	my ($self, $value) = @_;
		153	$CFG->{map_scale} = 0.05 * int $value / 0.05;
		154	}
		155	);
		156
140	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	157	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
141	$table->add (1, $row++, new CFClient::UI::CheckBox	158	$table->add (1, $row++, new CFClient::UI::CheckBox
142	state => $CFG->{fow_enable},	159	state => $CFG->{fow_enable},
143	tooltip => "Fog-of-War marks areas that cannot be seen by the player",	160	tooltip => "Fog-of-War marks areas that cannot be seen by the player",
144	connect_changed => sub {	161	connect_changed => sub {
…		…
196	$CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;	213	$CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
197	&set_stats_window_fontsize;	214	&set_stats_window_fontsize;
198	}	215	}
199	);	216	);
200		217
201	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gaugesize");
202	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], connect_changed => sub {
203	$CFG->{gauge_size} = $_[1];
204	my $h = int ($HEIGHT * $CFG->{gauge_size});
205	$GAUGES->{win}->set_size ($WIDTH, $h);
206	$GAUGES->{win}->{y} = $HEIGHT - $h;
207	$GAUGES->{win}->{x} = 0;
208	$GAUGES->{win}->update;
209	});
210
211	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");	218	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
212	$table->add (1, $row++, new CFClient::UI::Slider	219	$table->add (1, $row++, new CFClient::UI::Slider
213	range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],	220	range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
214	tooltip => "Adjust the size of the stats gauges at the bottom right",	221	tooltip => "Adjust the size of the stats gauges at the bottom right",
215	connect_changed => sub {	222	connect_changed => sub {
216	$CFG->{gauge_size} = $_[1];	223	$CFG->{gauge_size} = $_[1];
217	my $h = int ($HEIGHT * $CFG->{gauge_size});	224	my $h = int $HEIGHT * $CFG->{gauge_size};
218	$GAUGES->{win}->set_size ($WIDTH, $h);	225	$GAUGES->{win}->set_size ($WIDTH, $h);
219	$GAUGES->{win}->{y} = $HEIGHT - $h;	226	$GAUGES->{win}->move (0, $HEIGHT - $h);
220	$GAUGES->{win}->{x} = 0;
221	$GAUGES->{win}->update;
222	}	227	}
223	);	228	);
224		229
225	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	230	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
226	$table->add (1, $row++, new CFClient::UI::Slider	231	$table->add (1, $row++, new CFClient::UI::Slider
227	range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],	232	range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
		233	tooltip => "Adjusts the fontsize of the gauges at the bottom right",
228	connect_changed => sub {	234	connect_changed => sub {
229	$CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;	235	$CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
230	&set_gauge_window_fontsize;	236	&set_gauge_window_fontsize;
231	$GAUGES->{win}->check_size;
232	$GAUGES->{win}->update;
233	}	237	}
234	);	238	);
235		239
236	$table->add (1, $row++, new CFClient::UI::Button	240	$table->add (1, $row++, new CFClient::UI::Button
237	expand => 1, align => 0, text => "Apply",	241	expand => 1, align => 0, text => "Apply",
238	tooltip => "Apply the video settings (unless they are auto-apply)",	242	tooltip => "Apply the video settings",
239	connect_activate => sub {	243	connect_activate => sub {
240	video_shutdown ();	244	video_shutdown ();
241	video_init ();	245	video_init ();
242	}	246	}
243	);	247	);
…		…
272	}	276	}
273	);	277	);
274		278
275	$table->add (1, $row++, new CFClient::UI::Button	279	$table->add (1, $row++, new CFClient::UI::Button
276	expand => 1, align => 0, text => "Apply",	280	expand => 1, align => 0, text => "Apply",
277	tooltip => "Apply the audio settings that are not auto-apply",	281	tooltip => "Apply the audio settings",
278	connect_activate => sub {	282	connect_activate => sub {
279	audio_shutdown ();	283	audio_shutdown ();
280	audio_init ();	284	audio_init ();
281	}	285	}
282	);	286	);
…		…
292		296
293	sub set_gauge_window_fontsize {	297	sub set_gauge_window_fontsize {
294	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {	298	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
295	$_->set_fontsize ($::CFG->{gauge_fontsize});	299	$_->set_fontsize ($::CFG->{gauge_fontsize});
296	}	300	}
		301
		302	# local $GAUGES->{win}{parent};#d#
		303	# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
297	}	304	}
298		305
299	sub make_gauge_window {	306	sub make_gauge_window {
300	my $gh = int ($HEIGHT * $CFG->{gauge_size});	307	my $gh = int ($HEIGHT * $CFG->{gauge_size});
301	# my $gw = int ($WIDTH * $CFG->{gauge_w_size});	308	# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
302		309
303	my $win = new CFClient::UI::Frame (	310	my $win = new CFClient::UI::Frame (
304	y => $HEIGHT - $gh, x => 0, req_w => $WIDTH, req_h => $gh	311	y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh
305	);	312	);
306	$win->add (my $vb = new CFClient::UI::VBox);	313	$win->add (my $vb = new CFClient::UI::VBox);
307		314
308	$vb->add (my $hbg = new CFClient::UI::HBox expand => 1);	315	$vb->add (my $hbg = new CFClient::UI::HBox expand => 1);
309
310		316
311	$hbg->add (new CFClient::UI::Empty expand => 1);	317	$hbg->add (new CFClient::UI::Empty expand => 1);
312	$hbg->add (my $hb = new CFClient::UI::HBox);	318	$hbg->add (my $hb = new CFClient::UI::HBox);
313	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp');	319	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', tooltip => "Health points");
314	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana');	320	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', tooltip => "Spellpoints");
315	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace');	321	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', tooltip => "Grace");
316	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food');	322	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food', tooltip => "Food");
317		323
318	$vb->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, text => "XP:");	324	$vb->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, text => "XP: 0 LVL: 0");
319	# $vb->add (my $lvl = new CFClient::UI::Label valign => 0, align => 1, text => "Lvl:");
320	$vb->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, text => "Rng:");	325	$vb->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, text => "Rng:");
321		326
322
323	$GAUGES = {	327	$GAUGES = {
324	exp => $exp,# lvl => $lvl,
325	win => $win, range => $rng,	328	exp => $exp, win => $win, range => $rng,
326	food => $fg, mana => $mg, hp => $hg, grace => $gg	329	food => $fg, mana => $mg, hp => $hg, grace => $gg
327	};	330	};
		331
		332	&set_gauge_window_fontsize;
		333
328	$win	334	$win
329	}	335	}
330		336
331	sub make_stats_window {	337	sub make_stats_window {
332	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");	338	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
333		339
334	$tgw->add (my $vb = new CFClient::UI::VBox);	340	$tgw->add (my $vb = new CFClient::UI::VBox);
335	$vb->add (my $uhb = new CFClient::UI::HBox);
336	$uhb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);	341	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
337	$uhb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);	342	$vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
338		343
339	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	344	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
340		345
341	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	346	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);
342		347
		348	$tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		349	$tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		350	$tbl->add (0, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		351	$tbl->add (0, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		352	$tbl->add (0, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		353	$tbl->add (0, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		354	$tbl->add (0, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		355
343	$tbl->add (0, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Str");	356	$tbl->add (1, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Str");
344	$tbl->add (0, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dex");	357	$tbl->add (1, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Dex");
345	$tbl->add (0, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Con");	358	$tbl->add (1, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Con");
346	$tbl->add (0, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Int");	359	$tbl->add (1, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Int");
347	$tbl->add (0, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wis");	360	$tbl->add (1, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Wis");
348	$tbl->add (0, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Pow");	361	$tbl->add (1, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Pow");
349	$tbl->add (0, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Cha");	362	$tbl->add (1, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Cha");
350		363
351	$tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, text => "");	364	$tbl->add (2, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, template => "-120");
		365	$tbl->add (2, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, template => "-120");
352	$tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, text => "");	366	$tbl->add (2, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, template => "120");
353	$tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, text => "");
354	$tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, text => "");	367	$tbl->add (2, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, template => "120");
		368	$tbl->add (2, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, template => "10.54");
355	$tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, text => "");	369	$tbl->add (2, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, template => "9");
356	$tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, text => "");
357	$tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, text => "");
358		370
359	$tbl->add (2, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wc");	371	$tbl->add (3, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Wc");
360	$tbl->add (2, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ac");	372	$tbl->add (3, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Ac");
361	$tbl->add (2, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dam");	373	$tbl->add (3, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Dam");
362	$tbl->add (2, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Arm");	374	$tbl->add (3, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Arm");
363	$tbl->add (2, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Sp");	375	$tbl->add (3, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Sp");
364	$tbl->add (2, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "WSp");	376	$tbl->add (3, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "WSp");
365
366	$tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, text => "");
367	$tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, text => "");
368	$tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, text => "");
369	$tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, text => "");
370	$tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, text => "");
371	$tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, text => "");
372		377
373	$hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);	378	$hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
374		379
375	my $row = 0;	380	my $row = 0;
376	my $col = 0;	381	my $col = 0;
377		382
		383	my %resist_names = (
		384	slow => "Slow",
		385	holyw => "Holy Word",
		386	conf => "Confusion",
		387	fire => "Fire",
		388	depl => "Depletion",
		389	magic => "Magic",
		390	drain => "Draining",
		391	acid => "Acid",
		392	pois => "Poison",
		393	para => "Paralysation",
		394	deat => "Death",
		395	phys => "Physical",
		396	blind => "Blind",
		397	fear => "Fear",
		398	tund => "Turn undead",
		399	elec => "Electricity",
		400	cold => "Cold",
		401	ghit => "Ghost hit",
		402	);
378	for (qw/slow holyw conf fire depl magic	403	for (qw/slow holyw conf fire depl magic
379	drain acid pois para deat phys	404	drain acid pois para deat phys
380	blind fear tund elec cold ghit/)	405	blind fear tund elec cold ghit/)
381	{	406	{
382	$tbl2->add ($col , $row,	407	$tbl2->add ($col, $row,
383	$STATWIDS->{"res_$_"} =	408	$STATWIDS->{"res_$_"} =
384	new CFClient::UI::Label text => "0", align => +1, valign => 0	409	new CFClient::UI::Label
		410	template => "-100%",
		411	align => +1,
		412	valign => 0,
		413	tooltip => $resist_names{$_}
385	);	414	);
386	$tbl2->add ($col + 1, $row, new CFClient::UI::Image image => "ui/resist/resist_$_.png");	415	$tbl2->add ($col + 1, $row, new CFClient::UI::Image
		416	can_hover => 1,
		417	can_events => 1,
		418	image => "ui/resist/resist_$_.png",
		419	tooltip => $resist_names{$_}
		420	);
387		421
388	$row++;	422	$row++;
389	if ($row % 6 == 0) {	423	if ($row % 6 == 0) {
390	$col += 2;	424	$col += 2;
391	$row = 0;	425	$row = 0;
…		…
396	update_stats_window ({});	430	update_stats_window ({});
397		431
398	$tgw	432	$tgw
399	}	433	}
400		434
		435	sub formsep {
		436	reverse join ",", grep length, split /(...)/, reverse $_[0] * 1
		437	}
		438
401	sub update_stats_window {	439	sub update_stats_window {
402	my ($stats) = @_;	440	my ($stats) = @_;
403		441
404	# i love text protocols!!!	442	# i love text protocols!!!
405	my $hp = $stats->{1} * 1;	443	my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1;
406	my $hp_m = $stats->{2} * 1;	444	my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1;
407	my $sp = $stats->{3} * 1;	445	my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1;
408	my $sp_m = $stats->{4} * 1;	446	my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1;
409	my $fo = $stats->{18} * 1;	447	my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1;
410	my $fo_m = 999;	448	my $fo_m = 999;
411	my $gr = $stats->{23} * 1;	449	my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1;
412	my $gr_m = $stats->{24} * 1;	450	my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1;
413		451
414	$GAUGES->{hp} ->set_value ($hp, $hp_m);	452	$GAUGES->{hp} ->set_value ($hp, $hp_m);
415	$GAUGES->{mana} ->set_value ($sp, $sp_m);	453	$GAUGES->{mana} ->set_value ($sp, $sp_m);
416	$GAUGES->{food} ->set_value ($fo, $fo_m);	454	$GAUGES->{food} ->set_value ($fo, $fo_m);
417	$GAUGES->{grace} ->set_value ($gr, $gr_m);	455	$GAUGES->{grace} ->set_value ($gr, $gr_m);
418	$GAUGES->{exp} ->set_text ("XP: " . ($stats->{11} \|\| $stats->{28}) * 1	456	$GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64})
419	." LVL: " . $stats->{12} * 1);	457	. " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")");
420	my $rng = $stats->{20};	458	my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE};
421	$rng =~ s/^Range: //; # thank you so much dear server	459	$rng =~ s/^Range: //; # thank you so much dear server
422	$GAUGES->{range} ->set_text ("Rng: " . $rng);	460	$GAUGES->{range} ->set_text ("Rng: " . $rng);
423	# $GAUGES->{lvl} ->set_text ("LVL: " . $stats->{12});	461	my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE};
		462	$title =~ s/^Player: //;
424	$STATWIDS->{title} ->set_text ("Title: " . $stats->{21});	463	$STATWIDS->{title} ->set_text ("Title: " . $title);
425		464
426	if (0) { # this code can vanish, just wanted to preserver it for a checkin
427	$STATWIDS->{st_str} ->set_text (sprintf "S%d", $stats->{5});
428	$STATWIDS->{st_dex} ->set_text (sprintf "D%d", $stats->{8});
429	$STATWIDS->{st_con} ->set_text (sprintf "Co%d", $stats->{9});
430	$STATWIDS->{st_int} ->set_text (sprintf "I%d", $stats->{6});
431	$STATWIDS->{st_wis} ->set_text (sprintf "W%d", $stats->{7});
432	$STATWIDS->{st_pow} ->set_text (sprintf "P%d", $stats->{22});
433	$STATWIDS->{st_cha} ->set_text (sprintf "Ch%d", $stats->{10});
434	$STATWIDS->{st_wc} ->set_text (sprintf "Wc%d", $stats->{13});
435	$STATWIDS->{st_ac} ->set_text (sprintf "Ac%d", $stats->{14});
436	$STATWIDS->{st_dam} ->set_text (sprintf "Dam%d", $stats->{15});
437	$STATWIDS->{st_arm} ->set_text (sprintf "Arm%d", $stats->{16});
438	$STATWIDS->{st_spd} ->set_text (sprintf "Sp%.1f", $stats->{17});
439	$STATWIDS->{st_wspd}->set_text (sprintf "WSp%.1f", $stats->{19});
440	} else {
441	$STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});	465	$STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
442	$STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});	466	$STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
443	$STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});	467	$STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
444	$STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});	468	$STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
445	$STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});	469	$STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
446	$STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});	470	$STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
447	$STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});	471	$STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
448	$STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});	472	$STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
449	$STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});	473	$STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
450	$STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});	474	$STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
451	$STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});	475	$STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
452	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});	476	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_SPEED});
453	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});	477	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_WEAP_SP});
454	}
455		478
456	my %tbl = (	479	my %tbl = (
457	phys => 100,	480	phys => 100,
458	magic => 101,	481	magic => 101,
459	fire => 102,	482	fire => 102,
…		…
466	pois => 109,	489	pois => 109,
467	slow => 110,	490	slow => 110,
468	para => 111,	491	para => 111,
469	tund => 112,	492	tund => 112,
470	fear => 113,	493	fear => 113,
		494	depl => 113,
471	deat => 115,	495	deat => 115,
472	holyw => 116,	496	holyw => 116,
473	blind => 117	497	blind => 117
474	);	498	);
475		499
…		…
564	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	588	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
565		589
566	{	590	{
567	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	591	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
568		592
569	$vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub {	593	$vbox->add (
		594	my $HOST = new CFClient::UI::Entry
		595	expand => 1,
		596	text => $CFG->{host},
		597	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
		598	connect_changed => sub {
		599	my ($self, $value) = @_;
		600	$CFG->{host} = $value;
		601	}
		602	);
		603
		604	$METASERVER = metaserver_dialog;
		605
		606	$vbox->add (new CFClient::UI::Flopper
		607	expand => 1,
		608	text => "Metaserver",
		609	other => $METASERVER,
		610	tooltip => "Show a list of avaible crossfire servers",
		611	connect_open => sub {
		612	update_metaserver $HOST;
		613	}
		614	);
		615	}
		616
		617	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
		618	$table->add (1, 4, new CFClient::UI::Entry
		619	text => $CFG->{user},
		620	tooltip => "The name of your character on the server",
		621	connect_changed => sub {
570	my ($self, $value) = @_;	622	my ($self, $value) = @_;
571	$CFG->{host} = $value;
572	});
573
574	$METASERVER = metaserver_dialog;
575
576	$vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
577	update_metaserver $HOST;
578	});
579	}
580
581	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
582	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
583	my ($self, $value) = @_;
584	$CFG->{user} = $value;	623	$CFG->{user} = $value;
		624	}
585	});	625	);
586		626
587	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	627	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
588	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {	628	$table->add (1, 5, new CFClient::UI::Entry
		629	text => $CFG->{password},
		630	hidden => 1,
		631	tooltip => "The password for your character",
		632	connect_changed => sub {
589	my ($self, $value) = @_;	633	my ($self, $value) = @_;
590	$CFG->{password} = $value;	634	$CFG->{password} = $value;
		635	}
591	});	636	);
592		637
593	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");	638	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
594	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {	639	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry
		640	text => $CFG->{say_command},
		641	tooltip => "This is the command that will be used if you write a line in the message window entry. "
		642	."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
		643	."But you could also set it to 'tell <playername>' to only chat with that user.",
		644	connect_changed => sub {
595	my ($self, $value) = @_;	645	my ($self, $value) = @_;
596	$CFG->{say_command} = $value;	646	$CFG->{say_command} = $value;
		647	}
597	});	648	);
598		649
599	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	650	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
600	$table->add (1, 7, new CFClient::UI::Slider	651	$table->add (1, 7, new CFClient::UI::Slider
601	req_w => 100,	652	req_w => 100,
602	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	653	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
		654	tooltip => "This is the size of the portion of the map update the server sends you. "
		655	."If you set this to a high value you will be able to see further for example.",
603	connect_changed => sub {	656	connect_changed => sub {
604	my ($self, $value) = @_;	657	my ($self, $value) = @_;
605		658
606	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	659	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
607	},	660	},
…		…
623	user_h => int $::HEIGHT / 5,	676	user_h => int $::HEIGHT / 5,
624	child => (my $vbox = new CFClient::UI::VBox);	677	child => (my $vbox = new CFClient::UI::VBox);
625		678
626	$vbox->add ($LOGVIEW = new CFClient::UI::TextView	679	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
627	expand => 1,	680	expand => 1,
		681	font => $FONT_FIXED,
628	fontsize => $::CFG->{log_fontsize},	682	fontsize => $::CFG->{log_fontsize},
629	);	683	);
630		684
631	$vbox->add (my $input = new CFClient::UI::Entry	685	$vbox->add (my $input = new CFClient::UI::Entry
632	connect_focus_in => sub {	686	connect_focus_in => sub {
…		…
726		780
727	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);	781	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
728	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);	782	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
729	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);	783	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
730		784
		785	$CFClient::UI::ROOT->add (make_gauge_window); # 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
		786	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
		787
731	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {	788	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
732	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	789	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
733	status "Configuration Saved";	790	status "Configuration Saved";
734	});	791	});
735		792
736	$CFClient::UI::ROOT->add (make_gauge_window); # 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
737	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
738
739	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup	793	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
740
741
742	}	794	}
743		795
744	sub video_shutdown {	796	sub video_shutdown {
745	$CFClient::UI::ROOT->{children} = [];	797	$CFClient::UI::ROOT->{children} = [];
746	undef $SDL_ACTIVE;	798	undef $SDL_ACTIVE;
…		…
1121	$MAPWIDGET->add_command ("ready_skill $skill", "", sub {	1173	$MAPWIDGET->add_command ("ready_skill $skill", "", sub {
1122	});	1174	});
1123	$MAPWIDGET->add_command ("use_skill $skill", "", sub {	1175	$MAPWIDGET->add_command ("use_skill $skill", "", sub {
1124	});	1176	});
1125	}	1177	}
		1178	}
		1179
		1180	sub conn::container_add {
		1181	my ($self, $id, $items) = @_;
		1182
		1183	# 0 floor
		1184	# $self-<{player}{tag} => player inv
		1185	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
		1186	}
		1187
		1188	sub conn::container_clear {
		1189	my ($self, $id) = @_;
		1190	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1126	}	1191	}
1127		1192
1128	%SDL_CB = (	1193	%SDL_CB = (
1129	CFClient::SDL_QUIT => sub {	1194	CFClient::SDL_QUIT => sub {
1130	Event::unloop -1;	1195	Event::unloop -1;
…		…
1165	sdl_mode => 0,	1230	sdl_mode => 0,
1166	width => 640,	1231	width => 640,
1167	height => 480,	1232	height => 480,
1168	fullscreen => 0,	1233	fullscreen => 0,
1169	fast => 0,	1234	fast => 0,
		1235	map_scale => 0.5,
1170	fow_enable => 1,	1236	fow_enable => 1,
1171	fow_intensity => 0.45,	1237	fow_intensity => 0.45,
1172	fow_smooth => 0,	1238	fow_smooth => 0,
1173	gui_fontsize => 1,	1239	gui_fontsize => 1,
1174	log_fontsize => 1,	1240	log_fontsize => 1,
…		…
1196	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	1262	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1197		1263
1198	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	1264	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1199		1265
1200	{	1266	{
1201	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	1267	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
		1268	DejaVuSans.ttf
		1269	DejaVuSansMono.ttf
		1270	DejaVuSans-Bold.ttf
		1271	DejaVuSansMono-Bold.ttf
		1272	DejaVuSans-Oblique.ttf
		1273	DejaVuSansMono-Oblique.ttf
		1274	DejaVuSans-BoldOblique.ttf
		1275	DejaVuSansMono-BoldOblique.ttf
		1276	);
1202		1277
1203	CFClient::add_font $_ for @fonts;	1278	CFClient::add_font $_ for @fonts;
1204	CFClient::set_font $fonts[0];	1279
		1280	$FONT_PROP = new_from_file CFClient::Font $fonts[0];
		1281	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];
		1282
		1283	$FONT_PROP->make_default;
1205	}	1284	}
1206		1285
1207	video_init;	1286	video_init;
1208	audio_init;	1287	audio_init;
1209		1288

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.163 by root, Sun Apr 23 00:57:40 2006 UTC vs. Revision 1.169 by root, Mon Apr 24 02:41:48 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.163 by root, Sun Apr 23 00:57:40 2006 UTC vs.
Revision 1.169 by root, Mon Apr 24 02:41:48 2006 UTC