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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.143 by root, Wed Apr 19 08:05:07 2006 UTC vs.
Revision 1.158 by elmex, Sat Apr 22 12:14:45 2006 UTC

…		…
3	use strict;	3	use strict;
4	use utf8;	4	use utf8;
5		5
6	use Time::HiRes 'time';	6	use Time::HiRes 'time';
7	use Event;	7	use Event;
8
9	use SDL;
10	use SDL::App;
11	use SDL::Event;
12	use SDL::Surface;
13
14	use SDL::Mixer;
15	use SDL::Sound;
16	use SDL::Music;
17
18	use SDL::OpenGL;
19		8
20	use Crossfire;	9	use Crossfire;
21	use Crossfire::Protocol;	10	use Crossfire::Protocol;
22		11
23	use Compress::LZF;	12	use Compress::LZF;
…		…
56	our $LOGVIEW;	45	our $LOGVIEW;
57	our $CONSOLE;	46	our $CONSOLE;
58	our $METASERVER;	47	our $METASERVER;
59		48
60	our $GAUGES;	49	our $GAUGES;
		50	our $STATWIDS;
61		51
62	our $SDL_ACTIVE;	52	our $SDL_ACTIVE;
63	our $SDL_EV;
64	our %SDL_CB;	53	our %SDL_CB;
65		54
66	our $SDL_MIXER;	55	our $SDL_MIXER;
67	our @SOUNDS; # event => file mapping	56	our @SOUNDS; # event => file mapping
68	our %AUDIO_CHUNKS; # audio files	57	our %AUDIO_CHUNKS; # audio files
…		…
110	undef $CONN;	99	undef $CONN;
111	}	100	}
112		101
113	sub client_setup {	102	sub client_setup {
114	my $dialog = new CFClient::UI::FancyFrame	103	my $dialog = new CFClient::UI::FancyFrame
		104	title => "Client Setup",
115	child => (my $vbox = new CFClient::UI::VBox);	105	child => (my $vbox = new CFClient::UI::VBox);
116	$vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Client Setup");
117	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	106	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
118		107
119	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	108	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
120	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	109	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
121		110
122	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);	111	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
123	$hbox->add (my $mode_label = new CFClient::UI::Label valign => 0, height => 0.8);	112	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
124		113
125	$mode_slider->connect (changed => sub {	114	$mode_slider->connect (changed => sub {
126	my ($self, $value) = @_;	115	my ($self, $value) = @_;
127		116
128	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	117	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
129	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});	118	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
130	});	119	});
131	$mode_slider->emit (changed => $mode_slider->{range}[0]);	120	$mode_slider->emit (changed => $mode_slider->{range}[0]);
132		121
		122	my $row = 1;
		123
133	$table->add (0, 1, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	124	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
134	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {	125	$table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
135	my ($self, $value) = @_;	126	my ($self, $value) = @_;
136	$CFG->{fullscreen} = $value;	127	$CFG->{fullscreen} = $value;
137	});	128	});
138		129
139	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	130	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
140	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {	131	$table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
141	my ($self, $value) = @_;	132	my ($self, $value) = @_;
142	$CFG->{fast} = $value;	133	$CFG->{fast} = $value;
143	});	134	});
144		135
145	$table->add (0, 3, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	136	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
146	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {	137	$table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
147	my ($self, $value) = @_;	138	my ($self, $value) = @_;
148	$CFG->{fow_enable} = $value;	139	$CFG->{fow_enable} = $value;
149	});	140	});
150		141
151	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	142	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
152	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {	143	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
153	my ($self, $value) = @_;	144	my ($self, $value) = @_;
154	$CFG->{fow_intensity} = $value;	145	$CFG->{fow_intensity} = $value;
155	});	146	});
156		147
157	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	148	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
158	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {	149	$table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
159	my ($self, $value) = @_;	150	my ($self, $value) = @_;
160	$CFG->{fow_smooth} = $value;	151	$CFG->{fow_smooth} = $value;
161	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;
162	});	153	});
163		154
164	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	155	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
165	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {	156	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
166	$CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;	157	$CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
167	# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	158	# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
168	});	159	});
169		160
170	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");	161	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
171	$table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {	162	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
172	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);	163	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
173	});	164	});
174		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
175	$table->add (1, 8, 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 {
176	video_shutdown ();	206	video_shutdown ();
177	video_init ();	207	video_init ();
178	});	208	});
179		209
180	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	210	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
181	$table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {	211	$table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {
182	$CFG->{audio_enable} = $_[1];	212	$CFG->{audio_enable} = $_[1];
183	});	213	});
184	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	214	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
185	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {	215	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
186	# $CFG->{effects_volume} = $_[1];	216	# $CFG->{effects_volume} = $_[1];
187	# });	217	# });
188	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	218	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
189	$table->add (1, 10, my $hbox = new CFClient::UI::HBox);	219	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
190	$hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {	220	$hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {
191	$CFG->{bgm_enable} = $_[1];	221	$CFG->{bgm_enable} = $_[1];
192	});	222	});
193	$hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 128, 1], connect_changed => sub {	223	$hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub {
194	$CFG->{bgm_volume} = $_[1];	224	$CFG->{bgm_volume} = $_[1];
195	$SDL_MIXER->music_volume ($_[1]);	225	CFClient::MixMusic::volume $_[1] * 128;
196	});	226	});
197		227
198	$table->add (1, 11, 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 {
199	audio_shutdown ();	229	audio_shutdown ();
200	audio_init ();	230	audio_init ();
201	});	231	});
202		232
203	$dialog	233	$dialog
204	}	234	}
205		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
		265
		266	$GAUGES = {
		267	exp => $exp, lvl => $lvl, win => $win,
		268	food => $fg, mana => $mg, hp => $hg, grace => $gg
		269	};
		270	$win
		271	}
		272
		273	sub make_stats_window {
		274	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
		275
		276	$tgw->add (my $vb = new CFClient::UI::VBox);
		277	$vb->add (my $uhb = new CFClient::UI::HBox);
		278	$uhb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
		279	$uhb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
		280
		281	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
		282
		283	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);
		284
		285	$tbl->add (0, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "S");
		286	$tbl->add (0, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "D");
		287	$tbl->add (0, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Co");
		288	$tbl->add (0, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "I");
		289	$tbl->add (0, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "W");
		290	$tbl->add (0, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "P");
		291	$tbl->add (0, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ch");
		292
		293	$tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		294	$tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		295	$tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		296	$tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		297	$tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		298	$tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		299	$tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		300
		301	$tbl->add (2, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wc");
		302	$tbl->add (2, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ac");
		303	$tbl->add (2, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dam");
		304	$tbl->add (2, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Arm");
		305	$tbl->add (2, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Sp");
		306	$tbl->add (2, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "WSp");
		307
		308	$tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		309	$tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		310	$tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		311	$tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		312	$tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		313	$tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		314
		315	$hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
		316
		317	my $row = 0;
		318	my $col = 0;
		319
		320	for (qw/slow holyw conf fire depl magic
		321	drain acid pois para deat phys
		322	blind fear tund elec cold ghit/)
		323	{
		324	$tbl2->add ($col, $row, new CFClient::UI::Image image => "ui/resist/resist_$_.png");
		325	$tbl2->add ($col + 1, $row,
		326	$STATWIDS->{"res_$_"} =
		327	new CFClient::UI::Label text => "0", align => -1, valign => 0
		328	);
		329
		330	$row++;
		331	if ($row % 6 == 0) {
		332	$col += 2;
		333	$row = 0;
		334	}
		335	}
		336
		337	&set_stats_window_fontsize;
		338	update_stats_window ({});
		339
		340	$tgw
		341	}
		342
		343	sub update_stats_window {
		344	my ($stats) = @_;
		345
		346	# i love text protocols!!!
		347	my $hp = $stats->{1} * 1;
		348	my $hp_m = $stats->{2} * 1;
		349	my $sp = $stats->{3} * 1;
		350	my $sp_m = $stats->{4} * 1;
		351	my $fo = $stats->{18} * 1;
		352	my $fo_m = 999;
		353	my $gr = $stats->{23} * 1;
		354	my $gr_m = $stats->{24} * 1;
		355
		356	$GAUGES->{hp} ->set_value ($hp, $hp_m);
		357	$GAUGES->{mana} ->set_value ($sp, $sp_m);
		358	$GAUGES->{food} ->set_value ($fo, $fo_m);
		359	$GAUGES->{grace} ->set_value ($gr, $gr_m);
		360	$GAUGES->{exp} ->set_text ("XP: " . ($stats->{11} \|\| $stats->{28}));
		361	$GAUGES->{lvl} ->set_text ("LVL: " . $stats->{12});
		362	$STATWIDS->{title} ->set_text ("Title: " . $stats->{21});
		363
		364	if (0) { # this code can vanish, just wanted to preserver it for a checkin
		365	$STATWIDS->{st_str} ->set_text (sprintf "S%d", $stats->{5});
		366	$STATWIDS->{st_dex} ->set_text (sprintf "D%d", $stats->{8});
		367	$STATWIDS->{st_con} ->set_text (sprintf "Co%d", $stats->{9});
		368	$STATWIDS->{st_int} ->set_text (sprintf "I%d", $stats->{6});
		369	$STATWIDS->{st_wis} ->set_text (sprintf "W%d", $stats->{7});
		370	$STATWIDS->{st_pow} ->set_text (sprintf "P%d", $stats->{22});
		371	$STATWIDS->{st_cha} ->set_text (sprintf "Ch%d", $stats->{10});
		372	$STATWIDS->{st_wc} ->set_text (sprintf "Wc%d", $stats->{13});
		373	$STATWIDS->{st_ac} ->set_text (sprintf "Ac%d", $stats->{14});
		374	$STATWIDS->{st_dam} ->set_text (sprintf "Dam%d", $stats->{15});
		375	$STATWIDS->{st_arm} ->set_text (sprintf "Arm%d", $stats->{16});
		376	$STATWIDS->{st_spd} ->set_text (sprintf "Sp%.1f", $stats->{17});
		377	$STATWIDS->{st_wspd}->set_text (sprintf "WSp%.1f", $stats->{19});
		378	} else {
		379	$STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
		380	$STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
		381	$STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
		382	$STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
		383	$STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
		384	$STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
		385	$STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
		386	$STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
		387	$STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
		388	$STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
		389	$STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
		390	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});
		391	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});
		392	}
		393
		394	my %tbl = (
		395	phys => 100,
		396	magic => 101,
		397	fire => 102,
		398	elec => 103,
		399	cold => 104,
		400	conf => 105,
		401	acid => 106,
		402	drain => 107,
		403	ghit => 108,
		404	pois => 109,
		405	slow => 110,
		406	para => 111,
		407	tund => 112,
		408	fear => 113,
		409	deat => 115,
		410	holyw => 116,
		411	blind => 117
		412	);
		413
		414	for (keys %tbl) {
		415	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
		416	}
		417
		418	}
		419
206	sub metaserver_dialog {	420	sub metaserver_dialog {
207	my $dialog = new CFClient::UI::FancyFrame	421	my $dialog = new CFClient::UI::FancyFrame
		422	title => "Metaserver",
208	child => (my $vbox = new CFClient::UI::VBox);	423	child => (my $vbox = new CFClient::UI::VBox);
209		424
210	$vbox->add ($dialog->{table} = new CFClient::UI::Table);	425	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
211		426
212	$dialog	427	$dialog
…		…
278	});	493	});
279	}	494	}
280		495
281	sub server_setup {	496	sub server_setup {
282	my $dialog = new CFClient::UI::FancyFrame	497	my $dialog = new CFClient::UI::FancyFrame
		498	title => "Server Setup",
283	child => (my $vbox = new CFClient::UI::VBox);	499	child => (my $vbox = new CFClient::UI::VBox);
284		500
285	$vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Server Setup");
286	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	501	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
287	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	502	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
288		503
289	{	504	{
290	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	505	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
…		…
337	$dialog	552	$dialog
338	}	553	}
339		554
340	sub message_window {	555	sub message_window {
341	my $window = new CFClient::UI::FancyFrame	556	my $window = new CFClient::UI::FancyFrame
		557	title => "Messages",
342	border_bg => [1, 1, 1, 0.5],	558	border_bg => [1, 1, 1, 0.5],
343	bg => [0.3, 0.3, 0.3, 0.8],	559	bg => [0.3, 0.3, 0.3, 0.8],
344	user_w => int $::WIDTH / 3,	560	user_w => int $::WIDTH / 3,
345	user_h => int $::HEIGHT / 5,	561	user_h => int $::HEIGHT / 5,
346	child => (my $vbox = new CFClient::UI::VBox);	562	child => (my $vbox = new CFClient::UI::VBox);
…		…
388		604
389	$window	605	$window
390	}	606	}
391		607
392	sub sdl_init {	608	sub sdl_init {
393	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE	609	CFClient::SDL_Init
394	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
395	and die "SDL::Init failed!\n";	610	and die "SDL::Init failed!\n";
396	}	611	}
397		612
398	sub video_init {	613	sub video_init {
399	sdl_init;	614	sdl_init;
400		615
401	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	616	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
402	$FULLSCREEN = $CFG->{fullscreen};	617	$FULLSCREEN = $CFG->{fullscreen};
403	$FAST = $CFG->{fast};	618	$FAST = $CFG->{fast};
404		619
405	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	620	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
406	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
407	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
408	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
409
410	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
411	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
412	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
413	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
414
415	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
416	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
417	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
418
419	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
420	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
421	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
422	or die "SDL::SetVideoMode failed!\n";	621	or die "SDL_SetVideoMode failed!\n";
423
424	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
425
426	$SDL_EV = new SDL::Event;
427	$SDL_EV->set_unicode (1);
428		622
429	$SDL_ACTIVE = 1;	623	$SDL_ACTIVE = 1;
430		624
431	$LAST_REFRESH = time - 0.01;	625	$LAST_REFRESH = time - 0.01;
432		626
…		…
475	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {	669	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
476	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	670	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
477	status "Configuration Saved";	671	status "Configuration Saved";
478	});	672	});
479		673
		674	$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
		675	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
		676
480	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup	677	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
481		678
482	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
483	$tgw->add (my $hbox = new CFClient::UI::HBox ());
484		679
485	$hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
486	$hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
487	$hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
488	$hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
489
490	$GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
491	$CFClient::UI::ROOT->add ($tgw);
492	}	680	}
493		681
494	sub video_shutdown {	682	sub video_shutdown {
495	$CFClient::UI::ROOT->{children} = [];	683	$CFClient::UI::ROOT->{children} = [];
496	undef $SDL_ACTIVE;	684	undef $SDL_ACTIVE;
497	undef $SDL_EV;
498	}	685	}
499		686
		687	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
500	my $bgmusic;#TODO#hack#d#	688	my $bgmusic;#TODO#hack#d#
		689
		690	sub audio_music_finished {
		691	return unless $CFG->{bgm_enable};
		692
		693	# TODO: hack, do play loop and mood music
		694	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
		695	$bgmusic->play (0);
		696
		697	push @bgmusic, shift @bgmusic;
		698	}
501		699
502	sub audio_init {	700	sub audio_init {
503	if ($CFG->{audio_enable}) {	701	if ($CFG->{audio_enable}) {
504	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {	702	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
505		703	$SDL_MIXER = !CFClient::Mix_OpenAudio;
506	$SDL_MIXER = new SDL::Mixer	704	CFClient::Mix_AllocateChannels 8;
507	-rate => 22050,	705	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
508	-channels => 1, # mono
509	-size => 512;
510		706
511	$SDL_MIXER->allocate_channels (8);	707	audio_music_finished;
512
513	# TODO: hack, do play loop and mood music
514	if ($CFG->{bgm_enable}) {
515	$bgmusic = new SDL::Music CFClient::find_rcfile "music/game3.ogg";
516	$SDL_MIXER->play_music ($bgmusic, -1);
517	$SDL_MIXER->music_volume ($CFG->{bgm_volume});
518	}
519		708
520	while (<$fh>) {	709	while (<$fh>) {
521	next if /^\s*#/;	710	next if /^\s*#/;
522	next if /^\s*$/;	711	next if /^\s*$/;
523		712
524	my ($file, $volume, $event) = split /\s+/, $_, 3;	713	my ($file, $volume, $event) = split /\s+/, $_, 3;
525		714
526	push @SOUNDS, "$volume,$file";	715	push @SOUNDS, "$volume,$file";
527		716
528	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {	717	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {
529	my $chunk = new SDL::Sound CFClient::find_rcfile "sounds/$file";	718	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
530	$chunk->volume ($volume * 128 / 100);	719	$chunk->volume ($volume * 128 / 100);
531	$chunk	720	$chunk
532	};	721	};
533	}	722	}
534	} else {	723	} else {
…		…
536	}	725	}
537	}	726	}
538	}	727	}
539		728
540	sub audio_shutdown {	729	sub audio_shutdown {
		730	CFClient::Mix_CloseAudio if $SDL_MIXER;
541	undef $SDL_MIXER;	731	undef $SDL_MIXER;
542	@SOUNDS = ();	732	@SOUNDS = ();
543	%AUDIO_CHUNKS = ();	733	%AUDIO_CHUNKS = ();
544	}	734	}
545		735
…		…
558	$want_refresh = 0;	748	$want_refresh = 0;
559	$can_refresh = 0;	749	$can_refresh = 0;
560		750
561	$CFClient::UI::ROOT->draw;	751	$CFClient::UI::ROOT->draw;
562		752
563	SDL::GLSwapBuffers;	753	CFClient::SDL_GL_SwapBuffers;
564		754
565	$LAST_REFRESH = $NOW;	755	$LAST_REFRESH = $NOW;
566	}	756	}
567		757
568	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {	758	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
569	$NOW = time;	759	$NOW = time;
570		760
571	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()	761	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)
572	while $SDL_EV->poll;	762	for CFClient::SDL_PollEvent;
573		763
574	if (%animate_object) {	764	if (%animate_object) {
575	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	765	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
576	$want_refresh++;	766	$want_refresh++;
577	}	767	}
…		…
600	@conn::ISA = Crossfire::Protocol::;	790	@conn::ISA = Crossfire::Protocol::;
601		791
602	sub conn::stats_update {	792	sub conn::stats_update {
603	my ($self, $stats) = @_;	793	my ($self, $stats) = @_;
604		794
605	# i love text protocols!!!	795	update_stats_window ($stats);
606	# FIXME: the stats are somehow weird
607	my $hp = $stats->{1};
608	my $hp_m = $stats->{2};
609	my $sp = $stats->{3};
610	my $sp_m = $stats->{4};
611	my $fo = $stats->{18};
612	my $fo_m = 1000;
613	my $gr = $stats->{23};
614	my $gr_m = $stats->{24};
615
616	#d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
617	$GAUGES->{hp}->set_value ($hp, $hp_m);
618	$GAUGES->{mana}->set_value ($sp, $sp_m);
619	$GAUGES->{food}->set_value ($fo, $fo_m);
620	$GAUGES->{grace}->set_value ($gr, $gr_m);
621	}	796	}
622		797
623	sub conn::user_send {	798	sub conn::user_send {
624	my ($self, $command) = @_;	799	my ($self, $command) = @_;
625		800
…		…
650		825
651	my ($hash, $x, $y, $w, $h) = @$map_info;	826	my ($hash, $x, $y, $w, $h) = @$map_info;
652		827
653	my $data = $MAP->get_rect ($x, $y, $w, $h);	828	my $data = $MAP->get_rect ($x, $y, $w, $h);
654	$MAPCACHE->put ($hash => Compress::LZF::compress $data);	829	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
655
656	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	830	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
657
658	}	831	}
659		832
660	sub conn::map_clear {	833	sub conn::map_clear {
661	my ($self) = @_;	834	my ($self) = @_;
662		835
663	$self->flush_map;	836	$self->flush_map;
664	delete $self->{neigh};	837	delete $self->{neigh_map};
665		838
666	$MAP->clear;	839	$MAP->clear;
667	}	840	}
668		841
669		842
670	sub conn::load_map($$$) {	843	sub conn::load_map($$$) {
671	my ($self, $hash, $x, $y) = @_;	844	my ($self, $hash, $x, $y) = @_;
672		845
673	if (defined (my $data = $MAPCACHE->get ($hash))) {	846	if (defined (my $data = $MAPCACHE->get ($hash))) {
674	$data = Compress::LZF::decompress $data;	847	$data = Compress::LZF::decompress $data;
675	warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#	848	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
676	for my $id ($MAP->set_rect ($x, $y, $data)) {	849	for my $id ($MAP->set_rect ($x, $y, $data)) {
677	my $data = $TILECACHE->get ($id)	850	my $data = $TILECACHE->get ($id)
678	or next;	851	or next;
679		852
680	$self->set_texture ($id => $data);	853	$self->set_texture ($id => $data);
681	}	854	}
682	}	855	}
683	}	856	}
684		857
		858	# this method does a "flood fill" into every tile direction
		859	# it assumes that tiles are arranged in a rectangular grid,
		860	# i.e. a map is the same as the left of the right map etc.
		861	# failure to comply are harmless and result in display errors
		862	# at worst.
685	sub conn::flood_fill {	863	sub conn::flood_fill {
686	my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;	864	my ($self, $gx, $gy, $path, $hash, $flags) = @_;
687		865
688	# the server does not allow map paths > 6	866	# the server does not allow map paths > 6
689	return if 6 <= length $path;	867	return if 6 <= length $path;
690		868
691	for my $tile (1..4) {	869	my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
692	next if $self->{neigh}{$hash}[$tile];	870
		871	for (
		872	[1, 0, -1],
		873	[2, 1, 0],
		874	[3, 0, 1],
		875	[4, -1, 0],
		876	) {
		877	my ($tile, $dx, $dy) = @$_;
		878
		879	my $gx = $gx + $dx;
		880	my $gy = $gy + $dy;
		881
693	next unless $flags & (1 << ($tile - 1));	882	next unless $flags & (1 << ($tile - 1));
		883	next if $self->{neigh_grid}{$gx, $gy}++;
694		884
695	my $neigh = $self->{neigh}{$hash} \|\|= [];	885	my $neigh = $self->{neigh_map}{$hash} \|\|= [];
696		886	if (my $info = $neigh->[$tile]) {
697	$self->send_mapinfo ("spatial $path$tile", sub {
698	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	887	my ($flags, $x, $y, $w, $h, $hash) = @$info;
699		888
700	#warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
701	return if $mode ne "spatial";
702
703	$x += $MAP->ox;
704	$y += $MAP->oy;
705
706	$self->load_map ($hash, $x, $y)
707	unless $self->{neigh}{$hash}[5]++;#d#
708
709	$neigh->[$tile] = [$x, $y, $w, $h];
710
711	$self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1)	889	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
712	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	890	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		891
		892	} else {
		893	$self->send_mapinfo ("spatial $path$tile", sub {
		894	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
		895
		896	return if $mode ne "spatial";
		897
		898	$x += $MAP->ox;
		899	$y += $MAP->oy;
		900
		901	$self->load_map ($hash, $x, $y)
		902	unless $self->{neigh_map}{$hash}[5]++;#d#
		903
		904	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
		905
		906	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
		907	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		908	});
713	});	909	}
714	}	910	}
715	}	911	}
716		912
717	sub conn::map_change {	913	sub conn::map_change {
718	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	914	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
…		…
721		917
722	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	918	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
723		919
724	my $mapmapw = 250;	920	my $mapmapw = 250;
725	my $mapmaph = 250;	921	my $mapmaph = 250;
		922
		923	$self->{neigh_rect} = [
		924	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
		925	$ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
		926	];
726		927
		928	delete $self->{neigh_grid};
727	$self->flood_fill ("", $hash, $flags,	929	$self->flood_fill (0, 0, "", $hash, $flags);
728	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
729	$ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
730		930
731	$x += $ox;	931	$x += $ox;
732	$y += $oy;	932	$y += $oy;
733		933
734	$self->{map_info} = [$hash, $x, $y, $w, $h];	934	$self->{map_info} = [$hash, $x, $y, $w, $h];
		935
		936	my $map = $self->{map_info}[0];
		937	$map =~ s/^.*?\/([^\/]+)$/\1/;
		938	$STATWIDS->{map}->set_text ("Map: " . $map);
735		939
736	$self->load_map ($hash, $x, $y);	940	$self->load_map ($hash, $x, $y);
737	}	941	}
738		942
739	sub conn::face_find {	943	sub conn::face_find {
…		…
800	or return;	1004	or return;
801		1005
802	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}	1006	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
803	or return;	1007	or return;
804		1008
805	$SDL_MIXER->play_channel (-1, $chunk);	1009	$chunk->play;
806	# warn "sound $x,$y,$soundnum,$type\n";#d#	1010	# warn "sound $x,$y,$soundnum,$type\n";#d#
807	}	1011	}
808		1012
809	sub conn::query {	1013	sub conn::query {
810	my ($self, $flags, $prompt) = @_;	1014	my ($self, $flags, $prompt) = @_;
…		…
833	);	1037	);
834		1038
835	$LOGVIEW->add_paragraph ($color[$color], $text);	1039	$LOGVIEW->add_paragraph ($color[$color], $text);
836	}	1040	}
837		1041
838	sub conn::addspell {	1042	sub conn::spell_add {
839	my ($self, $spell) = @_;	1043	my ($self, $spell) = @_;
840		1044
841	# $MAPWIDGET->add_abbrev ("invoke spell $spell->{name}",	1045	$MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {
		1046	});
		1047	$MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {
		1048	});
		1049	}
		1050
		1051	sub conn::spell_delete {
		1052	my ($self, $spell) = @_;
		1053	}
		1054
		1055	sub conn::addme_success {
		1056	my ($self) = @_;
		1057
		1058	for my $skill (values %{$self->{skill_info}}) {
		1059	$MAPWIDGET->add_command ("ready_skill $skill", "", sub {
		1060	});
		1061	$MAPWIDGET->add_command ("use_skill $skill", "", sub {
		1062	});
		1063	}
842	}	1064	}
843		1065
844	%SDL_CB = (	1066	%SDL_CB = (
845	SDL_QUIT() => sub {	1067	CFClient::SDL_QUIT => sub {
846	Event::unloop -1;	1068	Event::unloop -1;
847	},	1069	},
848	SDL_VIDEORESIZE() => sub {	1070	CFClient::SDL_VIDEORESIZE => sub {
849	},	1071	},
850	SDL_VIDEOEXPOSE() => sub {	1072	CFClient::SDL_VIDEOEXPOSE => \&refresh,
851	refresh;	1073	CFClient::SDL_ACTIVEEVENT => sub {
		1074	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
852	},	1075	},
853	SDL_KEYDOWN() => sub {	1076	CFClient::SDL_KEYDOWN => sub {
854	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	1077	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
855	# alt-enter	1078	# alt-enter
856	video_shutdown;	1079	video_shutdown;
857	$CFG->{fullscreen} = !$CFG->{fullscreen};	1080	$CFG->{fullscreen} = !$CFG->{fullscreen};
858	video_init;	1081	video_init;
859	} else {	1082	} else {
860	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	1083	CFClient::UI::feed_sdl_key_down_event ($_[0]);
861	}	1084	}
862	},	1085	},
863	SDL_KEYUP() => sub {	1086	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
864	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);	1087	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
865	},	1088	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
866	SDL_MOUSEMOTION() => sub {	1089	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
867	CFClient::UI::feed_sdl_motion_event ($SDL_EV);	1090	CFClient::SDL_USEREVENT => \&audio_music_finished,
868	},
869	SDL_MOUSEBUTTONDOWN() => sub {
870	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
871	},
872	SDL_MOUSEBUTTONUP() => sub {
873	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
874	},
875	SDL_ACTIVEEVENT() => sub {
876	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
877	},
878	);	1091	);
879		1092
880	#############################################################################	1093	#############################################################################
881		1094
882	$SIG{INT} = $SIG{TERM} = sub { exit };	1095	$SIG{INT} = $SIG{TERM} = sub { exit };
…		…
894	fast => 0,	1107	fast => 0,
895	fow_enable => 1,	1108	fow_enable => 1,
896	fow_intensity => 0.45,	1109	fow_intensity => 0.45,
897	fow_smooth => 0,	1110	fow_smooth => 0,
898	gui_fontsize => 1,	1111	gui_fontsize => 1,
899	log_fontsize => 14,	1112	log_fontsize => 1,
		1113	gauge_fontsize => 1,
		1114	gauge_size => 0.35,
		1115	gauge_w_size => 0.14,
		1116	stat_fontsize => 1,
900	mapsize => 100,	1117	mapsize => 100,
901	host => "crossfire.schmorp.de",	1118	host => "crossfire.schmorp.de",
902	say_command => 'say',	1119	say_command => 'say',
903	audio_enable => 1,	1120	audio_enable => 1,
904	bgm_enable => 1,	1121	bgm_enable => 1,
905	bgm_volume => 64,	1122	bgm_volume => 0.25,
906	);	1123	);
907		1124
908	while (my ($k, $v) = each %DEF_CFG) {	1125	while (my ($k, $v) = each %DEF_CFG) {
909	$CFG->{$k} = $v unless exists $CFG->{$k};	1126	$CFG->{$k} = $v unless exists $CFG->{$k};
910	}	1127	}
911		1128
912	sdl_init;	1129	sdl_init;
913		1130
914	@SDL_MODES = reverse	1131	@SDL_MODES = reverse
915	grep $_->[0] >= 640 && $_->[1] >= 480,	1132	grep $_->[0] >= 640 && $_->[1] >= 480,
916	map [SDL::RectW ($_), SDL::RectH ($_)],	1133	CFClient::SDL_ListModes;
917	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
918		1134
919	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	1135	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
920		1136
921	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	1137	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
922		1138
…		…
930	video_init;	1146	video_init;
931	audio_init;	1147	audio_init;
932		1148
933	Event::loop;	1149	Event::loop;
934		1150
935	END { SDL::Quit }	1151	END { CFClient::SDL_Quit }
936		1152
937		1153

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.143 by root, Wed Apr 19 08:05:07 2006 UTC vs. Revision 1.158 by elmex, Sat Apr 22 12:14:45 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.143 by root, Wed Apr 19 08:05:07 2006 UTC vs.
Revision 1.158 by elmex, Sat Apr 22 12:14:45 2006 UTC