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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.141 by root, Wed Apr 19 06:21:07 2006 UTC vs.
Revision 1.167 by root, Sun Apr 23 05:33:24 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;
10	use SDL::App;
11	use SDL::Event;
12	use SDL::Surface;
13
14	use SDL::Mixer;
15	use SDL::Sound;
16	use SDL::Music;
17
18	use SDL::OpenGL;
19		8
20	use Crossfire;	9	use Crossfire;
21	use Crossfire::Protocol;	10	use Crossfire::Protocol;
22		11
23	use Compress::LZF;	12	use Compress::LZF;
…		…
56	our $LOGVIEW;	45	our $LOGVIEW;
57	our $CONSOLE;	46	our $CONSOLE;
58	our $METASERVER;	47	our $METASERVER;
59		48
60	our $GAUGES;	49	our $GAUGES;
		50	our $STATWIDS;
61		51
62	our $SDL_ACTIVE;	52	our $SDL_ACTIVE;
63	our $SDL_EV;
64	our %SDL_CB;	53	our %SDL_CB;
65		54
66	our $SDL_MIXER;	55	our $SDL_MIXER;
67	our @SOUNDS; # event => file mapping	56	our @SOUNDS; # event => file mapping
68	our %AUDIO_CHUNKS; # audio files	57	our %AUDIO_CHUNKS; # audio files
…		…
110	undef $CONN;	99	undef $CONN;
111	}	100	}
112		101
113	sub client_setup {	102	sub client_setup {
114	my $dialog = new CFClient::UI::FancyFrame	103	my $dialog = new CFClient::UI::FancyFrame
		104	title => "Client Setup",
115	child => (my $vbox = new CFClient::UI::VBox);	105	child => (my $vbox = new CFClient::UI::VBox);
116	$vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Client Setup");
117	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	106	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
118		107
119	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	108	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
120	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	109	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
121		110
122	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);	111	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
123	$hbox->add (my $mode_label = new CFClient::UI::Label valign => 0, height => 0.8);	112	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
124		113
125	$mode_slider->connect (changed => sub {	114	$mode_slider->connect (changed => sub {
126	my ($self, $value) = @_;	115	my ($self, $value) = @_;
127		116
128	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	117	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
129	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});	118	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
130	});	119	});
131	$mode_slider->emit (changed => $mode_slider->{range}[0]);	120	$mode_slider->emit (changed => $mode_slider->{range}[0]);
132		121
		122	my $row = 1;
		123
133	$table->add (0, 1, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	124	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
134	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {	125	$table->add (1, $row++, new CFClient::UI::CheckBox
		126	state => $CFG->{fullscreen},
		127	tooltip => "Bring the client into fullscreen mode",
		128	connect_changed => sub {
135	my ($self, $value) = @_;	129	my ($self, $value) = @_;
136	$CFG->{fullscreen} = $value;	130	$CFG->{fullscreen} = $value;
		131	}
137	});	132	);
138		133
139	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	134	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
140	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {	135	$table->add (1, $row++, new CFClient::UI::CheckBox
		136	state => $CFG->{fast},
		137	tooltip => "Lower the visual quality considerably to speed up rendering.",
		138	connect_changed => sub {
141	my ($self, $value) = @_;	139	my ($self, $value) = @_;
142	$CFG->{fast} = $value;	140	$CFG->{fast} = $value;
		141	}
143	});	142	);
144		143
145	$table->add (0, 3, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	144	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
146	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {	145	$table->add (1, $row++, new CFClient::UI::CheckBox
		146	state => $CFG->{fow_enable},
		147	tooltip => "Fog-of-War marks areas that cannot be seen by the player",
		148	connect_changed => sub {
147	my ($self, $value) = @_;	149	my ($self, $value) = @_;
148	$CFG->{fow_enable} = $value;	150	$CFG->{fow_enable} = $value;
		151	}
149	});	152	);
150		153
151	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	154	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
152	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {	155	$table->add (1, $row++, new CFClient::UI::Slider
		156	range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001],
		157	tooltip => "The higher the intensity, the lighter the Fog-of-War color",
		158	connect_changed => sub {
153	my ($self, $value) = @_;	159	my ($self, $value) = @_;
154	$CFG->{fow_intensity} = $value;	160	$CFG->{fow_intensity} = $value;
		161	}
155	});	162	);
156		163
157	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	164	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
158	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {	165	$table->add (1, $row++, new CFClient::UI::CheckBox
		166	state => $CFG->{fow_smooth},
		167	tooltip => "Smooth the Fog-of-War a bit to make it more realistic",
		168	connect_changed => sub {
159	my ($self, $value) = @_;	169	my ($self, $value) = @_;
160	$CFG->{fow_smooth} = $value;	170	$CFG->{fow_smooth} = $value;
161	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;	171	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
		172	}
162	});	173	);
163		174
164	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	175	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
165	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {	176	$table->add (1, $row++, new CFClient::UI::Slider
		177	range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1],
		178	tooltip => "The font size used by most GUI elements",
		179	connect_changed => sub {
166	$CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;	180	$CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
167	# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	181	# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
		182	}
168	});	183	);
169		184
170	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");	185	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
171	$table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {	186	$table->add (1, $row++, new CFClient::UI::Slider
		187	range => [$CFG->{log_fontsize}, 0.5, 2, 0.1],
		188	tooltip => "The font size used by the server log window only",
		189	connect_changed => sub {
172	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);	190	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
		191	}
173	});	192	);
174		193
175	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	194	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
		195
		196	$table->add (1, $row++, new CFClient::UI::Slider
		197	range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1],
		198	tooltip => "The font size used by the statistics window only",
		199	connect_changed => sub {
		200	$CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
		201	&set_stats_window_fontsize;
		202	}
		203	);
		204
		205	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
		206	$table->add (1, $row++, new CFClient::UI::Slider
		207	range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
		208	tooltip => "Adjust the size of the stats gauges at the bottom right",
		209	connect_changed => sub {
		210	$CFG->{gauge_size} = $_[1];
		211	my $h = int $HEIGHT * $CFG->{gauge_size};
		212	$GAUGES->{win}->set_size ($WIDTH, $h);
		213	$GAUGES->{win}->move (0, $HEIGHT - $h);
		214	}
		215	);
		216
		217	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
		218	$table->add (1, $row++, new CFClient::UI::Slider
		219	range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
		220	tooltip => "Adjusts the fontsize of the gauges at the bottom right",
		221	connect_changed => sub {
		222	$CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
		223	&set_gauge_window_fontsize;
		224	#$GAUGES->{win}->check_size;
		225	#$GAUGES->{win}->update;
		226	}
		227	);
		228
		229	$table->add (1, $row++, new CFClient::UI::Button
		230	expand => 1, align => 0, text => "Apply",
		231	tooltip => "Apply the video settings (unless they are auto-apply)",
		232	connect_activate => sub {
176	video_shutdown ();	233	video_shutdown ();
177	video_init ();	234	video_init ();
		235	}
178	});	236	);
179		237
180	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	238	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
181	$table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {	239	$table->add (1, $row++, new CFClient::UI::CheckBox
		240	state => $CFG->{audio_enable},
		241	tooltip => "If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
		242	connect_changed => sub {
182	$CFG->{audio_enable} = $_[1];	243	$CFG->{audio_enable} = $_[1];
		244	}
183	});	245	);
184	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	246	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
185	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {	247	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
186	# $CFG->{effects_volume} = $_[1];	248	# $CFG->{effects_volume} = $_[1];
187	# });	249	# });
188	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	250	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
189	$table->add (1, 10, my $hbox = new CFClient::UI::HBox);	251	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
190	$hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {	252	$hbox->add (new CFClient::UI::CheckBox
		253	expand => 1, state => $CFG->{bgm_enable},
		254	tooltip => "Enable background music playing",
		255	connect_changed => sub {
191	$CFG->{bgm_enable} = $_[1];	256	$CFG->{bgm_enable} = $_[1];
		257	}
192	});	258	);
193	$hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 128, 1], connect_changed => sub {	259	$hbox->add (new CFClient::UI::Slider
		260	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1],
		261	tooltip => "The volume of the background music",
		262	connect_changed => sub {
194	$CFG->{bgm_volume} = $_[1];	263	$CFG->{bgm_volume} = $_[1];
195	$SDL_MIXER->music_volume ($_[1]);	264	CFClient::MixMusic::volume $_[1] * 128;
		265	}
196	});	266	);
197		267
198	$table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	268	$table->add (1, $row++, new CFClient::UI::Button
		269	expand => 1, align => 0, text => "Apply",
		270	tooltip => "Apply the audio settings that are not auto-apply",
		271	connect_activate => sub {
199	audio_shutdown ();	272	audio_shutdown ();
200	audio_init ();	273	audio_init ();
		274	}
201	});	275	);
202		276
203	$dialog	277	$dialog
		278	}
		279
		280	sub set_stats_window_fontsize {
		281	for (values %{$STATWIDS}) {
		282	$_->set_fontsize ($::CFG->{stat_fontsize});
		283	}
		284	}
		285
		286	sub set_gauge_window_fontsize {
		287	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
		288	$_->set_fontsize ($::CFG->{gauge_fontsize});
		289	}
		290	}
		291
		292	sub make_gauge_window {
		293	my $gh = int ($HEIGHT * $CFG->{gauge_size});
		294	# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
		295
		296	my $win = new CFClient::UI::Frame (
		297	y => $HEIGHT - $gh, x => 0, req_w => $WIDTH, req_h => $gh
		298	);
		299	$win->add (my $vb = new CFClient::UI::VBox);
		300
		301	$vb->add (my $hbg = new CFClient::UI::HBox expand => 1);
		302
		303
		304	$hbg->add (new CFClient::UI::Empty expand => 1);
		305	$hbg->add (my $hb = new CFClient::UI::HBox);
		306	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', tooltip => "Health points");
		307	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', tooltip => "Spellpoints");
		308	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', tooltip => "Grace");
		309	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food', tooltip => "Food");
		310
		311	$vb->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, text => "XP: 0 LVL: 0");
		312	$vb->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, text => "Rng:");
		313
		314	$GAUGES = {
		315	exp => $exp, win => $win, range => $rng,
		316	food => $fg, mana => $mg, hp => $hg, grace => $gg
		317	};
		318	$win
		319	}
		320
		321	sub make_stats_window {
		322	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
		323
		324	$tgw->add (my $vb = new CFClient::UI::VBox);
		325	$vb->add (my $uhb = new CFClient::UI::HBox);
		326	$uhb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
		327	$uhb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
		328
		329	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
		330
		331	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);
		332
		333	$tbl->add (0, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Str");
		334	$tbl->add (0, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dex");
		335	$tbl->add (0, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Con");
		336	$tbl->add (0, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Int");
		337	$tbl->add (0, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wis");
		338	$tbl->add (0, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Pow");
		339	$tbl->add (0, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Cha");
		340
		341	$tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		342	$tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		343	$tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		344	$tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		345	$tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		346	$tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		347	$tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		348
		349	$tbl->add (2, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wc");
		350	$tbl->add (2, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ac");
		351	$tbl->add (2, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dam");
		352	$tbl->add (2, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Arm");
		353	$tbl->add (2, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Sp");
		354	$tbl->add (2, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "WSp");
		355
		356	$tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		357	$tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		358	$tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		359	$tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		360	$tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		361	$tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		362
		363	$hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
		364
		365	my $row = 0;
		366	my $col = 0;
		367
		368	my %resist_names = (
		369	slow => "Slow",
		370	holyw => "Holy Word",
		371	conf => "Confusion",
		372	fire => "Fire",
		373	depl => "Depletion",
		374	magic => "Magic",
		375	drain => "Draining",
		376	acid => "Acid",
		377	pois => "Poison",
		378	para => "Paralysation",
		379	deat => "Death",
		380	phys => "Physical",
		381	blind => "Blind",
		382	fear => "Fear",
		383	tund => "Turn undead",
		384	elec => "Electricity",
		385	cold => "Cold",
		386	ghit => "Ghost hit",
		387	);
		388	for (qw/slow holyw conf fire depl magic
		389	drain acid pois para deat phys
		390	blind fear tund elec cold ghit/)
		391	{
		392	$tbl2->add ($col, $row,
		393	$STATWIDS->{"res_$_"} =
		394	new CFClient::UI::Label text => "0", align => +1, valign => 0
		395	);
		396	$tbl2->add ($col + 1, $row, new CFClient::UI::Image can_hover => 1, can_events => 1, image => "ui/resist/resist_$_.png", tooltip => $resist_names{$_});
		397
		398	$row++;
		399	if ($row % 6 == 0) {
		400	$col += 2;
		401	$row = 0;
		402	}
		403	}
		404
		405	&set_stats_window_fontsize;
		406	update_stats_window ({});
		407
		408	$tgw
		409	}
		410
		411	sub update_stats_window {
		412	my ($stats) = @_;
		413
		414	# i love text protocols!!!
		415	my $hp = $stats->{1} * 1;
		416	my $hp_m = $stats->{2} * 1;
		417	my $sp = $stats->{3} * 1;
		418	my $sp_m = $stats->{4} * 1;
		419	my $fo = $stats->{18} * 1;
		420	my $fo_m = 999;
		421	my $gr = $stats->{23} * 1;
		422	my $gr_m = $stats->{24} * 1;
		423
		424	$GAUGES->{hp} ->set_value ($hp, $hp_m);
		425	$GAUGES->{mana} ->set_value ($sp, $sp_m);
		426	$GAUGES->{food} ->set_value ($fo, $fo_m);
		427	$GAUGES->{grace} ->set_value ($gr, $gr_m);
		428	$GAUGES->{exp} ->set_text ("XP: " . ($stats->{11} \|\| $stats->{28}) * 1
		429	." LVL: " . $stats->{12} * 1);
		430	my $rng = $stats->{20};
		431	$rng =~ s/^Range: //; # thank you so much dear server
		432	$GAUGES->{range} ->set_text ("Rng: " . $rng);
		433	my $title = $stats->{21};
		434	$title =~ s/^Player: //;
		435	$STATWIDS->{title} ->set_text ("Title: " . $title);
		436
		437	$STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
		438	$STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
		439	$STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
		440	$STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
		441	$STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
		442	$STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
		443	$STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
		444	$STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
		445	$STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
		446	$STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
		447	$STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
		448	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});
		449	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});
		450
		451	my %tbl = (
		452	phys => 100,
		453	magic => 101,
		454	fire => 102,
		455	elec => 103,
		456	cold => 104,
		457	conf => 105,
		458	acid => 106,
		459	drain => 107,
		460	ghit => 108,
		461	pois => 109,
		462	slow => 110,
		463	para => 111,
		464	tund => 112,
		465	fear => 113,
		466	depl => 113,
		467	deat => 115,
		468	holyw => 116,
		469	blind => 117
		470	);
		471
		472	for (keys %tbl) {
		473	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
		474	}
		475
204	}	476	}
205		477
206	sub metaserver_dialog {	478	sub metaserver_dialog {
207	my $dialog = new CFClient::UI::FancyFrame	479	my $dialog = new CFClient::UI::FancyFrame
		480	title => "Metaserver",
208	child => (my $vbox = new CFClient::UI::VBox);	481	child => (my $vbox = new CFClient::UI::VBox);
209		482
210	$vbox->add ($dialog->{table} = new CFClient::UI::Table);	483	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
211		484
212	$dialog	485	$dialog
…		…
278	});	551	});
279	}	552	}
280		553
281	sub server_setup {	554	sub server_setup {
282	my $dialog = new CFClient::UI::FancyFrame	555	my $dialog = new CFClient::UI::FancyFrame
		556	title => "Server Setup",
283	child => (my $vbox = new CFClient::UI::VBox);	557	child => (my $vbox = new CFClient::UI::VBox);
284		558
285	$vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Server Setup");
286	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	559	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
287	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	560	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
288		561
289	{	562	{
290	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	563	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
291		564
292	$vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub {	565	$vbox->add (
		566	my $HOST = new CFClient::UI::Entry
		567	expand => 1,
		568	text => $CFG->{host},
		569	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
		570	connect_changed => sub {
		571	my ($self, $value) = @_;
		572	$CFG->{host} = $value;
		573	}
		574	);
		575
		576	$METASERVER = metaserver_dialog;
		577
		578	$vbox->add (new CFClient::UI::Flopper
		579	expand => 1,
		580	text => "Metaserver",
		581	other => $METASERVER,
		582	tooltip => "Show a list of avaible crossfire servers",
		583	connect_open => sub {
		584	update_metaserver $HOST;
		585	}
		586	);
		587	}
		588
		589	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
		590	$table->add (1, 4, new CFClient::UI::Entry
		591	text => $CFG->{user},
		592	tooltip => "The name of your character on the server",
		593	connect_changed => sub {
293	my ($self, $value) = @_;	594	my ($self, $value) = @_;
294	$CFG->{host} = $value;
295	});
296
297	$METASERVER = metaserver_dialog;
298
299	$vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
300	update_metaserver $HOST;
301	});
302	}
303
304	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
305	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
306	my ($self, $value) = @_;
307	$CFG->{user} = $value;	595	$CFG->{user} = $value;
		596	}
308	});	597	);
309		598
310	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	599	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
311	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {	600	$table->add (1, 5, new CFClient::UI::Entry
		601	text => $CFG->{password},
		602	hidden => 1,
		603	tooltip => "The password for your character",
		604	connect_changed => sub {
312	my ($self, $value) = @_;	605	my ($self, $value) = @_;
313	$CFG->{password} = $value;	606	$CFG->{password} = $value;
		607	}
314	});	608	);
315		609
316	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");	610	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
317	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {	611	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry
		612	text => $CFG->{say_command},
		613	tooltip => "This is the command that will be used if you write a line in the message window entry. "
		614	."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
		615	."But you could also set it to 'tell <playername>' to only chat with that user.",
		616	connect_changed => sub {
318	my ($self, $value) = @_;	617	my ($self, $value) = @_;
319	$CFG->{say_command} = $value;	618	$CFG->{say_command} = $value;
		619	}
320	});	620	);
321		621
322	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	622	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
323	$table->add (1, 7, new CFClient::UI::Slider	623	$table->add (1, 7, new CFClient::UI::Slider
324	req_w => 100,	624	req_w => 100,
325	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	625	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
		626	tooltip => "This is the size of the portion of the map update the server sends you. "
		627	."If you set this to a high value you will be able to see further for example.",
326	connect_changed => sub {	628	connect_changed => sub {
327	my ($self, $value) = @_;	629	my ($self, $value) = @_;
328		630
329	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	631	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
330	},	632	},
…		…
337	$dialog	639	$dialog
338	}	640	}
339		641
340	sub message_window {	642	sub message_window {
341	my $window = new CFClient::UI::FancyFrame	643	my $window = new CFClient::UI::FancyFrame
		644	title => "Messages",
342	border_bg => [1, 1, 1, 0.5],	645	border_bg => [1, 1, 1, 0.5],
343	bg => [0.3, 0.3, 0.3, 0.8],	646	bg => [0.3, 0.3, 0.3, 0.8],
344	user_w => int $::WIDTH / 3,	647	user_w => int $::WIDTH / 3,
345	user_h => int $::HEIGHT / 5,	648	user_h => int $::HEIGHT / 5,
346	child => (my $vbox = new CFClient::UI::VBox);	649	child => (my $vbox = new CFClient::UI::VBox);
…		…
388		691
389	$window	692	$window
390	}	693	}
391		694
392	sub sdl_init {	695	sub sdl_init {
393	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE	696	CFClient::SDL_Init
394	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
395	and die "SDL::Init failed!\n";	697	and die "SDL::Init failed!\n";
396	}	698	}
397		699
398	sub video_init {	700	sub video_init {
399	sdl_init;	701	sdl_init;
400		702
401	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	703	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
402	$FULLSCREEN = $CFG->{fullscreen};	704	$FULLSCREEN = $CFG->{fullscreen};
403	$FAST = $CFG->{fast};	705	$FAST = $CFG->{fast};
404		706
405	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	707	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
406	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
407	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
408	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
409
410	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
411	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
412	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
413	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
414
415	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
416	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
417	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
418
419	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
420	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
421	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
422	or die "SDL::SetVideoMode failed!\n";	708	or die "SDL_SetVideoMode failed!\n";
423
424	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
425
426	$SDL_EV = new SDL::Event;
427	$SDL_EV->set_unicode (1);
428		709
429	$SDL_ACTIVE = 1;	710	$SDL_ACTIVE = 1;
430		711
431	$LAST_REFRESH = time - 0.01;	712	$LAST_REFRESH = time - 0.01;
432		713
…		…
470		751
471	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);	752	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
472	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);	753	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
473	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);	754	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
474		755
		756	$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
		757	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
		758
475	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {	759	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
476	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	760	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
477	status "Configuration Saved";	761	status "Configuration Saved";
478	});	762	});
479		763
480	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup	764	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
481
482	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
483	$tgw->add (my $hbox = new CFClient::UI::HBox ());
484
485	$hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
486	$hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
487	$hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
488	$hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
489
490	$GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
491	$CFClient::UI::ROOT->add ($tgw);
492	}	765	}
493		766
494	sub video_shutdown {	767	sub video_shutdown {
495	$CFClient::UI::ROOT->{children} = [];	768	$CFClient::UI::ROOT->{children} = [];
496	undef $SDL_ACTIVE;	769	undef $SDL_ACTIVE;
497	undef $SDL_EV;
498	}	770	}
499		771
		772	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
500	my $bgmusic;#TODO#hack#d#	773	my $bgmusic;#TODO#hack#d#
		774
		775	sub audio_music_finished {
		776	return unless $CFG->{bgm_enable};
		777
		778	# TODO: hack, do play loop and mood music
		779	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
		780	$bgmusic->play (0);
		781
		782	push @bgmusic, shift @bgmusic;
		783	}
501		784
502	sub audio_init {	785	sub audio_init {
503	if ($CFG->{audio_enable}) {	786	if ($CFG->{audio_enable}) {
504	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {	787	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
505	$SDL_MIXER = new SDL::Mixer;	788	$SDL_MIXER = !CFClient::Mix_OpenAudio;
506	$SDL_MIXER->allocate_channels (8);	789	CFClient::Mix_AllocateChannels 8;
		790	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
507		791
508	# TODO: hack, do play loop and mood music	792	audio_music_finished;
509	if ($CFG->{bgm_enable}) {
510	$bgmusic = new SDL::Music CFClient::find_rcfile "music/game3.ogg";
511	$SDL_MIXER->play_music ($bgmusic, -1);
512	$SDL_MIXER->music_volume ($CFG->{bgm_volume});
513	}
514		793
515	while (<$fh>) {	794	while (<$fh>) {
516	next if /^\s*#/;	795	next if /^\s*#/;
517	next if /^\s*$/;	796	next if /^\s*$/;
518		797
519	my ($file, $volume, $event) = split /\s+/, $_, 3;	798	my ($file, $volume, $event) = split /\s+/, $_, 3;
520		799
521	push @SOUNDS, "$volume,$file";	800	push @SOUNDS, "$volume,$file";
522		801
523	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {	802	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {
524	my $chunk = new SDL::Sound CFClient::find_rcfile "sounds/$file";	803	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
525	$chunk->volume ($volume * 128 / 100);	804	$chunk->volume ($volume * 128 / 100);
526	$chunk	805	$chunk
527	};	806	};
528	}	807	}
529	} else {	808	} else {
…		…
531	}	810	}
532	}	811	}
533	}	812	}
534		813
535	sub audio_shutdown {	814	sub audio_shutdown {
		815	CFClient::Mix_CloseAudio if $SDL_MIXER;
536	undef $SDL_MIXER;	816	undef $SDL_MIXER;
537	@SOUNDS = ();	817	@SOUNDS = ();
538	%AUDIO_CHUNKS = ();	818	%AUDIO_CHUNKS = ();
539	}	819	}
540		820
…		…
553	$want_refresh = 0;	833	$want_refresh = 0;
554	$can_refresh = 0;	834	$can_refresh = 0;
555		835
556	$CFClient::UI::ROOT->draw;	836	$CFClient::UI::ROOT->draw;
557		837
558	SDL::GLSwapBuffers;	838	CFClient::SDL_GL_SwapBuffers;
559		839
560	$LAST_REFRESH = $NOW;	840	$LAST_REFRESH = $NOW;
561	}	841	}
562		842
563	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {	843	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
564	$NOW = time;	844	$NOW = time;
565		845
566	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()	846	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)
567	while $SDL_EV->poll;	847	for CFClient::SDL_PollEvent;
568		848
569	if (%animate_object) {	849	if (%animate_object) {
570	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	850	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
571	$want_refresh++;	851	$want_refresh++;
572	}	852	}
…		…
595	@conn::ISA = Crossfire::Protocol::;	875	@conn::ISA = Crossfire::Protocol::;
596		876
597	sub conn::stats_update {	877	sub conn::stats_update {
598	my ($self, $stats) = @_;	878	my ($self, $stats) = @_;
599		879
600	# i love text protocols!!!	880	update_stats_window ($stats);
601	# FIXME: the stats are somehow weird
602	my $hp = $stats->{1};
603	my $hp_m = $stats->{2};
604	my $sp = $stats->{3};
605	my $sp_m = $stats->{4};
606	my $fo = $stats->{18};
607	my $fo_m = 1000;
608	my $gr = $stats->{23};
609	my $gr_m = $stats->{24};
610
611	#d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
612	$GAUGES->{hp}->set_value ($hp, $hp_m);
613	$GAUGES->{mana}->set_value ($sp, $sp_m);
614	$GAUGES->{food}->set_value ($fo, $fo_m);
615	$GAUGES->{grace}->set_value ($gr, $gr_m);
616	}	881	}
617		882
618	sub conn::user_send {	883	sub conn::user_send {
619	my ($self, $command) = @_;	884	my ($self, $command) = @_;
620		885
…		…
645		910
646	my ($hash, $x, $y, $w, $h) = @$map_info;	911	my ($hash, $x, $y, $w, $h) = @$map_info;
647		912
648	my $data = $MAP->get_rect ($x, $y, $w, $h);	913	my $data = $MAP->get_rect ($x, $y, $w, $h);
649	$MAPCACHE->put ($hash => Compress::LZF::compress $data);	914	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
650
651	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	915	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
652
653	}	916	}
654		917
655	sub conn::map_clear {	918	sub conn::map_clear {
656	my ($self) = @_;	919	my ($self) = @_;
657		920
658	$self->flush_map;	921	$self->flush_map;
659	delete $self->{neigh};	922	delete $self->{neigh_map};
660		923
661	$MAP->clear;	924	$MAP->clear;
662	}	925	}
663		926
664		927
665	sub conn::load_map($$$) {	928	sub conn::load_map($$$) {
666	my ($self, $hash, $x, $y) = @_;	929	my ($self, $hash, $x, $y) = @_;
667		930
668	if (defined (my $data = $MAPCACHE->get ($hash))) {	931	if (defined (my $data = $MAPCACHE->get ($hash))) {
669	$data = Compress::LZF::decompress $data;	932	$data = Compress::LZF::decompress $data;
670	warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#	933	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
671	for my $id ($MAP->set_rect ($x, $y, $data)) {	934	for my $id ($MAP->set_rect ($x, $y, $data)) {
672	my $data = $TILECACHE->get ($id)	935	my $data = $TILECACHE->get ($id)
673	or next;	936	or next;
674		937
675	$self->set_texture ($id => $data);	938	$self->set_texture ($id => $data);
676	}	939	}
677	}	940	}
678	}	941	}
679		942
		943	# this method does a "flood fill" into every tile direction
		944	# it assumes that tiles are arranged in a rectangular grid,
		945	# i.e. a map is the same as the left of the right map etc.
		946	# failure to comply are harmless and result in display errors
		947	# at worst.
680	sub conn::flood_fill {	948	sub conn::flood_fill {
681	my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;	949	my ($self, $gx, $gy, $path, $hash, $flags) = @_;
682		950
683	# the server does not allow map paths > 6	951	# the server does not allow map paths > 6
684	return if 6 <= length $path;	952	return if 6 <= length $path;
685		953
686	for my $tile (1..4) {	954	my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
687	next if $self->{neigh}{$hash}[$tile];	955
		956	for (
		957	[1, 0, -1],
		958	[2, 1, 0],
		959	[3, 0, 1],
		960	[4, -1, 0],
		961	) {
		962	my ($tile, $dx, $dy) = @$_;
		963
		964	my $gx = $gx + $dx;
		965	my $gy = $gy + $dy;
		966
688	next unless $flags & (1 << ($tile - 1));	967	next unless $flags & (1 << ($tile - 1));
		968	next if $self->{neigh_grid}{$gx, $gy}++;
689		969
690	my $neigh = $self->{neigh}{$hash} \|\|= [];	970	my $neigh = $self->{neigh_map}{$hash} \|\|= [];
691		971	if (my $info = $neigh->[$tile]) {
692	$self->send_mapinfo ("spatial $path$tile", sub {
693	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	972	my ($flags, $x, $y, $w, $h, $hash) = @$info;
694		973
695	#warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
696	return if $mode ne "spatial";
697
698	$x += $MAP->ox;
699	$y += $MAP->oy;
700
701	$self->load_map ($hash, $x, $y)
702	unless $self->{neigh}{$hash}[5]++;#d#
703
704	$neigh->[$tile] = [$x, $y, $w, $h];
705
706	$self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1)	974	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
707	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	975	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		976
		977	} else {
		978	$self->send_mapinfo ("spatial $path$tile", sub {
		979	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
		980
		981	return if $mode ne "spatial";
		982
		983	$x += $MAP->ox;
		984	$y += $MAP->oy;
		985
		986	$self->load_map ($hash, $x, $y)
		987	unless $self->{neigh_map}{$hash}[5]++;#d#
		988
		989	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
		990
		991	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
		992	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		993	});
708	});	994	}
709	}	995	}
710	}	996	}
711		997
712	sub conn::map_change {	998	sub conn::map_change {
713	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	999	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
…		…
716		1002
717	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	1003	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
718		1004
719	my $mapmapw = 250;	1005	my $mapmapw = 250;
720	my $mapmaph = 250;	1006	my $mapmaph = 250;
		1007
		1008	$self->{neigh_rect} = [
		1009	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
		1010	$ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
		1011	];
721		1012
		1013	delete $self->{neigh_grid};
722	$self->flood_fill ("", $hash, $flags,	1014	$self->flood_fill (0, 0, "", $hash, $flags);
723	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
724	$ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
725		1015
726	$x += $ox;	1016	$x += $ox;
727	$y += $oy;	1017	$y += $oy;
728		1018
729	$self->{map_info} = [$hash, $x, $y, $w, $h];	1019	$self->{map_info} = [$hash, $x, $y, $w, $h];
		1020
		1021	my $map = $self->{map_info}[0];
		1022	$map =~ s/^.*?\/([^\/]+)$/\1/;
		1023	$STATWIDS->{map}->set_text ("Map: " . $map);
730		1024
731	$self->load_map ($hash, $x, $y);	1025	$self->load_map ($hash, $x, $y);
732	}	1026	}
733		1027
734	sub conn::face_find {	1028	sub conn::face_find {
…		…
795	or return;	1089	or return;
796		1090
797	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}	1091	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
798	or return;	1092	or return;
799		1093
800	$SDL_MIXER->play_channel (-1, $chunk);	1094	$chunk->play;
801	warn "sound $x,$y,$soundnum,$type\n";#d#	1095	# warn "sound $x,$y,$soundnum,$type\n";#d#
802	}	1096	}
803		1097
804	sub conn::query {	1098	sub conn::query {
805	my ($self, $flags, $prompt) = @_;	1099	my ($self, $flags, $prompt) = @_;
806		1100
807	#TODO	1101	#TODO, display dialog with relevant information
808	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	1102	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
809	}	1103	}
810		1104
811	sub conn::drawinfo {	1105	sub conn::drawinfo {
812	my ($self, $color, $text) = @_;	1106	my ($self, $color, $text) = @_;
…		…
828	);	1122	);
829		1123
830	$LOGVIEW->add_paragraph ($color[$color], $text);	1124	$LOGVIEW->add_paragraph ($color[$color], $text);
831	}	1125	}
832		1126
		1127	sub conn::spell_add {
		1128	my ($self, $spell) = @_;
		1129
		1130	$MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {
		1131	});
		1132	$MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {
		1133	});
		1134	}
		1135
		1136	sub conn::spell_delete {
		1137	my ($self, $spell) = @_;
		1138	}
		1139
		1140	sub conn::addme_success {
		1141	my ($self) = @_;
		1142
		1143	for my $skill (values %{$self->{skill_info}}) {
		1144	$MAPWIDGET->add_command ("ready_skill $skill", "", sub {
		1145	});
		1146	$MAPWIDGET->add_command ("use_skill $skill", "", sub {
		1147	});
		1148	}
		1149	}
		1150
833	%SDL_CB = (	1151	%SDL_CB = (
834	SDL_QUIT() => sub {	1152	CFClient::SDL_QUIT => sub {
835	Event::unloop -1;	1153	Event::unloop -1;
836	},	1154	},
837	SDL_VIDEORESIZE() => sub {	1155	CFClient::SDL_VIDEORESIZE => sub {
838	},	1156	},
839	SDL_VIDEOEXPOSE() => sub {	1157	CFClient::SDL_VIDEOEXPOSE => \&refresh,
840	refresh;	1158	CFClient::SDL_ACTIVEEVENT => sub {
		1159	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
841	},	1160	},
842	SDL_KEYDOWN() => sub {	1161	CFClient::SDL_KEYDOWN => sub {
843	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	1162	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
844	# alt-enter	1163	# alt-enter
845	video_shutdown;	1164	video_shutdown;
846	$CFG->{fullscreen} = !$CFG->{fullscreen};	1165	$CFG->{fullscreen} = !$CFG->{fullscreen};
847	video_init;	1166	video_init;
848	} else {	1167	} else {
849	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	1168	CFClient::UI::feed_sdl_key_down_event ($_[0]);
850	}	1169	}
851	},	1170	},
852	SDL_KEYUP() => sub {	1171	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
853	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);	1172	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
854	},	1173	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
855	SDL_MOUSEMOTION() => sub {	1174	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
856	CFClient::UI::feed_sdl_motion_event ($SDL_EV);	1175	CFClient::SDL_USEREVENT => \&audio_music_finished,
857	},
858	SDL_MOUSEBUTTONDOWN() => sub {
859	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
860	},
861	SDL_MOUSEBUTTONUP() => sub {
862	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
863	},
864	SDL_ACTIVEEVENT() => sub {
865	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
866	},
867	);	1176	);
868		1177
869	#############################################################################	1178	#############################################################################
870		1179
871	$SIG{INT} = $SIG{TERM} = sub { exit };	1180	$SIG{INT} = $SIG{TERM} = sub { exit };
…		…
883	fast => 0,	1192	fast => 0,
884	fow_enable => 1,	1193	fow_enable => 1,
885	fow_intensity => 0.45,	1194	fow_intensity => 0.45,
886	fow_smooth => 0,	1195	fow_smooth => 0,
887	gui_fontsize => 1,	1196	gui_fontsize => 1,
888	log_fontsize => 14,	1197	log_fontsize => 1,
		1198	gauge_fontsize => 1,
		1199	gauge_size => 0.35,
		1200	stat_fontsize => 1,
889	mapsize => 100,	1201	mapsize => 100,
890	host => "crossfire.schmorp.de",	1202	host => "crossfire.schmorp.de",
891	say_command => 'say',	1203	say_command => 'say',
892	audio_enable => 1,	1204	audio_enable => 1,
893	bgm_enable => 1,	1205	bgm_enable => 1,
894	bgm_volume => 64,	1206	bgm_volume => 0.25,
895	);	1207	);
896		1208
897	while (my ($k, $v) = each %DEF_CFG) {	1209	while (my ($k, $v) = each %DEF_CFG) {
898	$CFG->{$k} = $v unless exists $CFG->{$k};	1210	$CFG->{$k} = $v unless exists $CFG->{$k};
899	}	1211	}
900		1212
901	sdl_init;	1213	sdl_init;
902		1214
903	@SDL_MODES = reverse	1215	@SDL_MODES = reverse
904	grep $_->[0] >= 640 && $_->[1] >= 480,	1216	grep $_->[0] >= 640 && $_->[1] >= 480,
905	map [SDL::RectW ($_), SDL::RectH ($_)],	1217	CFClient::SDL_ListModes;
906	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
907		1218
908	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	1219	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
909		1220
910	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	1221	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
911		1222
…		…
919	video_init;	1230	video_init;
920	audio_init;	1231	audio_init;
921		1232
922	Event::loop;	1233	Event::loop;
923		1234
924	END { SDL::Quit }	1235	END { CFClient::SDL_Quit }
925		1236
926		1237

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.141 by root, Wed Apr 19 06:21:07 2006 UTC vs. Revision 1.167 by root, Sun Apr 23 05:33:24 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.141 by root, Wed Apr 19 06:21:07 2006 UTC vs.
Revision 1.167 by root, Sun Apr 23 05:33:24 2006 UTC