ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.108 by elmex, Sun Aug 13 11:29:19 2006 UTC vs.
Revision 1.131 by root, Sun Nov 19 20:31:29 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4
5# do splash-screen thingy on win32
6BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) {
9 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
10 }
11
12 require Win32::GUI::SplashScreen;
13
14 Win32::GUI::SplashScreen::Show (
15 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
16 );
17
18 $startup_done = sub {
19 Win32::GUI::SplashScreen::Done (1);
20 };
21 }
22}
2 23
3use strict; 24use strict;
4use utf8; 25use utf8;
5 26
6# do things only needed for single-binary version (par) 27# do things only needed for single-binary version (par)
8 if (%PAR::LibCache) { 29 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 30 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 31
11 while (my ($filename, $zip) = each %PAR::LibCache) { 32 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 33 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 34 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 35 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 36 unless -e "$ENV{PAR_TEMP}/$1";
16 } 37 }
17 } 38 }
18 39
47 68
48$Event::Eval = 0; 69$Event::Eval = 0;
49$Event::DIED = sub { 70$Event::DIED = sub {
50 # TODO: display dialog box or so 71 # TODO: display dialog box or so
51 Carp::cluck $_[1];#d#TODO: remove when stable 72 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFPlus::error $_[1]; 73 return;#d#
74 CFPlus::fatal ($_[1]);
53}; 75};
54
55$SIG{__DIE__} = sub {
56 return if CFPlus::in_destruct;
57 Carp::cluck $_[0];
58 CFPlus::error $_[0];
59 return;#d#
60 #return unless defined $^S && !$^S;
61 $Event::DIED->(undef, $_[0]);
62};
63
64our $VERSION = '0.1';
65 76
66my $MAX_FPS = 60; 77my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 78my $MIN_FPS = 5; # unused as of yet
68 79
69our $META_SERVER = "crossfire.real-time.com:13326"; 80our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 81
71our $LAST_REFRESH; 82our $LAST_REFRESH;
72our $NOW; 83our $NOW;
73 84
74our $CFG; 85our $CFG;
75our $CONN; 86our $CONN;
87our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 88our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 89
78our $WANT_REFRESH; 90our $WANT_REFRESH;
79our $CAN_REFRESH; 91our $CAN_REFRESH;
80 92
111 123
112our $INVENTORY_PAGE; 124our $INVENTORY_PAGE;
113our $STATS_PAGE; 125our $STATS_PAGE;
114our $SKILL_PAGE; 126our $SKILL_PAGE;
115our $SPELL_PAGE; 127our $SPELL_PAGE;
128our $SPELL_LIST;
116 129
117our $HELP_WINDOW; 130our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 131our $MESSAGE_WINDOW;
119our $FLOORBOX; 132our $FLOORBOX;
120our $GAUGES; 133our $GAUGES;
146 159
147sub debug { 160sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 161 $DEBUG_STATUS->set_text ($_[0]);
149} 162}
150 163
164sub message {
165 my ($para) = @_;
166
167 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
168
169 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
170
171 $LOGVIEW->add_paragraph ($para);
172 $LOGVIEW->scroll_to_bottom;
173}
174
151sub destroy_query_dialog { 175sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 176 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 177 if $_[0]{query_dialog};
154} 178}
155 179
156# server query dialog 180# server query dialog
157sub server_query { 181sub server_query {
158 my ($conn, $flags, $prompt) = @_; 182 my ($conn, $flags, $prompt) = @_;
159 183
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame 184 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 185 x => "center",
162 y => "center", 186 y => "center",
163 title => "Server Query", 187 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 188 child => my $vbox = new CFPlus::UI::VBox,
165 ; 189 ;
222 ); 246 );
223 247
224 unshift @dialog, new CFPlus::UI::Label 248 unshift @dialog, new CFPlus::UI::Label
225 max_w => $::WIDTH * 0.4, 249 max_w => $::WIDTH * 0.4,
226 ellipsise => 0, 250 ellipsise => 0,
227 markup => 251 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
228 "<big><b>Character Creation: Race</b></big>\n\n"
229 . "Look at the <b>Messages</b> window to see a description of this race "
230 . "and the center of the screen to see how this race looks like "
231 . "(<small>below this dialog window: you may need to move the dialog away and "
232 . "click into the display area to make it visible</small>).\n\n"
233 . "You can look at another race, or accept this race (you will cycle back to "
234 . "this race eventually, so you can take your time making this important choice."
235 ; 252 ;
236 253
237 } elsif ($prompt =~ /roll new stats/) { 254 } elsif ($prompt =~ /roll new stats/) {
238 if (my $stat = delete $conn->{stat_change_with}) { 255 if (my $stat = delete $conn->{stat_change_with}) {
239 $conn->send ("reply $stat"); 256 $conn->send ("reply $stat");
320 } 337 }
321 338
322 unshift @dialog, new CFPlus::UI::Label 339 unshift @dialog, new CFPlus::UI::Label
323 max_w => $::WIDTH * 0.4, 340 max_w => $::WIDTH * 0.4,
324 ellipsise => 0, 341 ellipsise => 0,
325 markup => 342 markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
326 "<big><b>Character Creation: Stats</b></big>\n\n"
327 . "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
328 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
329 . "They will be modified later by both the race and the class you choose.\n\n"
330 . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
331 ; 343 ;
332 } 344 }
333 345
334 push @dialog, my $entry = new CFPlus::UI::Entry 346 push @dialog, my $entry = new CFPlus::UI::Entry
335 on_changed => sub { 347 on_changed => sub {
364 status "logging in..."; 376 status "logging in...";
365 377
366 $LOGIN_BUTTON->set_text ("Logout"); 378 $LOGIN_BUTTON->set_text ("Logout");
367 $SETUP_DIALOG->hide; 379 $SETUP_DIALOG->hide;
368 380
381 $PROFILE = $CFG->{profile}{default};
382
369 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 383 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
370 384
371 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 385 my ($host, $port) = split /:/, $PROFILE->{host};
372 386
373 $MAP = new CFPlus::Map $mapsize, $mapsize; 387 $MAP = new CFPlus::Map;
374 388
375 $CONN = eval { 389 $CONN = eval {
376 new CFPlus::Protocol 390 new CFPlus::Protocol
377 host => $host, 391 host => $host,
378 port => $port || 13327, 392 port => $port || 13327,
379 user => $CFG->{profile}{default}{user}, 393 user => $PROFILE->{user},
380 pass => $CFG->{profile}{default}{password}, 394 pass => $PROFILE->{password},
381 mapw => $mapsize, 395 mapw => $mapsize,
382 maph => $mapsize, 396 maph => $mapsize,
397
398 client => "cfplus $CFPlus::VERSION $] $^O",
383 399
384 map_widget => $MAPWIDGET, 400 map_widget => $MAPWIDGET,
385 logview => $LOGVIEW, 401 logview => $LOGVIEW,
386 statusbox => $STATUSBOX, 402 statusbox => $STATUSBOX,
387 map => $MAP, 403 map => $MAP,
622 (new CFPlus::UI::Empty expand => 1), 638 (new CFPlus::UI::Empty expand => 1),
623 (my $hb = new CFPlus::UI::HBox), 639 (my $hb = new CFPlus::UI::HBox),
624 ], 640 ],
625 ); 641 );
626 642
627 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', 643 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
628 tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
629 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', 644 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
630 tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
631 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', 645 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
632 tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
633 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', 646 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
634 tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
635 647
636 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 648 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
637 tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
638 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 649 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
639 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
640 650
641 $GAUGES = { 651 $GAUGES = {
642 exp => $exp, win => $win, range => $rng, 652 exp => $exp, win => $win, range => $rng,
643 food => $fg, mana => $mg, hp => $hg, grace => $gg 653 food => $fg, mana => $mg, hp => $hg, grace => $gg
644 }; 654 };
681 expand => 1, 691 expand => 1,
682 scroll_y => 1 692 scroll_y => 1
683 ); 693 );
684 $r->add (my $vb = new CFPlus::UI::VBox); 694 $r->add (my $vb = new CFPlus::UI::VBox);
685 695
696 $vb->add (new CFPlus::UI::FancyFrame
697 label => "Player",
698 child => (my $pi = new CFPlus::UI::VBox),
699 );
700
686 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 701 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
687 can_hover => 1, can_events => 1, 702 can_hover => 1, can_events => 1,
688 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 703 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
689 $vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 704 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
690 can_hover => 1, can_events => 1, 705 can_hover => 1, can_events => 1,
691 tooltip => "The map you are currently on (if supported by the server)."); 706 tooltip => "The map you are currently on (if supported by the server).");
692 707
693 $vb->add (my $hb0 = new CFPlus::UI::HBox); 708 $pi->add (my $hb0 = new CFPlus::UI::HBox);
694 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 709 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
695 can_hover => 1, can_events => 1, 710 can_hover => 1, can_events => 1,
696 tooltip => "The weight of the player including all inventory items."); 711 tooltip => "The weight of the player including all inventory items.");
697 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 712 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
698 can_hover => 1, can_events => 1, 713 can_hover => 1, can_events => 1,
699 tooltip => "The weight limit: you cannot carry more than this."); 714 tooltip => "The weight limit: you cannot carry more than this.");
700 715
716 $vb->add (new CFPlus::UI::FancyFrame
717 label => "Primary/Secondary Statistics",
701 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 718 child => (my $hb = new CFPlus::UI::HBox expand => 1),
719 );
702 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 720 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
703 721
704 my $color2 = [1, 1, 0]; 722 my $color2 = [1, 1, 0];
705 723
706 for ( 724 for (
727 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 745 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
728 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 746 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
729 align => -1, text => $label, tooltip => "#stat_$label"); 747 align => -1, text => $label, tooltip => "#stat_$label");
730 } 748 }
731 749
750 $vb->add (new CFPlus::UI::FancyFrame
751 label => "Resistancies",
732 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 752 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
753 );
733 754
734 my $row = 0; 755 my $row = 0;
735 my $col = 0; 756 my $col = 0;
736 757
737 my %resist_names = ( 758 my %resist_names = (
837 858
838 my $table = $METASERVER->{table}; 859 my $table = $METASERVER->{table};
839 $table->clear; 860 $table->clear;
840 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 861 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
841 862
842 my $buf; 863 my $ok = 0;
843 864
844 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 865 CFPlus::background {
866 my $ua = CFPlus::lwp_useragent;
845 867
846 unless ($fh) { 868 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
847 $label->set_text ("unable to contact metaserver: $!"); 869 } sub {
848 return; 870 my ($msg) = @_;
849 } 871 if ($msg) {
850
851 Event->io (fd => $fh, poll => 'r', cb => sub {
852 my $res = sysread $fh, $buf, 8192, length $buf;
853
854 if (!defined $res) {
855 $_[0]->w->cancel;
856 $label->set_text ("error while retrieving server list: $!");
857 } elsif ($res == 0) {
858 $_[0]->w->cancel;
859 status "server list retrieved";
860
861 utf8::decode $buf if utf8::valid $buf;
862
863 $table->clear; 872 $table->clear;
864 873
865 my @tip = ( 874 my @tip = (
866 "The current number of users logged in on the server.", 875 "The current number of users logged in on the server.",
867 "The hostname of the server.", 876 "The hostname of the server.",
877 for 0 .. $#col; 886 for 0 .. $#col;
878 887
879 my @align = qw(1 0 1 1 -1); 888 my @align = qw(1 0 1 1 -1);
880 889
881 my $y = 0; 890 my $y = 0;
882 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 891 for my $m (
892 sort {
893 $b->{version} <=> $a->{version}
894 or $b->{users} <=> $a->{users}
895 }
896 @{ $msg->{servers} }
897 ) {
883 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 898 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
899 @$m{qw(ip age hostname users version description ibytes obytes uptime)};
884 900
885 for ($desc) { 901 for ($desc) {
886 s/<br>/\n/gi; 902 s/<br>/\n/gi;
887 s/<li>/\n· /gi; 903 s/<li>/\n· /gi;
888 s/<.*?>//sgi; 904 s/<.*?>//sgi;
889 s/&/&amp;/g; 905 s/&amp;/&/g;
890 s/</&lt;/g; 906 s/&lt;/</g;
891 s/>/&gt;/g; 907 s/&gt;/>/g;
892 } 908 }
893 909
894 $uptime = sprintf "%dd %02d:%02d:%02d", 910 $uptime = sprintf "%dd %02d:%02d:%02d",
895 (int $m->[8] / 86400), 911 (int $uptime / 86400),
896 (int $m->[8] / 3600) % 24, 912 (int $uptime / 3600) % 24,
897 (int $m->[8] / 60) % 60, 913 (int $uptime / 60) % 60,
898 $m->[8] % 60; 914 $uptime % 60;
899 915
900 $m = [$users, $host, $uptime, $version, $desc]; 916 $m = [$users, $host, $uptime, $version, $desc];
901 917
902 $y++; 918 $y++;
903 919
913 ), 929 ),
914 (new CFPlus::UI::Empty expand => 1), 930 (new CFPlus::UI::Empty expand => 1),
915 ]); 931 ]);
916 932
917 $table->add ($_, $y, new CFPlus::UI::Label 933 $table->add ($_, $y, new CFPlus::UI::Label
934 max_w => $::WIDTH * 0.4,
918 ellipsise => 0, 935 ellipsise => 0,
919 align => $align[$_], 936 align => $align[$_],
920 text => $m->[$_], 937 text => $m->[$_],
921 tooltip => $tip[$_], 938 tooltip => $tip[$_],
939 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
922 can_hover => 1, 940 can_hover => 1,
923 can_events => 1, 941 can_events => 1,
924 fontsize => 0.8) 942 fontsize => 0.8)
925 for 0 .. $#$m; 943 for 0 .. $#$m;
926 } 944 }
945 } else {
946 $ok or $label->set_text ("error while contacting metaserver");
927 } 947 }
928 }); 948 };
949
929} 950}
930 951
931sub metaserver_dialog { 952sub metaserver_dialog {
932 my $vbox = new CFPlus::UI::VBox; 953 my $vbox = new CFPlus::UI::VBox;
933 my $table = new CFPlus::UI::Table; 954 my $table = new CFPlus::UI::Table;
934 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 955 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
935 956
936 my $dialog = new CFPlus::UI::FancyFrame 957 my $dialog = new CFPlus::UI::Toplevel
937 title => "Server List", 958 title => "Server List",
938 name => 'metaserver_dialog', 959 name => 'metaserver_dialog',
939 x => 'center', 960 x => 'center',
940 y => 'center', 961 y => 'center',
941 z => 3, 962 z => 3,
963 force_w => $::WIDTH * 0.9,
942 force_h => $::HEIGHT * 0.4, 964 force_h => $::HEIGHT * 0.7,
943 child => $vbox, 965 child => $vbox,
944 has_close_button => 1, 966 has_close_button => 1,
945 table => $table, 967 table => $table,
946 on_visibility_change => sub { 968 on_visibility_change => sub {
947 update_metaserver ($_[0]) if $_[1]; 969 update_metaserver ($_[0]) if $_[1];
953} 975}
954 976
955sub server_setup { 977sub server_setup {
956 my $vbox = new CFPlus::UI::VBox; 978 my $vbox = new CFPlus::UI::VBox;
957 979
980 $vbox->add (new CFPlus::UI::FancyFrame
981 label => "Connection Settings",
958 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 982 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
983 );
959 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 984 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
960 985
961 { 986 {
962 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 987 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
963 988
1047 }, 1072 },
1048 ); 1073 );
1049 1074
1050 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1075 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1051 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1076 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1052 text => $CFG->{say_command}, 1077 text => $CFG->{say_command},
1053 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 1078 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1054 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1079 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1055 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1080 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1056 on_changed => sub { 1081 on_changed => sub {
1057 my ($self, $value) = @_; 1082 my ($self, $value) = @_;
1058 $CFG->{say_command} = $value; 1083 $CFG->{say_command} = $value;
1059 0 1084 0
1060 } 1085 }
1061 ); 1086 );
1062 1087
1088 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1089 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1090 state => $CFG->{show_tips},
1091 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1092 on_changed => sub {
1093 my ($self, $value) = @_;
1094 $CFG->{show_tips} = $value;
1095 0
1096 }
1097 );
1098
1063 $vbox->add (new CFPlus::UI::Label 1099 $vbox->add (new CFPlus::UI::FancyFrame
1064 text => "Server Info", 1100 label => "Server Info",
1065 fontsize => 1.2,
1066 padding_y => 8,
1067 fg => [1, 1, 0, 1],
1068 );
1069
1070 $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0); 1101 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1102 );
1071 1103
1072 $vbox 1104 $vbox
1073} 1105}
1074 1106
1075sub message_window { 1107sub message_window {
1076 my $window = new CFPlus::UI::FancyFrame 1108 my $window = new CFPlus::UI::Toplevel
1077 name => "message_window", 1109 name => "message_window",
1078 title => "Messages", 1110 title => "Messages",
1079 border_bg => [1, 1, 1, 1], 1111 border_bg => [1, 1, 1, 1],
1080 x => "max", 1112 x => "max",
1081 y => 0, 1113 y => 0,
1131 window => $window, 1163 window => $window,
1132 input => $input, 1164 input => $input,
1133 }; 1165 };
1134 1166
1135 $window 1167 $window
1136}
1137
1138sub open_string_query {
1139 my $cb = $_[1];
1140 my $dialog = new CFPlus::UI::FancyFrame
1141 x => "center",
1142 y => "center",
1143 z => 50,
1144 force_w => $WIDTH * 4/5,
1145 title => $_[0];
1146
1147 $dialog->add (
1148 my $e = new CFPlus::UI::Entry
1149 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1150 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1151 );
1152
1153 $e->grab_focus;
1154 $dialog->show;
1155}
1156
1157sub open_quit_dialog {
1158 unless ($QUIT_DIALOG) {
1159 $QUIT_DIALOG = new CFPlus::UI::FancyFrame
1160 x => "center",
1161 y => "center",
1162 z => 50,
1163 title => "Really Quit?",
1164 on_key_down => sub {
1165 my ($dialog, $ev) = @_;
1166 $ev->{sym} == 27 and $dialog->hide;
1167 }
1168 ;
1169
1170 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1171
1172 $vb->add (new CFPlus::UI::Label
1173 text => "You should find a savebed and apply it first!",
1174 max_w => $WIDTH * 0.25,
1175 ellipsize => 0,
1176 );
1177 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1178 $hb->add (new CFPlus::UI::Button
1179 text => "Ok",
1180 expand => 1,
1181 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1182 );
1183 $hb->add (new CFPlus::UI::Button
1184 text => "Quit anyway",
1185 expand => 1,
1186 on_activate => sub { exit },
1187 );
1188 }
1189
1190 $QUIT_DIALOG->show;
1191 $QUIT_DIALOG->grab_focus;
1192} 1168}
1193 1169
1194sub autopickup_setup { 1170sub autopickup_setup {
1195 my $table = new CFPlus::UI::Table; 1171 my $table = new CFPlus::UI::Table;
1196 1172
1288 $table 1264 $table
1289} 1265}
1290 1266
1291my %SORT_ORDER = ( 1267my %SORT_ORDER = (
1292 type => undef, 1268 type => undef,
1293 mtime => sub { sort { 1269 mtime => sub {
1270 my $NOW = time;
1271 sort {
1272 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1273 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1274
1294 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1275 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1295 or $b->{mtime} <=> $a->{mtime} 1276 or $btime <=> $atime
1296 or $a->{type} <=> $b->{type} 1277 or $a->{type} <=> $b->{type}
1278 } @_
1297 } @_ }, 1279 },
1298 weight => sub { sort { 1280 weight => sub { sort {
1299 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1281 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1300 or $a->{type} <=> $b->{type} 1282 or $a->{type} <=> $b->{type}
1301 } @_ }, 1283 } @_ },
1302); 1284);
1327 #TODO# update to weigh/maxweight 1309 #TODO# update to weigh/maxweight
1328 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1310 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1329 1311
1330 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1312 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1331 $sw1->add ($INV = new CFPlus::UI::Inventory); 1313 $sw1->add ($INV = new CFPlus::UI::Inventory);
1314 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1332 1315
1333 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1316 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1334 1317
1335 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1318 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1336 1319
1353 $PL_WINDOW->show; 1336 $PL_WINDOW->show;
1354 } 1337 }
1355} 1338}
1356 1339
1357sub player_window { 1340sub player_window {
1358 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1341 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1359 x => "center", 1342 x => "center",
1360 y => "center", 1343 y => "center",
1361 force_w => $WIDTH * 9/10, 1344 force_w => $WIDTH * 9/10,
1362 force_h => $HEIGHT * 9/10, 1345 force_h => $HEIGHT * 9/10,
1363 title => "Player", 1346 title => "Player",
1376 $ntb->add ( 1359 $ntb->add (
1377 "Skills (F3)" => $SKILL_PAGE = skill_window, 1360 "Skills (F3)" => $SKILL_PAGE = skill_window,
1378 "Shows all your Skills." 1361 "Shows all your Skills."
1379 ); 1362 );
1380 1363
1381 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1364 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1382 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1365 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1383 $ntb->add ( 1366 $ntb->add (
1384 "Spellbook (F4)" => $spellsw, 1367 "Spellbook (F4)" => $spellsw,
1385 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1368 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1386 ); 1369 );
1387 $ntb->add ( 1370 $ntb->add (
1405 1388
1406 my $refresh; 1389 my $refresh;
1407 $refresh = $BIND_UPD_CB = sub { 1390 $refresh = $BIND_UPD_CB = sub {
1408 $binding_list->clear (); 1391 $binding_list->clear ();
1409 1392
1393 return unless $PROFILE;
1394
1410 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1395 for my $mod (keys %{$PROFILE->{bindings}}) {
1411 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1396 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1412 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1397 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1413 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1398 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1414 1399
1415 my $lbl = join "; ", @$cmds; 1400 my $lbl = join "; ", @$cmds;
1416 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym); 1401 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1417 $binding_list->add (my $hb = new CFPlus::UI::HBox); 1402 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1418 $hb->add (new CFPlus::UI::Button 1403 $hb->add (new CFPlus::UI::Button
1419 text => "delete", 1404 text => "delete",
1420 tooltip => "Deletes the binding", 1405 tooltip => "Deletes the binding",
1421 on_activate => sub { 1406 on_activate => sub {
1422 $binding_list->remove ($hb); 1407 $binding_list->remove ($hb);
1423 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1408 delete $PROFILE->{bindings}{$mod}{$sym};
1424 0 1409 0
1425 }); 1410 });
1426 1411
1427 $hb->add (new CFPlus::UI::Button 1412 $hb->add (new CFPlus::UI::Button
1428 text => "edit", 1413 text => "edit",
1429 tooltip => "Edits the binding", 1414 tooltip => "Edits the binding",
1430 on_activate => sub { 1415 on_activate => sub {
1431 $::BIND_EDITOR->set_binding ( 1416 $::BIND_EDITOR->set_binding (
1432 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1417 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1433 sub { 1418 sub {
1434 my ($nmod, $nsym, $ncmds) = @_; 1419 my ($nmod, $nsym, $ncmds) = @_;
1435 $::BIND_EDITOR->cfg_unbind ($mod, $sym); 1420 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1436 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds); 1421 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1437 $refresh->(); 1422 $refresh->();
1452 } 1437 }
1453 } 1438 }
1454 }; 1439 };
1455 1440
1456 my $vb = new CFPlus::UI::VBox; 1441 my $vb = new CFPlus::UI::VBox;
1442 $vb->add (new CFPlus::UI::FancyFrame
1443 label => "Options",
1457 $vb->add (my $hb = new CFPlus::UI::HBox); 1444 child => (my $hb = new CFPlus::UI::HBox),
1445 );
1458 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire"); 1446 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1459 $hb->add (new CFPlus::UI::CheckBox 1447 $hb->add (new CFPlus::UI::CheckBox
1460 expand => 1, 1448 expand => 1,
1461 state => $CFG->{shift_fire_stop}, 1449 state => $CFG->{shift_fire_stop},
1462 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1450 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1464 my ($cbox, $value) = @_; 1452 my ($cbox, $value) = @_;
1465 $CFG->{shift_fire_stop} = $value; 1453 $CFG->{shift_fire_stop} = $value;
1466 0 1454 0
1467 }); 1455 });
1468 1456
1469 $vb->add ($binding_list); 1457 $vb->add (new CFPlus::UI::FancyFrame
1458 label => "Bindings",
1459 child => $binding_list);
1470 $vb->add (my $hb = new CFPlus::UI::HBox); 1460 $vb->add (my $hb = new CFPlus::UI::HBox);
1471 1461
1472 $hb->add (new CFPlus::UI::Button 1462 $hb->add (new CFPlus::UI::Button
1473 text => "record new", 1463 text => "record new",
1474 expand => 1, 1464 expand => 1,
1507 1497
1508 $vb 1498 $vb
1509} 1499}
1510 1500
1511sub help_window { 1501sub help_window {
1512 my $win = new CFPlus::UI::FancyFrame 1502 my $win = new CFPlus::UI::Toplevel
1513 x => 'center', 1503 x => 'center',
1514 y => 'center', 1504 y => 'center',
1515 z => 2, 1505 z => 4,
1516 name => 'doc_browser', 1506 name => 'doc_browser',
1517 force_w => int $WIDTH * 7/8, 1507 force_w => int $WIDTH * 7/8,
1518 force_h => int $HEIGHT * 7/8, 1508 force_h => int $HEIGHT * 7/8,
1519 title => "Help Browser", 1509 title => "Help Browser",
1520 has_close_button => 1; 1510 has_close_button => 1;
1521 1511
1522 $win->add (my $vbox = new CFPlus::UI::VBox); 1512 $win->add (my $vbox = new CFPlus::UI::VBox);
1523 1513
1514 $vbox->add (new CFPlus::UI::FancyFrame
1515 label => "Navigation",
1524 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1516 child => (my $buttons = new CFPlus::UI::HBox),
1517 );
1525 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1518 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1526 expand => 1, fontsize => 0.8, padding_x => 4); 1519 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1527 1520
1528 $buttons->add (new CFPlus::UI::Label text => "Choose a document to display: "); 1521 my @history;
1529 $buttons->add (my $combo = new CFPlus::UI::Selector 1522 my @future;
1530 value => undef, 1523 my $curnode;
1531 options => [ 1524
1532 [intro => "Introduction"], 1525 my $load_node; $load_node = sub {
1533 [manual => "Main Manual"], 1526 my ($node, $para) = @_;
1534 [skill_help => "Skill Reference"], 1527
1535 [command_help => "Command Reference"], 1528 $buttons->clear;
1536 [dmcommand_help => "DM Commands"], 1529
1537 [COPYING => "License Terms"], 1530 $buttons->add (new CFPlus::UI::Button
1531 text => "⇤",
1532 tooltip => "back to the starting page",
1533 on_activate => sub {
1534 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1535 unshift @future, @history;
1536 @history = ();
1537 $load_node->(@{shift @future});
1538 },
1539 );
1540
1541 if (@history) {
1542 $buttons->add (new CFPlus::UI::Button
1543 text => "⋘",
1544 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1545 on_activate => sub {
1546 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1547 $load_node->(@{pop @history});
1548 },
1549 );
1538 ], 1550 }
1539 on_changed => sub {
1540 my ($self, $pod) = @_;
1541 1551
1552 if (@future) {
1553 $buttons->add (new CFPlus::UI::Button
1554 text => "⋙",
1555 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1556 on_activate => sub {
1557 push @history, [$curnode, $viewer->current_paragraph];
1558 $load_node->(@{shift @future});
1559 },
1560 );
1561 }
1562
1563 $buttons->add (new CFPlus::UI::Label text => " ");
1564
1565 my @path = CFPlus::Pod::full_path_of $node;
1566 pop @path; # drop current node
1567
1568 for my $node (@path) {
1569 $buttons->add (new CFPlus::UI::Button
1570 text => $node->{kw}[0],
1571 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1572 on_activate => sub {
1573 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1574 $load_node->($node);
1575 },
1576 );
1577 $buttons->add (new CFPlus::UI::Label text => "/");
1578 }
1579
1580 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1581
1582 $curnode = $node;
1583
1542 $viewer->clear; 1584 $viewer->clear;
1543 $viewer->add_paragraph (CFPlus::Pod::section pod => $pod); 1585 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1544 $viewer->set_offset (0); 1586 $viewer->scroll_to ($para);
1587 };
1545 1588
1589 $load_node->(CFPlus::Pod::find pod => "mainpage");
1590
1591 $CFPlus::Pod::goto_document = sub {
1592 my (@path) = @_;
1593
1594 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1595
1596 $load_node->((CFPlus::Pod::find @path)[0]);
1597 $win->show;
1598 };
1599
1600 $win
1601}
1602
1603sub open_string_query {
1604 my ($title, $cb, $txt, $tooltip) = @_;
1605 my $dialog = new CFPlus::UI::Toplevel
1606 x => "center",
1607 y => "center",
1608 z => 50,
1609 force_w => $WIDTH * 4/5,
1610 title => $title;
1611
1612 $dialog->add (
1613 my $e = new CFPlus::UI::Entry
1614 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1615 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1616 tooltip => $tooltip
1617 );
1618
1619 $e->grab_focus;
1620 $e->set_text ($txt) if $txt;
1621 $dialog->show;
1622}
1623
1624sub open_quit_dialog {
1625 unless ($QUIT_DIALOG) {
1626 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1627 x => "center",
1628 y => "center",
1629 z => 50,
1630 title => "Really Quit?",
1631 on_key_down => sub {
1632 my ($dialog, $ev) = @_;
1633 $ev->{sym} == 27 and $dialog->hide;
1546 0 1634 }
1635 ;
1636
1637 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1638
1639 $vb->add (new CFPlus::UI::Label
1640 text => "You should find a savebed and apply it first!",
1641 max_w => $WIDTH * 0.25,
1642 ellipsize => 0,
1643 );
1644 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1645 $hb->add (new CFPlus::UI::Button
1646 text => "Ok",
1647 expand => 1,
1648 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1649 );
1650 $hb->add (new CFPlus::UI::Button
1651 text => "Quit anyway",
1652 expand => 1,
1653 on_activate => sub { exit },
1654 );
1655 }
1656
1657 $QUIT_DIALOG->show;
1658 $QUIT_DIALOG->grab_focus;
1659}
1660
1661sub show_tip_of_the_day {
1662 # find all tips
1663 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1664
1665 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1666 $todindex = 0 if $todindex >= @tod;
1667 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1668
1669 # create dialog
1670 my $dialog;
1671
1672 my $close = sub {
1673 $dialog->destroy;
1674 };
1675
1676 $dialog = new CFPlus::UI::Toplevel
1677 x => "center",
1678 y => "center",
1679 z => 3,
1680 name => 'tip_of_the_day',
1681 force_w => int $WIDTH * 4/9,
1682 force_h => int $WIDTH * 2/9,
1683 title => "Tip of the day #" . (1 + $todindex),
1684 child => my $vbox = new CFPlus::UI::VBox,
1685 has_close_button => 1,
1686 on_delete => $close,
1687 ;
1688
1689 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1690 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1691 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1692
1693 $vbox->add (my $table = new CFPlus::UI::Table);
1694
1695 $table->add (0, 0, new CFPlus::UI::Button
1696 text => "Close",
1697 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1698 on_activate => $close,
1699 );
1700
1701 $table->add (2, 0, new CFPlus::UI::Button
1702 text => "Next",
1703 tooltip => "Show the next <b>Tip of the day</b>.",
1704 on_activate => sub {
1705 $close->();
1706 &show_tip_of_the_day;
1547 }, 1707 },
1548 on_visibility_change => sub {
1549 my ($self, $visible) = @_;
1550 return unless $visible;
1551 return if $self->{value};
1552 $self->set_value ("intro");
1553 0
1554 },
1555 ); 1708 );
1556 1709
1557 $win 1710 $dialog->show;
1558} 1711}
1559 1712
1560sub sdl_init { 1713sub sdl_init {
1561 CFPlus::SDL_Init 1714 CFPlus::SDL_Init
1562 and die "SDL::Init failed!\n"; 1715 and die "SDL::Init failed!\n";
1609 force_x => 0, 1762 force_x => 0,
1610 force_y => "max", 1763 force_y => "max",
1611 child => $STATUSBOX, 1764 child => $STATUSBOX,
1612 )->show; 1765 )->show;
1613 1766
1614 CFPlus::UI::FancyFrame->new ( 1767 CFPlus::UI::Toplevel->new (
1615 title => "Map", 1768 title => "Map",
1616 name => "mapmap", 1769 name => "mapmap",
1617 x => 0, 1770 x => 0,
1618 y => $FONTSIZE + 8, 1771 y => $FONTSIZE + 8,
1619 border_bg => [1, 1, 1, 192/255], 1772 border_bg => [1, 1, 1, 192/255],
1647 can_hover => 1, 1800 can_hover => 1,
1648 can_events => 1, 1801 can_events => 1,
1649 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1802 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1650 ; 1803 ;
1651 1804
1652 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 1805 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1653 title => "Setup", 1806 title => "Setup",
1654 name => "setup_dialog", 1807 name => "setup_dialog",
1655 x => 'center', 1808 x => 'center',
1656 y => 'center', 1809 y => 'center',
1657 z => 2, 1810 z => 2,
1768 CFPlus::Mix_AllocateChannels 8; 1921 CFPlus::Mix_AllocateChannels 8;
1769 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1922 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1770 1923
1771 audio_music_finished; 1924 audio_music_finished;
1772 1925
1926 local $_;
1773 while (<$fh>) { 1927 while (<$fh>) {
1774 next if /^\s*#/; 1928 next if /^\s*#/;
1775 next if /^\s*$/; 1929 next if /^\s*$/;
1776 1930
1777 my ($file, $volume, $event) = split /\s+/, $_, 3; 1931 my ($file, $volume, $event) = split /\s+/, $_, 3;
1911 log_fontsize => 0.7, 2065 log_fontsize => 0.7,
1912 gauge_fontsize => 1, 2066 gauge_fontsize => 1,
1913 gauge_size => 0.35, 2067 gauge_size => 0.35,
1914 stat_fontsize => 0.7, 2068 stat_fontsize => 0.7,
1915 mapsize => 100, 2069 mapsize => 100,
1916 say_command => 'say', 2070 say_command => 'chat',
1917 audio_enable => 1, 2071 audio_enable => 1,
1918 bgm_enable => 1, 2072 bgm_enable => 1,
1919 bgm_volume => 0.25, 2073 bgm_volume => 0.25,
1920 face_prefetch => 0, 2074 face_prefetch => 0,
1921 output_sync => 1, 2075 output_sync => 1,
1922 output_count => 1, 2076 output_count => 1,
1923 pickup => 0, 2077 pickup => 0,
1924 inv_sort => "mtime", 2078 inv_sort => "mtime",
1925 default => "profile", # default profile 2079 default => "profile", # default profile
2080 show_tips => 1,
1926 ); 2081 );
1927 2082
1928 while (my ($k, $v) = each %DEF_CFG) { 2083 while (my ($k, $v) = each %DEF_CFG) {
1929 $CFG->{$k} = $v unless exists $CFG->{$k}; 2084 $CFG->{$k} = $v unless exists $CFG->{$k};
1930 } 2085 }
1974# } 2129# }
1975# my $t2 = Time::HiRes::time; 2130# my $t2 = Time::HiRes::time;
1976# warn $t2-$t1; 2131# warn $t2-$t1;
1977# } 2132# }
1978 2133
2134 $startup_done->();
2135
1979 video_init; 2136 video_init;
1980 audio_init; 2137 audio_init;
1981} 2138}
2139
2140show_tip_of_the_day if $CFG->{show_tips};
1982 2141
1983Event::loop; 2142Event::loop;
1984#CFPlus::SDL_Quit; 2143#CFPlus::SDL_Quit;
1985#CFPlus::_exit 0; 2144#CFPlus::_exit 0;
1986 2145

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines