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.151 by root, Thu Apr 20 07:27:11 2006 UTC vs.
Revision 1.156 by elmex, Fri Apr 21 12:27:20 2006 UTC

… …
45our $LOGVIEW; 45our $LOGVIEW;
46our $CONSOLE; 46our $CONSOLE;
47our $METASERVER; 47our $METASERVER;
48 48
49our $GAUGES; 49our $GAUGES;
50our $STATWIDS;
50 51
51our $SDL_ACTIVE; 52our $SDL_ACTIVE;
52our %SDL_CB; 53our %SDL_CB;
53 54
54our $SDL_MIXER; 55our $SDL_MIXER;
… …
187 audio_shutdown (); 188 audio_shutdown ();
188 audio_init (); 189 audio_init ();
189 }); 190 });
190 191
191 $dialog 192 $dialog
193}
194
195sub make_stats_window {
196 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
197
198 $tgw->add (my $vb = new CFClient::UI::VBox);
199 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:");
200 $vb->add (my $lhb = new CFClient::UI::HBox);
201 $lhb->add ($STATWIDS->{exp} = new CFClient::UI::Label valign => 0, align => -1, text => "Exp:", expand => 1);
202 $lhb->add ($STATWIDS->{lvl} = new CFClient::UI::Label valign => 0, align => -1, text => "Level:", expand => 1);
203
204 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
205 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', expand => 1);
206 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', expand => 1);
207 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', expand => 1);
208 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', expand => 1);
209 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
210
211 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
212
213 if (0) { # this code can vanish, just wanted to preserver it for a checkin
214 $tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => -1, text => "S");
215 $tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => -1, text => "D");
216 $tbl->add (0, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => -1, text => "Co");
217 $tbl->add (0, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => -1, text => "I");
218 $tbl->add (0, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => -1, text => "W");
219 $tbl->add (0, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => -1, text => "P");
220 $tbl->add (0, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => -1, text => "Ch");
221
222 $tbl->add (1, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => -1, text => "Wc");
223 $tbl->add (1, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => -1, text => "Ac");
224 $tbl->add (1, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => -1, text => "Dam");
225 $tbl->add (1, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => -1, text => "Arm");
226 $tbl->add (1, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => -1, text => "Sp");
227 $tbl->add (1, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => -1, text => "WSp");
228 } else {
229 $tbl->add (0, 0, new CFClient::UI::Label valign => 0, align => +1, text => "S");
230 $tbl->add (0, 1, new CFClient::UI::Label valign => 0, align => +1, text => "D");
231 $tbl->add (0, 2, new CFClient::UI::Label valign => 0, align => +1, text => "Co");
232 $tbl->add (0, 3, new CFClient::UI::Label valign => 0, align => +1, text => "I");
233 $tbl->add (0, 4, new CFClient::UI::Label valign => 0, align => +1, text => "W");
234 $tbl->add (0, 5, new CFClient::UI::Label valign => 0, align => +1, text => "P");
235 $tbl->add (0, 6, new CFClient::UI::Label valign => 0, align => +1, text => "Ch");
236
237 $tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => -1, text => "");
238 $tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => -1, text => "");
239 $tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => -1, text => "");
240 $tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => -1, text => "");
241 $tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => -1, text => "");
242 $tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => -1, text => "");
243 $tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => -1, text => "");
244
245 $tbl->add (2, 0, new CFClient::UI::Label valign => 0, align => +1, text => "Wc");
246 $tbl->add (2, 1, new CFClient::UI::Label valign => 0, align => +1, text => "Ac");
247 $tbl->add (2, 2, new CFClient::UI::Label valign => 0, align => +1, text => "Dam");
248 $tbl->add (2, 3, new CFClient::UI::Label valign => 0, align => +1, text => "Arm");
249 $tbl->add (2, 4, new CFClient::UI::Label valign => 0, align => +1, text => "Sp");
250 $tbl->add (2, 5, new CFClient::UI::Label valign => 0, align => +1, text => "WSp");
251
252 $tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => -1, text => "");
253 $tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => -1, text => "");
254 $tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => -1, text => "");
255 $tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => -1, text => "");
256 $tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
257 $tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
258 }
259
260 $hb->add (my $tbl2 = new CFClient::UI::Table);
261
262 my $row = 0;
263 my $col = 0;
264
265 for (qw/slow holyw conf fire depl magic
266 drain acid pois para deat phys
267 blind fear tund elec cold ghit/)
268 {
269 $tbl2->add ($col, $row, new CFClient::UI::Image image => "ui/resist/resist_$_.png");
270 $tbl2->add ($col + 1, $row,
271 $STATWIDS->{"res_$_"} =
272 new CFClient::UI::Label text => "0", align => -1, valign => 0
273 );
274
275 $row++;
276 if ($row % 6 == 0) {
277 $col += 2;
278 $row = 0;
279 }
280 }
281
282 update_stats_window ({});
283
284 $tgw
285}
286
287sub update_stats_window {
288 my ($stats) = @_;
289
290 # i love text protocols!!!
291 my $hp = $stats->{1};
292 my $hp_m = $stats->{2};
293 my $sp = $stats->{3};
294 my $sp_m = $stats->{4};
295 my $fo = $stats->{18};
296 my $fo_m = 999;
297 my $gr = $stats->{23};
298 my $gr_m = $stats->{24};
299
300 $GAUGES->{hp} ->set_value ($hp, $hp_m);
301 $GAUGES->{mana} ->set_value ($sp, $sp_m);
302 $GAUGES->{food} ->set_value ($fo, $fo_m);
303 $GAUGES->{grace} ->set_value ($gr, $gr_m);
304 $STATWIDS->{title} ->set_text ("Title: " . $stats->{21});
305 $STATWIDS->{exp} ->set_text ("Exp.: " . ($stats->{11} || $stats->{28}));
306 $STATWIDS->{lvl} ->set_text ("Level: " . $stats->{12});
307
308 if (0) { # this code can vanish, just wanted to preserver it for a checkin
309 $STATWIDS->{st_str} ->set_text (sprintf "S%d", $stats->{5});
310 $STATWIDS->{st_dex} ->set_text (sprintf "D%d", $stats->{8});
311 $STATWIDS->{st_con} ->set_text (sprintf "Co%d", $stats->{9});
312 $STATWIDS->{st_int} ->set_text (sprintf "I%d", $stats->{6});
313 $STATWIDS->{st_wis} ->set_text (sprintf "W%d", $stats->{7});
314 $STATWIDS->{st_pow} ->set_text (sprintf "P%d", $stats->{22});
315 $STATWIDS->{st_cha} ->set_text (sprintf "Ch%d", $stats->{10});
316 $STATWIDS->{st_wc} ->set_text (sprintf "Wc%d", $stats->{13});
317 $STATWIDS->{st_ac} ->set_text (sprintf "Ac%d", $stats->{14});
318 $STATWIDS->{st_dam} ->set_text (sprintf "Dam%d", $stats->{15});
319 $STATWIDS->{st_arm} ->set_text (sprintf "Arm%d", $stats->{16});
320 $STATWIDS->{st_spd} ->set_text (sprintf "Sp%.1f", $stats->{17});
321 $STATWIDS->{st_wspd}->set_text (sprintf "WSp%.1f", $stats->{19});
322 } else {
323 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
324 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
325 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
326 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
327 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
328 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
329 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
330 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
331 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
332 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
333 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
334 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});
335 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});
336 }
337
338 my %tbl = (
339 phys => 100,
340 magic => 101,
341 fire => 102,
342 elec => 103,
343 cold => 104,
344 conf => 105,
345 acid => 106,
346 drain => 107,
347 ghit => 108,
348 pois => 109,
349 slow => 110,
350 para => 111,
351 tund => 112,
352 fear => 113,
353 deat => 115,
354 holyw => 116,
355 blind => 117
356 );
357
358 for (keys %tbl) {
359 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
360 }
361
192} 362}
193 363
194sub metaserver_dialog { 364sub metaserver_dialog {
195 my $dialog = new CFClient::UI::FancyFrame 365 my $dialog = new CFClient::UI::FancyFrame
196 title => "Metaserver", 366 title => "Metaserver",
… …
445 status "Configuration Saved"; 615 status "Configuration Saved";
446 }); 616 });
447 617
448 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 618 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
449 619
450 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0, title => "Stats");
451 $tgw->add (my $hbox = new CFClient::UI::HBox ());
452 620
453 $hbox->add (my $hg = new CFClient::UI::Gauge (type => 'hp'));
454 $hbox->add (my $mg = new CFClient::UI::Gauge (type => 'mana'));
455 $hbox->add (my $gg = new CFClient::UI::Gauge (type => 'grace'));
456 $hbox->add (my $fg = new CFClient::UI::Gauge (type => 'food'));
457
458 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
459 $CFClient::UI::ROOT->add ($tgw); 621 $CFClient::UI::ROOT->add (make_stats_window);
460} 622}
461 623
462sub video_shutdown { 624sub video_shutdown {
463 $CFClient::UI::ROOT->{children} = []; 625 $CFClient::UI::ROOT->{children} = [];
464 undef $SDL_ACTIVE; 626 undef $SDL_ACTIVE;
465} 627}
466 628
629my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
467my $bgmusic;#TODO#hack#d# 630my $bgmusic;#TODO#hack#d#
631
632sub audio_music_finished {
633 return unless $CFG->{bgm_enable};
634
635 # TODO: hack, do play loop and mood music
636 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
637 $bgmusic->play (0);
638
639 push @bgmusic, shift @bgmusic;
640}
468 641
469sub audio_init { 642sub audio_init {
470 if ($CFG->{audio_enable}) { 643 if ($CFG->{audio_enable}) {
471 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 644 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
472
473 $SDL_MIXER = !CFClient::Mix_OpenAudio; 645 $SDL_MIXER = !CFClient::Mix_OpenAudio;
474 CFClient::Mix_AllocateChannels 8; 646 CFClient::Mix_AllocateChannels 8;
475 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 647 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
476 648
477 # TODO: hack, do play loop and mood music 649 audio_music_finished;
478 if ($CFG->{bgm_enable}) {
479 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/game3.ogg";
480 $bgmusic->play;
481 }
482 650
483 while (<$fh>) { 651 while (<$fh>) {
484 next if /^\s*#/; 652 next if /^\s*#/;
485 next if /^\s*$/; 653 next if /^\s*$/;
486 654
… …
564@conn::ISA = Crossfire::Protocol::; 732@conn::ISA = Crossfire::Protocol::;
565 733
566sub conn::stats_update { 734sub conn::stats_update {
567 my ($self, $stats) = @_; 735 my ($self, $stats) = @_;
568 736
569 # i love text protocols!!! 737 update_stats_window ($stats);
570 # FIXME: the stats are somehow weird
571 my $hp = $stats->{1};
572 my $hp_m = $stats->{2};
573 my $sp = $stats->{3};
574 my $sp_m = $stats->{4};
575 my $fo = $stats->{18};
576 my $fo_m = 999;
577 my $gr = $stats->{23};
578 my $gr_m = $stats->{24};
579
580 #d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
581 $GAUGES->{hp} ->set_value ($hp, $hp_m);
582 $GAUGES->{mana} ->set_value ($sp, $sp_m);
583 $GAUGES->{food} ->set_value ($fo, $fo_m);
584 $GAUGES->{grace}->set_value ($gr, $gr_m);
585} 738}
586 739
587sub conn::user_send { 740sub conn::user_send {
588 my ($self, $command) = @_; 741 my ($self, $command) = @_;
589 742
… …
614 767
615 my ($hash, $x, $y, $w, $h) = @$map_info; 768 my ($hash, $x, $y, $w, $h) = @$map_info;
616 769
617 my $data = $MAP->get_rect ($x, $y, $w, $h); 770 my $data = $MAP->get_rect ($x, $y, $w, $h);
618 $MAPCACHE->put ($hash => Compress::LZF::compress $data); 771 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
619
620 warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 772 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
621
622} 773}
623 774
624sub conn::map_clear { 775sub conn::map_clear {
625 my ($self) = @_; 776 my ($self) = @_;
626 777
… …
634sub conn::load_map($$$) { 785sub conn::load_map($$$) {
635 my ($self, $hash, $x, $y) = @_; 786 my ($self, $hash, $x, $y) = @_;
636 787
637 if (defined (my $data = $MAPCACHE->get ($hash))) { 788 if (defined (my $data = $MAPCACHE->get ($hash))) {
638 $data = Compress::LZF::decompress $data; 789 $data = Compress::LZF::decompress $data;
639 warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 790 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
640 for my $id ($MAP->set_rect ($x, $y, $data)) { 791 for my $id ($MAP->set_rect ($x, $y, $data)) {
641 my $data = $TILECACHE->get ($id) 792 my $data = $TILECACHE->get ($id)
642 or next; 793 or next;
643 794
644 $self->set_texture ($id => $data); 795 $self->set_texture ($id => $data);
645 } 796 }
646 } 797 }
647} 798}
648 799
800# this method does a "flood fill" into every tile direction
801# it assumes that tiles are arranged in a rectangular grid,
802# i.e. a map is the same as the left of the right map etc.
803# failure to comply are harmless and result in display errors
804# at worst.
649sub conn::flood_fill { 805sub conn::flood_fill {
650 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 806 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
651 807
652 # the server does not allow map paths > 6 808 # the server does not allow map paths > 6
653 return if 6 <= length $path; 809 return if 6 <= length $path;
… …
705 861
706 my $mapmapw = 250; 862 my $mapmapw = 250;
707 my $mapmaph = 250; 863 my $mapmaph = 250;
708 864
709 $self->{neigh_rect} = [ 865 $self->{neigh_rect} = [
710 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 866 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
711 $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5, 867 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
712 ]; 868 ];
713 869
714 delete $self->{neigh_grid}; 870 delete $self->{neigh_grid};
715 $self->flood_fill (0, 0, "", $hash, $flags); 871 $self->flood_fill (0, 0, "", $hash, $flags);
716 872
… …
849 CFClient::SDL_QUIT => sub { 1005 CFClient::SDL_QUIT => sub {
850 Event::unloop -1; 1006 Event::unloop -1;
851 }, 1007 },
852 CFClient::SDL_VIDEORESIZE => sub { 1008 CFClient::SDL_VIDEORESIZE => sub {
853 }, 1009 },
854 CFClient::SDL_VIDEOEXPOSE => sub { 1010 CFClient::SDL_VIDEOEXPOSE => \&refresh,
855 refresh; 1011 CFClient::SDL_ACTIVEEVENT => sub {
1012# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
856 }, 1013 },
857 CFClient::SDL_KEYDOWN => sub { 1014 CFClient::SDL_KEYDOWN => sub {
858 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1015 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
859 # alt-enter 1016 # alt-enter
860 video_shutdown; 1017 video_shutdown;
… …
862 video_init; 1019 video_init;
863 } else { 1020 } else {
864 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1021 CFClient::UI::feed_sdl_key_down_event ($_[0]);
865 } 1022 }
866 }, 1023 },
867 CFClient::SDL_KEYUP => sub { 1024 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
868 CFClient::UI::feed_sdl_key_up_event ($_[0]); 1025 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
869 }, 1026 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
870 CFClient::SDL_MOUSEMOTION => sub { 1027 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
871 CFClient::UI::feed_sdl_motion_event ($_[0]); 1028 CFClient::SDL_USEREVENT => \&audio_music_finished,
872 },
873 CFClient::SDL_MOUSEBUTTONDOWN => sub {
874 CFClient::UI::feed_sdl_button_down_event ($_[0]);
875 },
876 CFClient::SDL_MOUSEBUTTONUP => sub {
877 CFClient::UI::feed_sdl_button_up_event ($_[0]);
878 },
879 CFClient::SDL_ACTIVEEVENT => sub {
880# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
881 },
882); 1029);
883 1030
884############################################################################# 1031#############################################################################
885 1032
886$SIG{INT} = $SIG{TERM} = sub { exit }; 1033$SIG{INT} = $SIG{TERM} = sub { exit };

Diff Legend

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