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.196 by elmex, Sun Apr 30 13:10:47 2006 UTC vs.
Revision 1.212 by root, Fri May 12 15:45:42 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
… …
89our $SDL_MIXER; 94our $SDL_MIXER;
90our @SOUNDS; # event => file mapping 95our @SOUNDS; # event => file mapping
91our %AUDIO_CHUNKS; # audio files 96our %AUDIO_CHUNKS; # audio files
92 97
93our $ALT_ENTER_MESSAGE; 98our $ALT_ENTER_MESSAGE;
94our $STATUS_LINE; 99our $STATUSBOX;
95our $DEBUG_STATUS; 100our $DEBUG_STATUS;
96 101
97our $INVWIN; 102our $INVWIN;
98our $INV; 103our $INV;
99 104
100sub status { 105sub status {
101 $STATUS_LINE->set_text ($_[0]); 106 $STATUSBOX->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_post_alloc (status_line_positioner => sub {
108 my $widget = $STATUSBOX->{parent};
109 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
110 });
103} 111}
104 112
105sub debug { 113sub debug {
106 $DEBUG_STATUS->set_text ($_[0]); 114 $DEBUG_STATUS->set_text ($_[0]);
107 $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);
108} 117}
109 118
110sub start_game { 119sub start_game {
111 status "logging in..."; 120 status "logging in...";
112 121
113 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;
114 123
115 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 124 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
116
117 $MAP = new CFClient::Map $mapsize, $mapsize; 125 $MAP = new CFClient::Map $mapsize, $mapsize;
118 126
119 my ($host, $port) = split /:/, $CFG->{host}; 127 my ($host, $port) = split /:/, $CFG->{host};
120 128
121 $CONN = eval { 129 $CONN = eval {
… …
128 maph => $mapsize, 136 maph => $mapsize,
129 ; 137 ;
130 }; 138 };
131 139
132 if ($CONN) { 140 if ($CONN) {
141 $LOGIN_BUTTON->set_text ("Logout");
142
133 status "login successful"; 143 status "login successful";
134 144
135 CFClient::lowdelay fileno $CONN->{fh}; 145 CFClient::lowdelay fileno $CONN->{fh};
136 } else { 146 } else {
137 status "unable to connect"; 147 status "unable to connect";
148 stop_game();
138 } 149 }
139} 150}
140 151
141sub 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;
142 undef $CONN; 161 undef $MAP;
143} 162}
144 163
145sub client_setup { 164sub client_setup {
146 my $dialog = new CFClient::UI::FancyFrame 165 my $dialog = new CFClient::UI::FancyFrame
147 title => "Client Setup", 166 title => "Client Setup",
… …
363 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 382 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh
364 ); 383 );
365 $win->add (my $hbox = new CFClient::UI::HBox 384 $win->add (my $hbox = new CFClient::UI::HBox
366 children => [ 385 children => [
367 (new CFClient::UI::HBox expand => 1), 386 (new CFClient::UI::HBox expand => 1),
368 ($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 ]),
369 (my $vbox = new CFClient::UI::VBox), 391 (my $vbox = new CFClient::UI::VBox),
370 ], 392 ],
371 ); 393 );
372 394
373 $vbox->add (new CFClient::UI::HBox 395 $vbox->add (new CFClient::UI::HBox
… …
571 593
572} 594}
573 595
574sub metaserver_dialog { 596sub metaserver_dialog {
575 my $dialog = new CFClient::UI::FancyFrame 597 my $dialog = new CFClient::UI::FancyFrame
576 title => "Metaserver", 598 title => "Server List",
577 child => (my $vbox = new CFClient::UI::VBox); 599 child => (my $vbox = new CFClient::UI::VBox);
578 600
579 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 601 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
580 602
581 $dialog 603 $dialog
… …
683 705
684 $METASERVER = metaserver_dialog; 706 $METASERVER = metaserver_dialog;
685 707
686 $vbox->add (new CFClient::UI::Flopper 708 $vbox->add (new CFClient::UI::Flopper
687 expand => 1, 709 expand => 1,
688 text => "Metaserver", 710 text => "Server List",
689 other => $METASERVER, 711 other => $METASERVER,
690 tooltip => "Show a list of avaible crossfire servers", 712 tooltip => "Show a list of available crossfire servers",
691 connect_open => sub { 713 connect_open => sub {
692 update_metaserver $HOST; 714 update_metaserver $HOST;
693 } 715 }
694 ); 716 );
695 } 717 }
… …
726 748
727 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 749 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
728 }, 750 },
729 ); 751 );
730 752
731 $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
732 start_game; 759 : start_game;
760 },
733 }); 761 );
734 762
735 $dialog 763 $dialog
736} 764}
737 765
738sub message_window { 766sub message_window {
… …
801} 829}
802 830
803sub video_init { 831sub video_init {
804 sdl_init; 832 sdl_init;
805 833
834 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
835
806 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 836 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
807 $FULLSCREEN = $CFG->{fullscreen}; 837 $FULLSCREEN = $CFG->{fullscreen};
808 $FAST = $CFG->{fast}; 838 $FAST = $CFG->{fast};
809 839
810 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 840 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
811 or die "SDL_SetVideoMode failed!\n"; 841 or die "SDL_SetVideoMode failed!\n";
812 842
813 $SDL_ACTIVE = 1; 843 $SDL_ACTIVE = 1;
814
815 $LAST_REFRESH = time - 0.01; 844 $LAST_REFRESH = time - 0.01;
816 845
817 CFClient::gl_init; 846 CFClient::gl_init;
818 847
819 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 848 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
820 849
850 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
851
821 ############################################################################# 852 #############################################################################
822 853
854 if ($DEBUG_STATUS) {
855 # reconfigure all widgets
856 $CFClient::UI::ROOT->reconfigure;
857
858 } else {
859 # create the widgets
860
823 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 861 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, text => "hulla", x => 100;#d#
824 $DEBUG_STATUS->show; 862 $DEBUG_STATUS->show;
825 863
826 $STATUS_LINE = new CFClient::UI::Label 864 $STATUSBOX = new CFClient::UI::Statusbox;
827 padding => 0, 865 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, size => 0.8, color => [1, 1, 1, 0.8]);
828 y => $HEIGHT - $FONTSIZE * 1.8;
829 $STATUS_LINE->show;
830 866
831 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 867 (new CFClient::UI::Frame
832 padding => 0, 868 bg => [0, 0, 0, 0.4],
833 fontsize => 0.8, 869 child => $STATUSBOX,
834 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 870 )->show;
835 $ALT_ENTER_MESSAGE->show;
836 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
837 871
838 CFClient::UI::FancyFrame->new ( 872 CFClient::UI::FancyFrame->new (
839 border_bg => [1, 1, 1, 192/255], 873 border_bg => [1, 1, 1, 192/255],
840 bg => [1, 1, 1, 0], 874 bg => [1, 1, 1, 0],
841 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 875 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
842 )->show; 876 )->show;
843 877
844 $MAPWIDGET = new CFClient::MapWidget; 878 $MAPWIDGET = new CFClient::MapWidget;
845 $MAPWIDGET->connect (activate_console => sub { 879 $MAPWIDGET->connect (activate_console => sub {
846 my ($mapwidget, $preset) = @_; 880 my ($mapwidget, $preset) = @_;
847 881
848 if ($CONSOLE) { 882 if ($CONSOLE) {
849 $CONSOLE->{input}->{auto_activated} = 1; 883 $CONSOLE->{input}->{auto_activated} = 1;
850 $CONSOLE->{input}->focus_in; 884 $CONSOLE->{input}->focus_in;
851 885
852 if ($preset && $CONSOLE->{input}->get_text eq '') { 886 if ($preset && $CONSOLE->{input}->get_text eq '') {
853 $CONSOLE->{input}->set_text ($preset); 887 $CONSOLE->{input}->set_text ($preset);
888 }
854 } 889 }
855 } 890 });
856 });
857 $MAPWIDGET->show; 891 $MAPWIDGET->show;
858 $MAPWIDGET->focus_in; 892 $MAPWIDGET->focus_in;
859 893
860 $BUTTONBAR = new CFClient::UI::HBox; 894 $BUTTONBAR = new CFClient::UI::HBox;
861 895
862 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 896 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
863 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 897 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
864 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 898 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
865 899
866 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 900 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
867 901
868 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 902 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
869 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window); 903 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
870 904
871 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 905 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
872 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 906 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
873 status "Configuration Saved"; 907 status "Configuration Saved";
874 }); 908 });
875 909
876 $BUTTONBAR->show; 910 $BUTTONBAR->show;
877 911
912 # delay till geometry is constant
913 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
878 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 914 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
915 });
916 force_refresh ();
917 }
879} 918}
880 919
881sub video_shutdown { 920sub video_shutdown {
882 $CFClient::UI::ROOT->{children} = [];
883 undef $CFClient::UI::GRAB;
884 undef $CFClient::UI::HOVER;
885 undef $SDL_ACTIVE; 921 undef $SDL_ACTIVE;
886} 922}
887 923
888my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 924my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
889my $bgmusic;#TODO#hack#d# 925my $bgmusic;#TODO#hack#d#
926
927sub audio_channel_finished {
928 my ($channel) = @_;
929
930 warn "channel $channel finished\n";#d#
931}
890 932
891sub audio_music_finished { 933sub audio_music_finished {
892 return unless $CFG->{bgm_enable}; 934 return unless $CFG->{bgm_enable};
893 935
894 # TODO: hack, do play loop and mood music 936 # TODO: hack, do play loop and mood music
… …
935} 977}
936 978
937my %animate_object; 979my %animate_object;
938my $animate_timer; 980my $animate_timer;
939 981
940my $want_refresh;
941my $can_refresh;
942
943my $fps = 9; 982my $fps = 9;
944 983
945sub force_refresh { 984sub force_refresh {
946 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 985 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
947 debug sprintf "%3.2f", $fps; 986 debug sprintf "%3.2f", $fps;
948 987
949 $want_refresh = 0;
950 $can_refresh = 0;
951
952 $CFClient::UI::ROOT->draw; 988 $CFClient::UI::ROOT->draw;
953
954 CFClient::SDL_GL_SwapBuffers; 989 CFClient::SDL_GL_SwapBuffers;
955 990
991 $WANT_REFRESH = 0;
992 $CAN_REFRESH = 0;
956 $LAST_REFRESH = $NOW; 993 $LAST_REFRESH = $NOW;
957} 994}
958 995
959my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 996my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
960 $NOW = time; 997 $NOW = time;
… …
962 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 999 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
963 for CFClient::SDL_PollEvent; 1000 for CFClient::SDL_PollEvent;
964 1001
965 if (%animate_object) { 1002 if (%animate_object) {
966 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1003 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
967 $want_refresh++; 1004 $WANT_REFRESH++;
968 } 1005 }
969 1006
970 if ($want_refresh) { 1007 if ($WANT_REFRESH) {
971 force_refresh; 1008 force_refresh;
972 } else { 1009 } else {
973 $can_refresh = 1; 1010 $CAN_REFRESH = 1;
974 } 1011 }
975}); 1012});
976
977sub refresh {
978 $want_refresh++;
979}
980 1013
981sub animation_start { 1014sub animation_start {
982 my ($widget) = @_; 1015 my ($widget) = @_;
983 $animate_object{$widget} = $widget; 1016 $animate_object{$widget} = $widget;
984} 1017}
… …
1296 [0.55, 0.41, 0.13], 1329 [0.55, 0.41, 0.13],
1297 [0.99, 0.77, 0.26], 1330 [0.99, 0.77, 0.26],
1298 [0.74, 0.65, 0.41], 1331 [0.74, 0.65, 0.41],
1299 ); 1332 );
1300 1333
1334 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1335
1336 $text =~ s/&/&amp;/g; $text =~ s/</&lt;/g;
1337 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1338 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1339
1301 $LOGVIEW->add_paragraph ($color[$color], $text); 1340 $LOGVIEW->add_paragraph ($color[$color],
1341 join "\n", map "$time $_", split /\n/, $text);
1342
1343 $STATUSBOX->add ($text,
1344 group => $text,
1345 color => $color[$color],
1346 timeout => 60,
1347 tooltip_font => $::FONT_FIXED,
1348 );
1349}
1350
1351sub conn::drawextinfo {
1352 my ($self, $color, $type, $subtype, $message) = @_;
1353
1354 $self->drawinfo ($color, $message);
1302} 1355}
1303 1356
1304sub conn::spell_add { 1357sub conn::spell_add {
1305 my ($self, $spell) = @_; 1358 my ($self, $spell) = @_;
1306 1359
… …
1319 1372
1320 for my $skill (values %{$self->{skill_info}}) { 1373 for my $skill (values %{$self->{skill_info}}) {
1321 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1374 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
1322 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1375 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
1323 } 1376 }
1377
1378 $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you");
1379 $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players");
1380 $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1381 $MAPWIDGET->add_command ("kill\\_pets", "kill your pets");
1382}
1383
1384sub conn::eof {
1385 stop_game;
1324} 1386}
1325 1387
1326sub update_floorbox { 1388sub update_floorbox {
1327 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1389 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1390 return unless $CONN;
1391
1328 $FLOORBOX->clear; 1392 $FLOORBOX->clear;
1329 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1393 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1330 1394
1331 # we basically have to use the same sorting as everybody else 1395 my $count = 4;
1332 for my $item (@{ $CONN->{container}{0} }) { 1396 for (@{ $CONN->{container}{0} }) {
1397 if (--$count) {
1333 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $item); 1398 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1399 } else {
1400 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1401 last;
1402 }
1334 } 1403 }
1335 }); 1404 });
1336 refresh; 1405
1406 $WANT_REFRESH++;
1337} 1407}
1338 1408
1339sub conn::container_add { 1409sub conn::container_add {
1340 my ($self, $id, $items) = @_; 1410 my ($self, $tag, $items) = @_;
1341 1411
1342 update_floorbox if $id == 0; 1412 update_floorbox if $tag == 0;
1343 if ($self->{player}{tag} == $id) { 1413
1344 $INV->set_items ($self->{container}{$self->{player}{tag}}); 1414 $INV->set_items ($self->{container}{$self->{player}{tag}})
1345 } 1415 if $tag == $self->{player}{tag};
1416
1346 # $self-<{player}{tag} => player inv 1417 # $self-<{player}{tag} => player inv
1347 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1418 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1348} 1419}
1349 1420
1350sub conn::container_clear { 1421sub conn::container_clear {
1351 my ($self, $id) = @_; 1422 my ($self, $tag) = @_;
1352 1423
1353 update_floorbox if $id == 0; 1424 update_floorbox if $tag == 0;
1354 if ($self->{player}{tag} == $id) { 1425
1355 $INV->set_items ($self->{container}{$id}); 1426 $INV->set_items ($self->{container}{$tag})
1356 } 1427 if $tag == $self->{player}{tag};
1357 1428
1358# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1429# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1359} 1430}
1360 1431
1361sub conn::item_delete { 1432sub conn::item_delete {
1362 my ($self, @items) = @_; 1433 my ($self, @items) = @_;
1363 1434
1364 for (@items) { 1435 for (@items) {
1365 update_floorbox if $_->{container} == 0; 1436 update_floorbox if $_->{container} == 0;
1366 if ($self->{player}{tag} == $_->{container}) { 1437
1367 $INV->set_items ($self->{container}{$_->{container}}); 1438 $INV->set_items ($self->{container}{$_->{container}})
1368 } 1439 if $_->{container} == $self->{player}{tag};
1369 } 1440 }
1370} 1441}
1371 1442
1372sub conn::item_update { 1443sub conn::item_update {
1373 my ($self, $item) = @_; 1444 my ($self, $item) = @_;
1374 1445
1375 update_floorbox if $item->{container} == 0; 1446 update_floorbox if $item->{container} == 0;
1376 if ($self->{player}{tag} == $item->{container}) { 1447
1377 $INV->set_items ($self->{container}{$item->{container}}); 1448 $INV->set_items ($self->{container}{$item->{container}})
1378 } 1449 if $item->{container} == $self->{player}{tag};
1379} 1450}
1380 1451
1381%SDL_CB = ( 1452%SDL_CB = (
1382 CFClient::SDL_QUIT => sub { 1453 CFClient::SDL_QUIT => sub {
1383 Event::unloop -1; 1454 Event::unloop -1;
1384 }, 1455 },
1385 CFClient::SDL_VIDEORESIZE => sub { 1456 CFClient::SDL_VIDEORESIZE => sub {
1386 }, 1457 },
1387 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1458 CFClient::SDL_VIDEOEXPOSE => sub {
1459 $WANT_REFRESH++;
1460 },
1388 CFClient::SDL_ACTIVEEVENT => sub { 1461 CFClient::SDL_ACTIVEEVENT => sub {
1389# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1462# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1390 }, 1463 },
1391 CFClient::SDL_KEYDOWN => sub { 1464 CFClient::SDL_KEYDOWN => sub {
1392 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1465 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1396 video_init; 1469 video_init;
1397 } else { 1470 } else {
1398 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1471 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1399 } 1472 }
1400 }, 1473 },
1401 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1474 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1402 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1475 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1403 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1476 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1404 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1477 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1405 CFClient::SDL_USEREVENT => \&audio_music_finished, 1478 CFClient::SDL_USEREVENT => sub {
1479 if ($_[0]{code} == 1) {
1480 audio_channel_finished $_[0]{data1};
1481 } elsif ($_[0]{code} == 0) {
1482 audio_music_finished;
1483 }
1484 },
1406); 1485);
1407 1486
1408############################################################################# 1487#############################################################################
1409 1488
1410$SIG{INT} = $SIG{TERM} = sub { exit }; 1489$SIG{INT} = $SIG{TERM} = sub { exit };
1411 1490
1412CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1413
1414$TILECACHE = CFClient::db_table "tilecache";
1415$FACEMAP = CFClient::db_table "facemap";
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{ 1491{
1492 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1493
1494 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1495
1496 $TILECACHE = CFClient::db_table "tilecache";
1497 $FACEMAP = CFClient::db_table "facemap";
1498
1499 my %DEF_CFG = (
1500 sdl_mode => 0,
1501 width => 640,
1502 height => 480,
1503 fullscreen => 0,
1504 fast => 0,
1505 map_scale => 0.5,
1506 fow_enable => 1,
1507 fow_intensity => 0.45,
1508 fow_smooth => 0,
1509 gui_fontsize => 1,
1510 log_fontsize => 1,
1511 gauge_fontsize=> 1,
1512 gauge_size => 0.35,
1513 stat_fontsize => 1,
1514 mapsize => 100,
1515 host => "crossfire.schmorp.de",
1516 say_command => 'say',
1517 audio_enable => 1,
1518 bgm_enable => 1,
1519 bgm_volume => 0.25,
1520 );
1521
1522 while (my ($k, $v) = each %DEF_CFG) {
1523 $CFG->{$k} = $v unless exists $CFG->{$k};
1524 }
1525
1526 sdl_init;
1527
1528 @SDL_MODES = reverse
1529 grep $_->[0] >= 640 && $_->[1] >= 480,
1530 CFClient::SDL_ListModes;
1531
1532 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1533
1534 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1535
1536 {
1455 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1537 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1456 DejaVuSans.ttf 1538 DejaVuSans.ttf
1457 DejaVuSansMono.ttf 1539 DejaVuSansMono.ttf
1458 DejaVuSans-Bold.ttf 1540 DejaVuSans-Bold.ttf
1459 DejaVuSansMono-Bold.ttf 1541 DejaVuSansMono-Bold.ttf
1460 DejaVuSans-Oblique.ttf 1542 DejaVuSans-Oblique.ttf
1461 DejaVuSansMono-Oblique.ttf 1543 DejaVuSansMono-Oblique.ttf
1462 DejaVuSans-BoldOblique.ttf 1544 DejaVuSans-BoldOblique.ttf
1463 DejaVuSansMono-BoldOblique.ttf 1545 DejaVuSansMono-BoldOblique.ttf
1464 ); 1546 );
1465 1547
1466 CFClient::add_font $_ for @fonts; 1548 CFClient::add_font $_ for @fonts;
1467 1549
1468 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1550 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1469 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1551 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1470 1552
1471 $FONT_PROP->make_default; 1553 $FONT_PROP->make_default;
1472} 1554 }
1473 1555
1474video_init; 1556 video_init;
1475audio_init; 1557 audio_init;
1558}
1476 1559
1477Event::loop; 1560Event::loop;
1478 1561
1479END { CFClient::SDL_Quit } 1562END { CFClient::SDL_Quit }
1480 1563

Diff Legend

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