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.193 by root, Sat Apr 29 16:17:10 2006 UTC vs.
Revision 1.210 by root, Fri May 12 01:47:04 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;
… …
76our $MAPWIDGET; 80our $MAPWIDGET;
77our $BUTTONBAR; 81our $BUTTONBAR;
78our $LOGVIEW; 82our $LOGVIEW;
79our $CONSOLE; 83our $CONSOLE;
80our $METASERVER; 84our $METASERVER;
85our $LOGIN_BUTTON;
81 86
82our $FLOORBOX; 87our $FLOORBOX;
83our $GAUGES; 88our $GAUGES;
84our $STATWIDS; 89our $STATWIDS;
85 90
… …
96 101
97our $INVWIN; 102our $INVWIN;
98our $INV; 103our $INV;
99 104
100sub status { 105sub status {
101 $STATUS_LINE->set_text ($_[0]); 106 $STATUS_LINE->add ($_[0], pri => -10, group => "status", timeout => 20, color => [1, 1, 0, 1]);
102 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h}); 107 $CFClient::UI::ROOT->on_refresh ($STATUS_LINE => sub {
108 $STATUS_LINE->move (0, $HEIGHT - $STATUS_LINE->{h});#d# to in toplevel
109 });
103} 110}
104 111
105sub debug { 112sub debug {
106 $DEBUG_STATUS->set_text ($_[0]); 113 $DEBUG_STATUS->set_text ($_[0]);
107 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h}); 114 my ($w, $h) = $DEBUG_STATUS->size_request;
115 $DEBUG_STATUS->move ($WIDTH - $w, 0);
108} 116}
109 117
110sub start_game { 118sub start_game {
111 status "logging in..."; 119 status "logging in...";
112 120
113 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 121 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
114 122
115 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 123 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
116
117 $MAP = new CFClient::Map $mapsize, $mapsize; 124 $MAP = new CFClient::Map $mapsize, $mapsize;
118 125
119 my ($host, $port) = split /:/, $CFG->{host}; 126 my ($host, $port) = split /:/, $CFG->{host};
120 127
121 $CONN = new conn 128 $CONN = eval {
129 new conn
122 host => $host, 130 host => $host,
123 port => $port || 13327, 131 port => $port || 13327,
124 user => $CFG->{user}, 132 user => $CFG->{user},
125 pass => $CFG->{password}, 133 pass => $CFG->{password},
126 mapw => $mapsize, 134 mapw => $mapsize,
127 maph => $mapsize, 135 maph => $mapsize,
136 ;
128 ; 137 };
129 138
139 if ($CONN) {
140 $LOGIN_BUTTON->set_text ("Logout");
141
130 status "login successful"; 142 status "login successful";
131 143
132 CFClient::lowdelay fileno $CONN->{fh}; 144 CFClient::lowdelay fileno $CONN->{fh};
145 } else {
146 status "unable to connect";
147 stop_game();
148 }
133} 149}
134 150
135sub stop_game { 151sub stop_game {
152 return unless $CONN;
153
154 status "connection closed";
155 $LOGIN_BUTTON->set_text ("Login");
156 $CONN->destroy;
157 $CONN = 0; # false, does not autovivify
158
159 undef $MAPCACHE;
136 undef $CONN; 160 undef $MAP;
137} 161}
138 162
139sub client_setup { 163sub client_setup {
140 my $dialog = new CFClient::UI::FancyFrame 164 my $dialog = new CFClient::UI::FancyFrame
141 title => "Client Setup", 165 title => "Client Setup",
… …
565 589
566} 590}
567 591
568sub metaserver_dialog { 592sub metaserver_dialog {
569 my $dialog = new CFClient::UI::FancyFrame 593 my $dialog = new CFClient::UI::FancyFrame
570 title => "Metaserver", 594 title => "Server List",
571 child => (my $vbox = new CFClient::UI::VBox); 595 child => (my $vbox = new CFClient::UI::VBox);
572 596
573 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 597 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
574 598
575 $dialog 599 $dialog
… …
677 701
678 $METASERVER = metaserver_dialog; 702 $METASERVER = metaserver_dialog;
679 703
680 $vbox->add (new CFClient::UI::Flopper 704 $vbox->add (new CFClient::UI::Flopper
681 expand => 1, 705 expand => 1,
682 text => "Metaserver", 706 text => "Server List",
683 other => $METASERVER, 707 other => $METASERVER,
684 tooltip => "Show a list of avaible crossfire servers", 708 tooltip => "Show a list of available crossfire servers",
685 connect_open => sub { 709 connect_open => sub {
686 update_metaserver $HOST; 710 update_metaserver $HOST;
687 } 711 }
688 ); 712 );
689 } 713 }
… …
720 744
721 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 745 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
722 }, 746 },
723 ); 747 );
724 748
725 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 749 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button
750 expand => 1,
751 align => 0,
752 text => "Login",
753 connect_activate => sub {
754 $CONN ? stop_game
726 start_game; 755 : start_game;
756 },
727 }); 757 );
728 758
729 $dialog 759 $dialog
730} 760}
731 761
732sub message_window { 762sub message_window {
… …
783 $window 813 $window
784} 814}
785 815
786sub make_inventory_window { 816sub make_inventory_window {
787 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory"; 817 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory";
788 $invwin->add (my $hb = new CFClient::UI::HBox);
789 $hb->add ($INV = new CFClient::UI::Inventory expand => 1); 818 $invwin->add ($INV = new CFClient::UI::Inventory expand => 1);
790 $hb->add (my $rng = new CFClient::UI::Slider vertical => 1);
791 $INV->set_range ($rng);
792 $invwin 819 $invwin
793} 820}
794 821
795sub sdl_init { 822sub sdl_init {
796 CFClient::SDL_Init 823 CFClient::SDL_Init
… …
798} 825}
799 826
800sub video_init { 827sub video_init {
801 sdl_init; 828 sdl_init;
802 829
830 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
831
803 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 832 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
804 $FULLSCREEN = $CFG->{fullscreen}; 833 $FULLSCREEN = $CFG->{fullscreen};
805 $FAST = $CFG->{fast}; 834 $FAST = $CFG->{fast};
806 835
807 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 836 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
808 or die "SDL_SetVideoMode failed!\n"; 837 or die "SDL_SetVideoMode failed!\n";
809 838
810 $SDL_ACTIVE = 1; 839 $SDL_ACTIVE = 1;
811
812 $LAST_REFRESH = time - 0.01; 840 $LAST_REFRESH = time - 0.01;
813 841
814 CFClient::gl_init; 842 CFClient::gl_init;
815 843
816 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 844 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
817 845
846 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
847
818 ############################################################################# 848 #############################################################################
819 849
850 if ($DEBUG_STATUS) {
851 # reconfigure all widgets
852 $CFClient::UI::ROOT->reconfigure;
853
854 } else {
855 # create the widgets
856
820 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 857 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, text => "hulla", x => 100;#d#
821 $DEBUG_STATUS->show; 858 $DEBUG_STATUS->show;
822 859
823 $STATUS_LINE = new CFClient::UI::Label 860 $STATUS_LINE = new CFClient::UI::Statusbox;
824 padding => 0, 861 $STATUS_LINE->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, size => 0.8, color => [1, 1, 1, 0.8]);
825 y => $HEIGHT - $FONTSIZE * 1.8;
826 $STATUS_LINE->show; 862 $STATUS_LINE->show;
827 863
828 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
829 padding => 0,
830 fontsize => 0.8,
831 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
832 $ALT_ENTER_MESSAGE->show;
833 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
834
835 CFClient::UI::FancyFrame->new ( 864 CFClient::UI::FancyFrame->new (
836 border_bg => [1, 1, 1, 192/255], 865 border_bg => [1, 1, 1, 192/255],
837 bg => [1, 1, 1, 0], 866 bg => [1, 1, 1, 0],
838 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 867 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
839 )->show; 868 )->show;
840 869
841 $MAPWIDGET = new CFClient::MapWidget; 870 $MAPWIDGET = new CFClient::MapWidget;
842 $MAPWIDGET->connect (activate_console => sub { 871 $MAPWIDGET->connect (activate_console => sub {
843 my ($mapwidget, $preset) = @_; 872 my ($mapwidget, $preset) = @_;
844 873
845 if ($CONSOLE) { 874 if ($CONSOLE) {
846 $CONSOLE->{input}->{auto_activated} = 1; 875 $CONSOLE->{input}->{auto_activated} = 1;
847 $CONSOLE->{input}->focus_in; 876 $CONSOLE->{input}->focus_in;
848 877
849 if ($preset && $CONSOLE->{input}->get_text eq '') { 878 if ($preset && $CONSOLE->{input}->get_text eq '') {
850 $CONSOLE->{input}->set_text ($preset); 879 $CONSOLE->{input}->set_text ($preset);
880 }
851 } 881 }
852 } 882 });
853 });
854 $MAPWIDGET->show; 883 $MAPWIDGET->show;
855 $MAPWIDGET->focus_in; 884 $MAPWIDGET->focus_in;
856 885
857 $BUTTONBAR = new CFClient::UI::HBox; 886 $BUTTONBAR = new CFClient::UI::HBox;
858 887
859 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 888 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
860 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 889 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
861 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 890 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
862 891
863 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 892 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
864 893
865 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 894 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
866 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window); 895 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
867 896
868 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 897 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
869 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 898 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
870 status "Configuration Saved"; 899 status "Configuration Saved";
871 }); 900 });
872 901
873 $BUTTONBAR->show; 902 $BUTTONBAR->show;
874 903
904 # delay till geometry is constant
905 $CFClient::UI::ROOT->on_refresh (startup => sub {
875 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 906 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
907 });
908 force_refresh ();
909 }
876} 910}
877 911
878sub video_shutdown { 912sub video_shutdown {
879 $CFClient::UI::ROOT->{children} = [];
880 undef $CFClient::UI::GRAB;
881 undef $CFClient::UI::HOVER;
882 undef $SDL_ACTIVE; 913 undef $SDL_ACTIVE;
883} 914}
884 915
885my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 916my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
886my $bgmusic;#TODO#hack#d# 917my $bgmusic;#TODO#hack#d#
918
919sub audio_channel_finished {
920 my ($channel) = @_;
921
922 warn "channel $channel finished\n";#d#
923}
887 924
888sub audio_music_finished { 925sub audio_music_finished {
889 return unless $CFG->{bgm_enable}; 926 return unless $CFG->{bgm_enable};
890 927
891 # TODO: hack, do play loop and mood music 928 # TODO: hack, do play loop and mood music
… …
895 push @bgmusic, shift @bgmusic; 932 push @bgmusic, shift @bgmusic;
896} 933}
897 934
898sub audio_init { 935sub audio_init {
899 if ($CFG->{audio_enable}) { 936 if ($CFG->{audio_enable}) {
900 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 937 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
901 $SDL_MIXER = !CFClient::Mix_OpenAudio; 938 $SDL_MIXER = !CFClient::Mix_OpenAudio;
902 CFClient::Mix_AllocateChannels 8; 939 CFClient::Mix_AllocateChannels 8;
903 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 940 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
904 941
905 audio_music_finished; 942 audio_music_finished;
… …
932} 969}
933 970
934my %animate_object; 971my %animate_object;
935my $animate_timer; 972my $animate_timer;
936 973
937my $want_refresh;
938my $can_refresh;
939
940my $fps = 9; 974my $fps = 9;
941 975
942sub force_refresh { 976sub force_refresh {
943 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 977 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
944 debug sprintf "%3.2f", $fps; 978 debug sprintf "%3.2f", $fps;
945 979
946 $want_refresh = 0;
947 $can_refresh = 0;
948
949 $CFClient::UI::ROOT->draw; 980 $CFClient::UI::ROOT->draw;
950
951 CFClient::SDL_GL_SwapBuffers; 981 CFClient::SDL_GL_SwapBuffers;
952 982
983 $WANT_REFRESH = 0;
984 $CAN_REFRESH = 0;
953 $LAST_REFRESH = $NOW; 985 $LAST_REFRESH = $NOW;
954} 986}
955 987
956my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 988my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
957 $NOW = time; 989 $NOW = time;
… …
959 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 991 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
960 for CFClient::SDL_PollEvent; 992 for CFClient::SDL_PollEvent;
961 993
962 if (%animate_object) { 994 if (%animate_object) {
963 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 995 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
964 $want_refresh++; 996 $WANT_REFRESH++;
965 } 997 }
966 998
967 if ($want_refresh) { 999 if ($WANT_REFRESH) {
968 force_refresh; 1000 force_refresh;
969 } else { 1001 } else {
970 $can_refresh = 1; 1002 $CAN_REFRESH = 1;
971 } 1003 }
972}); 1004});
973
974sub refresh {
975 $want_refresh++;
976}
977 1005
978sub animation_start { 1006sub animation_start {
979 my ($widget) = @_; 1007 my ($widget) = @_;
980 $animate_object{$widget} = $widget; 1008 $animate_object{$widget} = $widget;
981} 1009}
… …
1293 [0.55, 0.41, 0.13], 1321 [0.55, 0.41, 0.13],
1294 [0.99, 0.77, 0.26], 1322 [0.99, 0.77, 0.26],
1295 [0.74, 0.65, 0.41], 1323 [0.74, 0.65, 0.41],
1296 ); 1324 );
1297 1325
1326 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1327
1328 $text =~ s/&/&amp;/g; $text =~ s/</&lt;/g;
1329 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1330 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1331
1298 $LOGVIEW->add_paragraph ($color[$color], $text); 1332 $LOGVIEW->add_paragraph ($color[$color],
1333 join "\n", map "$time $_", split /\n/, $text);
1334 $STATUS_LINE->add ($text, color => $color[$color], timeout => 60);
1335}
1336
1337sub conn::drawextinfo {
1338 my ($self, $color, $type, $subtype, $message) = @_;
1339
1340 $self->drawinfo ($color, $message);
1299} 1341}
1300 1342
1301sub conn::spell_add { 1343sub conn::spell_add {
1302 my ($self, $spell) = @_; 1344 my ($self, $spell) = @_;
1303 1345
… …
1316 1358
1317 for my $skill (values %{$self->{skill_info}}) { 1359 for my $skill (values %{$self->{skill_info}}) {
1318 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1360 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
1319 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1361 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
1320 } 1362 }
1363
1364 $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you");
1365 $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players");
1366 $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1367 $MAPWIDGET->add_command ("kill\\_pets", "kill your pets");
1368}
1369
1370sub conn::eof {
1371 stop_game;
1321} 1372}
1322 1373
1323sub update_floorbox { 1374sub update_floorbox {
1324 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1375 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1376 return unless $CONN;
1377
1325 $FLOORBOX->clear; 1378 $FLOORBOX->clear;
1326 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1379 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1327 1380
1328 # we basically have to use the same sorting as everybody else 1381 my $count = 4;
1329 for my $item (@{ $CONN->{container}{0} }) { 1382 for (@{ $CONN->{container}{0} }) {
1330 my $desc = $item->{nrof} < 2 1383 if (--$count) {
1331 ? $item->{name} 1384 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1332 : "$item->{nrof} $item->{name_pl}"; 1385 } else {
1333 # todo: animation widget, face widget, weight(?) etc. 1386 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1334 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1335 tooltip => (CFClient::UI::Label->escape ($desc)
1336 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1337 can_hover => 1,
1338 can_events => 1,
1339 connect_button_down => sub {
1340 my ($self, $ev, $x, $y) = @_;
1341
1342 # todo: maybe put examine on 1? but should just be a tooltip :(
1343 if ($ev->{button} == 1) {
1344 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1345 } elsif ($ev->{button} == 2) {
1346 $CONN->send ("apply $item->{tag}");
1347 } elsif ($ev->{button} == 3) {
1348 CFClient::UI::Menu->new (
1349 items => [
1350 ["examine", sub { $CONN->send ("examine $item->{tag}") }],
1351 [
1352 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
1353 sub { $CONN->send ("lock $item->{tag}") },
1354 ],
1355 ["mark", sub { $CONN->send ("mark $item->{tag}") }],
1356 ["apply", sub { $CONN->send ("apply $item->{tag}") }],
1357 ],
1358 )->popup ($ev);
1359 }
1360
1361 1
1362 }, 1387 last;
1363 );
1364
1365 $hbox->add (new CFClient::UI::Face
1366 can_events => 0,
1367 face => $item->{face},
1368 anim => $item->{anim},
1369 animspeed => $item->{animspeed},
1370 );
1371 1388 }
1372 $hbox->add (new CFClient::UI::Label
1373 can_events => 0,
1374 text => $desc,
1375 );
1376 } 1389 }
1377 }); 1390 });
1378 refresh; 1391
1392 $WANT_REFRESH++;
1379} 1393}
1380 1394
1381sub conn::container_add { 1395sub conn::container_add {
1382 my ($self, $id, $items) = @_; 1396 my ($self, $tag, $items) = @_;
1383 1397
1384 update_floorbox if $id == 0; 1398 update_floorbox if $tag == 0;
1385 if ($self->{player}{tag} == $id) { 1399
1386 $INV->set_items ($self->{container}{$self->{player}{tag}}); 1400 $INV->set_items ($self->{container}{$self->{player}{tag}})
1387 } 1401 if $tag == $self->{player}{tag};
1402
1388 # $self-<{player}{tag} => player inv 1403 # $self-<{player}{tag} => player inv
1389 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1404 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1390} 1405}
1391 1406
1392sub conn::container_clear { 1407sub conn::container_clear {
1393 my ($self, $id) = @_; 1408 my ($self, $tag) = @_;
1394 1409
1395 update_floorbox if $id == 0; 1410 update_floorbox if $tag == 0;
1396 if ($self->{player}{tag} == $id) { 1411
1397 $INV->set_items ($self->{container}{$id}); 1412 $INV->set_items ($self->{container}{$tag})
1398 } 1413 if $tag == $self->{player}{tag};
1399 1414
1400# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1415# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1401} 1416}
1402 1417
1403sub conn::item_delete { 1418sub conn::item_delete {
1404 my ($self, @items) = @_; 1419 my ($self, @items) = @_;
1405 1420
1406 for (@items) { 1421 for (@items) {
1407 update_floorbox if $_->{container} == 0; 1422 update_floorbox if $_->{container} == 0;
1408 if ($self->{player}{tag} == $_->{container}) { 1423
1409 $INV->set_items ($self->{container}{$_->{container}}); 1424 $INV->set_items ($self->{container}{$_->{container}})
1410 } 1425 if $_->{container} == $self->{player}{tag};
1411 } 1426 }
1412} 1427}
1413 1428
1414sub conn::item_update { 1429sub conn::item_update {
1415 my ($self, $item) = @_; 1430 my ($self, $item) = @_;
1416 1431
1417 update_floorbox if $item->{container} == 0; 1432 update_floorbox if $item->{container} == 0;
1418 if ($self->{player}{tag} == $item->{container}) { 1433
1419 $INV->set_items ($self->{container}{$item->{container}}); 1434 $INV->set_items ($self->{container}{$item->{container}})
1420 } 1435 if $item->{container} == $self->{player}{tag};
1421} 1436}
1422 1437
1423%SDL_CB = ( 1438%SDL_CB = (
1424 CFClient::SDL_QUIT => sub { 1439 CFClient::SDL_QUIT => sub {
1425 Event::unloop -1; 1440 Event::unloop -1;
1426 }, 1441 },
1427 CFClient::SDL_VIDEORESIZE => sub { 1442 CFClient::SDL_VIDEORESIZE => sub {
1428 }, 1443 },
1429 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1444 CFClient::SDL_VIDEOEXPOSE => sub {
1445 $WANT_REFRESH++;
1446 },
1430 CFClient::SDL_ACTIVEEVENT => sub { 1447 CFClient::SDL_ACTIVEEVENT => sub {
1431# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1448# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1432 }, 1449 },
1433 CFClient::SDL_KEYDOWN => sub { 1450 CFClient::SDL_KEYDOWN => sub {
1434 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1451 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1438 video_init; 1455 video_init;
1439 } else { 1456 } else {
1440 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1457 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1441 } 1458 }
1442 }, 1459 },
1443 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1460 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1444 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1461 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1445 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1462 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1446 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1463 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1447 CFClient::SDL_USEREVENT => \&audio_music_finished, 1464 CFClient::SDL_USEREVENT => sub {
1465 if ($_[0]{code} == 1) {
1466 audio_channel_finished $_[0]{data1};
1467 } elsif ($_[0]{code} == 0) {
1468 audio_music_finished;
1469 }
1470 },
1448); 1471);
1449 1472
1450############################################################################# 1473#############################################################################
1451 1474
1452$SIG{INT} = $SIG{TERM} = sub { exit }; 1475$SIG{INT} = $SIG{TERM} = sub { exit };
1453 1476
1454$TILECACHE = CFClient::db_table "tilecache";
1455$FACEMAP = CFClient::db_table "facemap";
1456
1457CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1458
1459my %DEF_CFG = (
1460 sdl_mode => 0,
1461 width => 640,
1462 height => 480,
1463 fullscreen => 0,
1464 fast => 0,
1465 map_scale => 0.5,
1466 fow_enable => 1,
1467 fow_intensity => 0.45,
1468 fow_smooth => 0,
1469 gui_fontsize => 1,
1470 log_fontsize => 1,
1471 gauge_fontsize => 1,
1472 gauge_size => 0.35,
1473 stat_fontsize => 1,
1474 mapsize => 100,
1475 host => "crossfire.schmorp.de",
1476 say_command => 'say',
1477 audio_enable => 1,
1478 bgm_enable => 1,
1479 bgm_volume => 0.25,
1480);
1481
1482while (my ($k, $v) = each %DEF_CFG) {
1483 $CFG->{$k} = $v unless exists $CFG->{$k};
1484}
1485
1486sdl_init;
1487
1488@SDL_MODES = reverse
1489 grep $_->[0] >= 640 && $_->[1] >= 480,
1490 CFClient::SDL_ListModes;
1491
1492@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1493
1494$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1495
1496{ 1477{
1478 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1479
1480 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1481
1482 $TILECACHE = CFClient::db_table "tilecache";
1483 $FACEMAP = CFClient::db_table "facemap";
1484
1485 my %DEF_CFG = (
1486 sdl_mode => 0,
1487 width => 640,
1488 height => 480,
1489 fullscreen => 0,
1490 fast => 0,
1491 map_scale => 0.5,
1492 fow_enable => 1,
1493 fow_intensity => 0.45,
1494 fow_smooth => 0,
1495 gui_fontsize => 1,
1496 log_fontsize => 1,
1497 gauge_fontsize=> 1,
1498 gauge_size => 0.35,
1499 stat_fontsize => 1,
1500 mapsize => 100,
1501 host => "crossfire.schmorp.de",
1502 say_command => 'say',
1503 audio_enable => 1,
1504 bgm_enable => 1,
1505 bgm_volume => 0.25,
1506 );
1507
1508 while (my ($k, $v) = each %DEF_CFG) {
1509 $CFG->{$k} = $v unless exists $CFG->{$k};
1510 }
1511
1512 sdl_init;
1513
1514 @SDL_MODES = reverse
1515 grep $_->[0] >= 640 && $_->[1] >= 480,
1516 CFClient::SDL_ListModes;
1517
1518 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1519
1520 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1521
1522 {
1497 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1523 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1498 DejaVuSans.ttf 1524 DejaVuSans.ttf
1499 DejaVuSansMono.ttf 1525 DejaVuSansMono.ttf
1500 DejaVuSans-Bold.ttf 1526 DejaVuSans-Bold.ttf
1501 DejaVuSansMono-Bold.ttf 1527 DejaVuSansMono-Bold.ttf
1502 DejaVuSans-Oblique.ttf 1528 DejaVuSans-Oblique.ttf
1503 DejaVuSansMono-Oblique.ttf 1529 DejaVuSansMono-Oblique.ttf
1504 DejaVuSans-BoldOblique.ttf 1530 DejaVuSans-BoldOblique.ttf
1505 DejaVuSansMono-BoldOblique.ttf 1531 DejaVuSansMono-BoldOblique.ttf
1506 ); 1532 );
1507 1533
1508 CFClient::add_font $_ for @fonts; 1534 CFClient::add_font $_ for @fonts;
1509 1535
1510 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1536 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1511 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1537 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1512 1538
1513 $FONT_PROP->make_default; 1539 $FONT_PROP->make_default;
1514} 1540 }
1515 1541
1516video_init; 1542 video_init;
1517audio_init; 1543 audio_init;
1544}
1518 1545
1519Event::loop; 1546Event::loop;
1520 1547
1521END { CFClient::SDL_Quit } 1548END { CFClient::SDL_Quit }
1522 1549

Diff Legend

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