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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.136 by root, Tue Apr 18 06:34:30 2006 UTC vs.
Revision 1.166 by elmex, Sun Apr 23 02:50:44 2006 UTC

…		…
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		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
20	use Crossfire;	9	use Crossfire;
21	use Crossfire::Protocol;	10	use Crossfire::Protocol;
22		11
23	use Compress::LZF;	12	use Compress::LZF;
24		13
25	use CFClient;	14	use CFClient;
26	use CFClient::UI;	15	use CFClient::UI;
		16	use CFClient::MapWidget;
27		17
28	our $VERSION = '0.1';	18	our $VERSION = '0.1';
29		19
30	my $MAX_FPS = 60;	20	my $MAX_FPS = 60;
31	my $MIN_FPS = 5; # unused as of yet	21	my $MIN_FPS = 5; # unused as of yet
…		…
55	our $LOGVIEW;	45	our $LOGVIEW;
56	our $CONSOLE;	46	our $CONSOLE;
57	our $METASERVER;	47	our $METASERVER;
58		48
59	our $GAUGES;	49	our $GAUGES;
		50	our $STATWIDS;
60		51
61	our $SDL_ACTIVE;	52	our $SDL_ACTIVE;
62	our $SDL_EV;
63	our %SDL_CB;	53	our %SDL_CB;
64		54
65	our $SDL_MIXER;	55	our $SDL_MIXER;
66	our @SOUNDS; # event => file mapping	56	our @SOUNDS; # event => file mapping
67	our %AUDIO_CHUNKS; # audio files	57	our %AUDIO_CHUNKS; # audio files
…		…
109	undef $CONN;	99	undef $CONN;
110	}	100	}
111		101
112	sub client_setup {	102	sub client_setup {
113	my $dialog = new CFClient::UI::FancyFrame	103	my $dialog = new CFClient::UI::FancyFrame
		104	title => "Client Setup",
114	child => (my $vbox = new CFClient::UI::VBox);	105	child => (my $vbox = new CFClient::UI::VBox);
115	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
116	$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]);
117		107
118	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");	108	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
119	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	109	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
120		110
121	$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]);
122	$hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);	112	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
123		113
124	$mode_slider->connect (changed => sub {	114	$mode_slider->connect (changed => sub {
125	my ($self, $value) = @_;	115	my ($self, $value) = @_;
126		116
127	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	117	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
128	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});	118	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
129	});	119	});
130	$mode_slider->emit (changed => $mode_slider->{range}[0]);	120	$mode_slider->emit (changed => $mode_slider->{range}[0]);
131		121
		122	my $row = 1;
		123
132	$table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");	124	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
133	$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 {
134	my ($self, $value) = @_;	129	my ($self, $value) = @_;
135	$CFG->{fullscreen} = $value;	130	$CFG->{fullscreen} = $value;
		131	}
136	});	132	);
137		133
138	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");	134	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
139	$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 {
140	my ($self, $value) = @_;	139	my ($self, $value) = @_;
141	$CFG->{fast} = $value;	140	$CFG->{fast} = $value;
		141	}
142	});	142	);
143		143
144	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");	144	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
145	$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 {
146	my ($self, $value) = @_;	149	my ($self, $value) = @_;
147	$CFG->{fow_enable} = $value;	150	$CFG->{fow_enable} = $value;
		151	}
148	});	152	);
149		153
150	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");	154	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
151	$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 {
152	my ($self, $value) = @_;	159	my ($self, $value) = @_;
153	$CFG->{fow_intensity} = $value;	160	$CFG->{fow_intensity} = $value;
		161	}
154	});	162	);
155		163
156	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");	164	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
157	$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 {
158	my ($self, $value) = @_;	169	my ($self, $value) = @_;
159	$CFG->{fow_smooth} = $value;	170	$CFG->{fow_smooth} = $value;
160	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	}
161	});	173	);
162		174
163	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");	175	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
164	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {	176	$table->add (1, $row++, new CFClient::UI::Slider
165	my ($self, $value) = @_;	177	range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1],
166	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);	178	tooltip => "The font size used by most GUI elements",
		179	connect_changed => sub {
		180	$CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
		181	# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
		182	}
167	});	183	);
168		184
169	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	185	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
		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 {
		190	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
		191	}
		192	);
		193
		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 {
170	video_shutdown ();	233	video_shutdown ();
171	video_init ();	234	video_init ();
		235	}
		236	);
		237
		238	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
		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 {
		243	$CFG->{audio_enable} = $_[1];
		244	}
		245	);
		246	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
		247	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
		248	# $CFG->{effects_volume} = $_[1];
172	});	249	# });
		250	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
		251	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
		252	$hbox->add (new CFClient::UI::CheckBox
		253	expand => 1, state => $CFG->{bgm_enable},
		254	tooltip => "Enable background music playing",
		255	connect_changed => sub {
		256	$CFG->{bgm_enable} = $_[1];
		257	}
		258	);
		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 {
		263	$CFG->{bgm_volume} = $_[1];
		264	CFClient::MixMusic::volume $_[1] * 128;
		265	}
		266	);
		267
		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 {
		272	audio_shutdown ();
		273	audio_init ();
		274	}
		275	);
173		276
174	$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
175	}	476	}
176		477
177	sub metaserver_dialog {	478	sub metaserver_dialog {
178	my $dialog = new CFClient::UI::FancyFrame	479	my $dialog = new CFClient::UI::FancyFrame
		480	title => "Metaserver",
179	child => (my $vbox = new CFClient::UI::VBox);	481	child => (my $vbox = new CFClient::UI::VBox);
180		482
181	$vbox->add ($dialog->{table} = new CFClient::UI::Table);	483	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
182		484
183	$dialog	485	$dialog
…		…
240	$HOST->set_text ($CFG->{host} = $host);	542	$HOST->set_text ($CFG->{host} = $host);
241	}),	543	}),
242	(new CFClient::UI::Empty expand => 1),	544	(new CFClient::UI::Empty expand => 1),
243	]);	545	]);
244		546
245	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)	547	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8)
246	for 0 .. $#$m;	548	for 0 .. $#$m;
247	}	549	}
248	}	550	}
249	});	551	});
250	}	552	}
251		553
252	sub server_setup {	554	sub server_setup {
253	my $dialog = new CFClient::UI::FancyFrame	555	my $dialog = new CFClient::UI::FancyFrame
		556	title => "Server Setup",
254	child => (my $vbox = new CFClient::UI::VBox);	557	child => (my $vbox = new CFClient::UI::VBox);
255		558
256	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
257	$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]);
258	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");	560	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
259		561
260	{	562	{
261	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	563	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
262		564
263	$vbox->add (my $HOST = new CFClient::UI::Entry 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 aviable 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 {
264	my ($self, $value) = @_;	594	my ($self, $value) = @_;
265	$CFG->{host} = $value;	595	$CFG->{user} = $value;
266	});	596	}
		597	);
267		598
268	$METASERVER = metaserver_dialog;
269
270	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
271	update_metaserver $HOST;
272	});
273	}
274
275	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	599	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
276	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, 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 {
277	my ($self, $value) = @_;	605	my ($self, $value) = @_;
278	$CFG->{user} = $value;
279	});
280
281	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
282	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
283	my ($self, $value) = @_;
284	$CFG->{password} = $value;	606	$CFG->{password} = $value;
		607	}
285	});	608	);
286		609
287	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");	610	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
288	$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 {
289	my ($self, $value) = @_;	617	my ($self, $value) = @_;
290	$CFG->{say_command} = $value;	618	$CFG->{say_command} = $value;
		619	}
291	});	620	);
292		621
293	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");	622	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
294	$table->add (1, 7, new CFClient::UI::Slider	623	$table->add (1, 7, new CFClient::UI::Slider
295	req_w => 100,	624	req_w => 100,
296	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.",
297	connect_changed => sub {	628	connect_changed => sub {
298	my ($self, $value) = @_;	629	my ($self, $value) = @_;
299		630
300	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	631	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
301	},	632	},
…		…
308	$dialog	639	$dialog
309	}	640	}
310		641
311	sub message_window {	642	sub message_window {
312	my $window = new CFClient::UI::FancyFrame	643	my $window = new CFClient::UI::FancyFrame
		644	title => "Messages",
313	border_bg => [1, 1, 1, 0.5],	645	border_bg => [1, 1, 1, 0.5],
314	bg => [0.3, 0.3, 0.3, 0.8],	646	bg => [0.3, 0.3, 0.3, 0.8],
315	user_w => int $::WIDTH / 3,	647	user_w => int $::WIDTH / 3,
316	user_h => int $::HEIGHT / 5,	648	user_h => int $::HEIGHT / 5,
317	child => (my $vbox = new CFClient::UI::VBox);	649	child => (my $vbox = new CFClient::UI::VBox);
…		…
359		691
360	$window	692	$window
361	}	693	}
362		694
363	sub sdl_init {	695	sub sdl_init {
364	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE	696	CFClient::SDL_Init
365	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
366	and die "SDL::Init failed!\n";	697	and die "SDL::Init failed!\n";
367	}	698	}
368		699
369	sub video_init {	700	sub video_init {
370	sdl_init;	701	sdl_init;
371		702
372	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	703	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
373	$FULLSCREEN = $CFG->{fullscreen};	704	$FULLSCREEN = $CFG->{fullscreen};
374	$FAST = $CFG->{fast};	705	$FAST = $CFG->{fast};
375		706
376	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	707	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
377	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
378	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
379	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
380
381	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
382	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
383	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
384	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
385
386	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
387	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
388	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
389
390	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
391	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
392	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
393	or die "SDL::SetVideoMode failed!\n";	708	or die "SDL_SetVideoMode failed!\n";
394
395	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
396
397	$SDL_EV = new SDL::Event;
398	$SDL_EV->set_unicode (1);
399		709
400	$SDL_ACTIVE = 1;	710	$SDL_ACTIVE = 1;
401		711
402	$LAST_REFRESH = time - 0.01;	712	$LAST_REFRESH = time - 0.01;
403		713
404	CFClient::gl_init;	714	CFClient::gl_init;
405		715
406	$FONTSIZE = int $HEIGHT / 40;	716	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
407		717
408	#############################################################################	718	#############################################################################
409		719
410	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;	720	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
411	$CFClient::UI::ROOT->add ($DEBUG_STATUS);	721	$DEBUG_STATUS->show;
412		722
413	$STATUS_LINE = new CFClient::UI::Label	723	$STATUS_LINE = new CFClient::UI::Label
414	padding => 0,	724	padding => 0,
415	y => $HEIGHT * 44 / 45 - $FONTSIZE;	725	y => $HEIGHT - $FONTSIZE * 1.8;
416	$CFClient::UI::ROOT->add ($STATUS_LINE);	726	$STATUS_LINE->show;
417		727
418	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	728	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
419	padding => 0,	729	padding => 0,
420	y => $HEIGHT * 44 / 45,
421	fontsize => $HEIGHT / 45,	730	fontsize => 0.8,
422	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	731	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
423	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);	732	$ALT_ENTER_MESSAGE->show;
		733	$ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
424		734
425	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);	735	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);
426	$MAPWIDGET->focus_in;	736	$MAPWIDGET->focus_in;
427	$MAPWIDGET->connect (activate_console => sub {	737	$MAPWIDGET->connect (activate_console => sub {
428	my ($mapwidget, $preset) = @_;	738	my ($mapwidget, $preset) = @_;
429		739
430	if ($CONSOLE) {	740	if ($CONSOLE) {
…		…
446	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {	756	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
447	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	757	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
448	status "Configuration Saved";	758	status "Configuration Saved";
449	});	759	});
450		760
		761	$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
		762	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
		763
451	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup	764	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
452		765
453	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
454	$tgw->add (my $hbox = new CFClient::UI::HBox ());
455		766
456	$hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
457	$hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
458	$hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
459	$hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
460
461	$GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
462	$CFClient::UI::ROOT->add ($tgw);
463	}	767	}
464		768
465	sub video_shutdown {	769	sub video_shutdown {
466	$CFClient::UI::ROOT->{children} = [];	770	$CFClient::UI::ROOT->{children} = [];
467	undef $SDL_ACTIVE;	771	undef $SDL_ACTIVE;
468	undef $SDL_EV;
469	}	772	}
470		773
		774	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
471	my $bgmusic;#TODO#hack#d#	775	my $bgmusic;#TODO#hack#d#
472		776
		777	sub audio_music_finished {
		778	return unless $CFG->{bgm_enable};
		779
		780	# TODO: hack, do play loop and mood music
		781	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
		782	$bgmusic->play (0);
		783
		784	push @bgmusic, shift @bgmusic;
		785	}
		786
473	sub audio_init {	787	sub audio_init {
474	if ($CFG->{sound} \|\| 1) {	788	if ($CFG->{audio_enable}) {
475	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {	789	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
476	$SDL_MIXER = new SDL::Mixer;	790	$SDL_MIXER = !CFClient::Mix_OpenAudio;
477	$SDL_MIXER->allocate_channels (8);	791	CFClient::Mix_AllocateChannels 8;
		792	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
478		793
479	$bgmusic = new SDL::Music CFClient::find_rcfile "music/game3.ogg";	794	audio_music_finished;
480	$SDL_MIXER->play_music ($bgmusic, -1);
481		795
482	while (<$fh>) {	796	while (<$fh>) {
483	next if /^\s*#/;	797	next if /^\s*#/;
484	next if /^\s*$/;	798	next if /^\s*$/;
485		799
486	my ($file, $volume, $event) = split /\s+/, $_, 3;	800	my ($file, $volume, $event) = split /\s+/, $_, 3;
487		801
488	push @SOUNDS, "$volume,$file";	802	push @SOUNDS, "$volume,$file";
489		803
490	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {	804	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {
491	my $chunk = new SDL::Sound CFClient::find_rcfile "sounds/$file";	805	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
492	$chunk->volume ($volume * 128 / 100);	806	$chunk->volume ($volume * 128 / 100);
493	$chunk	807	$chunk
494	};	808	};
495	}	809	}
496	} else {	810	} else {
…		…
498	}	812	}
499	}	813	}
500	}	814	}
501		815
502	sub audio_shutdown {	816	sub audio_shutdown {
		817	CFClient::Mix_CloseAudio if $SDL_MIXER;
503	undef $SDL_MIXER;	818	undef $SDL_MIXER;
504	@SOUNDS = ();	819	@SOUNDS = ();
505	%AUDIO_CHUNKS = ();	820	%AUDIO_CHUNKS = ();
506	}	821	}
507		822
…		…
520	$want_refresh = 0;	835	$want_refresh = 0;
521	$can_refresh = 0;	836	$can_refresh = 0;
522		837
523	$CFClient::UI::ROOT->draw;	838	$CFClient::UI::ROOT->draw;
524		839
525	SDL::GLSwapBuffers;	840	CFClient::SDL_GL_SwapBuffers;
526		841
527	$LAST_REFRESH = $NOW;	842	$LAST_REFRESH = $NOW;
528	}	843	}
529		844
530	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {	845	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
531	$NOW = time;	846	$NOW = time;
532		847
533	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()	848	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)
534	while $SDL_EV->poll;	849	for CFClient::SDL_PollEvent;
535		850
536	if (%animate_object) {	851	if (%animate_object) {
537	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	852	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
538	$want_refresh++;	853	$want_refresh++;
539	}	854	}
…		…
562	@conn::ISA = Crossfire::Protocol::;	877	@conn::ISA = Crossfire::Protocol::;
563		878
564	sub conn::stats_update {	879	sub conn::stats_update {
565	my ($self, $stats) = @_;	880	my ($self, $stats) = @_;
566		881
567	# i love text protocols!!!	882	update_stats_window ($stats);
568	# FIXME: the stats are somehow weird
569	my $hp = $stats->{1};
570	my $hp_m = $stats->{2};
571	my $sp = $stats->{3};
572	my $sp_m = $stats->{4};
573	my $fo = $stats->{18};
574	my $fo_m = 1000;
575	my $gr = $stats->{23};
576	my $gr_m = $stats->{24};
577
578	#d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
579	$GAUGES->{hp}->set_value ($hp, $hp_m);
580	$GAUGES->{mana}->set_value ($sp, $sp_m);
581	$GAUGES->{food}->set_value ($fo, $fo_m);
582	$GAUGES->{grace}->set_value ($gr, $gr_m);
583	}	883	}
584		884
585	sub conn::user_send {	885	sub conn::user_send {
586	my ($self, $command) = @_;	886	my ($self, $command) = @_;
587		887
…		…
612		912
613	my ($hash, $x, $y, $w, $h) = @$map_info;	913	my ($hash, $x, $y, $w, $h) = @$map_info;
614		914
615	my $data = $MAP->get_rect ($x, $y, $w, $h);	915	my $data = $MAP->get_rect ($x, $y, $w, $h);
616	$MAPCACHE->put ($hash => Compress::LZF::compress $data);	916	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
617
618	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	917	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
619
620	}	918	}
621		919
622	sub conn::map_clear {	920	sub conn::map_clear {
623	my ($self) = @_;	921	my ($self) = @_;
624		922
625	$self->flush_map;	923	$self->flush_map;
626	delete $self->{neigh};	924	delete $self->{neigh_map};
627		925
628	$MAP->clear;	926	$MAP->clear;
629	}	927	}
630		928
631		929
632	sub conn::load_map($$$) {	930	sub conn::load_map($$$) {
633	my ($self, $hash, $x, $y) = @_;	931	my ($self, $hash, $x, $y) = @_;
634		932
635	if (defined (my $data = $MAPCACHE->get ($hash))) {	933	if (defined (my $data = $MAPCACHE->get ($hash))) {
636	$data = Compress::LZF::decompress $data;	934	$data = Compress::LZF::decompress $data;
637	warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#	935	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
638	for my $id ($MAP->set_rect ($x, $y, $data)) {	936	for my $id ($MAP->set_rect ($x, $y, $data)) {
639	my $data = $TILECACHE->get ($id)	937	my $data = $TILECACHE->get ($id)
640	or next;	938	or next;
641		939
642	$self->set_texture ($id => $data);	940	$self->set_texture ($id => $data);
643	}	941	}
644	}	942	}
645	}	943	}
646		944
		945	# this method does a "flood fill" into every tile direction
		946	# it assumes that tiles are arranged in a rectangular grid,
		947	# i.e. a map is the same as the left of the right map etc.
		948	# failure to comply are harmless and result in display errors
		949	# at worst.
647	sub conn::flood_fill {	950	sub conn::flood_fill {
648	my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;	951	my ($self, $gx, $gy, $path, $hash, $flags) = @_;
649		952
650	# the server does not allow map paths > 6	953	# the server does not allow map paths > 6
651	return if 6 <= length $path;	954	return if 6 <= length $path;
652		955
653	for my $tile (1..4) {	956	my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
654	next if $self->{neigh}{$hash}[$tile];	957
		958	for (
		959	[1, 0, -1],
		960	[2, 1, 0],
		961	[3, 0, 1],
		962	[4, -1, 0],
		963	) {
		964	my ($tile, $dx, $dy) = @$_;
		965
		966	my $gx = $gx + $dx;
		967	my $gy = $gy + $dy;
		968
655	next unless $flags & (1 << ($tile - 1));	969	next unless $flags & (1 << ($tile - 1));
		970	next if $self->{neigh_grid}{$gx, $gy}++;
656		971
657	my $neigh = $self->{neigh}{$hash} \|\|= [];	972	my $neigh = $self->{neigh_map}{$hash} \|\|= [];
658		973	if (my $info = $neigh->[$tile]) {
659	$self->send_mapinfo ("spatial $path$tile", sub {
660	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	974	my ($flags, $x, $y, $w, $h, $hash) = @$info;
661		975
662	#warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
663	return if $mode ne "spatial";
664
665	$x += $MAP->ox;
666	$y += $MAP->oy;
667
668	$self->load_map ($hash, $x, $y)
669	unless $self->{neigh}{$hash}[5]++;#d#
670
671	$neigh->[$tile] = [$x, $y, $w, $h];
672
673	$self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1)	976	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
674	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	977	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		978
		979	} else {
		980	$self->send_mapinfo ("spatial $path$tile", sub {
		981	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
		982
		983	return if $mode ne "spatial";
		984
		985	$x += $MAP->ox;
		986	$y += $MAP->oy;
		987
		988	$self->load_map ($hash, $x, $y)
		989	unless $self->{neigh_map}{$hash}[5]++;#d#
		990
		991	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
		992
		993	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
		994	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		995	});
675	});	996	}
676	}	997	}
677	}	998	}
678		999
679	sub conn::map_change {	1000	sub conn::map_change {
680	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	1001	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
…		…
683		1004
684	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	1005	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
685		1006
686	my $mapmapw = 250;	1007	my $mapmapw = 250;
687	my $mapmaph = 250;	1008	my $mapmaph = 250;
		1009
		1010	$self->{neigh_rect} = [
		1011	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
		1012	$ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
		1013	];
688		1014
		1015	delete $self->{neigh_grid};
689	$self->flood_fill ("", $hash, $flags,	1016	$self->flood_fill (0, 0, "", $hash, $flags);
690	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
691	$ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
692		1017
693	$x += $ox;	1018	$x += $ox;
694	$y += $oy;	1019	$y += $oy;
695		1020
696	$self->{map_info} = [$hash, $x, $y, $w, $h];	1021	$self->{map_info} = [$hash, $x, $y, $w, $h];
		1022
		1023	my $map = $self->{map_info}[0];
		1024	$map =~ s/^.*?\/([^\/]+)$/\1/;
		1025	$STATWIDS->{map}->set_text ("Map: " . $map);
697		1026
698	$self->load_map ($hash, $x, $y);	1027	$self->load_map ($hash, $x, $y);
699	}	1028	}
700		1029
701	sub conn::face_find {	1030	sub conn::face_find {
…		…
756	}	1085	}
757		1086
758	sub conn::sound_play {	1087	sub conn::sound_play {
759	my ($self, $x, $y, $soundnum, $type) = @_;	1088	my ($self, $x, $y, $soundnum, $type) = @_;
760		1089
		1090	$SDL_MIXER
		1091	or return;
		1092
761	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}	1093	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
762	or return;	1094	or return;
763		1095
764	$SDL_MIXER->play_channel (-1, $chunk);	1096	$chunk->play;
765	warn "sound $x,$y,$soundnum,$type\n";#d#	1097	# warn "sound $x,$y,$soundnum,$type\n";#d#
766	}	1098	}
767		1099
768	sub conn::query {	1100	sub conn::query {
769	my ($self, $flags, $prompt) = @_;	1101	my ($self, $flags, $prompt) = @_;
770		1102
771	#TODO	1103	#TODO, display dialog with relevant information
772	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	1104	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
773	}	1105	}
774		1106
775	sub conn::drawinfo {	1107	sub conn::drawinfo {
776	my ($self, $color, $text) = @_;	1108	my ($self, $color, $text) = @_;
…		…
792	);	1124	);
793		1125
794	$LOGVIEW->add_paragraph ($color[$color], $text);	1126	$LOGVIEW->add_paragraph ($color[$color], $text);
795	}	1127	}
796		1128
		1129	sub conn::spell_add {
		1130	my ($self, $spell) = @_;
		1131
		1132	$MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {
		1133	});
		1134	$MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {
		1135	});
		1136	}
		1137
		1138	sub conn::spell_delete {
		1139	my ($self, $spell) = @_;
		1140	}
		1141
		1142	sub conn::addme_success {
		1143	my ($self) = @_;
		1144
		1145	for my $skill (values %{$self->{skill_info}}) {
		1146	$MAPWIDGET->add_command ("ready_skill $skill", "", sub {
		1147	});
		1148	$MAPWIDGET->add_command ("use_skill $skill", "", sub {
		1149	});
		1150	}
		1151	}
		1152
797	%SDL_CB = (	1153	%SDL_CB = (
798	SDL_QUIT() => sub {	1154	CFClient::SDL_QUIT => sub {
799	Event::unloop -1;	1155	Event::unloop -1;
800	},	1156	},
801	SDL_VIDEORESIZE() => sub {	1157	CFClient::SDL_VIDEORESIZE => sub {
802	},	1158	},
803	SDL_VIDEOEXPOSE() => sub {	1159	CFClient::SDL_VIDEOEXPOSE => \&refresh,
804	refresh;	1160	CFClient::SDL_ACTIVEEVENT => sub {
		1161	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
805	},	1162	},
806	SDL_KEYDOWN() => sub {	1163	CFClient::SDL_KEYDOWN => sub {
807	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	1164	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
808	# alt-enter	1165	# alt-enter
809	video_shutdown;	1166	video_shutdown;
810	$CFG->{fullscreen} = !$CFG->{fullscreen};	1167	$CFG->{fullscreen} = !$CFG->{fullscreen};
811	video_init;	1168	video_init;
812	} else {	1169	} else {
813	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	1170	CFClient::UI::feed_sdl_key_down_event ($_[0]);
814	}	1171	}
815	},	1172	},
816	SDL_KEYUP() => sub {	1173	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
817	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);	1174	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
818	},	1175	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
819	SDL_MOUSEMOTION() => sub {	1176	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
820	CFClient::UI::feed_sdl_motion_event ($SDL_EV);	1177	CFClient::SDL_USEREVENT => \&audio_music_finished,
821	},
822	SDL_MOUSEBUTTONDOWN() => sub {
823	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
824	},
825	SDL_MOUSEBUTTONUP() => sub {
826	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
827	},
828	SDL_ACTIVEEVENT() => sub {
829	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
830	},
831	);	1178	);
832		1179
833	#############################################################################	1180	#############################################################################
834		1181
835	$SIG{INT} = $SIG{TERM} = sub { exit };	1182	$SIG{INT} = $SIG{TERM} = sub { exit };
…		…
846	fullscreen => 0,	1193	fullscreen => 0,
847	fast => 0,	1194	fast => 0,
848	fow_enable => 1,	1195	fow_enable => 1,
849	fow_intensity => 0.45,	1196	fow_intensity => 0.45,
850	fow_smooth => 0,	1197	fow_smooth => 0,
		1198	gui_fontsize => 1,
851	log_fontsize => 14,	1199	log_fontsize => 1,
		1200	gauge_fontsize => 1,
		1201	gauge_size => 0.35,
		1202	stat_fontsize => 1,
852	mapsize => 100,	1203	mapsize => 100,
853	host => "crossfire.schmorp.de",	1204	host => "crossfire.schmorp.de",
854	say_command => 'say',	1205	say_command => 'say',
		1206	audio_enable => 1,
		1207	bgm_enable => 1,
		1208	bgm_volume => 0.25,
855	);	1209	);
856		1210
857	while (my ($k, $v) = each %DEF_CFG) {	1211	while (my ($k, $v) = each %DEF_CFG) {
858	$CFG->{$k} = $v unless exists $CFG->{$k};	1212	$CFG->{$k} = $v unless exists $CFG->{$k};
859	}	1213	}
860		1214
861	sdl_init;	1215	sdl_init;
862		1216
863	@SDL_MODES = reverse	1217	@SDL_MODES = reverse
864	grep $_->[0] >= 640 && $_->[1] >= 480,	1218	grep $_->[0] >= 640 && $_->[1] >= 480,
865	map [SDL::RectW ($_), SDL::RectH ($_)],	1219	CFClient::SDL_ListModes;
866	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
867		1220
868	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	1221	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
869		1222
870	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	1223	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
871		1224
…		…
879	video_init;	1232	video_init;
880	audio_init;	1233	audio_init;
881		1234
882	Event::loop;	1235	Event::loop;
883		1236
884	END { SDL::Quit }	1237	END { CFClient::SDL_Quit }
885		1238
886		1239

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.136 by root, Tue Apr 18 06:34:30 2006 UTC vs. Revision 1.166 by elmex, Sun Apr 23 02:50:44 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.136 by root, Tue Apr 18 06:34:30 2006 UTC vs.
Revision 1.166 by elmex, Sun Apr 23 02:50:44 2006 UTC