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.146 by root, Wed Apr 4 02:43:30 2007 UTC vs.
Revision 1.154 by root, Wed May 9 11:46:49 2007 UTC

… …
29# do things only needed for single-binary version (par) 29# do things only needed for single-binary version (par)
30BEGIN { 30BEGIN {
31 if (%PAR::LibCache) { 31 if (%PAR::LibCache) {
32 @INC = grep ref, @INC; # weed out all paths except pars loader refs 32 @INC = grep ref, @INC; # weed out all paths except pars loader refs
33 33
34 my $tmp = $ENV{PAR_TEMP};
35
34 while (my ($filename, $zip) = each %PAR::LibCache) { 36 while (my ($filename, $zip) = each %PAR::LibCache) {
35 for ($zip->memberNames) { 37 for ($zip->memberNames) {
36 next unless /^root\/(.*)/; 38 next unless /^root\/(.*)/;
37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 39 $zip->extractMember ($_, "$tmp/$1")
38 unless -e "$ENV{PAR_TEMP}/$1"; 40 unless -e "$tmp/$1";
39 } 41 }
40 } 42 }
41 43
42 # TODO: pango-rc file, anybody? 44 if ($^O eq "MSWin32") {
45 # relocatable
46 } else {
47 # unix, need to patch pango rc file
48 open my $fh, "<:perlio", "$tmp/usr/lib/pango/1.5.0/module-files.d/libpango1.0-0.modules"
49 or die "$tmp/usr/lib/1.5.0/module-files.d/libpango1.0-0.modules: $!";
50 local $/;
51 my $rc = <$fh>;
52 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
43 53
44 unshift @INC, $ENV{PAR_TEMP}; 54 mkdir "$tmp/pango-modules";
55 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
56 or die "$tmp/pango-modules/pango.modules: $!";
57 print $fh $rc;
58
59 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
60 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
61 or die "$ENV{PANGO_RC_FILE}: $!";
62 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
63 }
64
65 unshift @INC, $tmp;
45 } 66 }
46} 67}
47 68
48# need to do it again because that pile of garbage called PAR nukes it before main 69# need to do it again because that pile of garbage called PAR nukes it before main
49unshift @INC, $ENV{PAR_TEMP} 70unshift @INC, $ENV{PAR_TEMP}
… …
58use Compress::LZF; 79use Compress::LZF;
59 80
60use CFPlus; 81use CFPlus;
61use CFPlus::OpenGL (); 82use CFPlus::OpenGL ();
62use CFPlus::Protocol; 83use CFPlus::Protocol;
84use CFPlus::DB;
63use CFPlus::UI; 85use CFPlus::UI;
64use CFPlus::UI::Inventory; 86use CFPlus::UI::Inventory;
65use CFPlus::UI::SpellList; 87use CFPlus::UI::SpellList;
66use CFPlus::Pod; 88use CFPlus::Pod;
67use CFPlus::MapWidget; 89use CFPlus::MapWidget;
… …
206 title => "Server Query", 228 title => "Server Query",
207 child => my $vbox = new CFPlus::UI::VBox, 229 child => my $vbox = new CFPlus::UI::VBox,
208 ; 230 ;
209 231
210 my @dialog = my $label = new CFPlus::UI::Label 232 my @dialog = my $label = new CFPlus::UI::Label
211 max_w => $::WIDTH * 0.4, 233 max_w => $::WIDTH * 0.8,
212 ellipsise => 0, 234 ellipsise => 0,
213 text => $prompt; 235 text => $prompt;
214 236
215 if ($flags & CS_QUERY_YESNO) { 237 if ($flags & CS_QUERY_YESNO) {
216 push @dialog, my $hbox = new CFPlus::UI::HBox; 238 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
233 ); 255 );
234 256
235 $dialog->grab_focus; 257 $dialog->grab_focus;
236 258
237 } elsif ($flags & CS_QUERY_SINGLECHAR) { 259 } elsif ($flags & CS_QUERY_SINGLECHAR) {
238 $dialog->{tooltip} = "#charcreation_focus";
239
240 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 260 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
241 $MESSAGE_WINDOW->show; 261 $dialog->{tooltip} = "#charcreation_focus";
242 262
243 unshift @dialog, new CFPlus::UI::Label 263 unshift @dialog, new CFPlus::UI::Label
244 max_w => $::WIDTH * 0.4, 264 max_w => $::WIDTH * 0.8,
245 ellipsise => 0, 265 ellipsise => 0,
246 markup => "\nOr use your keyboard and the text entry below:\n"; 266 markup => "\nOr use your keyboard and the text entry below:\n";
247 267
248 unshift @dialog, my $table = new CFPlus::UI::Table; 268 unshift @dialog, my $table = new CFPlus::UI::Table;
249 269
… …
261 $conn->send ("reply d"); 281 $conn->send ("reply d");
262 destroy_query_dialog $conn; 282 destroy_query_dialog $conn;
263 0 283 0
264 }, 284 },
265 ); 285 );
286
287 if ($conn->{chargen_race_description}) {
288 unshift @dialog, new CFPlus::UI::Label
289 max_w => $::WIDTH * 0.8,
290 ellipsise => 0,
291 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
292 ;
293 }
294
295 unshift @dialog, new CFPlus::UI::Face
296 face => $conn->{player}{face},
297 bg => [.2, .2, .2, 1],
298 min_w => 64,
299 min_h => 64,
300 ;
301
302 if ($conn->{chargen_race_title}) {
303 unshift @dialog, new CFPlus::UI::Label
304 allign => 1,
305 ellipsise => 0,
306 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
307 ;
308 }
266 309
267 unshift @dialog, new CFPlus::UI::Label 310 unshift @dialog, new CFPlus::UI::Label
268 max_w => $::WIDTH * 0.4, 311 max_w => $::WIDTH * 0.4,
269 ellipsise => 0, 312 ellipsise => 0,
270 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 313 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
… …
419 statusbox => $STATUSBOX, 462 statusbox => $STATUSBOX,
420 map => $MAP, 463 map => $MAP,
421 mapmap => $MAPMAP, 464 mapmap => $MAPMAP,
422 query => \&server_query, 465 query => \&server_query,
423 466
467 setup_req => {
468 smoothing => $CFG->{map_smoothing}*1,
469 },
470
424 sound_play => sub { 471 sound_play => sub {
425 my ($x, $y, $soundnum, $type) = @_; 472 my ($x, $y, $soundnum, $type) = @_;
426 473
427 $SDL_MIXER 474 $SDL_MIXER
428 or return; 475 or return;
… …
500 state => $CFG->{fast}, 547 state => $CFG->{fast},
501 tooltip => "Lower the visual quality considerably to speed up rendering.", 548 tooltip => "Lower the visual quality considerably to speed up rendering.",
502 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 549 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
503 ); 550 );
504 551
552 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
553 $table->add (1, $row++, new CFPlus::UI::Slider
554 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
555 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
556 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
557 );
558
559 $table->add (1, $row++, new CFPlus::UI::Button
560 expand => 1, align => 0, text => "Apply",
561 tooltip => "Apply the video settings above.",
562 on_activate => sub {
563 video_shutdown ();
564 video_init ();
565 0
566 }
567 );
568
505 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 569 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
506 $table->add (1, $row++, new CFPlus::UI::Slider 570 $table->add (1, $row++, new CFPlus::UI::Slider
507 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 571 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
508 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 572 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
509 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 573 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
574 );
575
576 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
577 $table->add (1, $row++, new CFPlus::UI::CheckBox
578 state => $CFG->{map_smoothing},
579 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
580 . "This increases load on the graphics subsystem and works only with 2.x servers. "
581 . "Changes take effect at next connection only.",
582 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
510 ); 583 );
511 584
512 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 585 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
513 $table->add (1, $row++, new CFPlus::UI::CheckBox 586 $table->add (1, $row++, new CFPlus::UI::CheckBox
514 state => $CFG->{fow_enable}, 587 state => $CFG->{fow_enable},
… …
533 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; 606 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
534 0 607 0
535 } 608 }
536 ); 609 );
537 610
538 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
539 $table->add (1, $row++, new CFPlus::UI::Slider
540 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
541 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
542 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
543 );
544
545 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 611 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
546 $table->add (1, $row++, new CFPlus::UI::Slider 612 $table->add (1, $row++, new CFPlus::UI::Slider
547 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 613 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
548 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 614 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
549 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 615 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
… …
565 range => [$CFG->{gauge_size}, 0.2, 0.8], 631 range => [$CFG->{gauge_size}, 0.2, 0.8],
566 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 632 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
567 on_changed => sub { 633 on_changed => sub {
568 $CFG->{gauge_size} = $_[1]; 634 $CFG->{gauge_size} = $_[1];
569 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 635 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
570 0
571 }
572 );
573
574 $table->add (1, $row++, new CFPlus::UI::Button
575 expand => 1, align => 0, text => "Apply",
576 tooltip => "Apply the video settings",
577 on_activate => sub {
578 video_shutdown ();
579 video_init ();
580 0 636 0
581 } 637 }
582 ); 638 );
583 639
584 $vbox 640 $vbox
… …
1097 : start_game; 1153 : start_game;
1098 0 1154 0
1099 }, 1155 },
1100 ); 1156 );
1101 1157
1158 $vbox->add (new CFPlus::UI::FancyFrame
1159 label => "Server Info",
1160 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1161 );
1162
1163 $vbox
1164}
1165
1166sub client_setup {
1167 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1168
1169 my $row = 0;
1170
1102 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1171 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1103 $table->add (1, 13, my $saycmd = new CFPlus::UI::Entry 1172 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1104 text => $CFG->{say_command}, 1173 text => $CFG->{say_command},
1105 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. " 1174 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. "
1106 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1175 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1107 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1176 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1108 on_changed => sub { 1177 on_changed => sub {
1109 my ($self, $value) = @_; 1178 my ($self, $value) = @_;
1110 $CFG->{say_command} = $value; 1179 $CFG->{say_command} = $value;
1111 0 1180 0
1112 } 1181 }
1113 ); 1182 );
1114 1183
1115 $table->add (0, 14, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1184 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1116 $table->add (1, 14, my $saycmd = new CFPlus::UI::CheckBox 1185 $table->add (1, $row++, new CFPlus::UI::CheckBox
1117 state => $CFG->{show_tips}, 1186 state => $CFG->{show_tips},
1118 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1187 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1119 on_changed => sub { 1188 on_changed => sub {
1120 my ($self, $value) = @_; 1189 my ($self, $value) = @_;
1121 $CFG->{show_tips} = $value; 1190 $CFG->{show_tips} = $value;
1122 0 1191 0
1123 } 1192 }
1124 ); 1193 );
1125 1194
1126 $vbox->add (new CFPlus::UI::FancyFrame 1195 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1127 label => "Server Info", 1196 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1128 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1197 text => $CFG->{logview_max_par},
1198 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1199 . "sends more messages than this number, older messages get removed to save memory and "
1200 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1201 on_changed => sub {
1202 my ($self, $value) = @_;
1203 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1204 0
1205 },
1129 ); 1206 );
1130 1207
1131 $vbox 1208 $table
1132} 1209}
1133 1210
1134sub message_window { 1211sub message_window {
1135 my $window = new CFPlus::UI::Toplevel 1212 my $window = new CFPlus::UI::Toplevel
1136 name => "message_window", 1213 name => "message_window",
… …
1573 1650
1574sub show_tip_of_the_day { 1651sub show_tip_of_the_day {
1575 # find all tips 1652 # find all tips
1576 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1653 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1577 1654
1578 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1655 CFPlus::DB::get state => "tip_of_the_day", sub {
1656 my ($todindex) = @_;
1579 $todindex = 0 if $todindex >= @tod; 1657 $todindex = 0 if $todindex >= @tod;
1580 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1658 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1581 1659
1582 # create dialog 1660 # create dialog
1583 my $dialog; 1661 my $dialog;
1584 1662
1585 my $close = sub { 1663 my $close = sub {
1586 $dialog->destroy; 1664 $dialog->destroy;
1665 };
1666
1667 $dialog = new CFPlus::UI::Toplevel
1668 x => "center",
1669 y => "center",
1670 z => 3,
1671 name => 'tip_of_the_day',
1672 force_w => int $WIDTH * 4/9,
1673 force_h => int $WIDTH * 2/9,
1674 title => "Tip of the day #" . (1 + $todindex),
1675 child => my $vbox = new CFPlus::UI::VBox,
1676 has_close_button => 1,
1677 on_delete => $close,
1678 ;
1679
1680 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1681 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1682 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1683
1684 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1685
1686 $table->add (0, 0, new CFPlus::UI::Button
1687 text => "Close",
1688 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>.",
1689 on_activate => $close,
1690 );
1691
1692 $table->add (2, 0, new CFPlus::UI::Button
1693 text => "Next",
1694 tooltip => "Show the next <b>Tip of the day</b>.",
1695 on_activate => sub {
1696 $close->();
1697 &show_tip_of_the_day;
1698 },
1699 );
1700
1701 $dialog->show;
1587 }; 1702 };
1588
1589 $dialog = new CFPlus::UI::Toplevel
1590 x => "center",
1591 y => "center",
1592 z => 3,
1593 name => 'tip_of_the_day',
1594 force_w => int $WIDTH * 4/9,
1595 force_h => int $WIDTH * 2/9,
1596 title => "Tip of the day #" . (1 + $todindex),
1597 child => my $vbox = new CFPlus::UI::VBox,
1598 has_close_button => 1,
1599 on_delete => $close,
1600 ;
1601
1602 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1603 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1604 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1605
1606 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1607
1608 $table->add (0, 0, new CFPlus::UI::Button
1609 text => "Close",
1610 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>.",
1611 on_activate => $close,
1612 );
1613
1614 $table->add (2, 0, new CFPlus::UI::Button
1615 text => "Next",
1616 tooltip => "Show the next <b>Tip of the day</b>.",
1617 on_activate => sub {
1618 $close->();
1619 &show_tip_of_the_day;
1620 },
1621 );
1622
1623 $dialog->show;
1624} 1703}
1625 1704
1626sub sdl_init { 1705sub sdl_init {
1627 CFPlus::SDL_Init 1706 CFPlus::SDL_Init
1628 and die "SDL::Init failed!\n"; 1707 and die "SDL::Init failed!\n";
… …
1708 font => $FONT_FIXED, 1787 font => $FONT_FIXED,
1709 fontsize => $::CFG->{log_fontsize}, 1788 fontsize => $::CFG->{log_fontsize},
1710 indent => -4, 1789 indent => -4,
1711 can_hover => 1, 1790 can_hover => 1,
1712 can_events => 1, 1791 can_events => 1,
1792 max_par => $CFG->{logview_max_par},
1713 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1793 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1714 ; 1794 ;
1715 1795
1716 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1796 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1717 title => "Setup", 1797 title => "Setup",
1718 name => "setup_dialog", 1798 name => "setup_dialog",
… …
1729 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1809 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1730 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1810 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1731 1811
1732 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1812 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1733 "Configure the server to play on, your username, password and other server-related options."); 1813 "Configure the server to play on, your username, password and other server-related options.");
1814 $SETUP_NOTEBOOK->add (Client => client_setup,
1815 "Configure various client-specific settings.");
1734 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1816 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1735 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1817 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1736 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1818 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1737 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1819 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1738 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1820 $SETUP_NOTEBOOK->add (Audio => audio_setup,
… …
2039 if $CONN; 2121 if $CONN;
2040}); 2122});
2041 2123
2042%SDL_CB = ( 2124%SDL_CB = (
2043 CFPlus::SDL_QUIT => sub { 2125 CFPlus::SDL_QUIT => sub {
2044 Event::unloop -1; 2126 exit;
2045 }, 2127 },
2046 CFPlus::SDL_VIDEORESIZE => sub { 2128 CFPlus::SDL_VIDEORESIZE => sub {
2047 }, 2129 },
2048 CFPlus::SDL_VIDEOEXPOSE => sub { 2130 CFPlus::SDL_VIDEOEXPOSE => sub {
2049 CFPlus::UI::full_refresh; 2131 CFPlus::UI::full_refresh;
… …
2082 2164
2083$SIG{INT} = $SIG{TERM} = sub { exit }; 2165$SIG{INT} = $SIG{TERM} = sub { exit };
2084 2166
2085{ 2167{
2086 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2168 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2169 CFPlus::DB::Server::run;
2170
2087 CFPlus::UI::set_layout ($::CFG->{layout}); 2171 CFPlus::UI::set_layout ($::CFG->{layout});
2088 2172
2089 my %DEF_CFG = ( 2173 my %DEF_CFG = (
2090 sdl_mode => 0, 2174 sdl_mode => 0,
2091 width => 640, 2175 width => 640,
2092 height => 480, 2176 height => 480,
2093 fullscreen => 0, 2177 fullscreen => 0,
2094 fast => 0, 2178 fast => 0,
2095 map_scale => 1, 2179 map_scale => 1,
2096 fow_enable => 1, 2180 fow_enable => 1,
2097 fow_intensity => 0.45, 2181 fow_intensity => 0.45,
2098 fow_smooth => 0, 2182 fow_smooth => 0,
2183 map_smoothing => 1,
2099 gui_fontsize => 1, 2184 gui_fontsize => 1,
2100 log_fontsize => 0.7, 2185 log_fontsize => 0.7,
2101 gauge_fontsize => 1, 2186 gauge_fontsize => 1,
2102 gauge_size => 0.35, 2187 gauge_size => 0.35,
2103 stat_fontsize => 0.7, 2188 stat_fontsize => 0.7,
2104 mapsize => 100, 2189 mapsize => 100,
2105 say_command => 'chat', 2190 say_command => 'chat',
2106 audio_enable => 1, 2191 audio_enable => 1,
2107 bgm_enable => 1, 2192 bgm_enable => 1,
2108 bgm_volume => 0.25, 2193 bgm_volume => 0.25,
2109 face_prefetch => 0, 2194 face_prefetch => 0,
2110 output_sync => 1, 2195 output_sync => 1,
2111 output_count => 1, 2196 output_count => 1,
2112 output_rate => "", 2197 output_rate => "",
2113 pickup => 0, 2198 pickup => 0,
2114 inv_sort => "mtime", 2199 inv_sort => "mtime",
2115 default => "profile", # default profile 2200 default => "profile", # default profile
2116 show_tips => 1, 2201 show_tips => 1,
2202 logview_max_par => 1000,
2117 ); 2203 );
2118 2204
2119 while (my ($k, $v) = each %DEF_CFG) { 2205 while (my ($k, $v) = each %DEF_CFG) {
2120 $CFG->{$k} = $v unless exists $CFG->{$k}; 2206 $CFG->{$k} = $v unless exists $CFG->{$k};
2121 } 2207 }
… …
2190 2276
2191Event::loop; 2277Event::loop;
2192#CFPlus::SDL_Quit; 2278#CFPlus::SDL_Quit;
2193#CFPlus::_exit 0; 2279#CFPlus::_exit 0;
2194 2280
2281END {
2195END { CFPlus::SDL_Quit } 2282 CFPlus::SDL_Quit;
2283 CFPlus::DB::Server::stop;
2284}
2196 2285
2197=head1 NAME 2286=head1 NAME
2198 2287
2199cfplus - A Crossfire+ and Crossfire game client 2288cfplus - A Crossfire+ and Crossfire game client
2200 2289

Diff Legend

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