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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.150 by root, Thu Apr 20 07:12:58 2006 UTC vs.
Revision 1.175 by root, Mon Apr 24 06:57:39 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;
46	our $CONSOLE;	49	our $CONSOLE;
47	our $METASERVER;	50	our $METASERVER;
48		51
		52	our $FLOORBOX;
49	our $GAUGES;	53	our $GAUGES;
		54	our $STATWIDS;
50		55
51	our $SDL_ACTIVE;	56	our $SDL_ACTIVE;
52	our %SDL_CB;	57	our %SDL_CB;
53		58
54	our $SDL_MIXER;	59	our $SDL_MIXER;
…		…
116	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	121	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
117	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});	122	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
118	});	123	});
119	$mode_slider->emit (changed => $mode_slider->{range}[0]);	124	$mode_slider->emit (changed => $mode_slider->{range}[0]);
120		125
		126	my $row = 1;
		127
121	$table->add (0, 1, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	128	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
122	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {	129	$table->add (1, $row++, new CFClient::UI::CheckBox
		130	state => $CFG->{fullscreen},
		131	tooltip => "Bring the client into fullscreen mode",
		132	connect_changed => sub {
123	my ($self, $value) = @_;	133	my ($self, $value) = @_;
124	$CFG->{fullscreen} = $value;	134	$CFG->{fullscreen} = $value;
		135	}
125	});	136	);
126		137
127	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	138	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
128	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {	139	$table->add (1, $row++, new CFClient::UI::CheckBox
		140	state => $CFG->{fast},
		141	tooltip => "Lower the visual quality considerably to speed up rendering.",
		142	connect_changed => sub {
129	my ($self, $value) = @_;	143	my ($self, $value) = @_;
130	$CFG->{fast} = $value;	144	$CFG->{fast} = $value;
		145	}
131	});	146	);
132		147
		148	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
		149	$table->add (1, $row++, new CFClient::UI::Slider
		150	range => [$CFG->{map_scale}, 0.25, 2, 0.05],
		151	tooltip => "Enlarge or shrink the displayed map",
		152	connect_changed => sub {
		153	my ($self, $value) = @_;
		154	$CFG->{map_scale} = 0.05 * int $value / 0.05;
		155	}
		156	);
		157
133	$table->add (0, 3, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	158	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
134	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {	159	$table->add (1, $row++, new CFClient::UI::CheckBox
		160	state => $CFG->{fow_enable},
		161	tooltip => "Fog-of-War marks areas that cannot be seen by the player",
		162	connect_changed => sub {
135	my ($self, $value) = @_;	163	my ($self, $value) = @_;
136	$CFG->{fow_enable} = $value;	164	$CFG->{fow_enable} = $value;
		165	}
137	});	166	);
138		167
139	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	168	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
140	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {	169	$table->add (1, $row++, new CFClient::UI::Slider
		170	range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001],
		171	tooltip => "The higher the intensity, the lighter the Fog-of-War color",
		172	connect_changed => sub {
141	my ($self, $value) = @_;	173	my ($self, $value) = @_;
142	$CFG->{fow_intensity} = $value;	174	$CFG->{fow_intensity} = $value;
		175	}
143	});	176	);
144		177
145	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	178	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
146	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {	179	$table->add (1, $row++, new CFClient::UI::CheckBox
		180	state => $CFG->{fow_smooth},
		181	tooltip => "Smooth the Fog-of-War a bit to make it more realistic",
		182	connect_changed => sub {
147	my ($self, $value) = @_;	183	my ($self, $value) = @_;
148	$CFG->{fow_smooth} = $value;	184	$CFG->{fow_smooth} = $value;
149	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;	185	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
		186	}
150	});	187	);
151		188
152	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	189	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
153	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {	190	$table->add (1, $row++, new CFClient::UI::Slider
		191	range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1],
		192	tooltip => "The font size used by most GUI elements",
		193	connect_changed => sub {
154	$CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;	194	$CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
155	# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	195	# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
		196	}
156	});	197	);
157		198
158	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");	199	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
159	$table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {	200	$table->add (1, $row++, new CFClient::UI::Slider
		201	range => [$CFG->{log_fontsize}, 0.5, 2, 0.1],
		202	tooltip => "The font size used by the server log window only",
		203	connect_changed => sub {
160	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);	204	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
		205	}
161	});	206	);
162		207
163	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	208	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
		209
		210	$table->add (1, $row++, new CFClient::UI::Slider
		211	range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1],
		212	tooltip => "The font size used by the statistics window only",
		213	connect_changed => sub {
		214	$CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
		215	&set_stats_window_fontsize;
		216	}
		217	);
		218
		219	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
		220	$table->add (1, $row++, new CFClient::UI::Slider
		221	range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
		222	tooltip => "Adjust the size of the stats gauges at the bottom right",
		223	connect_changed => sub {
		224	$CFG->{gauge_size} = $_[1];
		225	my $h = int $HEIGHT * $CFG->{gauge_size};
		226	$GAUGES->{win}->set_size ($WIDTH, $h);
		227	$GAUGES->{win}->move (0, $HEIGHT - $h);
		228	}
		229	);
		230
		231	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
		232	$table->add (1, $row++, new CFClient::UI::Slider
		233	range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
		234	tooltip => "Adjusts the fontsize of the gauges at the bottom right",
		235	connect_changed => sub {
		236	$CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
		237	&set_gauge_window_fontsize;
		238	}
		239	);
		240
		241	$table->add (1, $row++, new CFClient::UI::Button
		242	expand => 1, align => 0, text => "Apply",
		243	tooltip => "Apply the video settings",
		244	connect_activate => sub {
164	video_shutdown ();	245	video_shutdown ();
165	video_init ();	246	video_init ();
		247	}
166	});	248	);
167		249
168	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	250	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
169	$table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {	251	$table->add (1, $row++, new CFClient::UI::CheckBox
		252	state => $CFG->{audio_enable},
		253	tooltip => "If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
		254	connect_changed => sub {
170	$CFG->{audio_enable} = $_[1];	255	$CFG->{audio_enable} = $_[1];
		256	}
171	});	257	);
172	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	258	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
173	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {	259	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
174	# $CFG->{effects_volume} = $_[1];	260	# $CFG->{effects_volume} = $_[1];
175	# });	261	# });
176	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	262	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
177	$table->add (1, 10, my $hbox = new CFClient::UI::HBox);	263	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
178	$hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {	264	$hbox->add (new CFClient::UI::CheckBox
		265	expand => 1, state => $CFG->{bgm_enable},
		266	tooltip => "Enable background music playing",
		267	connect_changed => sub {
179	$CFG->{bgm_enable} = $_[1];	268	$CFG->{bgm_enable} = $_[1];
		269	}
180	});	270	);
181	$hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub {	271	$hbox->add (new CFClient::UI::Slider
		272	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1],
		273	tooltip => "The volume of the background music",
		274	connect_changed => sub {
182	$CFG->{bgm_volume} = $_[1];	275	$CFG->{bgm_volume} = $_[1];
183	CFClient::MixMusic::volume $_[1] * 128;	276	CFClient::MixMusic::volume $_[1] * 128;
		277	}
184	});	278	);
185		279
186	$table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	280	$table->add (1, $row++, new CFClient::UI::Button
		281	expand => 1, align => 0, text => "Apply",
		282	tooltip => "Apply the audio settings",
		283	connect_activate => sub {
187	audio_shutdown ();	284	audio_shutdown ();
188	audio_init ();	285	audio_init ();
		286	}
189	});	287	);
190		288
191	$dialog	289	$dialog
		290	}
		291
		292	sub set_stats_window_fontsize {
		293	for (values %{$STATWIDS}) {
		294	$_->set_fontsize ($::CFG->{stat_fontsize});
		295	}
		296	}
		297
		298	sub set_gauge_window_fontsize {
		299	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
		300	$_->set_fontsize ($::CFG->{gauge_fontsize});
		301	}
		302
		303	# local $GAUGES->{win}{parent};#d#
		304	# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
		305	}
		306
		307	sub make_gauge_window {
		308	my $gh = int ($HEIGHT * $CFG->{gauge_size});
		309	# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
		310
		311	my $win = new CFClient::UI::Frame (
		312	y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh
		313	);
		314	$win->add (my $hbox = new CFClient::UI::HBox
		315	children => [
		316	(new CFClient::UI::HBox expand => 1),
		317	($FLOORBOX = new CFClient::UI::VBox),
		318	(my $vbox = new CFClient::UI::VBox),
		319	],
		320	);
		321
		322	$vbox->add (new CFClient::UI::HBox
		323	expand => 1,
		324	children => [
		325	(new CFClient::UI::Empty expand => 1),
		326	(my $hb = new CFClient::UI::HBox),
		327	],
		328	);
		329
		330	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
		331	tooltip => "Health points - depletes when you get wounded, refills when you heal or idle");
		332	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
		333	tooltip => "Spell points - deplete when you cast wizard spells, refills when you idle");
		334	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
		335	tooltip => "Grace points - deplete when you cast priest spells, refills when you pray");
		336	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
		337	tooltip => "Food - depletes with time, faster when you heal or build mana, refills when you eat healthy food");
		338
		339	$vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
		340	tooltip => "Experience points and level - increases when you kill monsters or successfully use skills");
		341	$vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
		342	tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
		343
		344	$GAUGES = {
		345	exp => $exp, win => $win, range => $rng,
		346	food => $fg, mana => $mg, hp => $hg, grace => $gg
		347	};
		348
		349	&set_gauge_window_fontsize;
		350
		351	$win
		352	}
		353
		354	sub make_stats_window {
		355	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
		356
		357	$tgw->add (my $vb = new CFClient::UI::VBox);
		358	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
		359	$vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
		360
		361	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
		362
		363	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);
		364
		365	my $black = [0, 0, 0];
		366
		367	$tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		368	$tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		369	$tbl->add (0, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		370	$tbl->add (0, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		371	$tbl->add (0, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		372	$tbl->add (0, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		373	$tbl->add (0, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		374
		375	$tbl->add (1, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Str");
		376	$tbl->add (1, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Dex");
		377	$tbl->add (1, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Con");
		378	$tbl->add (1, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Int");
		379	$tbl->add (1, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Wis");
		380	$tbl->add (1, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Pow");
		381	$tbl->add (1, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Cha");
		382
		383	$tbl->add (2, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, template => "-120");
		384	$tbl->add (2, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, template => "-120");
		385	$tbl->add (2, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, template => "120");
		386	$tbl->add (2, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, template => "120");
		387	$tbl->add (2, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, template => "10.54");
		388	$tbl->add (2, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, template => "9");
		389
		390	$tbl->add (3, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Wc");
		391	$tbl->add (3, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Ac");
		392	$tbl->add (3, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Dam");
		393	$tbl->add (3, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Arm");
		394	$tbl->add (3, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Sp");
		395	$tbl->add (3, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "WSp");
		396
		397	$hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
		398
		399	my $row = 0;
		400	my $col = 0;
		401
		402	my %resist_names = (
		403	slow => "Slow",
		404	holyw => "Holy Word",
		405	conf => "Confusion",
		406	fire => "Fire",
		407	depl => "Depletion",
		408	magic => "Magic",
		409	drain => "Draining",
		410	acid => "Acid",
		411	pois => "Poison",
		412	para => "Paralysation",
		413	deat => "Death",
		414	phys => "Physical",
		415	blind => "Blind",
		416	fear => "Fear",
		417	tund => "Turn undead",
		418	elec => "Electricity",
		419	cold => "Cold",
		420	ghit => "Ghost hit",
		421	);
		422	for (qw/slow holyw conf fire depl magic
		423	drain acid pois para deat phys
		424	blind fear tund elec cold ghit/)
		425	{
		426	$tbl2->add ($col, $row,
		427	$STATWIDS->{"res_$_"} =
		428	new CFClient::UI::Label
		429	template => "-100%",
		430	align => +1,
		431	valign => 0,
		432	tooltip => $resist_names{$_}
		433	);
		434	$tbl2->add ($col + 1, $row, new CFClient::UI::Image
		435	can_hover => 1,
		436	can_events => 1,
		437	image => "ui/resist/resist_$_.png",
		438	tooltip => $resist_names{$_}
		439	);
		440
		441	$row++;
		442	if ($row % 6 == 0) {
		443	$col += 2;
		444	$row = 0;
		445	}
		446	}
		447
		448	&set_stats_window_fontsize;
		449	update_stats_window ({});
		450
		451	$tgw
		452	}
		453
		454	sub formsep {
		455	reverse join ",", grep length, split /(...)/, reverse $_[0] * 1
		456	}
		457
		458	sub update_stats_window {
		459	my ($stats) = @_;
		460
		461	# i love text protocols!!!
		462	my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1;
		463	my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1;
		464	my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1;
		465	my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1;
		466	my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1;
		467	my $fo_m = 999;
		468	my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1;
		469	my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1;
		470
		471	$GAUGES->{hp} ->set_value ($hp, $hp_m);
		472	$GAUGES->{mana} ->set_value ($sp, $sp_m);
		473	$GAUGES->{food} ->set_value ($fo, $fo_m);
		474	$GAUGES->{grace} ->set_value ($gr, $gr_m);
		475	$GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64})
		476	. " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")");
		477	my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE};
		478	$rng =~ s/^Range: //; # thank you so much dear server
		479	$GAUGES->{range} ->set_text ("Rng: " . $rng);
		480	my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE};
		481	$title =~ s/^Player: //;
		482	$STATWIDS->{title} ->set_text ("Title: " . $title);
		483
		484	$STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
		485	$STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
		486	$STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
		487	$STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
		488	$STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
		489	$STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
		490	$STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
		491	$STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
		492	$STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
		493	$STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
		494	$STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
		495	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_SPEED});
		496	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_WEAP_SP});
		497
		498	my %tbl = (
		499	phys => 100,
		500	magic => 101,
		501	fire => 102,
		502	elec => 103,
		503	cold => 104,
		504	conf => 105,
		505	acid => 106,
		506	drain => 107,
		507	ghit => 108,
		508	pois => 109,
		509	slow => 110,
		510	para => 111,
		511	tund => 112,
		512	fear => 113,
		513	depl => 113,
		514	deat => 115,
		515	holyw => 116,
		516	blind => 117
		517	);
		518
		519	for (keys %tbl) {
		520	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
		521	}
		522
192	}	523	}
193		524
194	sub metaserver_dialog {	525	sub metaserver_dialog {
195	my $dialog = new CFClient::UI::FancyFrame	526	my $dialog = new CFClient::UI::FancyFrame
196	title => "Metaserver",	527	title => "Metaserver",
…		…
276	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	607	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
277		608
278	{	609	{
279	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	610	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
280		611
281	$vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub {	612	$vbox->add (
		613	my $HOST = new CFClient::UI::Entry
		614	expand => 1,
		615	text => $CFG->{host},
		616	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
		617	connect_changed => sub {
		618	my ($self, $value) = @_;
		619	$CFG->{host} = $value;
		620	}
		621	);
		622
		623	$METASERVER = metaserver_dialog;
		624
		625	$vbox->add (new CFClient::UI::Flopper
		626	expand => 1,
		627	text => "Metaserver",
		628	other => $METASERVER,
		629	tooltip => "Show a list of avaible crossfire servers",
		630	connect_open => sub {
		631	update_metaserver $HOST;
		632	}
		633	);
		634	}
		635
		636	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
		637	$table->add (1, 4, new CFClient::UI::Entry
		638	text => $CFG->{user},
		639	tooltip => "The name of your character on the server",
		640	connect_changed => sub {
282	my ($self, $value) = @_;	641	my ($self, $value) = @_;
283	$CFG->{host} = $value;
284	});
285
286	$METASERVER = metaserver_dialog;
287
288	$vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
289	update_metaserver $HOST;
290	});
291	}
292
293	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
294	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
295	my ($self, $value) = @_;
296	$CFG->{user} = $value;	642	$CFG->{user} = $value;
		643	}
297	});	644	);
298		645
299	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	646	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
300	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {	647	$table->add (1, 5, new CFClient::UI::Entry
		648	text => $CFG->{password},
		649	hidden => 1,
		650	tooltip => "The password for your character",
		651	connect_changed => sub {
301	my ($self, $value) = @_;	652	my ($self, $value) = @_;
302	$CFG->{password} = $value;	653	$CFG->{password} = $value;
		654	}
303	});	655	);
304		656
305	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");	657	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
306	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {	658	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry
		659	text => $CFG->{say_command},
		660	tooltip => "This is the command that will be used if you write a line in the message window entry. "
		661	."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
		662	."But you could also set it to 'tell <playername>' to only chat with that user.",
		663	connect_changed => sub {
307	my ($self, $value) = @_;	664	my ($self, $value) = @_;
308	$CFG->{say_command} = $value;	665	$CFG->{say_command} = $value;
		666	}
309	});	667	);
310		668
311	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	669	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
312	$table->add (1, 7, new CFClient::UI::Slider	670	$table->add (1, 7, new CFClient::UI::Slider
313	req_w => 100,	671	req_w => 100,
314	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	672	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
		673	tooltip => "This is the size of the portion of the map update the server sends you. "
		674	."If you set this to a high value you will be able to see further for example.",
315	connect_changed => sub {	675	connect_changed => sub {
316	my ($self, $value) = @_;	676	my ($self, $value) = @_;
317		677
318	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	678	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
319	},	679	},
…		…
335	user_h => int $::HEIGHT / 5,	695	user_h => int $::HEIGHT / 5,
336	child => (my $vbox = new CFClient::UI::VBox);	696	child => (my $vbox = new CFClient::UI::VBox);
337		697
338	$vbox->add ($LOGVIEW = new CFClient::UI::TextView	698	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
339	expand => 1,	699	expand => 1,
		700	font => $FONT_FIXED,
340	fontsize => $::CFG->{log_fontsize},	701	fontsize => $::CFG->{log_fontsize},
341	);	702	);
342		703
343	$vbox->add (my $input = new CFClient::UI::Entry	704	$vbox->add (my $input = new CFClient::UI::Entry
344	connect_focus_in => sub {	705	connect_focus_in => sub {
…		…
438		799
439	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);	800	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
440	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);	801	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
441	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);	802	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
442		803
		804	$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
		805	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
		806
443	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {	807	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
444	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	808	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
445	status "Configuration Saved";	809	status "Configuration Saved";
446	});	810	});
447		811
448	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup	812	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
449
450	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0, title => "Stats");
451	$tgw->add (my $hbox = new CFClient::UI::HBox ());
452
453	$hbox->add (my $hg = new CFClient::UI::Gauge (type => 'hp'));
454	$hbox->add (my $mg = new CFClient::UI::Gauge (type => 'mana'));
455	$hbox->add (my $gg = new CFClient::UI::Gauge (type => 'grace'));
456	$hbox->add (my $fg = new CFClient::UI::Gauge (type => 'food'));
457
458	$GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
459	$CFClient::UI::ROOT->add ($tgw);
460	}	813	}
461		814
462	sub video_shutdown {	815	sub video_shutdown {
463	$CFClient::UI::ROOT->{children} = [];	816	$CFClient::UI::ROOT->{children} = [];
464	undef $SDL_ACTIVE;	817	undef $SDL_ACTIVE;
465	}	818	}
466		819
		820	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
467	my $bgmusic;#TODO#hack#d#	821	my $bgmusic;#TODO#hack#d#
		822
		823	sub audio_music_finished {
		824	return unless $CFG->{bgm_enable};
		825
		826	# TODO: hack, do play loop and mood music
		827	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
		828	$bgmusic->play (0);
		829
		830	push @bgmusic, shift @bgmusic;
		831	}
468		832
469	sub audio_init {	833	sub audio_init {
470	if ($CFG->{audio_enable}) {	834	if ($CFG->{audio_enable}) {
471	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {	835	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
472
473	$SDL_MIXER = !CFClient::Mix_OpenAudio;	836	$SDL_MIXER = !CFClient::Mix_OpenAudio;
474	CFClient::Mix_AllocateChannels 8;	837	CFClient::Mix_AllocateChannels 8;
475	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;	838	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
476		839
477	# TODO: hack, do play loop and mood music	840	audio_music_finished;
478	if ($CFG->{bgm_enable}) {
479	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/game3.ogg";
480	$bgmusic->play;
481	}
482		841
483	while (<$fh>) {	842	while (<$fh>) {
484	next if /^\s*#/;	843	next if /^\s*#/;
485	next if /^\s*$/;	844	next if /^\s*$/;
486		845
…		…
564	@conn::ISA = Crossfire::Protocol::;	923	@conn::ISA = Crossfire::Protocol::;
565		924
566	sub conn::stats_update {	925	sub conn::stats_update {
567	my ($self, $stats) = @_;	926	my ($self, $stats) = @_;
568		927
569	# i love text protocols!!!	928	update_stats_window ($stats);
570	# FIXME: the stats are somehow weird
571	my $hp = $stats->{1};
572	my $hp_m = $stats->{2};
573	my $sp = $stats->{3};
574	my $sp_m = $stats->{4};
575	my $fo = $stats->{18};
576	my $fo_m = 999;
577	my $gr = $stats->{23};
578	my $gr_m = $stats->{24};
579
580	#d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
581	$GAUGES->{hp} ->set_value ($hp, $hp_m);
582	$GAUGES->{mana} ->set_value ($sp, $sp_m);
583	$GAUGES->{food} ->set_value ($fo, $fo_m);
584	$GAUGES->{grace}->set_value ($gr, $gr_m);
585	}	929	}
586		930
587	sub conn::user_send {	931	sub conn::user_send {
588	my ($self, $command) = @_;	932	my ($self, $command) = @_;
589		933
…		…
614		958
615	my ($hash, $x, $y, $w, $h) = @$map_info;	959	my ($hash, $x, $y, $w, $h) = @$map_info;
616		960
617	my $data = $MAP->get_rect ($x, $y, $w, $h);	961	my $data = $MAP->get_rect ($x, $y, $w, $h);
618	$MAPCACHE->put ($hash => Compress::LZF::compress $data);	962	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
619
620	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	963	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
621
622	}	964	}
623		965
624	sub conn::map_clear {	966	sub conn::map_clear {
625	my ($self) = @_;	967	my ($self) = @_;
626		968
…		…
634	sub conn::load_map($$$) {	976	sub conn::load_map($$$) {
635	my ($self, $hash, $x, $y) = @_;	977	my ($self, $hash, $x, $y) = @_;
636		978
637	if (defined (my $data = $MAPCACHE->get ($hash))) {	979	if (defined (my $data = $MAPCACHE->get ($hash))) {
638	$data = Compress::LZF::decompress $data;	980	$data = Compress::LZF::decompress $data;
639	warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#	981	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
640	for my $id ($MAP->set_rect ($x, $y, $data)) {	982	for my $id ($MAP->set_rect ($x, $y, $data)) {
641	my $data = $TILECACHE->get ($id)	983	my $data = $TILECACHE->get ($id)
642	or next;	984	or next;
643		985
644	$self->set_texture ($id => $data);	986	$self->set_texture ($id => $data);
645	}	987	}
646	}	988	}
647	}	989	}
648		990
		991	# this method does a "flood fill" into every tile direction
		992	# it assumes that tiles are arranged in a rectangular grid,
		993	# i.e. a map is the same as the left of the right map etc.
		994	# failure to comply are harmless and result in display errors
		995	# at worst.
649	sub conn::flood_fill {	996	sub conn::flood_fill {
650	my ($self, $gx, $gy, $path, $hash, $flags) = @_;	997	my ($self, $gx, $gy, $path, $hash, $flags) = @_;
651		998
652	# the server does not allow map paths > 6	999	# the server does not allow map paths > 6
653	return if 6 <= length $path;	1000	return if 6 <= length $path;
…		…
677		1024
678	} else {	1025	} else {
679	$self->send_mapinfo ("spatial $path$tile", sub {	1026	$self->send_mapinfo ("spatial $path$tile", sub {
680	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	1027	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
681		1028
682	#warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
683	return if $mode ne "spatial";	1029	return if $mode ne "spatial";
684		1030
685	$x += $MAP->ox;	1031	$x += $MAP->ox;
686	$y += $MAP->oy;	1032	$y += $MAP->oy;
687		1033
…		…
706		1052
707	my $mapmapw = 250;	1053	my $mapmapw = 250;
708	my $mapmaph = 250;	1054	my $mapmaph = 250;
709		1055
710	$self->{neigh_rect} = [	1056	$self->{neigh_rect} = [
711	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,	1057	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
712	$ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5,	1058	$ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
713	];	1059	];
714		1060
715	delete $self->{neigh_grid};	1061	delete $self->{neigh_grid};
716	$self->flood_fill (0, 0, "", $hash, $flags);	1062	$self->flood_fill (0, 0, "", $hash, $flags);
717		1063
718	$x += $ox;	1064	$x += $ox;
719	$y += $oy;	1065	$y += $oy;
720		1066
721	$self->{map_info} = [$hash, $x, $y, $w, $h];	1067	$self->{map_info} = [$hash, $x, $y, $w, $h];
		1068
		1069	my $map = $self->{map_info}[0];
		1070	$map =~ s/^.*?\/([^\/]+)$/\1/;
		1071	$STATWIDS->{map}->set_text ("Map: " . $map);
722		1072
723	$self->load_map ($hash, $x, $y);	1073	$self->load_map ($hash, $x, $y);
724	}	1074	}
725		1075
726	sub conn::face_find {	1076	sub conn::face_find {
…		…
752	}	1102	}
753		1103
754	gotid:	1104	gotid:
755	$face->{id} = $id;	1105	$face->{id} = $id;
756	$MAP->set_face ($facenum => $id);	1106	$MAP->set_face ($facenum => $id);
		1107	$self->{faceid}[$facenum] = $id;#d#
757	$TILECACHE->get ($id)	1108	$TILECACHE->get ($id)
758	}	1109	}
759		1110
760	sub conn::face_update {	1111	sub conn::face_update {
761	my ($self, $facenum, $face) = @_;	1112	my ($self, $facenum, $face) = @_;
…		…
769	my ($self, $id, $data) = @_;	1120	my ($self, $id, $data) = @_;
770		1121
771	$self->{texture}[$id] \|\|= do {	1122	$self->{texture}[$id] \|\|= do {
772	my $tex =	1123	my $tex =
773	new_from_image CFClient::Texture	1124	new_from_image CFClient::Texture
774	$data, minify => 1;	1125	$data, minify => 1, mipmap => 1;
775		1126
776	$MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	1127	$MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
777	$MAPWIDGET->update;	1128	$MAPWIDGET->update;
778		1129
779	$tex	1130	$tex
…		…
791		1142
792	$chunk->play;	1143	$chunk->play;
793	# warn "sound $x,$y,$soundnum,$type\n";#d#	1144	# warn "sound $x,$y,$soundnum,$type\n";#d#
794	}	1145	}
795		1146
		1147	my $LAST_QUERY; # server is stupid, stupid, stupid
		1148
796	sub conn::query {	1149	sub conn::query {
797	my ($self, $flags, $prompt) = @_;	1150	my ($self, $flags, $prompt) = @_;
798		1151
799	#TODO, display dialog with relevant information	1152	$prompt = $LAST_QUERY unless length $prompt;
800	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	1153	$LAST_QUERY = $prompt;
		1154
		1155	my $dialog = new CFClient::UI::FancyFrame
		1156	title => "Query",
		1157	child => my $vbox = new CFClient::UI::VBox;
		1158
		1159	$vbox->add (new CFClient::UI::Label
		1160	max_w => $::WIDTH * 0.4,
		1161	text => $prompt);
		1162
		1163	if ($flags & Crossfire::Protocol::CS_QUERY_YESNO) {
		1164	$vbox->add (my $hbox = new CFClient::HBox);
		1165	$hbox->add (new CFClient::Button
		1166	text => "No",
		1167	connect_activate => sub {
		1168	$self->send ("reply n");
		1169	$dialog->destroy;
		1170	$MAPWIDGET->focus_in;
		1171	}
		1172	);
		1173	$hbox->add (new CFClient::Button
		1174	text => "Yes",
		1175	connect_activate => sub {
		1176	$self->send ("reply y");
		1177	$dialog->destroy;
		1178	$MAPWIDGET->focus_in;
		1179	},
		1180	);
		1181
		1182	$dialog->focus_in;
		1183
		1184	} elsif ($flags & Crossfire::Protocol::CS_QUERY_SINGLECHAR) {
		1185	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
		1186	$vbox->add (my $entry = new CFClient::UI::Entry
		1187	connect_changed => sub {
		1188	$self->send ("reply $_[1]");
		1189	$dialog->destroy;
		1190	$MAPWIDGET->focus_in;
		1191	},
		1192	);
		1193
		1194	$entry->focus_in;
		1195
		1196	} else {
		1197	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
		1198
		1199	$vbox->add (my $entry = new CFClient::UI::Entry
		1200	$flags & Crossfire::Protocol::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
		1201	connect_activate => sub {
		1202	$self->send ("reply $_[1]");
		1203	$dialog->destroy;
		1204	$MAPWIDGET->focus_in;
		1205	},
		1206	);
		1207
		1208	$entry->focus_in;
		1209	}
		1210
		1211	$dialog->show;
801	}	1212	}
802		1213
803	sub conn::drawinfo {	1214	sub conn::drawinfo {
804	my ($self, $color, $text) = @_;	1215	my ($self, $color, $text) = @_;
805		1216
…		…
823	}	1234	}
824		1235
825	sub conn::spell_add {	1236	sub conn::spell_add {
826	my ($self, $spell) = @_;	1237	my ($self, $spell) = @_;
827		1238
		1239	# TODO
		1240	# create a widget dynamically, using spell face (CF::Protocol downloads them)
828	$MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {	1241	$MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message});
829	});
830	$MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {	1242	$MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message});
831	});
832	}	1243	}
833		1244
834	sub conn::spell_delete {	1245	sub conn::spell_delete {
835	my ($self, $spell) = @_;	1246	my ($self, $spell) = @_;
836	}	1247	}
837		1248
838	sub conn::addme_success {	1249	sub conn::addme_success {
839	my ($self) = @_;	1250	my ($self) = @_;
840		1251
841	for my $skill (values %{$self->{skill_info}}) {	1252	for my $skill (values %{$self->{skill_info}}) {
842	$MAPWIDGET->add_command ("ready_skill $skill", "", sub {	1253	$MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
843	});	1254	$MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
844	$MAPWIDGET->add_command ("use_skill $skill", "", sub {
845	});
846	}	1255	}
		1256	}
		1257
		1258	sub update_floorbox {
		1259	$CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
		1260	$FLOORBOX->clear;
		1261	$FLOORBOX->add (new CFClient::UI::Empty expand => 1);
		1262
		1263	my @items = values %{ $CONN->{container}{0} };
		1264
		1265	# we basically have to use the same sorting as everybody else
		1266	@items = sort { $a->{type} <=> $b->{type} } @items;
		1267
		1268	for my $item (reverse @items) {
		1269	my $desc = $item->{nrof} < 2
		1270	? $item->{name}
		1271	: "$item->{nrof} $item->{name_pl}";
		1272	# todo: animation widget, face widget, weight(?) etc.
		1273	$FLOORBOX->add (my $hbox = new CFClient::UI::HBox
		1274	tooltip => (CFClient::UI::Label->escape ($desc)
		1275	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		1276	can_hover => 1,
		1277	can_events => 1,
		1278	connect_button_down => sub {
		1279	my ($self, $ev, $x, $y) = @_;
		1280
		1281	# todo: maybe put examine on 1? but should just be a tooltip :(
		1282	if ($ev->{button} == 1) {
		1283	$CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
		1284	} elsif ($ev->{button} == 2) {
		1285	$CONN->send ("apply $item->{tag}");
		1286	} elsif ($ev->{button} == 3) {
		1287	# examine, lock, mark, maybe other things
		1288	warn "MENU not implemented yet\n";
		1289	}
		1290
		1291	1
		1292	},
		1293	);
		1294
		1295	$hbox->add (new CFClient::UI::Face
		1296	can_events => 0,
		1297	face => $item->{face},
		1298	anim => $item->{anim},
		1299	animspeed => $item->{animspeed},
		1300	);
		1301
		1302	$hbox->add (new CFClient::UI::Label
		1303	can_events => 0,
		1304	text => $desc,
		1305	);
		1306	}
		1307	});
		1308	refresh;
		1309	}
		1310
		1311	sub conn::container_add {
		1312	my ($self, $id, $items) = @_;
		1313
		1314	update_floorbox if $id == 0;
		1315	# $self-<{player}{tag} => player inv
		1316	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
		1317	}
		1318
		1319	sub conn::container_clear {
		1320	my ($self, $id) = @_;
		1321
		1322	update_floorbox if $id == 0;
		1323	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
		1324	}
		1325
		1326	sub conn::item_delete {
		1327	my ($self, @items) = @_;
		1328
		1329	for (@items) {
		1330	update_floorbox if $_->{container} == 0;
		1331	}
		1332	}
		1333
		1334	sub conn::item_update {
		1335	my ($self, $item) = @_;
		1336
		1337	update_floorbox if $item->{container} == 0;
847	}	1338	}
848		1339
849	%SDL_CB = (	1340	%SDL_CB = (
850	CFClient::SDL_QUIT => sub {	1341	CFClient::SDL_QUIT => sub {
851	Event::unloop -1;	1342	Event::unloop -1;
852	},	1343	},
853	CFClient::SDL_VIDEORESIZE => sub {	1344	CFClient::SDL_VIDEORESIZE => sub {
854	},	1345	},
855	CFClient::SDL_VIDEOEXPOSE => sub {	1346	CFClient::SDL_VIDEOEXPOSE => \&refresh,
856	refresh;	1347	CFClient::SDL_ACTIVEEVENT => sub {
		1348	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
857	},	1349	},
858	CFClient::SDL_KEYDOWN => sub {	1350	CFClient::SDL_KEYDOWN => sub {
859	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	1351	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
860	# alt-enter	1352	# alt-enter
861	video_shutdown;	1353	video_shutdown;
…		…
863	video_init;	1355	video_init;
864	} else {	1356	} else {
865	CFClient::UI::feed_sdl_key_down_event ($_[0]);	1357	CFClient::UI::feed_sdl_key_down_event ($_[0]);
866	}	1358	}
867	},	1359	},
868	CFClient::SDL_KEYUP => sub {	1360	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
869	CFClient::UI::feed_sdl_key_up_event ($_[0]);	1361	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
870	},	1362	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
871	CFClient::SDL_MOUSEMOTION => sub {	1363	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
872	CFClient::UI::feed_sdl_motion_event ($_[0]);	1364	CFClient::SDL_USEREVENT => \&audio_music_finished,
873	},
874	CFClient::SDL_MOUSEBUTTONDOWN => sub {
875	CFClient::UI::feed_sdl_button_down_event ($_[0]);
876	},
877	CFClient::SDL_MOUSEBUTTONUP => sub {
878	CFClient::UI::feed_sdl_button_up_event ($_[0]);
879	},
880	CFClient::SDL_ACTIVEEVENT => sub {
881	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
882	},
883	);	1365	);
884		1366
885	#############################################################################	1367	#############################################################################
886		1368
887	$SIG{INT} = $SIG{TERM} = sub { exit };	1369	$SIG{INT} = $SIG{TERM} = sub { exit };
…		…
895	sdl_mode => 0,	1377	sdl_mode => 0,
896	width => 640,	1378	width => 640,
897	height => 480,	1379	height => 480,
898	fullscreen => 0,	1380	fullscreen => 0,
899	fast => 0,	1381	fast => 0,
		1382	map_scale => 0.5,
900	fow_enable => 1,	1383	fow_enable => 1,
901	fow_intensity => 0.45,	1384	fow_intensity => 0.45,
902	fow_smooth => 0,	1385	fow_smooth => 0,
903	gui_fontsize => 1,	1386	gui_fontsize => 1,
904	log_fontsize => 14,	1387	log_fontsize => 1,
		1388	gauge_fontsize => 1,
		1389	gauge_size => 0.35,
		1390	stat_fontsize => 1,
905	mapsize => 100,	1391	mapsize => 100,
906	host => "crossfire.schmorp.de",	1392	host => "crossfire.schmorp.de",
907	say_command => 'say',	1393	say_command => 'say',
908	audio_enable => 1,	1394	audio_enable => 1,
909	bgm_enable => 1,	1395	bgm_enable => 1,
…		…
923	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	1409	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
924		1410
925	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	1411	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
926		1412
927	{	1413	{
928	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	1414	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
		1415	DejaVuSans.ttf
		1416	DejaVuSansMono.ttf
		1417	DejaVuSans-Bold.ttf
		1418	DejaVuSansMono-Bold.ttf
		1419	DejaVuSans-Oblique.ttf
		1420	DejaVuSansMono-Oblique.ttf
		1421	DejaVuSans-BoldOblique.ttf
		1422	DejaVuSansMono-BoldOblique.ttf
		1423	);
929		1424
930	CFClient::add_font $_ for @fonts;	1425	CFClient::add_font $_ for @fonts;
931	CFClient::set_font $fonts[0];	1426
		1427	$FONT_PROP = new_from_file CFClient::Font $fonts[0];
		1428	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];
		1429
		1430	$FONT_PROP->make_default;
932	}	1431	}
933		1432
934	video_init;	1433	video_init;
935	audio_init;	1434	audio_init;
936		1435

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.150 by root, Thu Apr 20 07:12:58 2006 UTC vs. Revision 1.175 by root, Mon Apr 24 06:57:39 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.150 by root, Thu Apr 20 07:12:58 2006 UTC vs.
Revision 1.175 by root, Mon Apr 24 06:57:39 2006 UTC