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

Diff Legend

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