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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.147 by root, Wed Apr 19 21:38:05 2006 UTC vs.
Revision 1.170 by root, Mon Apr 24 03:19:42 2006 UTC

…		…
3	use strict;	3	use strict;
4	use utf8;	4	use utf8;
5		5
6	use Time::HiRes 'time';	6	use Time::HiRes 'time';
7	use Event;	7	use Event;
8
9	use SDL::OpenGL;
10		8
11	use Crossfire;	9	use Crossfire;
12	use Crossfire::Protocol;	10	use Crossfire::Protocol;
13		11
14	use Compress::LZF;	12	use Compress::LZF;
…		…
38	our @SDL_MODES;	36	our @SDL_MODES;
39	our $WIDTH;	37	our $WIDTH;
40	our $HEIGHT;	38	our $HEIGHT;
41	our $FULLSCREEN;	39	our $FULLSCREEN;
42	our $FONTSIZE;	40	our $FONTSIZE;
		41
		42	our $FONT_PROP;
		43	our $FONT_FIXED;
43		44
44	our $MAP;	45	our $MAP;
45	our $MAPWIDGET;	46	our $MAPWIDGET;
46	our $BUTTONBAR;	47	our $BUTTONBAR;
47	our $LOGVIEW;	48	our $LOGVIEW;
48	our $CONSOLE;	49	our $CONSOLE;
49	our $METASERVER;	50	our $METASERVER;
50		51
51	our $GAUGES;	52	our $GAUGES;
		53	our $STATWIDS;
52		54
53	our $SDL_ACTIVE;	55	our $SDL_ACTIVE;
54	our %SDL_CB;	56	our %SDL_CB;
55		57
56	our $SDL_MIXER;	58	our $SDL_MIXER;
…		…
100	undef $CONN;	102	undef $CONN;
101	}	103	}
102		104
103	sub client_setup {	105	sub client_setup {
104	my $dialog = new CFClient::UI::FancyFrame	106	my $dialog = new CFClient::UI::FancyFrame
		107	title => "Client Setup",
105	child => (my $vbox = new CFClient::UI::VBox);	108	child => (my $vbox = new CFClient::UI::VBox);
106	$vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Client Setup");
107	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	109	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
108		110
109	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	111	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
110	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	112	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
111		113
112	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);	114	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
113	$hbox->add (my $mode_label = new CFClient::UI::Label valign => 0, height => 0.8);	115	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
114		116
115	$mode_slider->connect (changed => sub {	117	$mode_slider->connect (changed => sub {
116	my ($self, $value) = @_;	118	my ($self, $value) = @_;
117		119
118	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	120	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
119	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});	121	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
120	});	122	});
121	$mode_slider->emit (changed => $mode_slider->{range}[0]);	123	$mode_slider->emit (changed => $mode_slider->{range}[0]);
122		124
		125	my $row = 1;
		126
123	$table->add (0, 1, 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");
124	$table->add (1, 1, 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 {
125	my ($self, $value) = @_;	132	my ($self, $value) = @_;
126	$CFG->{fullscreen} = $value;	133	$CFG->{fullscreen} = $value;
		134	}
127	});	135	);
128		136
129	$table->add (0, 2, 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");
130	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {	138	$table->add (1, $row++, new CFClient::UI::CheckBox
		139	state => $CFG->{fast},
		140	tooltip => "Lower the visual quality considerably to speed up rendering.",
		141	connect_changed => sub {
131	my ($self, $value) = @_;	142	my ($self, $value) = @_;
132	$CFG->{fast} = $value;	143	$CFG->{fast} = $value;
		144	}
133	});	145	);
134		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
135	$table->add (0, 3, 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");
136	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {	158	$table->add (1, $row++, new CFClient::UI::CheckBox
		159	state => $CFG->{fow_enable},
		160	tooltip => "Fog-of-War marks areas that cannot be seen by the player",
		161	connect_changed => sub {
137	my ($self, $value) = @_;	162	my ($self, $value) = @_;
138	$CFG->{fow_enable} = $value;	163	$CFG->{fow_enable} = $value;
		164	}
139	});	165	);
140		166
141	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	167	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
142	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {	168	$table->add (1, $row++, new CFClient::UI::Slider
		169	range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001],
		170	tooltip => "The higher the intensity, the lighter the Fog-of-War color",
		171	connect_changed => sub {
143	my ($self, $value) = @_;	172	my ($self, $value) = @_;
144	$CFG->{fow_intensity} = $value;	173	$CFG->{fow_intensity} = $value;
		174	}
145	});	175	);
146		176
147	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	177	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
148	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {	178	$table->add (1, $row++, new CFClient::UI::CheckBox
		179	state => $CFG->{fow_smooth},
		180	tooltip => "Smooth the Fog-of-War a bit to make it more realistic",
		181	connect_changed => sub {
149	my ($self, $value) = @_;	182	my ($self, $value) = @_;
150	$CFG->{fow_smooth} = $value;	183	$CFG->{fow_smooth} = $value;
151	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;	184	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
		185	}
152	});	186	);
153		187
154	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	188	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
155	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {	189	$table->add (1, $row++, new CFClient::UI::Slider
		190	range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1],
		191	tooltip => "The font size used by most GUI elements",
		192	connect_changed => sub {
156	$CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;	193	$CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
157	# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	194	# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
		195	}
158	});	196	);
159		197
160	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");	198	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
161	$table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {	199	$table->add (1, $row++, new CFClient::UI::Slider
		200	range => [$CFG->{log_fontsize}, 0.5, 2, 0.1],
		201	tooltip => "The font size used by the server log window only",
		202	connect_changed => sub {
162	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);	203	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
		204	}
163	});	205	);
164		206
165	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	207	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
		208
		209	$table->add (1, $row++, new CFClient::UI::Slider
		210	range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1],
		211	tooltip => "The font size used by the statistics window only",
		212	connect_changed => sub {
		213	$CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
		214	&set_stats_window_fontsize;
		215	}
		216	);
		217
		218	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
		219	$table->add (1, $row++, new CFClient::UI::Slider
		220	range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
		221	tooltip => "Adjust the size of the stats gauges at the bottom right",
		222	connect_changed => sub {
		223	$CFG->{gauge_size} = $_[1];
		224	my $h = int $HEIGHT * $CFG->{gauge_size};
		225	$GAUGES->{win}->set_size ($WIDTH, $h);
		226	$GAUGES->{win}->move (0, $HEIGHT - $h);
		227	}
		228	);
		229
		230	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
		231	$table->add (1, $row++, new CFClient::UI::Slider
		232	range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
		233	tooltip => "Adjusts the fontsize of the gauges at the bottom right",
		234	connect_changed => sub {
		235	$CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
		236	&set_gauge_window_fontsize;
		237	}
		238	);
		239
		240	$table->add (1, $row++, new CFClient::UI::Button
		241	expand => 1, align => 0, text => "Apply",
		242	tooltip => "Apply the video settings",
		243	connect_activate => sub {
166	video_shutdown ();	244	video_shutdown ();
167	video_init ();	245	video_init ();
		246	}
168	});	247	);
169		248
170	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	249	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
171	$table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {	250	$table->add (1, $row++, new CFClient::UI::CheckBox
		251	state => $CFG->{audio_enable},
		252	tooltip => "If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
		253	connect_changed => sub {
172	$CFG->{audio_enable} = $_[1];	254	$CFG->{audio_enable} = $_[1];
		255	}
173	});	256	);
174	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	257	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
175	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {	258	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
176	# $CFG->{effects_volume} = $_[1];	259	# $CFG->{effects_volume} = $_[1];
177	# });	260	# });
178	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	261	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
179	$table->add (1, 10, my $hbox = new CFClient::UI::HBox);	262	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
180	$hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {	263	$hbox->add (new CFClient::UI::CheckBox
		264	expand => 1, state => $CFG->{bgm_enable},
		265	tooltip => "Enable background music playing",
		266	connect_changed => sub {
181	$CFG->{bgm_enable} = $_[1];	267	$CFG->{bgm_enable} = $_[1];
		268	}
182	});	269	);
183	$hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub {	270	$hbox->add (new CFClient::UI::Slider
		271	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1],
		272	tooltip => "The volume of the background music",
		273	connect_changed => sub {
184	$CFG->{bgm_volume} = $_[1];	274	$CFG->{bgm_volume} = $_[1];
185	CFClient::Mix_VolumeMusic ($_[1]);	275	CFClient::MixMusic::volume $_[1] * 128;
		276	}
186	});	277	);
187		278
188	$table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	279	$table->add (1, $row++, new CFClient::UI::Button
		280	expand => 1, align => 0, text => "Apply",
		281	tooltip => "Apply the audio settings",
		282	connect_activate => sub {
189	audio_shutdown ();	283	audio_shutdown ();
190	audio_init ();	284	audio_init ();
		285	}
191	});	286	);
192		287
193	$dialog	288	$dialog
		289	}
		290
		291	sub set_stats_window_fontsize {
		292	for (values %{$STATWIDS}) {
		293	$_->set_fontsize ($::CFG->{stat_fontsize});
		294	}
		295	}
		296
		297	sub set_gauge_window_fontsize {
		298	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
		299	$_->set_fontsize ($::CFG->{gauge_fontsize});
		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;
		304	}
		305
		306	sub make_gauge_window {
		307	my $gh = int ($HEIGHT * $CFG->{gauge_size});
		308	# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
		309
		310	my $win = new CFClient::UI::Frame (
		311	y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh
		312	);
		313	$win->add (my $vb = new CFClient::UI::VBox);
		314
		315	$vb->add (my $hbg = new CFClient::UI::HBox expand => 1);
		316
		317	$hbg->add (new CFClient::UI::Empty expand => 1);
		318	$hbg->add (my $hb = new CFClient::UI::HBox);
		319	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', tooltip => "Health points");
		320	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', tooltip => "Spellpoints");
		321	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', tooltip => "Grace");
		322	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food', tooltip => "Food");
		323
		324	$vb->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, text => "XP: 0 LVL: 0");
		325	$vb->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, text => "Rng:");
		326
		327	$GAUGES = {
		328	exp => $exp, win => $win, range => $rng,
		329	food => $fg, mana => $mg, hp => $hg, grace => $gg
		330	};
		331
		332	&set_gauge_window_fontsize;
		333
		334	$win
		335	}
		336
		337	sub make_stats_window {
		338	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
		339
		340	$tgw->add (my $vb = new CFClient::UI::VBox);
		341	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
		342	$vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
		343
		344	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
		345
		346	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);
		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
		356	$tbl->add (1, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Str");
		357	$tbl->add (1, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Dex");
		358	$tbl->add (1, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Con");
		359	$tbl->add (1, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Int");
		360	$tbl->add (1, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Wis");
		361	$tbl->add (1, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Pow");
		362	$tbl->add (1, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Cha");
		363
		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");
		366	$tbl->add (2, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, template => "120");
		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");
		369	$tbl->add (2, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, template => "9");
		370
		371	$tbl->add (3, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Wc");
		372	$tbl->add (3, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Ac");
		373	$tbl->add (3, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Dam");
		374	$tbl->add (3, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Arm");
		375	$tbl->add (3, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Sp");
		376	$tbl->add (3, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "WSp");
		377
		378	$hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
		379
		380	my $row = 0;
		381	my $col = 0;
		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	);
		403	for (qw/slow holyw conf fire depl magic
		404	drain acid pois para deat phys
		405	blind fear tund elec cold ghit/)
		406	{
		407	$tbl2->add ($col, $row,
		408	$STATWIDS->{"res_$_"} =
		409	new CFClient::UI::Label
		410	template => "-100%",
		411	align => +1,
		412	valign => 0,
		413	tooltip => $resist_names{$_}
		414	);
		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	);
		421
		422	$row++;
		423	if ($row % 6 == 0) {
		424	$col += 2;
		425	$row = 0;
		426	}
		427	}
		428
		429	&set_stats_window_fontsize;
		430	update_stats_window ({});
		431
		432	$tgw
		433	}
		434
		435	sub formsep {
		436	reverse join ",", grep length, split /(...)/, reverse $_[0] * 1
		437	}
		438
		439	sub update_stats_window {
		440	my ($stats) = @_;
		441
		442	# i love text protocols!!!
		443	my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1;
		444	my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1;
		445	my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1;
		446	my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1;
		447	my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1;
		448	my $fo_m = 999;
		449	my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1;
		450	my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1;
		451
		452	$GAUGES->{hp} ->set_value ($hp, $hp_m);
		453	$GAUGES->{mana} ->set_value ($sp, $sp_m);
		454	$GAUGES->{food} ->set_value ($fo, $fo_m);
		455	$GAUGES->{grace} ->set_value ($gr, $gr_m);
		456	$GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64})
		457	. " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")");
		458	my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE};
		459	$rng =~ s/^Range: //; # thank you so much dear server
		460	$GAUGES->{range} ->set_text ("Rng: " . $rng);
		461	my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE};
		462	$title =~ s/^Player: //;
		463	$STATWIDS->{title} ->set_text ("Title: " . $title);
		464
		465	$STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
		466	$STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
		467	$STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
		468	$STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
		469	$STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
		470	$STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
		471	$STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
		472	$STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
		473	$STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
		474	$STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
		475	$STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
		476	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_SPEED});
		477	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_WEAP_SP});
		478
		479	my %tbl = (
		480	phys => 100,
		481	magic => 101,
		482	fire => 102,
		483	elec => 103,
		484	cold => 104,
		485	conf => 105,
		486	acid => 106,
		487	drain => 107,
		488	ghit => 108,
		489	pois => 109,
		490	slow => 110,
		491	para => 111,
		492	tund => 112,
		493	fear => 113,
		494	depl => 113,
		495	deat => 115,
		496	holyw => 116,
		497	blind => 117
		498	);
		499
		500	for (keys %tbl) {
		501	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
		502	}
		503
194	}	504	}
195		505
196	sub metaserver_dialog {	506	sub metaserver_dialog {
197	my $dialog = new CFClient::UI::FancyFrame	507	my $dialog = new CFClient::UI::FancyFrame
		508	title => "Metaserver",
198	child => (my $vbox = new CFClient::UI::VBox);	509	child => (my $vbox = new CFClient::UI::VBox);
199		510
200	$vbox->add ($dialog->{table} = new CFClient::UI::Table);	511	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
201		512
202	$dialog	513	$dialog
…		…
268	});	579	});
269	}	580	}
270		581
271	sub server_setup {	582	sub server_setup {
272	my $dialog = new CFClient::UI::FancyFrame	583	my $dialog = new CFClient::UI::FancyFrame
		584	title => "Server Setup",
273	child => (my $vbox = new CFClient::UI::VBox);	585	child => (my $vbox = new CFClient::UI::VBox);
274		586
275	$vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Server Setup");
276	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	587	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
277	$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");
278		589
279	{	590	{
280	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	591	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
281		592
282	$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 {
283	my ($self, $value) = @_;	622	my ($self, $value) = @_;
284	$CFG->{host} = $value;
285	});
286
287	$METASERVER = metaserver_dialog;
288
289	$vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
290	update_metaserver $HOST;
291	});
292	}
293
294	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
295	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
296	my ($self, $value) = @_;
297	$CFG->{user} = $value;	623	$CFG->{user} = $value;
		624	}
298	});	625	);
299		626
300	$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");
301	$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 {
302	my ($self, $value) = @_;	633	my ($self, $value) = @_;
303	$CFG->{password} = $value;	634	$CFG->{password} = $value;
		635	}
304	});	636	);
305		637
306	$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");
307	$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 {
308	my ($self, $value) = @_;	645	my ($self, $value) = @_;
309	$CFG->{say_command} = $value;	646	$CFG->{say_command} = $value;
		647	}
310	});	648	);
311		649
312	$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");
313	$table->add (1, 7, new CFClient::UI::Slider	651	$table->add (1, 7, new CFClient::UI::Slider
314	req_w => 100,	652	req_w => 100,
315	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.",
316	connect_changed => sub {	656	connect_changed => sub {
317	my ($self, $value) = @_;	657	my ($self, $value) = @_;
318		658
319	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	659	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
320	},	660	},
…		…
327	$dialog	667	$dialog
328	}	668	}
329		669
330	sub message_window {	670	sub message_window {
331	my $window = new CFClient::UI::FancyFrame	671	my $window = new CFClient::UI::FancyFrame
		672	title => "Messages",
332	border_bg => [1, 1, 1, 0.5],	673	border_bg => [1, 1, 1, 0.5],
333	bg => [0.3, 0.3, 0.3, 0.8],	674	bg => [0.3, 0.3, 0.3, 0.8],
334	user_w => int $::WIDTH / 3,	675	user_w => int $::WIDTH / 3,
335	user_h => int $::HEIGHT / 5,	676	user_h => int $::HEIGHT / 5,
336	child => (my $vbox = new CFClient::UI::VBox);	677	child => (my $vbox = new CFClient::UI::VBox);
337		678
338	$vbox->add ($LOGVIEW = new CFClient::UI::TextView	679	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
339	expand => 1,	680	expand => 1,
		681	font => $FONT_FIXED,
340	fontsize => $::CFG->{log_fontsize},	682	fontsize => $::CFG->{log_fontsize},
341	);	683	);
342		684
343	$vbox->add (my $input = new CFClient::UI::Entry	685	$vbox->add (my $input = new CFClient::UI::Entry
344	connect_focus_in => sub {	686	connect_focus_in => sub {
…		…
438		780
439	$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);
440	$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);
441	$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);
442		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
443	$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 {
444	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	789	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
445	status "Configuration Saved";	790	status "Configuration Saved";
446	});	791	});
447		792
448	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup	793	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
449
450	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
451	$tgw->add (my $hbox = new CFClient::UI::HBox ());
452
453	$hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
454	$hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
455	$hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
456	$hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
457
458	$GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
459	$CFClient::UI::ROOT->add ($tgw);
460	}	794	}
461		795
462	sub video_shutdown {	796	sub video_shutdown {
463	$CFClient::UI::ROOT->{children} = [];	797	$CFClient::UI::ROOT->{children} = [];
464	undef $SDL_ACTIVE;	798	undef $SDL_ACTIVE;
465	}	799	}
466		800
		801	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#	802	my $bgmusic;#TODO#hack#d#
		803
		804	sub audio_music_finished {
		805	return unless $CFG->{bgm_enable};
		806
		807	# TODO: hack, do play loop and mood music
		808	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
		809	$bgmusic->play (0);
		810
		811	push @bgmusic, shift @bgmusic;
		812	}
468		813
469	sub audio_init {	814	sub audio_init {
470	if ($CFG->{audio_enable}) {	815	if ($CFG->{audio_enable}) {
471	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {	816	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
472
473	$SDL_MIXER = !CFClient::Mix_OpenAudio;	817	$SDL_MIXER = !CFClient::Mix_OpenAudio;
474	CFClient::Mix_AllocateChannels 8;	818	CFClient::Mix_AllocateChannels 8;
475	CFClient::MixMusic::volume $CFG->{bgm_volume};	819	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
476		820
477	# TODO: hack, do play loop and mood music	821	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		822
483	while (<$fh>) {	823	while (<$fh>) {
484	next if /^\s*#/;	824	next if /^\s*#/;
485	next if /^\s*$/;	825	next if /^\s*$/;
486		826
…		…
522	$want_refresh = 0;	862	$want_refresh = 0;
523	$can_refresh = 0;	863	$can_refresh = 0;
524		864
525	$CFClient::UI::ROOT->draw;	865	$CFClient::UI::ROOT->draw;
526		866
527	SDL::GLSwapBuffers;	867	CFClient::SDL_GL_SwapBuffers;
528		868
529	$LAST_REFRESH = $NOW;	869	$LAST_REFRESH = $NOW;
530	}	870	}
531		871
532	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {	872	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
…		…
564	@conn::ISA = Crossfire::Protocol::;	904	@conn::ISA = Crossfire::Protocol::;
565		905
566	sub conn::stats_update {	906	sub conn::stats_update {
567	my ($self, $stats) = @_;	907	my ($self, $stats) = @_;
568		908
569	# i love text protocols!!!	909	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 = 1000;
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	}	910	}
586		911
587	sub conn::user_send {	912	sub conn::user_send {
588	my ($self, $command) = @_;	913	my ($self, $command) = @_;
589		914
…		…
614		939
615	my ($hash, $x, $y, $w, $h) = @$map_info;	940	my ($hash, $x, $y, $w, $h) = @$map_info;
616		941
617	my $data = $MAP->get_rect ($x, $y, $w, $h);	942	my $data = $MAP->get_rect ($x, $y, $w, $h);
618	$MAPCACHE->put ($hash => Compress::LZF::compress $data);	943	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
619
620	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	944	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
621
622	}	945	}
623		946
624	sub conn::map_clear {	947	sub conn::map_clear {
625	my ($self) = @_;	948	my ($self) = @_;
626		949
627	$self->flush_map;	950	$self->flush_map;
628	delete $self->{neigh};	951	delete $self->{neigh_map};
629		952
630	$MAP->clear;	953	$MAP->clear;
631	}	954	}
632		955
633		956
634	sub conn::load_map($$$) {	957	sub conn::load_map($$$) {
635	my ($self, $hash, $x, $y) = @_;	958	my ($self, $hash, $x, $y) = @_;
636		959
637	if (defined (my $data = $MAPCACHE->get ($hash))) {	960	if (defined (my $data = $MAPCACHE->get ($hash))) {
638	$data = Compress::LZF::decompress $data;	961	$data = Compress::LZF::decompress $data;
639	warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#	962	#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)) {	963	for my $id ($MAP->set_rect ($x, $y, $data)) {
641	my $data = $TILECACHE->get ($id)	964	my $data = $TILECACHE->get ($id)
642	or next;	965	or next;
643		966
644	$self->set_texture ($id => $data);	967	$self->set_texture ($id => $data);
645	}	968	}
646	}	969	}
647	}	970	}
648		971
		972	# this method does a "flood fill" into every tile direction
		973	# it assumes that tiles are arranged in a rectangular grid,
		974	# i.e. a map is the same as the left of the right map etc.
		975	# failure to comply are harmless and result in display errors
		976	# at worst.
649	sub conn::flood_fill {	977	sub conn::flood_fill {
650	my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;	978	my ($self, $gx, $gy, $path, $hash, $flags) = @_;
651		979
652	# the server does not allow map paths > 6	980	# the server does not allow map paths > 6
653	return if 6 <= length $path;	981	return if 6 <= length $path;
654		982
655	for my $tile (1..4) {	983	my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
656	next if $self->{neigh}{$hash}[$tile];	984
		985	for (
		986	[1, 0, -1],
		987	[2, 1, 0],
		988	[3, 0, 1],
		989	[4, -1, 0],
		990	) {
		991	my ($tile, $dx, $dy) = @$_;
		992
		993	my $gx = $gx + $dx;
		994	my $gy = $gy + $dy;
		995
657	next unless $flags & (1 << ($tile - 1));	996	next unless $flags & (1 << ($tile - 1));
		997	next if $self->{neigh_grid}{$gx, $gy}++;
658		998
659	my $neigh = $self->{neigh}{$hash} \|\|= [];	999	my $neigh = $self->{neigh_map}{$hash} \|\|= [];
660		1000	if (my $info = $neigh->[$tile]) {
661	$self->send_mapinfo ("spatial $path$tile", sub {
662	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	1001	my ($flags, $x, $y, $w, $h, $hash) = @$info;
663		1002
664	#warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
665	return if $mode ne "spatial";
666
667	$x += $MAP->ox;
668	$y += $MAP->oy;
669
670	$self->load_map ($hash, $x, $y)
671	unless $self->{neigh}{$hash}[5]++;#d#
672
673	$neigh->[$tile] = [$x, $y, $w, $h];
674
675	$self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1)	1003	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
676	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	1004	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		1005
		1006	} else {
		1007	$self->send_mapinfo ("spatial $path$tile", sub {
		1008	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
		1009
		1010	return if $mode ne "spatial";
		1011
		1012	$x += $MAP->ox;
		1013	$y += $MAP->oy;
		1014
		1015	$self->load_map ($hash, $x, $y)
		1016	unless $self->{neigh_map}{$hash}[5]++;#d#
		1017
		1018	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
		1019
		1020	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
		1021	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		1022	});
677	});	1023	}
678	}	1024	}
679	}	1025	}
680		1026
681	sub conn::map_change {	1027	sub conn::map_change {
682	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	1028	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
…		…
685		1031
686	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	1032	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
687		1033
688	my $mapmapw = 250;	1034	my $mapmapw = 250;
689	my $mapmaph = 250;	1035	my $mapmaph = 250;
		1036
		1037	$self->{neigh_rect} = [
		1038	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
		1039	$ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
		1040	];
690		1041
		1042	delete $self->{neigh_grid};
691	$self->flood_fill ("", $hash, $flags,	1043	$self->flood_fill (0, 0, "", $hash, $flags);
692	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
693	$ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
694		1044
695	$x += $ox;	1045	$x += $ox;
696	$y += $oy;	1046	$y += $oy;
697		1047
698	$self->{map_info} = [$hash, $x, $y, $w, $h];	1048	$self->{map_info} = [$hash, $x, $y, $w, $h];
		1049
		1050	my $map = $self->{map_info}[0];
		1051	$map =~ s/^.*?\/([^\/]+)$/\1/;
		1052	$STATWIDS->{map}->set_text ("Map: " . $map);
699		1053
700	$self->load_map ($hash, $x, $y);	1054	$self->load_map ($hash, $x, $y);
701	}	1055	}
702		1056
703	sub conn::face_find {	1057	sub conn::face_find {
…		…
768		1122
769	$chunk->play;	1123	$chunk->play;
770	# warn "sound $x,$y,$soundnum,$type\n";#d#	1124	# warn "sound $x,$y,$soundnum,$type\n";#d#
771	}	1125	}
772		1126
		1127	my $LAST_QUERY; # server is stupid, stupid, stupid
		1128
773	sub conn::query {	1129	sub conn::query {
774	my ($self, $flags, $prompt) = @_;	1130	my ($self, $flags, $prompt) = @_;
775		1131
776	#TODO, display dialog with relevant information	1132	$prompt = $LAST_QUERY unless length $prompt;
777	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	1133	$LAST_QUERY = $prompt;
		1134
		1135	my $dialog = new CFClient::UI::FancyFrame
		1136	title => "Query",
		1137	child => my $vbox = new CFClient::UI::VBox;
		1138
		1139	$vbox->add (new CFClient::UI::Label
		1140	max_w => $::WIDTH * 0.4,
		1141	text => $prompt);
		1142
		1143	if ($flags & Crossfire::Protocol::CS_QUERY_YESNO) {
		1144	$vbox->add (my $hbox = new CFClient::HBox);
		1145	$hbox->add (new CFClient::Button
		1146	text => "No",
		1147	connect_activate => sub {
		1148	$self->send ("reply n");
		1149	$dialog->destroy;
		1150	$MAPWIDGET->focus_in;
		1151	}
		1152	);
		1153	$hbox->add (new CFClient::Button
		1154	text => "Yes",
		1155	connect_activate => sub {
		1156	$self->send ("reply y");
		1157	$dialog->destroy;
		1158	$MAPWIDGET->focus_in;
		1159	},
		1160	);
		1161
		1162	$dialog->focus_in;
		1163
		1164	} elsif ($flags & Crossfire::Protocol::CS_QUERY_SINGLECHAR) {
		1165	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
		1166	$vbox->add (my $entry = new CFClient::UI::Entry
		1167	connect_changed => sub {
		1168	$self->send ("reply $_[1]");
		1169	$dialog->destroy;
		1170	$MAPWIDGET->focus_in;
		1171	},
		1172	);
		1173
		1174	$entry->focus_in;
		1175
		1176	} else {
		1177	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
		1178
		1179	$vbox->add (my $entry = new CFClient::UI::Entry
		1180	$flags & Crossfire::Protocol::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
		1181	connect_activate => sub {
		1182	$self->send ("reply $_[1]");
		1183	$dialog->destroy;
		1184	$MAPWIDGET->focus_in;
		1185	},
		1186	);
		1187
		1188	$entry->focus_in;
		1189	}
		1190
		1191	$dialog->show;
778	}	1192	}
779		1193
780	sub conn::drawinfo {	1194	sub conn::drawinfo {
781	my ($self, $color, $text) = @_;	1195	my ($self, $color, $text) = @_;
782		1196
…		…
821	$MAPWIDGET->add_command ("use_skill $skill", "", sub {	1235	$MAPWIDGET->add_command ("use_skill $skill", "", sub {
822	});	1236	});
823	}	1237	}
824	}	1238	}
825		1239
		1240	sub conn::container_add {
		1241	my ($self, $id, $items) = @_;
		1242
		1243	# 0 floor
		1244	# $self-<{player}{tag} => player inv
		1245	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
		1246	}
		1247
		1248	sub conn::container_clear {
		1249	my ($self, $id) = @_;
		1250	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
		1251	}
		1252
826	%SDL_CB = (	1253	%SDL_CB = (
827	CFClient::SDL_QUIT => sub {	1254	CFClient::SDL_QUIT => sub {
828	Event::unloop -1;	1255	Event::unloop -1;
829	},	1256	},
830	CFClient::SDL_VIDEORESIZE => sub {	1257	CFClient::SDL_VIDEORESIZE => sub {
831	},	1258	},
832	CFClient::SDL_VIDEOEXPOSE => sub {	1259	CFClient::SDL_VIDEOEXPOSE => \&refresh,
833	refresh;	1260	CFClient::SDL_ACTIVEEVENT => sub {
		1261	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
834	},	1262	},
835	CFClient::SDL_KEYDOWN => sub {	1263	CFClient::SDL_KEYDOWN => sub {
836	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	1264	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
837	# alt-enter	1265	# alt-enter
838	video_shutdown;	1266	video_shutdown;
…		…
840	video_init;	1268	video_init;
841	} else {	1269	} else {
842	CFClient::UI::feed_sdl_key_down_event ($_[0]);	1270	CFClient::UI::feed_sdl_key_down_event ($_[0]);
843	}	1271	}
844	},	1272	},
845	CFClient::SDL_KEYUP => sub {	1273	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
846	CFClient::UI::feed_sdl_key_up_event ($_[0]);	1274	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
847	},	1275	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
848	CFClient::SDL_MOUSEMOTION => sub {	1276	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
849	CFClient::UI::feed_sdl_motion_event ($_[0]);	1277	CFClient::SDL_USEREVENT => \&audio_music_finished,
850	},
851	CFClient::SDL_MOUSEBUTTONDOWN => sub {
852	CFClient::UI::feed_sdl_button_down_event ($_[0]);
853	},
854	CFClient::SDL_MOUSEBUTTONUP => sub {
855	CFClient::UI::feed_sdl_button_up_event ($_[0]);
856	},
857	CFClient::SDL_ACTIVEEVENT => sub {
858	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
859	},
860	);	1278	);
861		1279
862	#############################################################################	1280	#############################################################################
863		1281
864	$SIG{INT} = $SIG{TERM} = sub { exit };	1282	$SIG{INT} = $SIG{TERM} = sub { exit };
…		…
872	sdl_mode => 0,	1290	sdl_mode => 0,
873	width => 640,	1291	width => 640,
874	height => 480,	1292	height => 480,
875	fullscreen => 0,	1293	fullscreen => 0,
876	fast => 0,	1294	fast => 0,
		1295	map_scale => 0.5,
877	fow_enable => 1,	1296	fow_enable => 1,
878	fow_intensity => 0.45,	1297	fow_intensity => 0.45,
879	fow_smooth => 0,	1298	fow_smooth => 0,
880	gui_fontsize => 1,	1299	gui_fontsize => 1,
881	log_fontsize => 14,	1300	log_fontsize => 1,
		1301	gauge_fontsize => 1,
		1302	gauge_size => 0.35,
		1303	stat_fontsize => 1,
882	mapsize => 100,	1304	mapsize => 100,
883	host => "crossfire.schmorp.de",	1305	host => "crossfire.schmorp.de",
884	say_command => 'say',	1306	say_command => 'say',
885	audio_enable => 1,	1307	audio_enable => 1,
886	bgm_enable => 1,	1308	bgm_enable => 1,
887	bgm_volume => 64,	1309	bgm_volume => 0.25,
888	);	1310	);
889		1311
890	while (my ($k, $v) = each %DEF_CFG) {	1312	while (my ($k, $v) = each %DEF_CFG) {
891	$CFG->{$k} = $v unless exists $CFG->{$k};	1313	$CFG->{$k} = $v unless exists $CFG->{$k};
892	}	1314	}
…		…
900	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	1322	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
901		1323
902	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	1324	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
903		1325
904	{	1326	{
905	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	1327	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
		1328	DejaVuSans.ttf
		1329	DejaVuSansMono.ttf
		1330	DejaVuSans-Bold.ttf
		1331	DejaVuSansMono-Bold.ttf
		1332	DejaVuSans-Oblique.ttf
		1333	DejaVuSansMono-Oblique.ttf
		1334	DejaVuSans-BoldOblique.ttf
		1335	DejaVuSansMono-BoldOblique.ttf
		1336	);
906		1337
907	CFClient::add_font $_ for @fonts;	1338	CFClient::add_font $_ for @fonts;
908	CFClient::set_font $fonts[0];	1339
		1340	$FONT_PROP = new_from_file CFClient::Font $fonts[0];
		1341	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];
		1342
		1343	$FONT_PROP->make_default;
909	}	1344	}
910		1345
911	video_init;	1346	video_init;
912	audio_init;	1347	audio_init;
913		1348
914	Event::loop;	1349	Event::loop;
915		1350
916	END { SDL::Quit }	1351	END { CFClient::SDL_Quit }
917		1352
918		1353

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.147 by root, Wed Apr 19 21:38:05 2006 UTC vs. Revision 1.170 by root, Mon Apr 24 03:19:42 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.147 by root, Wed Apr 19 21:38:05 2006 UTC vs.
Revision 1.170 by root, Mon Apr 24 03:19:42 2006 UTC