[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.165 by elmex, Sun Apr 23 01:46:20 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 state => $CFG->{fullscreen}, connect_changed => sub {
134	my ($self, $value) = @_;	126	my ($self, $value) = @_;
135	$CFG->{fullscreen} = $value;	127	$CFG->{fullscreen} = $value;
136	});	128	});
137		129
138	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");	130	$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 {	131	$table->add (1, $row++, new CFClient::UI::CheckBox
		132	state => $CFG->{fast},
		133	tooltip => "Lower the visual quality considerably to speed up rendering.",
		134	connect_changed => sub {
140	my ($self, $value) = @_;	135	my ($self, $value) = @_;
141	$CFG->{fast} = $value;	136	$CFG->{fast} = $value;
		137	}
142	});	138	);
143		139
144	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");	140	$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 {	141	$table->add (1, $row++, new CFClient::UI::CheckBox
		142	state => $CFG->{fow_enable},
		143	tooltip => "Fog-of-War marks areas that cannot be seen by the player",
		144	connect_changed => sub {
146	my ($self, $value) = @_;	145	my ($self, $value) = @_;
147	$CFG->{fow_enable} = $value;	146	$CFG->{fow_enable} = $value;
		147	}
148	});	148	);
149		149
150	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");	150	$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 {	151	$table->add (1, $row++, new CFClient::UI::Slider
		152	range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001],
		153	tooltip => "The higher the intensity, the lighter the Fog-of-War color",
		154	connect_changed => sub {
152	my ($self, $value) = @_;	155	my ($self, $value) = @_;
153	$CFG->{fow_intensity} = $value;	156	$CFG->{fow_intensity} = $value;
		157	}
154	});	158	);
155		159
156	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");	160	$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 {	161	$table->add (1, $row++, new CFClient::UI::CheckBox
		162	state => $CFG->{fow_smooth},
		163	tooltip => "Smooth the Fog-of-War a bit to make it more realistic",
		164	connect_changed => sub {
158	my ($self, $value) = @_;	165	my ($self, $value) = @_;
159	$CFG->{fow_smooth} = $value;	166	$CFG->{fow_smooth} = $value;
160	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;	167	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
		168	}
161	});	169	);
162		170
163	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");	171	$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 {	172	$table->add (1, $row++, new CFClient::UI::Slider
165	my ($self, $value) = @_;	173	range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1],
166	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);	174	tooltip => "The font size used by most GUI elements",
		175	connect_changed => sub {
		176	$CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
		177	# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
		178	}
167	});	179	);
168		180
169	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	181	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
		182	$table->add (1, $row++, new CFClient::UI::Slider
		183	range => [$CFG->{log_fontsize}, 0.5, 2, 0.1],
		184	tooltip => "The font size used by the server log window only",
		185	connect_changed => sub {
		186	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
		187	}
		188	);
		189
		190	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
		191
		192	$table->add (1, $row++, new CFClient::UI::Slider
		193	range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1],
		194	tooltip => "The font size used by the statistics window only",
		195	connect_changed => sub {
		196	$CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
		197	&set_stats_window_fontsize;
		198	}
		199	);
		200
		201	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
		202	$table->add (1, $row++, new CFClient::UI::Slider
		203	range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
		204	tooltip => "Adjust the size of the stats gauges at the bottom right",
		205	connect_changed => sub {
		206	$CFG->{gauge_size} = $_[1];
		207	my $h = int $HEIGHT * $CFG->{gauge_size};
		208	$GAUGES->{win}->set_size ($WIDTH, $h);
		209	$GAUGES->{win}->move (0, $HEIGHT - $h);
		210	}
		211	);
		212
		213	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
		214	$table->add (1, $row++, new CFClient::UI::Slider
		215	range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
		216	connect_changed => sub {
		217	$CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
		218	&set_gauge_window_fontsize;
		219	#$GAUGES->{win}->check_size;
		220	#$GAUGES->{win}->update;
		221	}
		222	);
		223
		224	$table->add (1, $row++, new CFClient::UI::Button
		225	expand => 1, align => 0, text => "Apply",
		226	tooltip => "Apply the video settings (unless they are auto-apply)",
		227	connect_activate => sub {
170	video_shutdown ();	228	video_shutdown ();
171	video_init ();	229	video_init ();
		230	}
		231	);
		232
		233	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
		234	$table->add (1, $row++, new CFClient::UI::CheckBox
		235	state => $CFG->{audio_enable},
		236	tooltip => "If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
		237	connect_changed => sub {
		238	$CFG->{audio_enable} = $_[1];
		239	}
		240	);
		241	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
		242	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
		243	# $CFG->{effects_volume} = $_[1];
172	});	244	# });
		245	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
		246	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
		247	$hbox->add (new CFClient::UI::CheckBox
		248	expand => 1, state => $CFG->{bgm_enable},
		249	tooltip => "Enable background music playing",
		250	connect_changed => sub {
		251	$CFG->{bgm_enable} = $_[1];
		252	}
		253	);
		254	$hbox->add (new CFClient::UI::Slider
		255	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1],
		256	tooltip => "The volume of the background music",
		257	connect_changed => sub {
		258	$CFG->{bgm_volume} = $_[1];
		259	CFClient::MixMusic::volume $_[1] * 128;
		260	}
		261	);
		262
		263	$table->add (1, $row++, new CFClient::UI::Button
		264	expand => 1, align => 0, text => "Apply",
		265	tooltip => "Apply the audio settings that are not auto-apply",
		266	connect_activate => sub {
		267	audio_shutdown ();
		268	audio_init ();
		269	}
		270	);
173		271
174	$dialog	272	$dialog
		273	}
		274
		275	sub set_stats_window_fontsize {
		276	for (values %{$STATWIDS}) {
		277	$_->set_fontsize ($::CFG->{stat_fontsize});
		278	}
		279	}
		280
		281	sub set_gauge_window_fontsize {
		282	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
		283	$_->set_fontsize ($::CFG->{gauge_fontsize});
		284	}
		285	}
		286
		287	sub make_gauge_window {
		288	my $gh = int ($HEIGHT * $CFG->{gauge_size});
		289	# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
		290
		291	my $win = new CFClient::UI::Frame (
		292	y => $HEIGHT - $gh, x => 0, req_w => $WIDTH, req_h => $gh
		293	);
		294	$win->add (my $vb = new CFClient::UI::VBox);
		295
		296	$vb->add (my $hbg = new CFClient::UI::HBox expand => 1);
		297
		298
		299	$hbg->add (new CFClient::UI::Empty expand => 1);
		300	$hbg->add (my $hb = new CFClient::UI::HBox);
		301	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp');
		302	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana');
		303	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace');
		304	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food');
		305
		306	$vb->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, text => "XP:");
		307	# $vb->add (my $lvl = new CFClient::UI::Label valign => 0, align => 1, text => "Lvl:");
		308	$vb->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, text => "Rng:");
		309
		310
		311	$GAUGES = {
		312	exp => $exp,# lvl => $lvl,
		313	win => $win, range => $rng,
		314	food => $fg, mana => $mg, hp => $hg, grace => $gg
		315	};
		316	$win
		317	}
		318
		319	sub make_stats_window {
		320	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
		321
		322	$tgw->add (my $vb = new CFClient::UI::VBox);
		323	$vb->add (my $uhb = new CFClient::UI::HBox);
		324	$uhb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
		325	$uhb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
		326
		327	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
		328
		329	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);
		330
		331	$tbl->add (0, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Str");
		332	$tbl->add (0, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dex");
		333	$tbl->add (0, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Con");
		334	$tbl->add (0, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Int");
		335	$tbl->add (0, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wis");
		336	$tbl->add (0, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Pow");
		337	$tbl->add (0, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Cha");
		338
		339	$tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		340	$tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		341	$tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		342	$tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		343	$tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		344	$tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		345	$tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		346
		347	$tbl->add (2, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wc");
		348	$tbl->add (2, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ac");
		349	$tbl->add (2, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dam");
		350	$tbl->add (2, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Arm");
		351	$tbl->add (2, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Sp");
		352	$tbl->add (2, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "WSp");
		353
		354	$tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		355	$tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		356	$tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		357	$tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		358	$tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		359	$tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		360
		361	$hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
		362
		363	my $row = 0;
		364	my $col = 0;
		365
		366	for (qw/slow holyw conf fire depl magic
		367	drain acid pois para deat phys
		368	blind fear tund elec cold ghit/)
		369	{
		370	$tbl2->add ($col, $row,
		371	$STATWIDS->{"res_$_"} =
		372	new CFClient::UI::Label text => "0", align => +1, valign => 0
		373	);
		374	$tbl2->add ($col + 1, $row, new CFClient::UI::Image image => "ui/resist/resist_$_.png");
		375
		376	$row++;
		377	if ($row % 6 == 0) {
		378	$col += 2;
		379	$row = 0;
		380	}
		381	}
		382
		383	&set_stats_window_fontsize;
		384	update_stats_window ({});
		385
		386	$tgw
		387	}
		388
		389	sub update_stats_window {
		390	my ($stats) = @_;
		391
		392	# i love text protocols!!!
		393	my $hp = $stats->{1} * 1;
		394	my $hp_m = $stats->{2} * 1;
		395	my $sp = $stats->{3} * 1;
		396	my $sp_m = $stats->{4} * 1;
		397	my $fo = $stats->{18} * 1;
		398	my $fo_m = 999;
		399	my $gr = $stats->{23} * 1;
		400	my $gr_m = $stats->{24} * 1;
		401
		402	$GAUGES->{hp} ->set_value ($hp, $hp_m);
		403	$GAUGES->{mana} ->set_value ($sp, $sp_m);
		404	$GAUGES->{food} ->set_value ($fo, $fo_m);
		405	$GAUGES->{grace} ->set_value ($gr, $gr_m);
		406	$GAUGES->{exp} ->set_text ("XP: " . ($stats->{11} \|\| $stats->{28}) * 1
		407	." LVL: " . $stats->{12} * 1);
		408	my $rng = $stats->{20};
		409	$rng =~ s/^Range: //; # thank you so much dear server
		410	$GAUGES->{range} ->set_text ("Rng: " . $rng);
		411	# $GAUGES->{lvl} ->set_text ("LVL: " . $stats->{12});
		412	my $title = $stats->{21};
		413	$title =~ s/^Player: //;
		414	$STATWIDS->{title} ->set_text ("Title: " . $title);
		415
		416	if (0) { # this code can vanish, just wanted to preserver it for a checkin
		417	$STATWIDS->{st_str} ->set_text (sprintf "S%d", $stats->{5});
		418	$STATWIDS->{st_dex} ->set_text (sprintf "D%d", $stats->{8});
		419	$STATWIDS->{st_con} ->set_text (sprintf "Co%d", $stats->{9});
		420	$STATWIDS->{st_int} ->set_text (sprintf "I%d", $stats->{6});
		421	$STATWIDS->{st_wis} ->set_text (sprintf "W%d", $stats->{7});
		422	$STATWIDS->{st_pow} ->set_text (sprintf "P%d", $stats->{22});
		423	$STATWIDS->{st_cha} ->set_text (sprintf "Ch%d", $stats->{10});
		424	$STATWIDS->{st_wc} ->set_text (sprintf "Wc%d", $stats->{13});
		425	$STATWIDS->{st_ac} ->set_text (sprintf "Ac%d", $stats->{14});
		426	$STATWIDS->{st_dam} ->set_text (sprintf "Dam%d", $stats->{15});
		427	$STATWIDS->{st_arm} ->set_text (sprintf "Arm%d", $stats->{16});
		428	$STATWIDS->{st_spd} ->set_text (sprintf "Sp%.1f", $stats->{17});
		429	$STATWIDS->{st_wspd}->set_text (sprintf "WSp%.1f", $stats->{19});
		430	} else {
		431	$STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
		432	$STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
		433	$STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
		434	$STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
		435	$STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
		436	$STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
		437	$STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
		438	$STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
		439	$STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
		440	$STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
		441	$STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
		442	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});
		443	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});
		444	}
		445
		446	my %tbl = (
		447	phys => 100,
		448	magic => 101,
		449	fire => 102,
		450	elec => 103,
		451	cold => 104,
		452	conf => 105,
		453	acid => 106,
		454	drain => 107,
		455	ghit => 108,
		456	pois => 109,
		457	slow => 110,
		458	para => 111,
		459	tund => 112,
		460	fear => 113,
		461	depl => 113,
		462	deat => 115,
		463	holyw => 116,
		464	blind => 117
		465	);
		466
		467	for (keys %tbl) {
		468	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
		469	}
		470
175	}	471	}
176		472
177	sub metaserver_dialog {	473	sub metaserver_dialog {
178	my $dialog = new CFClient::UI::FancyFrame	474	my $dialog = new CFClient::UI::FancyFrame
		475	title => "Metaserver",
179	child => (my $vbox = new CFClient::UI::VBox);	476	child => (my $vbox = new CFClient::UI::VBox);
180		477
181	$vbox->add ($dialog->{table} = new CFClient::UI::Table);	478	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
182		479
183	$dialog	480	$dialog
…		…
240	$HOST->set_text ($CFG->{host} = $host);	537	$HOST->set_text ($CFG->{host} = $host);
241	}),	538	}),
242	(new CFClient::UI::Empty expand => 1),	539	(new CFClient::UI::Empty expand => 1),
243	]);	540	]);
244		541
245	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)	542	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8)
246	for 0 .. $#$m;	543	for 0 .. $#$m;
247	}	544	}
248	}	545	}
249	});	546	});
250	}	547	}
251		548
252	sub server_setup {	549	sub server_setup {
253	my $dialog = new CFClient::UI::FancyFrame	550	my $dialog = new CFClient::UI::FancyFrame
		551	title => "Server Setup",
254	child => (my $vbox = new CFClient::UI::VBox);	552	child => (my $vbox = new CFClient::UI::VBox);
255		553
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]);	554	$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");	555	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
259		556
260	{	557	{
261	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	558	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
262		559
263	$vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {	560	$vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub {
264	my ($self, $value) = @_;	561	my ($self, $value) = @_;
265	$CFG->{host} = $value;	562	$CFG->{host} = $value;
266	});	563	});
267		564
268	$METASERVER = metaserver_dialog;	565	$METASERVER = metaserver_dialog;
269		566
270	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {	567	$vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
271	update_metaserver $HOST;	568	update_metaserver $HOST;
272	});	569	});
273	}	570	}
274		571
275	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	572	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
276	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {	573	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
277	my ($self, $value) = @_;	574	my ($self, $value) = @_;
278	$CFG->{user} = $value;	575	$CFG->{user} = $value;
279	});	576	});
280		577
281	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	578	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
282	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {	579	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
283	my ($self, $value) = @_;	580	my ($self, $value) = @_;
284	$CFG->{password} = $value;	581	$CFG->{password} = $value;
285	});	582	});
286		583
287	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");	584	$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 {	585	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
289	my ($self, $value) = @_;	586	my ($self, $value) = @_;
290	$CFG->{say_command} = $value;	587	$CFG->{say_command} = $value;
291	});	588	});
292		589
293	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");	590	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
294	$table->add (1, 7, new CFClient::UI::Slider	591	$table->add (1, 7, new CFClient::UI::Slider
295	req_w => 100,	592	req_w => 100,
296	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	593	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
297	connect_changed => sub {	594	connect_changed => sub {
298	my ($self, $value) = @_;	595	my ($self, $value) = @_;
…		…
308	$dialog	605	$dialog
309	}	606	}
310		607
311	sub message_window {	608	sub message_window {
312	my $window = new CFClient::UI::FancyFrame	609	my $window = new CFClient::UI::FancyFrame
		610	title => "Messages",
313	border_bg => [1, 1, 1, 0.5],	611	border_bg => [1, 1, 1, 0.5],
314	bg => [0.3, 0.3, 0.3, 0.8],	612	bg => [0.3, 0.3, 0.3, 0.8],
315	user_w => int $::WIDTH / 3,	613	user_w => int $::WIDTH / 3,
316	user_h => int $::HEIGHT / 5,	614	user_h => int $::HEIGHT / 5,
317	child => (my $vbox = new CFClient::UI::VBox);	615	child => (my $vbox = new CFClient::UI::VBox);
…		…
359		657
360	$window	658	$window
361	}	659	}
362		660
363	sub sdl_init {	661	sub sdl_init {
364	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE	662	CFClient::SDL_Init
365	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
366	and die "SDL::Init failed!\n";	663	and die "SDL::Init failed!\n";
367	}	664	}
368		665
369	sub video_init {	666	sub video_init {
370	sdl_init;	667	sdl_init;
371		668
372	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	669	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
373	$FULLSCREEN = $CFG->{fullscreen};	670	$FULLSCREEN = $CFG->{fullscreen};
374	$FAST = $CFG->{fast};	671	$FAST = $CFG->{fast};
375		672
376	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	673	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";	674	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		675
400	$SDL_ACTIVE = 1;	676	$SDL_ACTIVE = 1;
401		677
402	$LAST_REFRESH = time - 0.01;	678	$LAST_REFRESH = time - 0.01;
403		679
404	CFClient::gl_init;	680	CFClient::gl_init;
405		681
406	$FONTSIZE = int $HEIGHT / 40;	682	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
407		683
408	#############################################################################	684	#############################################################################
409		685
410	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;	686	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
411	$CFClient::UI::ROOT->add ($DEBUG_STATUS);	687	$DEBUG_STATUS->show;
412		688
413	$STATUS_LINE = new CFClient::UI::Label	689	$STATUS_LINE = new CFClient::UI::Label
414	padding => 0,	690	padding => 0,
415	y => $HEIGHT * 44 / 45 - $FONTSIZE;	691	y => $HEIGHT - $FONTSIZE * 1.8;
416	$CFClient::UI::ROOT->add ($STATUS_LINE);	692	$STATUS_LINE->show;
417		693
418	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	694	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
419	padding => 0,	695	padding => 0,
420	y => $HEIGHT * 44 / 45,
421	fontsize => $HEIGHT / 45,	696	fontsize => 0.8,
422	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	697	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
423	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);	698	$ALT_ENTER_MESSAGE->show;
		699	$ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
424		700
425	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);	701	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);
426	$MAPWIDGET->focus_in;	702	$MAPWIDGET->focus_in;
427	$MAPWIDGET->connect (activate_console => sub {	703	$MAPWIDGET->connect (activate_console => sub {
428	my ($mapwidget, $preset) = @_;	704	my ($mapwidget, $preset) = @_;
429		705
430	if ($CONSOLE) {	706	if ($CONSOLE) {
…		…
446	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {	722	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
447	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	723	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
448	status "Configuration Saved";	724	status "Configuration Saved";
449	});	725	});
450		726
		727	$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
		728	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
		729
451	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup	730	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
452		731
453	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
454	$tgw->add (my $hbox = new CFClient::UI::HBox ());
455		732
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	}	733	}
464		734
465	sub video_shutdown {	735	sub video_shutdown {
466	$CFClient::UI::ROOT->{children} = [];	736	$CFClient::UI::ROOT->{children} = [];
467	undef $SDL_ACTIVE;	737	undef $SDL_ACTIVE;
468	undef $SDL_EV;
469	}	738	}
470		739
		740	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#	741	my $bgmusic;#TODO#hack#d#
472		742
		743	sub audio_music_finished {
		744	return unless $CFG->{bgm_enable};
		745
		746	# TODO: hack, do play loop and mood music
		747	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
		748	$bgmusic->play (0);
		749
		750	push @bgmusic, shift @bgmusic;
		751	}
		752
473	sub audio_init {	753	sub audio_init {
474	if ($CFG->{sound} \|\| 1) {	754	if ($CFG->{audio_enable}) {
475	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {	755	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
476	$SDL_MIXER = new SDL::Mixer;	756	$SDL_MIXER = !CFClient::Mix_OpenAudio;
477	$SDL_MIXER->allocate_channels (8);	757	CFClient::Mix_AllocateChannels 8;
		758	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
478		759
479	$bgmusic = new SDL::Music CFClient::find_rcfile "music/game3.ogg";	760	audio_music_finished;
480	$SDL_MIXER->play_music ($bgmusic, -1);
481		761
482	while (<$fh>) {	762	while (<$fh>) {
483	next if /^\s*#/;	763	next if /^\s*#/;
484	next if /^\s*$/;	764	next if /^\s*$/;
485		765
486	my ($file, $volume, $event) = split /\s+/, $_, 3;	766	my ($file, $volume, $event) = split /\s+/, $_, 3;
487		767
488	push @SOUNDS, "$volume,$file";	768	push @SOUNDS, "$volume,$file";
489		769
490	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {	770	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {
491	my $chunk = new SDL::Sound CFClient::find_rcfile "sounds/$file";	771	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
492	$chunk->volume ($volume * 128 / 100);	772	$chunk->volume ($volume * 128 / 100);
493	$chunk	773	$chunk
494	};	774	};
495	}	775	}
496	} else {	776	} else {
…		…
498	}	778	}
499	}	779	}
500	}	780	}
501		781
502	sub audio_shutdown {	782	sub audio_shutdown {
		783	CFClient::Mix_CloseAudio if $SDL_MIXER;
503	undef $SDL_MIXER;	784	undef $SDL_MIXER;
504	@SOUNDS = ();	785	@SOUNDS = ();
505	%AUDIO_CHUNKS = ();	786	%AUDIO_CHUNKS = ();
506	}	787	}
507		788
…		…
520	$want_refresh = 0;	801	$want_refresh = 0;
521	$can_refresh = 0;	802	$can_refresh = 0;
522		803
523	$CFClient::UI::ROOT->draw;	804	$CFClient::UI::ROOT->draw;
524		805
525	SDL::GLSwapBuffers;	806	CFClient::SDL_GL_SwapBuffers;
526		807
527	$LAST_REFRESH = $NOW;	808	$LAST_REFRESH = $NOW;
528	}	809	}
529		810
530	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {	811	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
531	$NOW = time;	812	$NOW = time;
532		813
533	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()	814	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)
534	while $SDL_EV->poll;	815	for CFClient::SDL_PollEvent;
535		816
536	if (%animate_object) {	817	if (%animate_object) {
537	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	818	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
538	$want_refresh++;	819	$want_refresh++;
539	}	820	}
…		…
562	@conn::ISA = Crossfire::Protocol::;	843	@conn::ISA = Crossfire::Protocol::;
563		844
564	sub conn::stats_update {	845	sub conn::stats_update {
565	my ($self, $stats) = @_;	846	my ($self, $stats) = @_;
566		847
567	# i love text protocols!!!	848	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	}	849	}
584		850
585	sub conn::user_send {	851	sub conn::user_send {
586	my ($self, $command) = @_;	852	my ($self, $command) = @_;
587		853
…		…
612		878
613	my ($hash, $x, $y, $w, $h) = @$map_info;	879	my ($hash, $x, $y, $w, $h) = @$map_info;
614		880
615	my $data = $MAP->get_rect ($x, $y, $w, $h);	881	my $data = $MAP->get_rect ($x, $y, $w, $h);
616	$MAPCACHE->put ($hash => Compress::LZF::compress $data);	882	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
617
618	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	883	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
619
620	}	884	}
621		885
622	sub conn::map_clear {	886	sub conn::map_clear {
623	my ($self) = @_;	887	my ($self) = @_;
624		888
625	$self->flush_map;	889	$self->flush_map;
626	delete $self->{neigh};	890	delete $self->{neigh_map};
627		891
628	$MAP->clear;	892	$MAP->clear;
629	}	893	}
630		894
631		895
632	sub conn::load_map($$$) {	896	sub conn::load_map($$$) {
633	my ($self, $hash, $x, $y) = @_;	897	my ($self, $hash, $x, $y) = @_;
634		898
635	if (defined (my $data = $MAPCACHE->get ($hash))) {	899	if (defined (my $data = $MAPCACHE->get ($hash))) {
636	$data = Compress::LZF::decompress $data;	900	$data = Compress::LZF::decompress $data;
637	warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#	901	#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)) {	902	for my $id ($MAP->set_rect ($x, $y, $data)) {
639	my $data = $TILECACHE->get ($id)	903	my $data = $TILECACHE->get ($id)
640	or next;	904	or next;
641		905
642	$self->set_texture ($id => $data);	906	$self->set_texture ($id => $data);
643	}	907	}
644	}	908	}
645	}	909	}
646		910
		911	# this method does a "flood fill" into every tile direction
		912	# it assumes that tiles are arranged in a rectangular grid,
		913	# i.e. a map is the same as the left of the right map etc.
		914	# failure to comply are harmless and result in display errors
		915	# at worst.
647	sub conn::flood_fill {	916	sub conn::flood_fill {
648	my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;	917	my ($self, $gx, $gy, $path, $hash, $flags) = @_;
649		918
650	# the server does not allow map paths > 6	919	# the server does not allow map paths > 6
651	return if 6 <= length $path;	920	return if 6 <= length $path;
652		921
653	for my $tile (1..4) {	922	my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
654	next if $self->{neigh}{$hash}[$tile];	923
		924	for (
		925	[1, 0, -1],
		926	[2, 1, 0],
		927	[3, 0, 1],
		928	[4, -1, 0],
		929	) {
		930	my ($tile, $dx, $dy) = @$_;
		931
		932	my $gx = $gx + $dx;
		933	my $gy = $gy + $dy;
		934
655	next unless $flags & (1 << ($tile - 1));	935	next unless $flags & (1 << ($tile - 1));
		936	next if $self->{neigh_grid}{$gx, $gy}++;
656		937
657	my $neigh = $self->{neigh}{$hash} \|\|= [];	938	my $neigh = $self->{neigh_map}{$hash} \|\|= [];
658		939	if (my $info = $neigh->[$tile]) {
659	$self->send_mapinfo ("spatial $path$tile", sub {
660	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	940	my ($flags, $x, $y, $w, $h, $hash) = @$info;
661		941
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)	942	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
674	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	943	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		944
		945	} else {
		946	$self->send_mapinfo ("spatial $path$tile", sub {
		947	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
		948
		949	return if $mode ne "spatial";
		950
		951	$x += $MAP->ox;
		952	$y += $MAP->oy;
		953
		954	$self->load_map ($hash, $x, $y)
		955	unless $self->{neigh_map}{$hash}[5]++;#d#
		956
		957	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
		958
		959	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
		960	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		961	});
675	});	962	}
676	}	963	}
677	}	964	}
678		965
679	sub conn::map_change {	966	sub conn::map_change {
680	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	967	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
…		…
683		970
684	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	971	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
685		972
686	my $mapmapw = 250;	973	my $mapmapw = 250;
687	my $mapmaph = 250;	974	my $mapmaph = 250;
		975
		976	$self->{neigh_rect} = [
		977	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
		978	$ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
		979	];
688		980
		981	delete $self->{neigh_grid};
689	$self->flood_fill ("", $hash, $flags,	982	$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		983
693	$x += $ox;	984	$x += $ox;
694	$y += $oy;	985	$y += $oy;
695		986
696	$self->{map_info} = [$hash, $x, $y, $w, $h];	987	$self->{map_info} = [$hash, $x, $y, $w, $h];
		988
		989	my $map = $self->{map_info}[0];
		990	$map =~ s/^.*?\/([^\/]+)$/\1/;
		991	$STATWIDS->{map}->set_text ("Map: " . $map);
697		992
698	$self->load_map ($hash, $x, $y);	993	$self->load_map ($hash, $x, $y);
699	}	994	}
700		995
701	sub conn::face_find {	996	sub conn::face_find {
…		…
756	}	1051	}
757		1052
758	sub conn::sound_play {	1053	sub conn::sound_play {
759	my ($self, $x, $y, $soundnum, $type) = @_;	1054	my ($self, $x, $y, $soundnum, $type) = @_;
760		1055
		1056	$SDL_MIXER
		1057	or return;
		1058
761	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}	1059	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
762	or return;	1060	or return;
763		1061
764	$SDL_MIXER->play_channel (-1, $chunk);	1062	$chunk->play;
765	warn "sound $x,$y,$soundnum,$type\n";#d#	1063	# warn "sound $x,$y,$soundnum,$type\n";#d#
766	}	1064	}
767		1065
768	sub conn::query {	1066	sub conn::query {
769	my ($self, $flags, $prompt) = @_;	1067	my ($self, $flags, $prompt) = @_;
770		1068
771	#TODO	1069	#TODO, display dialog with relevant information
772	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	1070	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
773	}	1071	}
774		1072
775	sub conn::drawinfo {	1073	sub conn::drawinfo {
776	my ($self, $color, $text) = @_;	1074	my ($self, $color, $text) = @_;
…		…
792	);	1090	);
793		1091
794	$LOGVIEW->add_paragraph ($color[$color], $text);	1092	$LOGVIEW->add_paragraph ($color[$color], $text);
795	}	1093	}
796		1094
		1095	sub conn::spell_add {
		1096	my ($self, $spell) = @_;
		1097
		1098	$MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {
		1099	});
		1100	$MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {
		1101	});
		1102	}
		1103
		1104	sub conn::spell_delete {
		1105	my ($self, $spell) = @_;
		1106	}
		1107
		1108	sub conn::addme_success {
		1109	my ($self) = @_;
		1110
		1111	for my $skill (values %{$self->{skill_info}}) {
		1112	$MAPWIDGET->add_command ("ready_skill $skill", "", sub {
		1113	});
		1114	$MAPWIDGET->add_command ("use_skill $skill", "", sub {
		1115	});
		1116	}
		1117	}
		1118
797	%SDL_CB = (	1119	%SDL_CB = (
798	SDL_QUIT() => sub {	1120	CFClient::SDL_QUIT => sub {
799	Event::unloop -1;	1121	Event::unloop -1;
800	},	1122	},
801	SDL_VIDEORESIZE() => sub {	1123	CFClient::SDL_VIDEORESIZE => sub {
802	},	1124	},
803	SDL_VIDEOEXPOSE() => sub {	1125	CFClient::SDL_VIDEOEXPOSE => \&refresh,
804	refresh;	1126	CFClient::SDL_ACTIVEEVENT => sub {
		1127	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
805	},	1128	},
806	SDL_KEYDOWN() => sub {	1129	CFClient::SDL_KEYDOWN => sub {
807	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	1130	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
808	# alt-enter	1131	# alt-enter
809	video_shutdown;	1132	video_shutdown;
810	$CFG->{fullscreen} = !$CFG->{fullscreen};	1133	$CFG->{fullscreen} = !$CFG->{fullscreen};
811	video_init;	1134	video_init;
812	} else {	1135	} else {
813	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	1136	CFClient::UI::feed_sdl_key_down_event ($_[0]);
814	}	1137	}
815	},	1138	},
816	SDL_KEYUP() => sub {	1139	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
817	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);	1140	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
818	},	1141	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
819	SDL_MOUSEMOTION() => sub {	1142	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
820	CFClient::UI::feed_sdl_motion_event ($SDL_EV);	1143	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	);	1144	);
832		1145
833	#############################################################################	1146	#############################################################################
834		1147
835	$SIG{INT} = $SIG{TERM} = sub { exit };	1148	$SIG{INT} = $SIG{TERM} = sub { exit };
…		…
846	fullscreen => 0,	1159	fullscreen => 0,
847	fast => 0,	1160	fast => 0,
848	fow_enable => 1,	1161	fow_enable => 1,
849	fow_intensity => 0.45,	1162	fow_intensity => 0.45,
850	fow_smooth => 0,	1163	fow_smooth => 0,
		1164	gui_fontsize => 1,
851	log_fontsize => 14,	1165	log_fontsize => 1,
		1166	gauge_fontsize => 1,
		1167	gauge_size => 0.35,
		1168	stat_fontsize => 1,
852	mapsize => 100,	1169	mapsize => 100,
853	host => "crossfire.schmorp.de",	1170	host => "crossfire.schmorp.de",
854	say_command => 'say',	1171	say_command => 'say',
		1172	audio_enable => 1,
		1173	bgm_enable => 1,
		1174	bgm_volume => 0.25,
855	);	1175	);
856		1176
857	while (my ($k, $v) = each %DEF_CFG) {	1177	while (my ($k, $v) = each %DEF_CFG) {
858	$CFG->{$k} = $v unless exists $CFG->{$k};	1178	$CFG->{$k} = $v unless exists $CFG->{$k};
859	}	1179	}
860		1180
861	sdl_init;	1181	sdl_init;
862		1182
863	@SDL_MODES = reverse	1183	@SDL_MODES = reverse
864	grep $_->[0] >= 640 && $_->[1] >= 480,	1184	grep $_->[0] >= 640 && $_->[1] >= 480,
865	map [SDL::RectW ($_), SDL::RectH ($_)],	1185	CFClient::SDL_ListModes;
866	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
867		1186
868	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	1187	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
869		1188
870	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	1189	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
871		1190
…		…
879	video_init;	1198	video_init;
880	audio_init;	1199	audio_init;
881		1200
882	Event::loop;	1201	Event::loop;
883		1202
884	END { SDL::Quit }	1203	END { CFClient::SDL_Quit }
885		1204
886		1205

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.165 by elmex, Sun Apr 23 01:46:20 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.165 by elmex, Sun Apr 23 01:46:20 2006 UTC