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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.139 by root, Wed Apr 19 00:47:35 2006 UTC vs.
Revision 1.159 by elmex, Sat Apr 22 22:13:16 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 state => $CFG->{fast}, connect_changed => sub {
140	my ($self, $value) = @_;	132	my ($self, $value) = @_;
141	$CFG->{fast} = $value;	133	$CFG->{fast} = $value;
142	});	134	});
143		135
144	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");	136	$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 {	137	$table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
146	my ($self, $value) = @_;	138	my ($self, $value) = @_;
147	$CFG->{fow_enable} = $value;	139	$CFG->{fow_enable} = $value;
148	});	140	});
149		141
150	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");	142	$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 {	143	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
152	my ($self, $value) = @_;	144	my ($self, $value) = @_;
153	$CFG->{fow_intensity} = $value;	145	$CFG->{fow_intensity} = $value;
154	});	146	});
155		147
156	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");	148	$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 {	149	$table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
158	my ($self, $value) = @_;	150	my ($self, $value) = @_;
159	$CFG->{fow_smooth} = $value;	151	$CFG->{fow_smooth} = $value;
160	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;	152	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
161	});	153	});
162		154
163	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");	155	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
		156	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
		157	$CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
		158	# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
		159	});
		160
		161	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
164	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {	162	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
165	my ($self, $value) = @_;
166	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);	163	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
167	});	164	});
168		165
		166	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
		167	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{stat_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
		168	$CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
		169	&set_stats_window_fontsize;
		170	});
		171
		172	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge width");
		173	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gauge_w_size}, 0.1, 0.5, 0.02], connect_changed => sub {
		174	$CFG->{gauge_w_size} = $_[1];
		175	my $h = int ($HEIGHT * $CFG->{gauge_size});
		176	my $w = int ($WIDTH * $CFG->{gauge_w_size});
		177	$GAUGES->{win}->set_size ($w, $h);
		178	$GAUGES->{win}->{y} = $HEIGHT - $h;
		179	$GAUGES->{win}->{x} = $WIDTH - $w;
		180	$GAUGES->{win}->update;
		181	});
		182
		183	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge height");
		184	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], connect_changed => sub {
		185	$CFG->{gauge_size} = $_[1];
		186	my $h = int ($HEIGHT * $CFG->{gauge_size});
		187	my $w = int ($WIDTH * $CFG->{gauge_w_size});
		188	$GAUGES->{win}->set_size ($w, $h);
		189	$GAUGES->{win}->{y} = $HEIGHT - $h;
		190	$GAUGES->{win}->{x} = $WIDTH - $w;
		191	$GAUGES->{win}->update;
		192	});
		193
		194
		195	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
		196	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gauge_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
		197	$CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
		198	&set_gauge_window_fontsize;
		199	$GAUGES->{win}->check_size;
		200	$GAUGES->{win}->update;
		201	});
		202
		203
		204
169	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	205	$table->add (1, $row++, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
170	video_shutdown ();	206	video_shutdown ();
171	video_init ();	207	video_init ();
172	});	208	});
173		209
174	$table->add (0, 8, new CFClient::UI::Label align => 1, text => "Sound");	210	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
175	$table->add (1, 8, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {	211	$table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {
176	my ($self, $value) = @_;
177	$CFG->{audio_enable} = $value;	212	$CFG->{audio_enable} = $_[1];
		213	});
		214	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
		215	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
		216	# $CFG->{effects_volume} = $_[1];
178	});	217	# });
179	$table->add (0, 9, new CFClient::UI::Label align => 1, text => "Bg. Music");	218	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
		219	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
180	$table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{bgm_enable}, connect_changed => sub {	220	$hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {
181	my ($self, $value) = @_;
182	$CFG->{bgm_enable} = $value;	221	$CFG->{bgm_enable} = $_[1];
183	});	222	});
		223	$hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub {
		224	$CFG->{bgm_volume} = $_[1];
		225	CFClient::MixMusic::volume $_[1] * 128;
		226	});
		227
184	$table->add (1, 10, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	228	$table->add (1, $row++, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
185	audio_shutdown ();	229	audio_shutdown ();
186	audio_init ();	230	audio_init ();
187	});	231	});
188		232
189	$dialog	233	$dialog
190	}	234	}
191		235
		236	sub set_stats_window_fontsize {
		237	for (values %{$STATWIDS}) {
		238	$_->set_fontsize ($::CFG->{stat_fontsize});
		239	}
		240	}
		241
		242	sub set_gauge_window_fontsize {
		243	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
		244	$_->set_fontsize ($::CFG->{gauge_fontsize});
		245	}
		246	}
		247
		248	sub make_gauge_window {
		249	my $gh = int ($HEIGHT * $CFG->{gauge_size});
		250	my $gw = int ($WIDTH * $CFG->{gauge_w_size});
		251
		252	my $win = new CFClient::UI::Frame (
		253	y => $HEIGHT - $gh, x => $WIDTH - $gw, req_w => $gw, req_h => $gh
		254	);
		255	$win->add (my $vb = new CFClient::UI::VBox);
		256
		257	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
		258	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', expand => 1);
		259	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', expand => 1);
		260	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', expand => 1);
		261	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food', expand => 1);
		262	$vb->add (my $exp = new CFClient::UI::Label valign => 0, align => -1, text => "XP:");
		263	$vb->add (my $lvl = new CFClient::UI::Label valign => 0, align => -1, text => "Lvl:");
		264	$vb->add (my $rng = new CFClient::UI::Label valign => 0, align => -1, text => "Rng:");
		265
		266
		267	$GAUGES = {
		268	exp => $exp, lvl => $lvl, win => $win, range => $rng,
		269	food => $fg, mana => $mg, hp => $hg, grace => $gg
		270	};
		271	$win
		272	}
		273
		274	sub make_stats_window {
		275	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
		276
		277	$tgw->add (my $vb = new CFClient::UI::VBox);
		278	$vb->add (my $uhb = new CFClient::UI::HBox);
		279	$uhb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
		280	$uhb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
		281
		282	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
		283
		284	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);
		285
		286	$tbl->add (0, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "S");
		287	$tbl->add (0, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "D");
		288	$tbl->add (0, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Co");
		289	$tbl->add (0, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "I");
		290	$tbl->add (0, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "W");
		291	$tbl->add (0, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "P");
		292	$tbl->add (0, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ch");
		293
		294	$tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		295	$tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		296	$tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		297	$tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		298	$tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		299	$tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		300	$tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		301
		302	$tbl->add (2, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wc");
		303	$tbl->add (2, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ac");
		304	$tbl->add (2, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dam");
		305	$tbl->add (2, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Arm");
		306	$tbl->add (2, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Sp");
		307	$tbl->add (2, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "WSp");
		308
		309	$tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		310	$tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		311	$tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		312	$tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		313	$tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		314	$tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		315
		316	$hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
		317
		318	my $row = 0;
		319	my $col = 0;
		320
		321	for (qw/slow holyw conf fire depl magic
		322	drain acid pois para deat phys
		323	blind fear tund elec cold ghit/)
		324	{
		325	$tbl2->add ($col, $row, new CFClient::UI::Image image => "ui/resist/resist_$_.png");
		326	$tbl2->add ($col + 1, $row,
		327	$STATWIDS->{"res_$_"} =
		328	new CFClient::UI::Label text => "0", align => -1, valign => 0
		329	);
		330
		331	$row++;
		332	if ($row % 6 == 0) {
		333	$col += 2;
		334	$row = 0;
		335	}
		336	}
		337
		338	&set_stats_window_fontsize;
		339	update_stats_window ({});
		340
		341	$tgw
		342	}
		343
		344	sub update_stats_window {
		345	my ($stats) = @_;
		346
		347	# i love text protocols!!!
		348	my $hp = $stats->{1} * 1;
		349	my $hp_m = $stats->{2} * 1;
		350	my $sp = $stats->{3} * 1;
		351	my $sp_m = $stats->{4} * 1;
		352	my $fo = $stats->{18} * 1;
		353	my $fo_m = 999;
		354	my $gr = $stats->{23} * 1;
		355	my $gr_m = $stats->{24} * 1;
		356
		357	$GAUGES->{hp} ->set_value ($hp, $hp_m);
		358	$GAUGES->{mana} ->set_value ($sp, $sp_m);
		359	$GAUGES->{food} ->set_value ($fo, $fo_m);
		360	$GAUGES->{grace} ->set_value ($gr, $gr_m);
		361	$GAUGES->{exp} ->set_text ("XP: " . ($stats->{11} \|\| $stats->{28}));
		362	my $rng = $stats->{20};
		363	$rng =~ s/^Range: //; # thank you so much dear server
		364	$GAUGES->{range} ->set_text ("Rng: " . $rng);
		365	$GAUGES->{lvl} ->set_text ("LVL: " . $stats->{12});
		366	$STATWIDS->{title} ->set_text ("Title: " . $stats->{21});
		367
		368	if (0) { # this code can vanish, just wanted to preserver it for a checkin
		369	$STATWIDS->{st_str} ->set_text (sprintf "S%d", $stats->{5});
		370	$STATWIDS->{st_dex} ->set_text (sprintf "D%d", $stats->{8});
		371	$STATWIDS->{st_con} ->set_text (sprintf "Co%d", $stats->{9});
		372	$STATWIDS->{st_int} ->set_text (sprintf "I%d", $stats->{6});
		373	$STATWIDS->{st_wis} ->set_text (sprintf "W%d", $stats->{7});
		374	$STATWIDS->{st_pow} ->set_text (sprintf "P%d", $stats->{22});
		375	$STATWIDS->{st_cha} ->set_text (sprintf "Ch%d", $stats->{10});
		376	$STATWIDS->{st_wc} ->set_text (sprintf "Wc%d", $stats->{13});
		377	$STATWIDS->{st_ac} ->set_text (sprintf "Ac%d", $stats->{14});
		378	$STATWIDS->{st_dam} ->set_text (sprintf "Dam%d", $stats->{15});
		379	$STATWIDS->{st_arm} ->set_text (sprintf "Arm%d", $stats->{16});
		380	$STATWIDS->{st_spd} ->set_text (sprintf "Sp%.1f", $stats->{17});
		381	$STATWIDS->{st_wspd}->set_text (sprintf "WSp%.1f", $stats->{19});
		382	} else {
		383	$STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
		384	$STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
		385	$STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
		386	$STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
		387	$STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
		388	$STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
		389	$STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
		390	$STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
		391	$STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
		392	$STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
		393	$STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
		394	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});
		395	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});
		396	}
		397
		398	my %tbl = (
		399	phys => 100,
		400	magic => 101,
		401	fire => 102,
		402	elec => 103,
		403	cold => 104,
		404	conf => 105,
		405	acid => 106,
		406	drain => 107,
		407	ghit => 108,
		408	pois => 109,
		409	slow => 110,
		410	para => 111,
		411	tund => 112,
		412	fear => 113,
		413	deat => 115,
		414	holyw => 116,
		415	blind => 117
		416	);
		417
		418	for (keys %tbl) {
		419	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
		420	}
		421
		422	}
		423
192	sub metaserver_dialog {	424	sub metaserver_dialog {
193	my $dialog = new CFClient::UI::FancyFrame	425	my $dialog = new CFClient::UI::FancyFrame
		426	title => "Metaserver",
194	child => (my $vbox = new CFClient::UI::VBox);	427	child => (my $vbox = new CFClient::UI::VBox);
195		428
196	$vbox->add ($dialog->{table} = new CFClient::UI::Table);	429	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
197		430
198	$dialog	431	$dialog
…		…
255	$HOST->set_text ($CFG->{host} = $host);	488	$HOST->set_text ($CFG->{host} = $host);
256	}),	489	}),
257	(new CFClient::UI::Empty expand => 1),	490	(new CFClient::UI::Empty expand => 1),
258	]);	491	]);
259		492
260	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)	493	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8)
261	for 0 .. $#$m;	494	for 0 .. $#$m;
262	}	495	}
263	}	496	}
264	});	497	});
265	}	498	}
266		499
267	sub server_setup {	500	sub server_setup {
268	my $dialog = new CFClient::UI::FancyFrame	501	my $dialog = new CFClient::UI::FancyFrame
		502	title => "Server Setup",
269	child => (my $vbox = new CFClient::UI::VBox);	503	child => (my $vbox = new CFClient::UI::VBox);
270		504
271	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
272	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	505	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
273	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");	506	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
274		507
275	{	508	{
276	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	509	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
277		510
278	$vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {	511	$vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub {
279	my ($self, $value) = @_;	512	my ($self, $value) = @_;
280	$CFG->{host} = $value;	513	$CFG->{host} = $value;
281	});	514	});
282		515
283	$METASERVER = metaserver_dialog;	516	$METASERVER = metaserver_dialog;
284		517
285	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {	518	$vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
286	update_metaserver $HOST;	519	update_metaserver $HOST;
287	});	520	});
288	}	521	}
289		522
290	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	523	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
291	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {	524	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
292	my ($self, $value) = @_;	525	my ($self, $value) = @_;
293	$CFG->{user} = $value;	526	$CFG->{user} = $value;
294	});	527	});
295		528
296	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	529	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
297	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {	530	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
298	my ($self, $value) = @_;	531	my ($self, $value) = @_;
299	$CFG->{password} = $value;	532	$CFG->{password} = $value;
300	});	533	});
301		534
302	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");	535	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
303	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {	536	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
304	my ($self, $value) = @_;	537	my ($self, $value) = @_;
305	$CFG->{say_command} = $value;	538	$CFG->{say_command} = $value;
306	});	539	});
307		540
308	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");	541	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
309	$table->add (1, 7, new CFClient::UI::Slider	542	$table->add (1, 7, new CFClient::UI::Slider
310	req_w => 100,	543	req_w => 100,
311	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	544	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
312	connect_changed => sub {	545	connect_changed => sub {
313	my ($self, $value) = @_;	546	my ($self, $value) = @_;
…		…
323	$dialog	556	$dialog
324	}	557	}
325		558
326	sub message_window {	559	sub message_window {
327	my $window = new CFClient::UI::FancyFrame	560	my $window = new CFClient::UI::FancyFrame
		561	title => "Messages",
328	border_bg => [1, 1, 1, 0.5],	562	border_bg => [1, 1, 1, 0.5],
329	bg => [0.3, 0.3, 0.3, 0.8],	563	bg => [0.3, 0.3, 0.3, 0.8],
330	user_w => int $::WIDTH / 3,	564	user_w => int $::WIDTH / 3,
331	user_h => int $::HEIGHT / 5,	565	user_h => int $::HEIGHT / 5,
332	child => (my $vbox = new CFClient::UI::VBox);	566	child => (my $vbox = new CFClient::UI::VBox);
…		…
374		608
375	$window	609	$window
376	}	610	}
377		611
378	sub sdl_init {	612	sub sdl_init {
379	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE	613	CFClient::SDL_Init
380	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
381	and die "SDL::Init failed!\n";	614	and die "SDL::Init failed!\n";
382	}	615	}
383		616
384	sub video_init {	617	sub video_init {
385	sdl_init;	618	sdl_init;
386		619
387	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	620	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
388	$FULLSCREEN = $CFG->{fullscreen};	621	$FULLSCREEN = $CFG->{fullscreen};
389	$FAST = $CFG->{fast};	622	$FAST = $CFG->{fast};
390		623
391	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	624	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
392	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
393	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
394	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
395
396	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
397	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
398	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
399	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
400
401	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
402	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
403	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
404
405	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
406	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
407	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
408	or die "SDL::SetVideoMode failed!\n";	625	or die "SDL_SetVideoMode failed!\n";
409
410	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
411
412	$SDL_EV = new SDL::Event;
413	$SDL_EV->set_unicode (1);
414		626
415	$SDL_ACTIVE = 1;	627	$SDL_ACTIVE = 1;
416		628
417	$LAST_REFRESH = time - 0.01;	629	$LAST_REFRESH = time - 0.01;
418		630
419	CFClient::gl_init;	631	CFClient::gl_init;
420		632
421	$FONTSIZE = int $HEIGHT / 40;	633	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
422		634
423	#############################################################################	635	#############################################################################
424		636
425	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;	637	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
426	$CFClient::UI::ROOT->add ($DEBUG_STATUS);	638	$DEBUG_STATUS->show;
427		639
428	$STATUS_LINE = new CFClient::UI::Label	640	$STATUS_LINE = new CFClient::UI::Label
429	padding => 0,	641	padding => 0,
430	y => $HEIGHT * 44 / 45 - $FONTSIZE;	642	y => $HEIGHT - $FONTSIZE * 1.8;
431	$CFClient::UI::ROOT->add ($STATUS_LINE);	643	$STATUS_LINE->show;
432		644
433	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	645	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
434	padding => 0,	646	padding => 0,
435	y => $HEIGHT * 44 / 45,
436	fontsize => $HEIGHT / 45,	647	fontsize => 0.8,
437	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	648	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
438	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);	649	$ALT_ENTER_MESSAGE->show;
		650	$ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
439		651
440	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);	652	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);
441	$MAPWIDGET->focus_in;	653	$MAPWIDGET->focus_in;
442	$MAPWIDGET->connect (activate_console => sub {	654	$MAPWIDGET->connect (activate_console => sub {
443	my ($mapwidget, $preset) = @_;	655	my ($mapwidget, $preset) = @_;
444		656
445	if ($CONSOLE) {	657	if ($CONSOLE) {
…		…
461	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {	673	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
462	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	674	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
463	status "Configuration Saved";	675	status "Configuration Saved";
464	});	676	});
465		677
		678	$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
		679	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
		680
466	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup	681	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
467		682
468	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
469	$tgw->add (my $hbox = new CFClient::UI::HBox ());
470		683
471	$hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
472	$hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
473	$hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
474	$hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
475
476	$GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
477	$CFClient::UI::ROOT->add ($tgw);
478	}	684	}
479		685
480	sub video_shutdown {	686	sub video_shutdown {
481	$CFClient::UI::ROOT->{children} = [];	687	$CFClient::UI::ROOT->{children} = [];
482	undef $SDL_ACTIVE;	688	undef $SDL_ACTIVE;
483	undef $SDL_EV;
484	}	689	}
485		690
		691	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
486	my $bgmusic;#TODO#hack#d#	692	my $bgmusic;#TODO#hack#d#
		693
		694	sub audio_music_finished {
		695	return unless $CFG->{bgm_enable};
		696
		697	# TODO: hack, do play loop and mood music
		698	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
		699	$bgmusic->play (0);
		700
		701	push @bgmusic, shift @bgmusic;
		702	}
487		703
488	sub audio_init {	704	sub audio_init {
489	if ($CFG->{audio_enable}) {	705	if ($CFG->{audio_enable}) {
490	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {	706	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
491	$SDL_MIXER = new SDL::Mixer;	707	$SDL_MIXER = !CFClient::Mix_OpenAudio;
492	$SDL_MIXER->allocate_channels (8);	708	CFClient::Mix_AllocateChannels 8;
		709	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
493		710
494	# TODO: hack, do play loop and mood music	711	audio_music_finished;
495	if ($CFG->{bgm_enable}) {
496	$bgmusic = new SDL::Music CFClient::find_rcfile "music/game3.ogg";
497	$SDL_MIXER->play_music ($bgmusic, -1);
498	}
499		712
500	while (<$fh>) {	713	while (<$fh>) {
501	next if /^\s*#/;	714	next if /^\s*#/;
502	next if /^\s*$/;	715	next if /^\s*$/;
503		716
504	my ($file, $volume, $event) = split /\s+/, $_, 3;	717	my ($file, $volume, $event) = split /\s+/, $_, 3;
505		718
506	push @SOUNDS, "$volume,$file";	719	push @SOUNDS, "$volume,$file";
507		720
508	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {	721	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {
509	my $chunk = new SDL::Sound CFClient::find_rcfile "sounds/$file";	722	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
510	$chunk->volume ($volume * 128 / 100);	723	$chunk->volume ($volume * 128 / 100);
511	$chunk	724	$chunk
512	};	725	};
513	}	726	}
514	} else {	727	} else {
…		…
516	}	729	}
517	}	730	}
518	}	731	}
519		732
520	sub audio_shutdown {	733	sub audio_shutdown {
		734	CFClient::Mix_CloseAudio if $SDL_MIXER;
521	undef $SDL_MIXER;	735	undef $SDL_MIXER;
522	@SOUNDS = ();	736	@SOUNDS = ();
523	%AUDIO_CHUNKS = ();	737	%AUDIO_CHUNKS = ();
524	}	738	}
525		739
…		…
538	$want_refresh = 0;	752	$want_refresh = 0;
539	$can_refresh = 0;	753	$can_refresh = 0;
540		754
541	$CFClient::UI::ROOT->draw;	755	$CFClient::UI::ROOT->draw;
542		756
543	SDL::GLSwapBuffers;	757	CFClient::SDL_GL_SwapBuffers;
544		758
545	$LAST_REFRESH = $NOW;	759	$LAST_REFRESH = $NOW;
546	}	760	}
547		761
548	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {	762	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
549	$NOW = time;	763	$NOW = time;
550		764
551	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()	765	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)
552	while $SDL_EV->poll;	766	for CFClient::SDL_PollEvent;
553		767
554	if (%animate_object) {	768	if (%animate_object) {
555	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	769	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
556	$want_refresh++;	770	$want_refresh++;
557	}	771	}
…		…
580	@conn::ISA = Crossfire::Protocol::;	794	@conn::ISA = Crossfire::Protocol::;
581		795
582	sub conn::stats_update {	796	sub conn::stats_update {
583	my ($self, $stats) = @_;	797	my ($self, $stats) = @_;
584		798
585	# i love text protocols!!!	799	update_stats_window ($stats);
586	# FIXME: the stats are somehow weird
587	my $hp = $stats->{1};
588	my $hp_m = $stats->{2};
589	my $sp = $stats->{3};
590	my $sp_m = $stats->{4};
591	my $fo = $stats->{18};
592	my $fo_m = 1000;
593	my $gr = $stats->{23};
594	my $gr_m = $stats->{24};
595
596	#d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
597	$GAUGES->{hp}->set_value ($hp, $hp_m);
598	$GAUGES->{mana}->set_value ($sp, $sp_m);
599	$GAUGES->{food}->set_value ($fo, $fo_m);
600	$GAUGES->{grace}->set_value ($gr, $gr_m);
601	}	800	}
602		801
603	sub conn::user_send {	802	sub conn::user_send {
604	my ($self, $command) = @_;	803	my ($self, $command) = @_;
605		804
…		…
630		829
631	my ($hash, $x, $y, $w, $h) = @$map_info;	830	my ($hash, $x, $y, $w, $h) = @$map_info;
632		831
633	my $data = $MAP->get_rect ($x, $y, $w, $h);	832	my $data = $MAP->get_rect ($x, $y, $w, $h);
634	$MAPCACHE->put ($hash => Compress::LZF::compress $data);	833	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
635
636	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	834	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
637
638	}	835	}
639		836
640	sub conn::map_clear {	837	sub conn::map_clear {
641	my ($self) = @_;	838	my ($self) = @_;
642		839
643	$self->flush_map;	840	$self->flush_map;
644	delete $self->{neigh};	841	delete $self->{neigh_map};
645		842
646	$MAP->clear;	843	$MAP->clear;
647	}	844	}
648		845
649		846
650	sub conn::load_map($$$) {	847	sub conn::load_map($$$) {
651	my ($self, $hash, $x, $y) = @_;	848	my ($self, $hash, $x, $y) = @_;
652		849
653	if (defined (my $data = $MAPCACHE->get ($hash))) {	850	if (defined (my $data = $MAPCACHE->get ($hash))) {
654	$data = Compress::LZF::decompress $data;	851	$data = Compress::LZF::decompress $data;
655	warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#	852	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
656	for my $id ($MAP->set_rect ($x, $y, $data)) {	853	for my $id ($MAP->set_rect ($x, $y, $data)) {
657	my $data = $TILECACHE->get ($id)	854	my $data = $TILECACHE->get ($id)
658	or next;	855	or next;
659		856
660	$self->set_texture ($id => $data);	857	$self->set_texture ($id => $data);
661	}	858	}
662	}	859	}
663	}	860	}
664		861
		862	# this method does a "flood fill" into every tile direction
		863	# it assumes that tiles are arranged in a rectangular grid,
		864	# i.e. a map is the same as the left of the right map etc.
		865	# failure to comply are harmless and result in display errors
		866	# at worst.
665	sub conn::flood_fill {	867	sub conn::flood_fill {
666	my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;	868	my ($self, $gx, $gy, $path, $hash, $flags) = @_;
667		869
668	# the server does not allow map paths > 6	870	# the server does not allow map paths > 6
669	return if 6 <= length $path;	871	return if 6 <= length $path;
670		872
671	for my $tile (1..4) {	873	my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
672	next if $self->{neigh}{$hash}[$tile];	874
		875	for (
		876	[1, 0, -1],
		877	[2, 1, 0],
		878	[3, 0, 1],
		879	[4, -1, 0],
		880	) {
		881	my ($tile, $dx, $dy) = @$_;
		882
		883	my $gx = $gx + $dx;
		884	my $gy = $gy + $dy;
		885
673	next unless $flags & (1 << ($tile - 1));	886	next unless $flags & (1 << ($tile - 1));
		887	next if $self->{neigh_grid}{$gx, $gy}++;
674		888
675	my $neigh = $self->{neigh}{$hash} \|\|= [];	889	my $neigh = $self->{neigh_map}{$hash} \|\|= [];
676		890	if (my $info = $neigh->[$tile]) {
677	$self->send_mapinfo ("spatial $path$tile", sub {
678	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	891	my ($flags, $x, $y, $w, $h, $hash) = @$info;
679		892
680	#warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
681	return if $mode ne "spatial";
682
683	$x += $MAP->ox;
684	$y += $MAP->oy;
685
686	$self->load_map ($hash, $x, $y)
687	unless $self->{neigh}{$hash}[5]++;#d#
688
689	$neigh->[$tile] = [$x, $y, $w, $h];
690
691	$self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1)	893	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
692	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	894	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		895
		896	} else {
		897	$self->send_mapinfo ("spatial $path$tile", sub {
		898	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
		899
		900	return if $mode ne "spatial";
		901
		902	$x += $MAP->ox;
		903	$y += $MAP->oy;
		904
		905	$self->load_map ($hash, $x, $y)
		906	unless $self->{neigh_map}{$hash}[5]++;#d#
		907
		908	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
		909
		910	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
		911	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		912	});
693	});	913	}
694	}	914	}
695	}	915	}
696		916
697	sub conn::map_change {	917	sub conn::map_change {
698	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	918	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
…		…
701		921
702	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	922	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
703		923
704	my $mapmapw = 250;	924	my $mapmapw = 250;
705	my $mapmaph = 250;	925	my $mapmaph = 250;
		926
		927	$self->{neigh_rect} = [
		928	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
		929	$ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
		930	];
706		931
		932	delete $self->{neigh_grid};
707	$self->flood_fill ("", $hash, $flags,	933	$self->flood_fill (0, 0, "", $hash, $flags);
708	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
709	$ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
710		934
711	$x += $ox;	935	$x += $ox;
712	$y += $oy;	936	$y += $oy;
713		937
714	$self->{map_info} = [$hash, $x, $y, $w, $h];	938	$self->{map_info} = [$hash, $x, $y, $w, $h];
		939
		940	my $map = $self->{map_info}[0];
		941	$map =~ s/^.*?\/([^\/]+)$/\1/;
		942	$STATWIDS->{map}->set_text ("Map: " . $map);
715		943
716	$self->load_map ($hash, $x, $y);	944	$self->load_map ($hash, $x, $y);
717	}	945	}
718		946
719	sub conn::face_find {	947	sub conn::face_find {
…		…
780	or return;	1008	or return;
781		1009
782	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}	1010	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
783	or return;	1011	or return;
784		1012
785	$SDL_MIXER->play_channel (-1, $chunk);	1013	$chunk->play;
786	warn "sound $x,$y,$soundnum,$type\n";#d#	1014	# warn "sound $x,$y,$soundnum,$type\n";#d#
787	}	1015	}
788		1016
789	sub conn::query {	1017	sub conn::query {
790	my ($self, $flags, $prompt) = @_;	1018	my ($self, $flags, $prompt) = @_;
791		1019
792	#TODO	1020	#TODO, display dialog with relevant information
793	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	1021	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
794	}	1022	}
795		1023
796	sub conn::drawinfo {	1024	sub conn::drawinfo {
797	my ($self, $color, $text) = @_;	1025	my ($self, $color, $text) = @_;
…		…
813	);	1041	);
814		1042
815	$LOGVIEW->add_paragraph ($color[$color], $text);	1043	$LOGVIEW->add_paragraph ($color[$color], $text);
816	}	1044	}
817		1045
		1046	sub conn::spell_add {
		1047	my ($self, $spell) = @_;
		1048
		1049	$MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {
		1050	});
		1051	$MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {
		1052	});
		1053	}
		1054
		1055	sub conn::spell_delete {
		1056	my ($self, $spell) = @_;
		1057	}
		1058
		1059	sub conn::addme_success {
		1060	my ($self) = @_;
		1061
		1062	for my $skill (values %{$self->{skill_info}}) {
		1063	$MAPWIDGET->add_command ("ready_skill $skill", "", sub {
		1064	});
		1065	$MAPWIDGET->add_command ("use_skill $skill", "", sub {
		1066	});
		1067	}
		1068	}
		1069
818	%SDL_CB = (	1070	%SDL_CB = (
819	SDL_QUIT() => sub {	1071	CFClient::SDL_QUIT => sub {
820	Event::unloop -1;	1072	Event::unloop -1;
821	},	1073	},
822	SDL_VIDEORESIZE() => sub {	1074	CFClient::SDL_VIDEORESIZE => sub {
823	},	1075	},
824	SDL_VIDEOEXPOSE() => sub {	1076	CFClient::SDL_VIDEOEXPOSE => \&refresh,
825	refresh;	1077	CFClient::SDL_ACTIVEEVENT => sub {
		1078	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
826	},	1079	},
827	SDL_KEYDOWN() => sub {	1080	CFClient::SDL_KEYDOWN => sub {
828	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	1081	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
829	# alt-enter	1082	# alt-enter
830	video_shutdown;	1083	video_shutdown;
831	$CFG->{fullscreen} = !$CFG->{fullscreen};	1084	$CFG->{fullscreen} = !$CFG->{fullscreen};
832	video_init;	1085	video_init;
833	} else {	1086	} else {
834	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	1087	CFClient::UI::feed_sdl_key_down_event ($_[0]);
835	}	1088	}
836	},	1089	},
837	SDL_KEYUP() => sub {	1090	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
838	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);	1091	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
839	},	1092	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
840	SDL_MOUSEMOTION() => sub {	1093	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
841	CFClient::UI::feed_sdl_motion_event ($SDL_EV);	1094	CFClient::SDL_USEREVENT => \&audio_music_finished,
842	},
843	SDL_MOUSEBUTTONDOWN() => sub {
844	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
845	},
846	SDL_MOUSEBUTTONUP() => sub {
847	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
848	},
849	SDL_ACTIVEEVENT() => sub {
850	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
851	},
852	);	1095	);
853		1096
854	#############################################################################	1097	#############################################################################
855		1098
856	$SIG{INT} = $SIG{TERM} = sub { exit };	1099	$SIG{INT} = $SIG{TERM} = sub { exit };
…		…
867	fullscreen => 0,	1110	fullscreen => 0,
868	fast => 0,	1111	fast => 0,
869	fow_enable => 1,	1112	fow_enable => 1,
870	fow_intensity => 0.45,	1113	fow_intensity => 0.45,
871	fow_smooth => 0,	1114	fow_smooth => 0,
		1115	gui_fontsize => 1,
872	log_fontsize => 14,	1116	log_fontsize => 1,
		1117	gauge_fontsize => 1,
		1118	gauge_size => 0.35,
		1119	gauge_w_size => 0.14,
		1120	stat_fontsize => 1,
873	mapsize => 100,	1121	mapsize => 100,
874	host => "crossfire.schmorp.de",	1122	host => "crossfire.schmorp.de",
875	say_command => 'say',	1123	say_command => 'say',
876	audio_enable => 1,	1124	audio_enable => 1,
877	bgm_enable => 1,	1125	bgm_enable => 1,
		1126	bgm_volume => 0.25,
878	);	1127	);
879		1128
880	while (my ($k, $v) = each %DEF_CFG) {	1129	while (my ($k, $v) = each %DEF_CFG) {
881	$CFG->{$k} = $v unless exists $CFG->{$k};	1130	$CFG->{$k} = $v unless exists $CFG->{$k};
882	}	1131	}
883		1132
884	sdl_init;	1133	sdl_init;
885		1134
886	@SDL_MODES = reverse	1135	@SDL_MODES = reverse
887	grep $_->[0] >= 640 && $_->[1] >= 480,	1136	grep $_->[0] >= 640 && $_->[1] >= 480,
888	map [SDL::RectW ($_), SDL::RectH ($_)],	1137	CFClient::SDL_ListModes;
889	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
890		1138
891	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	1139	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
892		1140
893	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	1141	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
894		1142
…		…
902	video_init;	1150	video_init;
903	audio_init;	1151	audio_init;
904		1152
905	Event::loop;	1153	Event::loop;
906		1154
907	END { SDL::Quit }	1155	END { CFClient::SDL_Quit }
908		1156
909		1157

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.139 by root, Wed Apr 19 00:47:35 2006 UTC vs. Revision 1.159 by elmex, Sat Apr 22 22:13:16 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.139 by root, Wed Apr 19 00:47:35 2006 UTC vs.
Revision 1.159 by elmex, Sat Apr 22 22:13:16 2006 UTC