ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/pclient
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.130 by root, Tue Apr 18 01:36:13 2006 UTC vs.
Revision 1.169 by root, Mon Apr 24 02:41:48 2006 UTC

… …
4use utf8; 4use utf8;
5 5
6use Time::HiRes 'time'; 6use Time::HiRes 'time';
7use Event; 7use Event;
8 8
9use SDL;
10use SDL::App;
11use SDL::Event;
12use SDL::Surface;
13use SDL::OpenGL;
14
15use Crossfire; 9use Crossfire;
16use Crossfire::Protocol; 10use Crossfire::Protocol;
17 11
18use Compress::LZF; 12use Compress::LZF;
19 13
20use CFClient; 14use CFClient;
21use CFClient::UI; 15use CFClient::UI;
16use CFClient::MapWidget;
22 17
23our $VERSION = '0.1'; 18our $VERSION = '0.1';
24 19
25my $MAX_FPS = 60; 20my $MAX_FPS = 60;
26my $MIN_FPS = 5; # unused as of yet 21my $MIN_FPS = 5; # unused as of yet
… …
41our @SDL_MODES; 36our @SDL_MODES;
42our $WIDTH; 37our $WIDTH;
43our $HEIGHT; 38our $HEIGHT;
44our $FULLSCREEN; 39our $FULLSCREEN;
45our $FONTSIZE; 40our $FONTSIZE;
41
42our $FONT_PROP;
43our $FONT_FIXED;
46 44
47our $MAP; 45our $MAP;
48our $MAPWIDGET; 46our $MAPWIDGET;
49our $BUTTONBAR; 47our $BUTTONBAR;
50our $LOGVIEW; 48our $LOGVIEW;
51our $CONSOLE; 49our $CONSOLE;
52our $METASERVER; 50our $METASERVER;
53 51
54our $GAUGES; 52our $GAUGES;
53our $STATWIDS;
55 54
56our $SDL_ACTIVE; 55our $SDL_ACTIVE;
57our $SDL_EV;
58our %SDL_CB; 56our %SDL_CB;
57
58our $SDL_MIXER;
59our @SOUNDS; # event => file mapping
60our %AUDIO_CHUNKS; # audio files
59 61
60our $ALT_ENTER_MESSAGE; 62our $ALT_ENTER_MESSAGE;
61our $STATUS_LINE; 63our $STATUS_LINE;
62our $DEBUG_STATUS; 64our $DEBUG_STATUS;
63 65
… …
100 undef $CONN; 102 undef $CONN;
101} 103}
102 104
103sub client_setup { 105sub client_setup {
104 my $dialog = new CFClient::UI::FancyFrame 106 my $dialog = new CFClient::UI::FancyFrame
107 title => "Client Setup",
105 child => (my $vbox = new CFClient::UI::VBox); 108 child => (my $vbox = new CFClient::UI::VBox);
106 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
107 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 109 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
108 110
109 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode"); 111 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
110 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 112 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
111 113
112 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 114 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
113 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8); 115 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
114 116
115 $mode_slider->connect (changed => sub { 117 $mode_slider->connect (changed => sub {
116 my ($self, $value) = @_; 118 my ($self, $value) = @_;
117 119
118 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 120 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
119 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 121 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
120 }); 122 });
121 $mode_slider->emit (changed => $mode_slider->{range}[0]); 123 $mode_slider->emit (changed => $mode_slider->{range}[0]);
122 124
125 my $row = 1;
126
123 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen"); 127 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
124 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub { 128 $table->add (1, $row++, new CFClient::UI::CheckBox
129 state => $CFG->{fullscreen},
130 tooltip => "Bring the client into fullscreen mode",
131 connect_changed => sub {
125 my ($self, $value) = @_; 132 my ($self, $value) = @_;
126 $CFG->{fullscreen} = $value; 133 $CFG->{fullscreen} = $value;
134 }
127 }); 135 );
128 136
129 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly"); 137 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
130 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub { 138 $table->add (1, $row++, new CFClient::UI::CheckBox
139 state => $CFG->{fast},
140 tooltip => "Lower the visual quality considerably to speed up rendering.",
141 connect_changed => sub {
131 my ($self, $value) = @_; 142 my ($self, $value) = @_;
132 $CFG->{fast} = $value; 143 $CFG->{fast} = $value;
144 }
133 }); 145 );
134 146
135 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War"); 147 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
136 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub { 148 $table->add (1, $row++, new CFClient::UI::Slider
149 range => [$CFG->{map_scale}, 0.25, 2, 0.05],
150 tooltip => "Enlarge or shrink the displayed map",
151 connect_changed => sub {
137 my ($self, $value) = @_; 152 my ($self, $value) = @_;
153 $CFG->{map_scale} = 0.05 * int $value / 0.05;
154 }
155 );
156
157 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
158 $table->add (1, $row++, new CFClient::UI::CheckBox
159 state => $CFG->{fow_enable},
160 tooltip => "Fog-of-War marks areas that cannot be seen by the player",
161 connect_changed => sub {
162 my ($self, $value) = @_;
138 $CFG->{fow_enable} = $value; 163 $CFG->{fow_enable} = $value;
164 }
139 }); 165 );
140 166
141 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity"); 167 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
142 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub { 168 $table->add (1, $row++, new CFClient::UI::Slider
169 range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001],
170 tooltip => "The higher the intensity, the lighter the Fog-of-War color",
171 connect_changed => sub {
143 my ($self, $value) = @_; 172 my ($self, $value) = @_;
144 $CFG->{fow_intensity} = $value; 173 $CFG->{fow_intensity} = $value;
174 }
145 }); 175 );
146 176
147 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth"); 177 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
148 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { 178 $table->add (1, $row++, new CFClient::UI::CheckBox
179 state => $CFG->{fow_smooth},
180 tooltip => "Smooth the Fog-of-War a bit to make it more realistic",
181 connect_changed => sub {
149 my ($self, $value) = @_; 182 my ($self, $value) = @_;
150 $CFG->{fow_smooth} = $value; 183 $CFG->{fow_smooth} = $value;
184 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
185 }
186 );
187
188 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
189 $table->add (1, $row++, new CFClient::UI::Slider
190 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1],
191 tooltip => "The font size used by most GUI elements",
192 connect_changed => sub {
193 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
194# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
195 }
196 );
197
198 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
199 $table->add (1, $row++, new CFClient::UI::Slider
200 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1],
201 tooltip => "The font size used by the server log window only",
202 connect_changed => sub {
203 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
204 }
205 );
206
207 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
208
209 $table->add (1, $row++, new CFClient::UI::Slider
210 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1],
211 tooltip => "The font size used by the statistics window only",
212 connect_changed => sub {
213 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
214 &set_stats_window_fontsize;
215 }
216 );
217
218 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
219 $table->add (1, $row++, new CFClient::UI::Slider
220 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
221 tooltip => "Adjust the size of the stats gauges at the bottom right",
222 connect_changed => sub {
223 $CFG->{gauge_size} = $_[1];
224 my $h = int $HEIGHT * $CFG->{gauge_size};
225 $GAUGES->{win}->set_size ($WIDTH, $h);
226 $GAUGES->{win}->move (0, $HEIGHT - $h);
227 }
228 );
229
230 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
231 $table->add (1, $row++, new CFClient::UI::Slider
232 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
233 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
234 connect_changed => sub {
235 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
236 &set_gauge_window_fontsize;
237 }
238 );
239
240 $table->add (1, $row++, new CFClient::UI::Button
241 expand => 1, align => 0, text => "Apply",
242 tooltip => "Apply the video settings",
243 connect_activate => sub {
244 video_shutdown ();
245 video_init ();
246 }
247 );
248
249 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
250 $table->add (1, $row++, new CFClient::UI::CheckBox
251 state => $CFG->{audio_enable},
252 tooltip => "If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
253 connect_changed => sub {
254 $CFG->{audio_enable} = $_[1];
255 }
256 );
257# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
258# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
259# $CFG->{effects_volume} = $_[1];
151 }); 260# });
152
153 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize"); 261 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
154 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub { 262 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
155 my ($self, $value) = @_; 263 $hbox->add (new CFClient::UI::CheckBox
156 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value); 264 expand => 1, state => $CFG->{bgm_enable},
265 tooltip => "Enable background music playing",
266 connect_changed => sub {
267 $CFG->{bgm_enable} = $_[1];
268 }
157 }); 269 );
158 270 $hbox->add (new CFClient::UI::Slider
159 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 271 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1],
160 destroy_screen (); 272 tooltip => "The volume of the background music",
161 init_screen (); 273 connect_changed => sub {
274 $CFG->{bgm_volume} = $_[1];
275 CFClient::MixMusic::volume $_[1] * 128;
276 }
162 }); 277 );
278
279 $table->add (1, $row++, new CFClient::UI::Button
280 expand => 1, align => 0, text => "Apply",
281 tooltip => "Apply the audio settings",
282 connect_activate => sub {
283 audio_shutdown ();
284 audio_init ();
285 }
286 );
163 287
164 $dialog 288 $dialog
289}
290
291sub set_stats_window_fontsize {
292 for (values %{$STATWIDS}) {
293 $_->set_fontsize ($::CFG->{stat_fontsize});
294 }
295}
296
297sub set_gauge_window_fontsize {
298 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
299 $_->set_fontsize ($::CFG->{gauge_fontsize});
300 }
301
302# local $GAUGES->{win}{parent};#d#
303# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
304}
305
306sub make_gauge_window {
307 my $gh = int ($HEIGHT * $CFG->{gauge_size});
308# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
309
310 my $win = new CFClient::UI::Frame (
311 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh
312 );
313 $win->add (my $vb = new CFClient::UI::VBox);
314
315 $vb->add (my $hbg = new CFClient::UI::HBox expand => 1);
316
317 $hbg->add (new CFClient::UI::Empty expand => 1);
318 $hbg->add (my $hb = new CFClient::UI::HBox);
319 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', tooltip => "Health points");
320 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', tooltip => "Spellpoints");
321 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', tooltip => "Grace");
322 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', tooltip => "Food");
323
324 $vb->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, text => "XP: 0 LVL: 0");
325 $vb->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, text => "Rng:");
326
327 $GAUGES = {
328 exp => $exp, win => $win, range => $rng,
329 food => $fg, mana => $mg, hp => $hg, grace => $gg
330 };
331
332 &set_gauge_window_fontsize;
333
334 $win
335}
336
337sub make_stats_window {
338 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
339
340 $tgw->add (my $vb = new CFClient::UI::VBox);
341 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
342 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
343
344 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
345
346 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
347
348 $tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
349 $tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
350 $tbl->add (0, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
351 $tbl->add (0, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
352 $tbl->add (0, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
353 $tbl->add (0, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
354 $tbl->add (0, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
355
356 $tbl->add (1, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Str");
357 $tbl->add (1, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Dex");
358 $tbl->add (1, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Con");
359 $tbl->add (1, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Int");
360 $tbl->add (1, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Wis");
361 $tbl->add (1, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Pow");
362 $tbl->add (1, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Cha");
363
364 $tbl->add (2, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, template => "-120");
365 $tbl->add (2, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, template => "-120");
366 $tbl->add (2, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, template => "120");
367 $tbl->add (2, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, template => "120");
368 $tbl->add (2, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, template => "10.54");
369 $tbl->add (2, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, template => "9");
370
371 $tbl->add (3, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Wc");
372 $tbl->add (3, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Ac");
373 $tbl->add (3, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Dam");
374 $tbl->add (3, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Arm");
375 $tbl->add (3, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Sp");
376 $tbl->add (3, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "WSp");
377
378 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
379
380 my $row = 0;
381 my $col = 0;
382
383 my %resist_names = (
384 slow => "Slow",
385 holyw => "Holy Word",
386 conf => "Confusion",
387 fire => "Fire",
388 depl => "Depletion",
389 magic => "Magic",
390 drain => "Draining",
391 acid => "Acid",
392 pois => "Poison",
393 para => "Paralysation",
394 deat => "Death",
395 phys => "Physical",
396 blind => "Blind",
397 fear => "Fear",
398 tund => "Turn undead",
399 elec => "Electricity",
400 cold => "Cold",
401 ghit => "Ghost hit",
402 );
403 for (qw/slow holyw conf fire depl magic
404 drain acid pois para deat phys
405 blind fear tund elec cold ghit/)
406 {
407 $tbl2->add ($col, $row,
408 $STATWIDS->{"res_$_"} =
409 new CFClient::UI::Label
410 template => "-100%",
411 align => +1,
412 valign => 0,
413 tooltip => $resist_names{$_}
414 );
415 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
416 can_hover => 1,
417 can_events => 1,
418 image => "ui/resist/resist_$_.png",
419 tooltip => $resist_names{$_}
420 );
421
422 $row++;
423 if ($row % 6 == 0) {
424 $col += 2;
425 $row = 0;
426 }
427 }
428
429 &set_stats_window_fontsize;
430 update_stats_window ({});
431
432 $tgw
433}
434
435sub formsep {
436 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1
437}
438
439sub update_stats_window {
440 my ($stats) = @_;
441
442 # i love text protocols!!!
443 my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1;
444 my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1;
445 my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1;
446 my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1;
447 my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1;
448 my $fo_m = 999;
449 my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1;
450 my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1;
451
452 $GAUGES->{hp} ->set_value ($hp, $hp_m);
453 $GAUGES->{mana} ->set_value ($sp, $sp_m);
454 $GAUGES->{food} ->set_value ($fo, $fo_m);
455 $GAUGES->{grace} ->set_value ($gr, $gr_m);
456 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64})
457 . " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")");
458 my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE};
459 $rng =~ s/^Range: //; # thank you so much dear server
460 $GAUGES->{range} ->set_text ("Rng: " . $rng);
461 my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE};
462 $title =~ s/^Player: //;
463 $STATWIDS->{title} ->set_text ("Title: " . $title);
464
465 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
466 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
467 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
468 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
469 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
470 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
471 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
472 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
473 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
474 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
475 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
476 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_SPEED});
477 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_WEAP_SP});
478
479 my %tbl = (
480 phys => 100,
481 magic => 101,
482 fire => 102,
483 elec => 103,
484 cold => 104,
485 conf => 105,
486 acid => 106,
487 drain => 107,
488 ghit => 108,
489 pois => 109,
490 slow => 110,
491 para => 111,
492 tund => 112,
493 fear => 113,
494 depl => 113,
495 deat => 115,
496 holyw => 116,
497 blind => 117
498 );
499
500 for (keys %tbl) {
501 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
502 }
503
165} 504}
166 505
167sub metaserver_dialog { 506sub metaserver_dialog {
168 my $dialog = new CFClient::UI::FancyFrame 507 my $dialog = new CFClient::UI::FancyFrame
508 title => "Metaserver",
169 child => (my $vbox = new CFClient::UI::VBox); 509 child => (my $vbox = new CFClient::UI::VBox);
170 510
171 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 511 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
172 512
173 $dialog 513 $dialog
… …
230 $HOST->set_text ($CFG->{host} = $host); 570 $HOST->set_text ($CFG->{host} = $host);
231 }), 571 }),
232 (new CFClient::UI::Empty expand => 1), 572 (new CFClient::UI::Empty expand => 1),
233 ]); 573 ]);
234 574
235 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8) 575 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8)
236 for 0 .. $#$m; 576 for 0 .. $#$m;
237 } 577 }
238 } 578 }
239 }); 579 });
240} 580}
241 581
242sub server_setup { 582sub server_setup {
243 my $dialog = new CFClient::UI::FancyFrame 583 my $dialog = new CFClient::UI::FancyFrame
584 title => "Server Setup",
244 child => (my $vbox = new CFClient::UI::VBox); 585 child => (my $vbox = new CFClient::UI::VBox);
245 586
246 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
247 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 587 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
248 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port"); 588 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
249 589
250 { 590 {
251 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 591 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
252 592
253 $vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub { 593 $vbox->add (
594 my $HOST = new CFClient::UI::Entry
595 expand => 1,
596 text => $CFG->{host},
597 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
598 connect_changed => sub {
599 my ($self, $value) = @_;
600 $CFG->{host} = $value;
601 }
602 );
603
604 $METASERVER = metaserver_dialog;
605
606 $vbox->add (new CFClient::UI::Flopper
607 expand => 1,
608 text => "Metaserver",
609 other => $METASERVER,
610 tooltip => "Show a list of avaible crossfire servers",
611 connect_open => sub {
612 update_metaserver $HOST;
613 }
614 );
615 }
616
617 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
618 $table->add (1, 4, new CFClient::UI::Entry
619 text => $CFG->{user},
620 tooltip => "The name of your character on the server",
621 connect_changed => sub {
254 my ($self, $value) = @_; 622 my ($self, $value) = @_;
255 $CFG->{host} = $value; 623 $CFG->{user} = $value;
256 }); 624 }
625 );
257 626
258 $METASERVER = metaserver_dialog;
259
260 $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
261 update_metaserver $HOST;
262 });
263 }
264
265 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); 627 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
266 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub { 628 $table->add (1, 5, new CFClient::UI::Entry
629 text => $CFG->{password},
630 hidden => 1,
631 tooltip => "The password for your character",
632 connect_changed => sub {
267 my ($self, $value) = @_; 633 my ($self, $value) = @_;
268 $CFG->{user} = $value;
269 });
270
271 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
272 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
273 my ($self, $value) = @_;
274 $CFG->{password} = $value; 634 $CFG->{password} = $value;
635 }
275 }); 636 );
276 637
277 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd"); 638 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
278 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub { 639 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
640 text => $CFG->{say_command},
641 tooltip => "This is the command that will be used if you write a line in the message window entry. "
642 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
643 ."But you could also set it to 'tell <playername>' to only chat with that user.",
644 connect_changed => sub {
279 my ($self, $value) = @_; 645 my ($self, $value) = @_;
280 $CFG->{say_command} = $value; 646 $CFG->{say_command} = $value;
647 }
281 }); 648 );
282 649
283 $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size"); 650 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
284 $table->add (1, 7, new CFClient::UI::Slider 651 $table->add (1, 7, new CFClient::UI::Slider
285 req_w => 100, 652 req_w => 100,
286 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 653 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
654 tooltip => "This is the size of the portion of the map update the server sends you. "
655 ."If you set this to a high value you will be able to see further for example.",
287 connect_changed => sub { 656 connect_changed => sub {
288 my ($self, $value) = @_; 657 my ($self, $value) = @_;
289 658
290 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 659 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
291 }, 660 },
… …
298 $dialog 667 $dialog
299} 668}
300 669
301sub message_window { 670sub message_window {
302 my $window = new CFClient::UI::FancyFrame 671 my $window = new CFClient::UI::FancyFrame
672 title => "Messages",
303 border_bg => [1, 1, 1, 0.5], 673 border_bg => [1, 1, 1, 0.5],
304 bg => [0.3, 0.3, 0.3, 0.8], 674 bg => [0.3, 0.3, 0.3, 0.8],
305 user_w => int $::WIDTH / 3, 675 user_w => int $::WIDTH / 3,
306 user_h => int $::HEIGHT / 5, 676 user_h => int $::HEIGHT / 5,
307 child => (my $vbox = new CFClient::UI::VBox); 677 child => (my $vbox = new CFClient::UI::VBox);
308 678
309 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 679 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
310 expand => 1, 680 expand => 1,
681 font => $FONT_FIXED,
311 fontsize => $::CFG->{log_fontsize}, 682 fontsize => $::CFG->{log_fontsize},
312 ); 683 );
313 684
314 $vbox->add (my $input = new CFClient::UI::Entry 685 $vbox->add (my $input = new CFClient::UI::Entry
315 connect_focus_in => sub { 686 connect_focus_in => sub {
… …
349 720
350 $window 721 $window
351} 722}
352 723
353sub sdl_init { 724sub sdl_init {
354 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE 725 CFClient::SDL_Init
355 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
356 and die "SDL::Init failed!\n"; 726 and die "SDL::Init failed!\n";
357} 727}
358 728
359sub init_screen { 729sub video_init {
360 sdl_init; 730 sdl_init;
361 731
362 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 732 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
363 $FULLSCREEN = $CFG->{fullscreen}; 733 $FULLSCREEN = $CFG->{fullscreen};
364 $FAST = $CFG->{fast}; 734 $FAST = $CFG->{fast};
365 735
366 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5; 736 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
367 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
368 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
369 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
370
371 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
372 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
373 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
374 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
375
376 SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
377 SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
378 SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
379
380 SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
381 SDL_HWSURFACE | SDL_ANYFORMAT | SDL_OPENGL | SDL_DOUBLEBUF
382 | ($FULLSCREEN ? SDL_FULLSCREEN : 0)
383 or die "SDL::SetVideoMode failed!\n"; 737 or die "SDL_SetVideoMode failed!\n";
384
385 SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
386
387 $SDL_EV = new SDL::Event;
388 $SDL_EV->set_unicode (1);
389 738
390 $SDL_ACTIVE = 1; 739 $SDL_ACTIVE = 1;
391 740
392 $LAST_REFRESH = time - 0.01; 741 $LAST_REFRESH = time - 0.01;
393 742
394 CFClient::gl_init; 743 CFClient::gl_init;
395 744
396 $FONTSIZE = int $HEIGHT / 40; 745 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
397 746
398 ############################################################################# 747 #############################################################################
399 748
400 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 749 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
401 $CFClient::UI::ROOT->add ($DEBUG_STATUS); 750 $DEBUG_STATUS->show;
402 751
403 $STATUS_LINE = new CFClient::UI::Label 752 $STATUS_LINE = new CFClient::UI::Label
404 padding => 0, 753 padding => 0,
405 y => $HEIGHT * 44 / 45 - $FONTSIZE; 754 y => $HEIGHT - $FONTSIZE * 1.8;
406 $CFClient::UI::ROOT->add ($STATUS_LINE); 755 $STATUS_LINE->show;
407 756
408 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 757 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
409 padding => 0, 758 padding => 0,
410 y => $HEIGHT * 44 / 45,
411 fontsize => $HEIGHT / 45, 759 fontsize => 0.8,
412 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 760 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
413 $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE); 761 $ALT_ENTER_MESSAGE->show;
762 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
414 763
415 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget); 764 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);
416 $MAPWIDGET->focus_in; 765 $MAPWIDGET->focus_in;
417 $MAPWIDGET->connect (activate_console => sub { 766 $MAPWIDGET->connect (activate_console => sub {
418 my ($mapwidget, $preset) = @_; 767 my ($mapwidget, $preset) = @_;
419 768
420 if ($CONSOLE) { 769 if ($CONSOLE) {
… …
430 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); 779 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
431 780
432 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 781 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
433 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 782 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
434 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 783 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
784
785 $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
786 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
435 787
436 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 788 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
437 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 789 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
438 status "Configuration Saved"; 790 status "Configuration Saved";
439 }); 791 });
440 792
441 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 793 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
442
443 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
444 $tgw->add (my $hbox = new CFClient::UI::HBox ());
445
446 $hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
447 $hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
448 $hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
449 $hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
450
451 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
452 $CFClient::UI::ROOT->add ($tgw);
453} 794}
454 795
455sub destroy_screen { 796sub video_shutdown {
456 $CFClient::UI::ROOT->{children} = []; 797 $CFClient::UI::ROOT->{children} = [];
457 undef $SDL_ACTIVE; 798 undef $SDL_ACTIVE;
799}
800
801my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
802my $bgmusic;#TODO#hack#d#
803
804sub audio_music_finished {
805 return unless $CFG->{bgm_enable};
806
807 # TODO: hack, do play loop and mood music
808 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
809 $bgmusic->play (0);
810
811 push @bgmusic, shift @bgmusic;
812}
813
814sub audio_init {
815 if ($CFG->{audio_enable}) {
816 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
817 $SDL_MIXER = !CFClient::Mix_OpenAudio;
818 CFClient::Mix_AllocateChannels 8;
819 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
820
821 audio_music_finished;
822
823 while (<$fh>) {
824 next if /^\s*#/;
825 next if /^\s*$/;
826
827 my ($file, $volume, $event) = split /\s+/, $_, 3;
828
829 push @SOUNDS, "$volume,$file";
830
831 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
832 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
833 $chunk->volume ($volume * 128 / 100);
834 $chunk
835 };
836 }
837 } else {
838 status "unable to open sound config: $!";
839 }
840 }
841}
842
843sub audio_shutdown {
844 CFClient::Mix_CloseAudio if $SDL_MIXER;
458 undef $SDL_EV; 845 undef $SDL_MIXER;
459 SDL::Quit; 846 @SOUNDS = ();
847 %AUDIO_CHUNKS = ();
460} 848}
461 849
462my %animate_object; 850my %animate_object;
463my $animate_timer; 851my $animate_timer;
464 852
… …
474 $want_refresh = 0; 862 $want_refresh = 0;
475 $can_refresh = 0; 863 $can_refresh = 0;
476 864
477 $CFClient::UI::ROOT->draw; 865 $CFClient::UI::ROOT->draw;
478 866
479 SDL::GLSwapBuffers; 867 CFClient::SDL_GL_SwapBuffers;
480 868
481 $LAST_REFRESH = $NOW; 869 $LAST_REFRESH = $NOW;
482} 870}
483 871
484my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 872my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
485 $NOW = time; 873 $NOW = time;
486 874
487 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 875 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
488 while $SDL_EV->poll; 876 for CFClient::SDL_PollEvent;
489 877
490 if (%animate_object) { 878 if (%animate_object) {
491 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 879 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
492 $want_refresh++; 880 $want_refresh++;
493 } 881 }
… …
516@conn::ISA = Crossfire::Protocol::; 904@conn::ISA = Crossfire::Protocol::;
517 905
518sub conn::stats_update { 906sub conn::stats_update {
519 my ($self, $stats) = @_; 907 my ($self, $stats) = @_;
520 908
521 # i love text protocols!!! 909 update_stats_window ($stats);
522 # FIXME: the stats are somehow weird
523 my $hp = $stats->{1};
524 my $hp_m = $stats->{2};
525 my $sp = $stats->{3};
526 my $sp_m = $stats->{4};
527 my $fo = $stats->{18};
528 my $fo_m = 1000;
529 my $gr = $stats->{23};
530 my $gr_m = $stats->{24};
531
532 #d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
533 $GAUGES->{hp}->set_value ($hp, $hp_m);
534 $GAUGES->{mana}->set_value ($sp, $sp_m);
535 $GAUGES->{food}->set_value ($fo, $fo_m);
536 $GAUGES->{grace}->set_value ($gr, $gr_m);
537} 910}
538 911
539sub conn::user_send { 912sub conn::user_send {
540 my ($self, $command) = @_; 913 my ($self, $command) = @_;
541 914
… …
566 939
567 my ($hash, $x, $y, $w, $h) = @$map_info; 940 my ($hash, $x, $y, $w, $h) = @$map_info;
568 941
569 my $data = $MAP->get_rect ($x, $y, $w, $h); 942 my $data = $MAP->get_rect ($x, $y, $w, $h);
570 $MAPCACHE->put ($hash => Compress::LZF::compress $data); 943 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
571
572 warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 944 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
573
574} 945}
575 946
576sub conn::map_clear { 947sub conn::map_clear {
577 my ($self) = @_; 948 my ($self) = @_;
578 949
579 $self->flush_map; 950 $self->flush_map;
580 delete $self->{neigh}; 951 delete $self->{neigh_map};
581 952
582 $MAP->clear; 953 $MAP->clear;
583} 954}
584 955
585 956
586sub conn::load_map($$$) { 957sub conn::load_map($$$) {
587 my ($self, $hash, $x, $y) = @_; 958 my ($self, $hash, $x, $y) = @_;
588 959
589 if (defined (my $data = $MAPCACHE->get ($hash))) { 960 if (defined (my $data = $MAPCACHE->get ($hash))) {
590 $data = Compress::LZF::decompress $data; 961 $data = Compress::LZF::decompress $data;
591 warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 962 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
592 for my $id ($MAP->set_rect ($x, $y, $data)) { 963 for my $id ($MAP->set_rect ($x, $y, $data)) {
593 my $data = $TILECACHE->get ($id) 964 my $data = $TILECACHE->get ($id)
594 or next; 965 or next;
595 966
596 $self->set_texture ($id => $data); 967 $self->set_texture ($id => $data);
597 } 968 }
598 } 969 }
599} 970}
600 971
972# this method does a "flood fill" into every tile direction
973# it assumes that tiles are arranged in a rectangular grid,
974# i.e. a map is the same as the left of the right map etc.
975# failure to comply are harmless and result in display errors
976# at worst.
601sub conn::flood_fill { 977sub conn::flood_fill {
602 my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_; 978 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
603 979
604 # the server does not allow map paths > 6 980 # the server does not allow map paths > 6
605 return if 6 <= length $path; 981 return if 6 <= length $path;
606 982
607 for my $tile (1..4) { 983 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
608 next if $self->{neigh}{$hash}[$tile]; 984
985 for (
986 [1, 0, -1],
987 [2, 1, 0],
988 [3, 0, 1],
989 [4, -1, 0],
990 ) {
991 my ($tile, $dx, $dy) = @$_;
992
993 my $gx = $gx + $dx;
994 my $gy = $gy + $dy;
995
609 next unless $flags & (1 << ($tile - 1)); 996 next unless $flags & (1 << ($tile - 1));
997 next if $self->{neigh_grid}{$gx, $gy}++;
610 998
611 my $neigh = $self->{neigh}{$hash} ||= []; 999 my $neigh = $self->{neigh_map}{$hash} ||= [];
612 1000 if (my $info = $neigh->[$tile]) {
613 $self->send_mapinfo ("spatial $path$tile", sub {
614 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1001 my ($flags, $x, $y, $w, $h, $hash) = @$info;
615 1002
616 #warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
617 return if $mode ne "spatial";
618
619 $x += $MAP->ox;
620 $y += $MAP->oy;
621
622 $self->load_map ($hash, $x, $y)
623 unless $self->{neigh}{$hash}[5]++;#d#
624
625 $neigh->[$tile] = [$x, $y, $w, $h];
626
627 $self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1) 1003 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
628 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1004 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1005
1006 } else {
1007 $self->send_mapinfo ("spatial $path$tile", sub {
1008 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1009
1010 return if $mode ne "spatial";
1011
1012 $x += $MAP->ox;
1013 $y += $MAP->oy;
1014
1015 $self->load_map ($hash, $x, $y)
1016 unless $self->{neigh_map}{$hash}[5]++;#d#
1017
1018 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1019
1020 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
1021 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1022 });
629 }); 1023 }
630 } 1024 }
631} 1025}
632 1026
633sub conn::map_change { 1027sub conn::map_change {
634 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 1028 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
635 1029
636 $self->flush_map; 1030 $self->flush_map;
637 1031
638 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1032 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
639 1033
640 warn "$ox $oy map_info<$flags, $x, $y, $w, $h, $hash>\n";#d#
641
642 my $mapmapw = 250; 1034 my $mapmapw = 250;
643 my $mapmaph = 250; 1035 my $mapmaph = 250;
1036
1037 $self->{neigh_rect} = [
1038 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1039 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1040 ];
644 1041
1042 delete $self->{neigh_grid};
645 $self->flood_fill ("", $hash, $flags, 1043 $self->flood_fill (0, 0, "", $hash, $flags);
646 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
647 $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
648 1044
649 $x += $ox; 1045 $x += $ox;
650 $y += $oy; 1046 $y += $oy;
651 1047
652 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1048 $self->{map_info} = [$hash, $x, $y, $w, $h];
1049
1050 my $map = $self->{map_info}[0];
1051 $map =~ s/^.*?\/([^\/]+)$/\1/;
1052 $STATWIDS->{map}->set_text ("Map: " . $map);
653 1053
654 $self->load_map ($hash, $x, $y); 1054 $self->load_map ($hash, $x, $y);
655} 1055}
656 1056
657sub conn::face_find { 1057sub conn::face_find {
… …
709 1109
710 $tex 1110 $tex
711 }; 1111 };
712} 1112}
713 1113
1114sub conn::sound_play {
1115 my ($self, $x, $y, $soundnum, $type) = @_;
1116
1117 $SDL_MIXER
1118 or return;
1119
1120 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
1121 or return;
1122
1123 $chunk->play;
1124# warn "sound $x,$y,$soundnum,$type\n";#d#
1125}
1126
714sub conn::query { 1127sub conn::query {
715 my ($self, $flags, $prompt) = @_; 1128 my ($self, $flags, $prompt) = @_;
716 1129
717 #TODO 1130 #TODO, display dialog with relevant information
718 warn "<<<<QUERY:$flags:$prompt>>>\n";#d# 1131 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
719} 1132}
720 1133
721sub conn::drawinfo { 1134sub conn::drawinfo {
722 my ($self, $color, $text) = @_; 1135 my ($self, $color, $text) = @_;
… …
738 ); 1151 );
739 1152
740 $LOGVIEW->add_paragraph ($color[$color], $text); 1153 $LOGVIEW->add_paragraph ($color[$color], $text);
741} 1154}
742 1155
1156sub conn::spell_add {
1157 my ($self, $spell) = @_;
1158
1159 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {
1160 });
1161 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {
1162 });
1163}
1164
1165sub conn::spell_delete {
1166 my ($self, $spell) = @_;
1167}
1168
1169sub conn::addme_success {
1170 my ($self) = @_;
1171
1172 for my $skill (values %{$self->{skill_info}}) {
1173 $MAPWIDGET->add_command ("ready_skill $skill", "", sub {
1174 });
1175 $MAPWIDGET->add_command ("use_skill $skill", "", sub {
1176 });
1177 }
1178}
1179
1180sub conn::container_add {
1181 my ($self, $id, $items) = @_;
1182
1183 # 0 floor
1184 # $self-<{player}{tag} => player inv
1185 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1186}
1187
1188sub conn::container_clear {
1189 my ($self, $id) = @_;
1190# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1191}
1192
743%SDL_CB = ( 1193%SDL_CB = (
744 SDL_QUIT() => sub { 1194 CFClient::SDL_QUIT => sub {
745 Event::unloop -1; 1195 Event::unloop -1;
746 }, 1196 },
747 SDL_VIDEORESIZE() => sub { 1197 CFClient::SDL_VIDEORESIZE => sub {
748 }, 1198 },
749 SDL_VIDEOEXPOSE() => sub { 1199 CFClient::SDL_VIDEOEXPOSE => \&refresh,
750 refresh;
751 },
752 SDL_KEYDOWN() => sub {
753 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
754 # alt-enter
755 destroy_screen;
756 $CFG->{fullscreen} = !$CFG->{fullscreen};
757 init_screen;
758 } else {
759 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
760 }
761 },
762 SDL_KEYUP() => sub {
763 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
764 },
765 SDL_MOUSEMOTION() => sub {
766 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
767 },
768 SDL_MOUSEBUTTONDOWN() => sub {
769 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
770 },
771 SDL_MOUSEBUTTONUP() => sub {
772 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
773 },
774 SDL_ACTIVEEVENT() => sub { 1200 CFClient::SDL_ACTIVEEVENT => sub {
775# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1201# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
776 }, 1202 },
1203 CFClient::SDL_KEYDOWN => sub {
1204 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1205 # alt-enter
1206 video_shutdown;
1207 $CFG->{fullscreen} = !$CFG->{fullscreen};
1208 video_init;
1209 } else {
1210 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1211 }
1212 },
1213 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1214 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1215 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1216 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1217 CFClient::SDL_USEREVENT => \&audio_music_finished,
777); 1218);
778 1219
779############################################################################# 1220#############################################################################
1221
1222$SIG{INT} = $SIG{TERM} = sub { exit };
780 1223
781$TILECACHE = CFClient::db_table "tilecache"; 1224$TILECACHE = CFClient::db_table "tilecache";
782$FACEMAP = CFClient::db_table "facemap"; 1225$FACEMAP = CFClient::db_table "facemap";
783 1226
784CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1227CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
… …
787 sdl_mode => 0, 1230 sdl_mode => 0,
788 width => 640, 1231 width => 640,
789 height => 480, 1232 height => 480,
790 fullscreen => 0, 1233 fullscreen => 0,
791 fast => 0, 1234 fast => 0,
1235 map_scale => 0.5,
792 fow_enable => 1, 1236 fow_enable => 1,
793 fow_intensity => 0.45, 1237 fow_intensity => 0.45,
794 fow_smooth => 0, 1238 fow_smooth => 0,
1239 gui_fontsize => 1,
795 log_fontsize => 14, 1240 log_fontsize => 1,
1241 gauge_fontsize => 1,
1242 gauge_size => 0.35,
1243 stat_fontsize => 1,
796 mapsize => 100, 1244 mapsize => 100,
797 host => "crossfire.schmorp.de", 1245 host => "crossfire.schmorp.de",
798 say_command => 'say', 1246 say_command => 'say',
1247 audio_enable => 1,
1248 bgm_enable => 1,
1249 bgm_volume => 0.25,
799); 1250);
800 1251
801while (my ($k, $v) = each %DEF_CFG) { 1252while (my ($k, $v) = each %DEF_CFG) {
802 $CFG->{$k} = $v unless exists $CFG->{$k}; 1253 $CFG->{$k} = $v unless exists $CFG->{$k};
803} 1254}
804 1255
805sdl_init; 1256sdl_init;
806 1257
807@SDL_MODES = reverse 1258@SDL_MODES = reverse
808 grep $_->[0] >= 640 && $_->[1] >= 480, 1259 grep $_->[0] >= 640 && $_->[1] >= 480,
809 map [SDL::RectW ($_), SDL::RectH ($_)], 1260 CFClient::SDL_ListModes;
810 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
811 1261
812@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 1262@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
813 1263
814$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1264$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
815 1265
816{ 1266{
817 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf); 1267 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1268 DejaVuSans.ttf
1269 DejaVuSansMono.ttf
1270 DejaVuSans-Bold.ttf
1271 DejaVuSansMono-Bold.ttf
1272 DejaVuSans-Oblique.ttf
1273 DejaVuSansMono-Oblique.ttf
1274 DejaVuSans-BoldOblique.ttf
1275 DejaVuSansMono-BoldOblique.ttf
1276 );
818 1277
819 CFClient::add_font $_ for @fonts; 1278 CFClient::add_font $_ for @fonts;
820 CFClient::set_font $fonts[0]; 1279
821} 1280 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1281 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
822 1282
823init_screen; 1283 $FONT_PROP->make_default;
1284}
1285
1286video_init;
1287audio_init;
824 1288
825Event::loop; 1289Event::loop;
826 1290
1291END { CFClient::SDL_Quit }
827 1292
1293

Diff Legend

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