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.184 by root, Tue Apr 25 11:25:20 2006 UTC vs.
Revision 1.213 by root, Sun May 14 20:51:20 2006 UTC

… …
37use CFClient; 37use CFClient;
38use CFClient::UI; 38use CFClient::UI;
39use CFClient::MapWidget; 39use CFClient::MapWidget;
40 40
41$Event::DIED = sub { 41$Event::DIED = sub {
42 # TODO: display dialog box or so
42 CFClient::error $_[1]; 43 CFClient::error $_[1];
43}; 44};
44 45
45#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 46#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
46 47
… …
59our $NOW; 60our $NOW;
60 61
61our $CFG; 62our $CFG;
62our $CONN; 63our $CONN;
63our $FAST; # fast, low-quality mode, possibly useful for software-rendering 64our $FAST; # fast, low-quality mode, possibly useful for software-rendering
65
66our $WANT_REFRESH;
67our $CAN_REFRESH;
64 68
65our @SDL_MODES; 69our @SDL_MODES;
66our $WIDTH; 70our $WIDTH;
67our $HEIGHT; 71our $HEIGHT;
68our $FULLSCREEN; 72our $FULLSCREEN;
… …
70 74
71our $FONT_PROP; 75our $FONT_PROP;
72our $FONT_FIXED; 76our $FONT_FIXED;
73 77
74our $MAP; 78our $MAP;
79our $MAPMAP;
75our $MAPWIDGET; 80our $MAPWIDGET;
76our $BUTTONBAR; 81our $BUTTONBAR;
77our $LOGVIEW; 82our $LOGVIEW;
78our $CONSOLE; 83our $CONSOLE;
79our $METASERVER; 84our $METASERVER;
85our $LOGIN_BUTTON;
80 86
81our $FLOORBOX; 87our $FLOORBOX;
82our $GAUGES; 88our $GAUGES;
83our $STATWIDS; 89our $STATWIDS;
84 90
… …
88our $SDL_MIXER; 94our $SDL_MIXER;
89our @SOUNDS; # event => file mapping 95our @SOUNDS; # event => file mapping
90our %AUDIO_CHUNKS; # audio files 96our %AUDIO_CHUNKS; # audio files
91 97
92our $ALT_ENTER_MESSAGE; 98our $ALT_ENTER_MESSAGE;
93our $STATUS_LINE; 99our $STATUSBOX;
94our $DEBUG_STATUS; 100our $DEBUG_STATUS;
95 101
102our $INVWIN;
103our $INV;
104
96sub status { 105sub status {
97 $STATUS_LINE->set_text ($_[0]); 106 $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, color => [1, 1, 0, 1]);
98 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h}); 107 $CFClient::UI::ROOT->on_post_alloc (status_line_positioner => sub {
108 my $widget = $STATUSBOX->{parent};
109 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
110 });
99} 111}
100 112
101sub debug { 113sub debug {
102 $DEBUG_STATUS->set_text ($_[0]); 114 $DEBUG_STATUS->set_text ($_[0]);
103 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h}); 115 my ($w, $h) = $DEBUG_STATUS->size_request;
116 $DEBUG_STATUS->move ($WIDTH - $w, 0);
104} 117}
105 118
106sub start_game { 119sub start_game {
107 status "logging in..."; 120 status "logging in...";
108 121
109 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 122 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
110 123
111 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 124 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
112
113 $MAP = new CFClient::Map $mapsize, $mapsize; 125 $MAP = new CFClient::Map $mapsize, $mapsize;
114 126
115 my ($host, $port) = split /:/, $CFG->{host}; 127 my ($host, $port) = split /:/, $CFG->{host};
116 128
117 $CONN = new conn 129 $CONN = eval {
130 new conn
118 host => $host, 131 host => $host,
119 port => $port || 13327, 132 port => $port || 13327,
120 user => $CFG->{user}, 133 user => $CFG->{user},
121 pass => $CFG->{password}, 134 pass => $CFG->{password},
122 mapw => $mapsize, 135 mapw => $mapsize,
123 maph => $mapsize, 136 maph => $mapsize,
137 ;
124 ; 138 };
125 139
140 if ($CONN) {
141 $LOGIN_BUTTON->set_text ("Logout");
142
126 status "login successful"; 143 status "login successful";
127 144
128 CFClient::lowdelay fileno $CONN->{fh}; 145 CFClient::lowdelay fileno $CONN->{fh};
146 } else {
147 status "unable to connect";
148 stop_game();
149 }
129} 150}
130 151
131sub stop_game { 152sub stop_game {
153 return unless $CONN;
154
155 status "connection closed";
156 $LOGIN_BUTTON->set_text ("Login");
157 $CONN->destroy;
158 $CONN = 0; # false, does not autovivify
159
160 undef $MAPCACHE;
132 undef $CONN; 161 undef $MAP;
133} 162}
134 163
135sub client_setup { 164sub client_setup {
136 my $dialog = new CFClient::UI::FancyFrame 165 my $dialog = new CFClient::UI::FancyFrame
137 title => "Client Setup", 166 title => "Client Setup",
… …
313 audio_shutdown (); 342 audio_shutdown ();
314 audio_init (); 343 audio_init ();
315 } 344 }
316 ); 345 );
317 346
347 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Communication cmd");
348 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
349 text => $CFG->{say_command},
350 tooltip => "This is the command that will be used if you write a line in the message window entry. "
351 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
352 ."But you could also set it to 'tell <playername>' to only chat with that user.",
353 connect_changed => sub {
354 my ($self, $value) = @_;
355 $CFG->{say_command} = $value;
356 }
357 );
358
318 $dialog 359 $dialog
319} 360}
320 361
321sub set_stats_window_fontsize { 362sub set_stats_window_fontsize {
322 for (values %{$STATWIDS}) { 363 for (values %{$STATWIDS}) {
… …
341 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 382 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh
342 ); 383 );
343 $win->add (my $hbox = new CFClient::UI::HBox 384 $win->add (my $hbox = new CFClient::UI::HBox
344 children => [ 385 children => [
345 (new CFClient::UI::HBox expand => 1), 386 (new CFClient::UI::HBox expand => 1),
346 ($FLOORBOX = new CFClient::UI::VBox), 387 (new CFClient::UI::VBox children => [
388 (new CFClient::UI::Empty expand => 1),
389 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)),
390 ]),
347 (my $vbox = new CFClient::UI::VBox), 391 (my $vbox = new CFClient::UI::VBox),
348 ], 392 ],
349 ); 393 );
350 394
351 $vbox->add (new CFClient::UI::HBox 395 $vbox->add (new CFClient::UI::HBox
… …
381} 425}
382 426
383sub make_stats_window { 427sub make_stats_window {
384 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats"; 428 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats";
385 429
386 $tgw->add (my $vb = new CFClient::UI::VBox); 430 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
387 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1); 431 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
388 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1); 432 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
389 433
390 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 434 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
391 435
… …
421 465
422 my $row = 0; 466 my $row = 0;
423 my $col = 0; 467 my $col = 0;
424 468
425 my %resist_names = ( 469 my %resist_names = (
426 slow => "Slow", 470 slow => "Slow (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)",
427 holyw => "Holy Word", 471 holyw => "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",
428 conf => "Confusion", 472 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)",
429 fire => "Fire", 473 fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
430 depl => "Depletion (some monsters and other effects can cause stats depletion)", 474 depl => "Depletion (some monsters and other effects can cause stats depletion)",
431 magic => "Magic", 475 magic => "Magic (resistance to magic spells like magic missile or similar)",
432 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)", 476 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)",
433 acid => "Acid", 477 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
434 pois => "Poison", 478 pois => "Poison (resistance to getting poisoned)",
435 para => "Paralysation", 479 para => "Paralysation (this resistance affects the chance you get paralysed)",
436 deat => "Death (resistance against death spells)", 480 deat => "Death (resistance against death spells)",
437 phys => "Physical", 481 phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
438 blind => "Blind", 482 blind => "Blind (blind resistance affects the chance of a successful blinding attack)",
439 fear => "Fear", 483 fear => "Fear (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
440 tund => "Turn undead", 484 tund => "Turn undead",
441 elec => "Electricity", 485 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)",
442 cold => "Cold", 486 cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)",
443 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)", 487 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)",
444 ); 488 );
445 for (qw/slow holyw conf fire depl magic 489 for (qw/slow holyw conf fire depl magic
446 drain acid pois para deat phys 490 drain acid pois para deat phys
447 blind fear tund elec cold ghit/) 491 blind fear tund elec cold ghit/)
… …
456 can_events => 1, 500 can_events => 1,
457 can_hover => 1, 501 can_hover => 1,
458 tooltip => $resist_names{$_}, 502 tooltip => $resist_names{$_},
459 ); 503 );
460 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 504 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
505 font => $FONT_FIXED,
461 can_hover => 1, 506 can_hover => 1,
462 can_events => 1, 507 can_events => 1,
463 image => "ui/resist/resist_$_.png", 508 image => "ui/resist/resist_$_.png",
464 tooltip => $resist_names{$_}, 509 tooltip => $resist_names{$_},
465 ); 510 );
… …
548 593
549} 594}
550 595
551sub metaserver_dialog { 596sub metaserver_dialog {
552 my $dialog = new CFClient::UI::FancyFrame 597 my $dialog = new CFClient::UI::FancyFrame
553 title => "Metaserver", 598 title => "Server List",
554 child => (my $vbox = new CFClient::UI::VBox); 599 child => (my $vbox = new CFClient::UI::VBox);
555 600
556 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 601 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
557 602
558 $dialog 603 $dialog
… …
660 705
661 $METASERVER = metaserver_dialog; 706 $METASERVER = metaserver_dialog;
662 707
663 $vbox->add (new CFClient::UI::Flopper 708 $vbox->add (new CFClient::UI::Flopper
664 expand => 1, 709 expand => 1,
665 text => "Metaserver", 710 text => "Server List",
666 other => $METASERVER, 711 other => $METASERVER,
667 tooltip => "Show a list of avaible crossfire servers", 712 tooltip => "Show a list of available crossfire servers",
668 connect_open => sub { 713 connect_open => sub {
669 update_metaserver $HOST; 714 update_metaserver $HOST;
670 } 715 }
671 ); 716 );
672 } 717 }
… …
687 hidden => 1, 732 hidden => 1,
688 tooltip => "The password for your character", 733 tooltip => "The password for your character",
689 connect_changed => sub { 734 connect_changed => sub {
690 my ($self, $value) = @_; 735 my ($self, $value) = @_;
691 $CFG->{password} = $value; 736 $CFG->{password} = $value;
692 }
693 );
694
695 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
696 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
697 text => $CFG->{say_command},
698 tooltip => "This is the command that will be used if you write a line in the message window entry. "
699 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
700 ."But you could also set it to 'tell <playername>' to only chat with that user.",
701 connect_changed => sub {
702 my ($self, $value) = @_;
703 $CFG->{say_command} = $value;
704 } 737 }
705 ); 738 );
706 739
707 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 740 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
708 $table->add (1, 7, new CFClient::UI::Slider 741 $table->add (1, 7, new CFClient::UI::Slider
… …
715 748
716 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 749 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
717 }, 750 },
718 ); 751 );
719 752
720 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 753 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button
754 expand => 1,
755 align => 0,
756 text => "Login",
757 connect_activate => sub {
758 $CONN ? stop_game
721 start_game; 759 : start_game;
760 },
722 }); 761 );
723 762
724 $dialog 763 $dialog
725} 764}
726 765
727sub message_window { 766sub message_window {
728 my $window = new CFClient::UI::FancyFrame 767 my $window = new CFClient::UI::FancyFrame
729 title => "Messages", 768 title => "Messages",
730 border_bg => [1, 1, 1, 0.5], 769 border_bg => [1, 1, 1, 1],
731 bg => [0.3, 0.3, 0.3, 0.8], 770 bg => [0, 0, 0, 0.5],
732 user_w => int $::WIDTH / 3, 771 user_w => int $::WIDTH / 3,
733 user_h => int $::HEIGHT / 5, 772 user_h => int $::HEIGHT / 5,
734 child => (my $vbox = new CFClient::UI::VBox); 773 child => (my $vbox = new CFClient::UI::VBox);
735 774
736 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 775 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
… …
776 }; 815 };
777 816
778 $window 817 $window
779} 818}
780 819
820sub make_inventory_window {
821 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory";
822 $invwin->add ($INV = new CFClient::UI::Inventory expand => 1);
823 $invwin
824}
825
781sub sdl_init { 826sub sdl_init {
782 CFClient::SDL_Init 827 CFClient::SDL_Init
783 and die "SDL::Init failed!\n"; 828 and die "SDL::Init failed!\n";
784} 829}
785 830
786sub video_init { 831sub video_init {
787 sdl_init; 832 sdl_init;
788 833
834 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
835
789 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 836 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
790 $FULLSCREEN = $CFG->{fullscreen}; 837 $FULLSCREEN = $CFG->{fullscreen};
791 $FAST = $CFG->{fast}; 838 $FAST = $CFG->{fast};
792 839
793 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 840 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
794 or die "SDL_SetVideoMode failed!\n"; 841 or die "SDL_SetVideoMode failed!\n";
795 842
796 $SDL_ACTIVE = 1; 843 $SDL_ACTIVE = 1;
797
798 $LAST_REFRESH = time - 0.01; 844 $LAST_REFRESH = time - 0.01;
799 845
800 CFClient::gl_init; 846 CFClient::gl_init;
801 847
802 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 848 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
803 849
850 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
851
804 ############################################################################# 852 #############################################################################
805 853
854 unless ($DEBUG_STATUS) {
855 # create the widgets
856
806 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 857 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
807 $DEBUG_STATUS->show; 858 $DEBUG_STATUS->show;
808 859
809 $STATUS_LINE = new CFClient::UI::Label 860 $STATUSBOX = new CFClient::UI::Statusbox;
810 padding => 0, 861 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, size => 0.8, color => [1, 1, 1, 0.8]);
811 y => $HEIGHT - $FONTSIZE * 1.8;
812 $STATUS_LINE->show;
813 862
814 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 863 (new CFClient::UI::Frame
815 padding => 0, 864 bg => [0, 0, 0, 0.4],
816 fontsize => 0.8, 865 child => $STATUSBOX,
817 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 866 )->show;
818 $ALT_ENTER_MESSAGE->show;
819 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
820 867
821 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget); 868 CFClient::UI::FancyFrame->new (
822 $MAPWIDGET->focus_in; 869 border_bg => [1, 1, 1, 192/255],
870 bg => [1, 1, 1, 0],
871 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
872 )->show;
873
874 $MAPWIDGET = new CFClient::MapWidget;
823 $MAPWIDGET->connect (activate_console => sub { 875 $MAPWIDGET->connect (activate_console => sub {
824 my ($mapwidget, $preset) = @_; 876 my ($mapwidget, $preset) = @_;
825 877
826 if ($CONSOLE) { 878 if ($CONSOLE) {
827 $CONSOLE->{input}->{auto_activated} = 1; 879 $CONSOLE->{input}->{auto_activated} = 1;
828 $CONSOLE->{input}->focus_in; 880 $CONSOLE->{input}->focus_in;
829 881
830 if ($preset && $CONSOLE->{input}->get_text eq '') { 882 if ($preset && $CONSOLE->{input}->get_text eq '') {
831 $CONSOLE->{input}->set_text ($preset); 883 $CONSOLE->{input}->set_text ($preset);
884 }
832 } 885 }
833 } 886 });
834 }); 887 $MAPWIDGET->show;
888 $MAPWIDGET->focus_in;
835 889
836 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); 890 $BUTTONBAR = new CFClient::UI::HBox;
837 891
838 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 892 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
839 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 893 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
840 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 894 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
841 895
842 $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 896 make_gauge_window->show; # 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
897
843 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 898 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
899 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
844 900
845 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 901 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
846 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 902 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
847 status "Configuration Saved"; 903 status "Configuration Saved";
848 }); 904 });
849 905
906 $BUTTONBAR->show;
907
908 # delay till geometry is constant
909 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
850 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 910 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
911 });
912 force_refresh ();
913 }
851} 914}
852 915
853sub video_shutdown { 916sub video_shutdown {
854 $CFClient::UI::ROOT->{children} = [];
855 undef $CFClient::UI::GRAB;
856 undef $CFClient::UI::HOVER;
857 undef $SDL_ACTIVE; 917 undef $SDL_ACTIVE;
858} 918}
859 919
860my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 920my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
861my $bgmusic;#TODO#hack#d# 921my $bgmusic;#TODO#hack#d#
922
923sub audio_channel_finished {
924 my ($channel) = @_;
925
926 warn "channel $channel finished\n";#d#
927}
862 928
863sub audio_music_finished { 929sub audio_music_finished {
864 return unless $CFG->{bgm_enable}; 930 return unless $CFG->{bgm_enable};
865 931
866 # TODO: hack, do play loop and mood music 932 # TODO: hack, do play loop and mood music
… …
870 push @bgmusic, shift @bgmusic; 936 push @bgmusic, shift @bgmusic;
871} 937}
872 938
873sub audio_init { 939sub audio_init {
874 if ($CFG->{audio_enable}) { 940 if ($CFG->{audio_enable}) {
875 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 941 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
876 $SDL_MIXER = !CFClient::Mix_OpenAudio; 942 $SDL_MIXER = !CFClient::Mix_OpenAudio;
877 CFClient::Mix_AllocateChannels 8; 943 CFClient::Mix_AllocateChannels 8;
878 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 944 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
879 945
880 audio_music_finished; 946 audio_music_finished;
… …
907} 973}
908 974
909my %animate_object; 975my %animate_object;
910my $animate_timer; 976my $animate_timer;
911 977
912my $want_refresh;
913my $can_refresh;
914
915my $fps = 9; 978my $fps = 9;
916 979
917sub force_refresh { 980sub force_refresh {
918 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 981 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
919 debug sprintf "%3.2f", $fps; 982 debug sprintf "%3.2f", $fps;
920 983
921 $want_refresh = 0;
922 $can_refresh = 0;
923
924 $CFClient::UI::ROOT->draw; 984 $CFClient::UI::ROOT->draw;
925
926 CFClient::SDL_GL_SwapBuffers; 985 CFClient::SDL_GL_SwapBuffers;
927 986
987 $WANT_REFRESH = 0;
988 $CAN_REFRESH = 0;
928 $LAST_REFRESH = $NOW; 989 $LAST_REFRESH = $NOW;
929} 990}
930 991
931my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 992my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
932 $NOW = time; 993 $NOW = time;
… …
934 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 995 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
935 for CFClient::SDL_PollEvent; 996 for CFClient::SDL_PollEvent;
936 997
937 if (%animate_object) { 998 if (%animate_object) {
938 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 999 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
939 $want_refresh++; 1000 $WANT_REFRESH++;
940 } 1001 }
941 1002
942 if ($want_refresh) { 1003 if ($WANT_REFRESH) {
943 force_refresh; 1004 force_refresh;
944 } else { 1005 } else {
945 $can_refresh = 1; 1006 $CAN_REFRESH = 1;
946 } 1007 }
947}); 1008});
948
949sub refresh {
950 $want_refresh++;
951}
952 1009
953sub animation_start { 1010sub animation_start {
954 my ($widget) = @_; 1011 my ($widget) = @_;
955 $animate_object{$widget} = $widget; 1012 $animate_object{$widget} = $widget;
956} 1013}
… …
1035# at worst. 1092# at worst.
1036sub conn::flood_fill { 1093sub conn::flood_fill {
1037 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1094 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
1038 1095
1039 # the server does not allow map paths > 6 1096 # the server does not allow map paths > 6
1040 return if 6 <= length $path; 1097 return if 7 <= length $path;
1041 1098
1042 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1099 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1043 1100
1044 for ( 1101 for (
1045 [1, 0, -1], 1102 [1, 0, -1],
… …
1088 1145
1089 $self->flush_map; 1146 $self->flush_map;
1090 1147
1091 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1148 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1092 1149
1093 my $mapmapw = 250; 1150 my $mapmapw = $MAPMAP->{w};
1094 my $mapmaph = 250; 1151 my $mapmaph = $MAPMAP->{h};
1095 1152
1096 $self->{neigh_rect} = [ 1153 $self->{neigh_rect} = [
1097 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1154 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1098 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1155 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1099 ]; 1156 ];
… …
1268 [0.55, 0.41, 0.13], 1325 [0.55, 0.41, 0.13],
1269 [0.99, 0.77, 0.26], 1326 [0.99, 0.77, 0.26],
1270 [0.74, 0.65, 0.41], 1327 [0.74, 0.65, 0.41],
1271 ); 1328 );
1272 1329
1330 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1331
1332 $text =~ s/&/&amp;/g; $text =~ s/</&lt;/g;
1333 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1334 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1335
1273 $LOGVIEW->add_paragraph ($color[$color], $text); 1336 $LOGVIEW->add_paragraph ($color[$color],
1337 join "\n", map "$time $_", split /\n/, $text);
1338
1339 $STATUSBOX->add ($text,
1340 group => $text,
1341 color => $color[$color],
1342 timeout => 60,
1343 tooltip_font => $::FONT_FIXED,
1344 );
1345}
1346
1347sub conn::drawextinfo {
1348 my ($self, $color, $type, $subtype, $message) = @_;
1349
1350 $self->drawinfo ($color, $message);
1274} 1351}
1275 1352
1276sub conn::spell_add { 1353sub conn::spell_add {
1277 my ($self, $spell) = @_; 1354 my ($self, $spell) = @_;
1278 1355
… …
1291 1368
1292 for my $skill (values %{$self->{skill_info}}) { 1369 for my $skill (values %{$self->{skill_info}}) {
1293 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1370 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
1294 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1371 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
1295 } 1372 }
1373
1374 $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you");
1375 $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players");
1376 $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1377 $MAPWIDGET->add_command ("kill\\_pets", "kill your pets");
1378}
1379
1380sub conn::eof {
1381 stop_game;
1296} 1382}
1297 1383
1298sub update_floorbox { 1384sub update_floorbox {
1299 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1385 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1386 return unless $CONN;
1387
1300 $FLOORBOX->clear; 1388 $FLOORBOX->clear;
1301 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1389 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1302 1390
1303 my @items = values %{ $CONN->{container}{0} }; 1391 my $count = 4;
1304 1392 for (@{ $CONN->{container}{0} }) {
1305 # we basically have to use the same sorting as everybody else 1393 if (--$count) {
1306 @items = sort { $a->{type} <=> $b->{type} } @items; 1394 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1307 1395 } else {
1308 for my $item (reverse @items) { 1396 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1309 my $desc = $item->{nrof} < 2
1310 ? $item->{name}
1311 : "$item->{nrof} $item->{name_pl}";
1312 # todo: animation widget, face widget, weight(?) etc.
1313 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1314 tooltip => (CFClient::UI::Label->escape ($desc)
1315 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1316 can_hover => 1,
1317 can_events => 1,
1318 connect_button_down => sub {
1319 my ($self, $ev, $x, $y) = @_;
1320
1321 # todo: maybe put examine on 1? but should just be a tooltip :(
1322 if ($ev->{button} == 1) {
1323 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1324 } elsif ($ev->{button} == 2) {
1325 $CONN->send ("apply $item->{tag}");
1326 } elsif ($ev->{button} == 3) {
1327 # examine, lock, mark, maybe other things
1328 warn "MENU not implemented yet\n";
1329 }
1330
1331 1
1332 }, 1397 last;
1333 );
1334
1335 $hbox->add (new CFClient::UI::Face
1336 can_events => 0,
1337 face => $item->{face},
1338 anim => $item->{anim},
1339 animspeed => $item->{animspeed},
1340 );
1341 1398 }
1342 $hbox->add (new CFClient::UI::Label
1343 can_events => 0,
1344 text => $desc,
1345 );
1346 } 1399 }
1347 }); 1400 });
1348 refresh; 1401
1402 $WANT_REFRESH++;
1349} 1403}
1350 1404
1351sub conn::container_add { 1405sub conn::container_add {
1352 my ($self, $id, $items) = @_; 1406 my ($self, $tag, $items) = @_;
1353 1407
1354 update_floorbox if $id == 0; 1408 update_floorbox if $tag == 0;
1409
1410 $INV->set_items ($self->{container}{$self->{player}{tag}})
1411 if $tag == $self->{player}{tag};
1412
1355 # $self-<{player}{tag} => player inv 1413 # $self-<{player}{tag} => player inv
1356 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1414 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1357} 1415}
1358 1416
1359sub conn::container_clear { 1417sub conn::container_clear {
1360 my ($self, $id) = @_; 1418 my ($self, $tag) = @_;
1361 1419
1362 update_floorbox if $id == 0; 1420 update_floorbox if $tag == 0;
1421
1422 $INV->set_items ($self->{container}{$tag})
1423 if $tag == $self->{player}{tag};
1424
1363# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1425# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1364} 1426}
1365 1427
1366sub conn::item_delete { 1428sub conn::item_delete {
1367 my ($self, @items) = @_; 1429 my ($self, @items) = @_;
1368 1430
1369 for (@items) { 1431 for (@items) {
1370 update_floorbox if $_->{container} == 0; 1432 update_floorbox if $_->{container} == 0;
1433
1434 $INV->set_items ($self->{container}{$_->{container}})
1435 if $_->{container} == $self->{player}{tag};
1371 } 1436 }
1372} 1437}
1373 1438
1374sub conn::item_update { 1439sub conn::item_update {
1375 my ($self, $item) = @_; 1440 my ($self, $item) = @_;
1376 1441
1377 update_floorbox if $item->{container} == 0; 1442 update_floorbox if $item->{container} == 0;
1443
1444 $INV->set_items ($self->{container}{$item->{container}})
1445 if $item->{container} == $self->{player}{tag};
1378} 1446}
1379 1447
1380%SDL_CB = ( 1448%SDL_CB = (
1381 CFClient::SDL_QUIT => sub { 1449 CFClient::SDL_QUIT => sub {
1382 Event::unloop -1; 1450 Event::unloop -1;
1383 }, 1451 },
1384 CFClient::SDL_VIDEORESIZE => sub { 1452 CFClient::SDL_VIDEORESIZE => sub {
1385 }, 1453 },
1386 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1454 CFClient::SDL_VIDEOEXPOSE => sub {
1455 $WANT_REFRESH++;
1456 },
1387 CFClient::SDL_ACTIVEEVENT => sub { 1457 CFClient::SDL_ACTIVEEVENT => sub {
1388# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1458# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1389 }, 1459 },
1390 CFClient::SDL_KEYDOWN => sub { 1460 CFClient::SDL_KEYDOWN => sub {
1391 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1461 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1395 video_init; 1465 video_init;
1396 } else { 1466 } else {
1397 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1467 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1398 } 1468 }
1399 }, 1469 },
1400 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1470 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1401 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1471 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1402 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1472 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1403 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1473 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1404 CFClient::SDL_USEREVENT => \&audio_music_finished, 1474 CFClient::SDL_USEREVENT => sub {
1475 if ($_[0]{code} == 1) {
1476 audio_channel_finished $_[0]{data1};
1477 } elsif ($_[0]{code} == 0) {
1478 audio_music_finished;
1479 }
1480 },
1405); 1481);
1406 1482
1407############################################################################# 1483#############################################################################
1408 1484
1409$SIG{INT} = $SIG{TERM} = sub { exit }; 1485$SIG{INT} = $SIG{TERM} = sub { exit };
1410 1486
1411$TILECACHE = CFClient::db_table "tilecache";
1412$FACEMAP = CFClient::db_table "facemap";
1413
1414CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1415
1416my %DEF_CFG = (
1417 sdl_mode => 0,
1418 width => 640,
1419 height => 480,
1420 fullscreen => 0,
1421 fast => 0,
1422 map_scale => 0.5,
1423 fow_enable => 1,
1424 fow_intensity => 0.45,
1425 fow_smooth => 0,
1426 gui_fontsize => 1,
1427 log_fontsize => 1,
1428 gauge_fontsize => 1,
1429 gauge_size => 0.35,
1430 stat_fontsize => 1,
1431 mapsize => 100,
1432 host => "crossfire.schmorp.de",
1433 say_command => 'say',
1434 audio_enable => 1,
1435 bgm_enable => 1,
1436 bgm_volume => 0.25,
1437);
1438
1439while (my ($k, $v) = each %DEF_CFG) {
1440 $CFG->{$k} = $v unless exists $CFG->{$k};
1441}
1442
1443sdl_init;
1444
1445@SDL_MODES = reverse
1446 grep $_->[0] >= 640 && $_->[1] >= 480,
1447 CFClient::SDL_ListModes;
1448
1449@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1450
1451$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1452
1453{ 1487{
1488 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1489
1490 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1491
1492 $TILECACHE = CFClient::db_table "tilecache";
1493 $FACEMAP = CFClient::db_table "facemap";
1494
1495 my %DEF_CFG = (
1496 sdl_mode => 0,
1497 width => 640,
1498 height => 480,
1499 fullscreen => 0,
1500 fast => 0,
1501 map_scale => 0.5,
1502 fow_enable => 1,
1503 fow_intensity => 0.45,
1504 fow_smooth => 0,
1505 gui_fontsize => 1,
1506 log_fontsize => 1,
1507 gauge_fontsize=> 1,
1508 gauge_size => 0.35,
1509 stat_fontsize => 1,
1510 mapsize => 100,
1511 host => "crossfire.schmorp.de",
1512 say_command => 'say',
1513 audio_enable => 1,
1514 bgm_enable => 1,
1515 bgm_volume => 0.25,
1516 );
1517
1518 while (my ($k, $v) = each %DEF_CFG) {
1519 $CFG->{$k} = $v unless exists $CFG->{$k};
1520 }
1521
1522 sdl_init;
1523
1524 @SDL_MODES = reverse
1525 grep $_->[0] >= 640 && $_->[1] >= 480,
1526 CFClient::SDL_ListModes;
1527
1528 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1529
1530 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1531
1532 {
1454 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1533 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1455 DejaVuSans.ttf 1534 DejaVuSans.ttf
1456 DejaVuSansMono.ttf 1535 DejaVuSansMono.ttf
1457 DejaVuSans-Bold.ttf 1536 DejaVuSans-Bold.ttf
1458 DejaVuSansMono-Bold.ttf 1537 DejaVuSansMono-Bold.ttf
1459 DejaVuSans-Oblique.ttf 1538 DejaVuSans-Oblique.ttf
1460 DejaVuSansMono-Oblique.ttf 1539 DejaVuSansMono-Oblique.ttf
1461 DejaVuSans-BoldOblique.ttf 1540 DejaVuSans-BoldOblique.ttf
1462 DejaVuSansMono-BoldOblique.ttf 1541 DejaVuSansMono-BoldOblique.ttf
1463 ); 1542 );
1464 1543
1465 CFClient::add_font $_ for @fonts; 1544 CFClient::add_font $_ for @fonts;
1466 1545
1467 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1546 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1468 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1547 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1469 1548
1470 $FONT_PROP->make_default; 1549 $FONT_PROP->make_default;
1471} 1550 }
1472 1551
1473video_init; 1552 video_init;
1474audio_init; 1553 audio_init;
1554}
1475 1555
1476Event::loop; 1556Event::loop;
1477 1557
1478END { CFClient::SDL_Quit } 1558END { CFClient::SDL_Quit }
1479 1559

Diff Legend

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