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.144 by root, Fri Mar 16 03:14:50 2007 UTC vs.
Revision 1.175 by root, Tue Jul 17 22:08:57 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3my $startup_done = sub { }; 3my $startup_done = sub { };
4our $PANGO = "1.5.0";
4 5
5# do splash-screen thingy on win32 6# do splash-screen thingy on win32
6BEGIN { 7BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") { 8 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) { 9 while (my ($filename, $zip) = each %PAR::LibCache) {
… …
29# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
30BEGIN { 31BEGIN {
31 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
32 @INC = grep ref, @INC; # weed out all paths except pars loader refs 33 @INC = grep ref, @INC; # weed out all paths except pars loader refs
33 34
35 my $tmp = $ENV{PAR_TEMP};
36
34 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
35 for ($zip->memberNames) { 38 for ($zip->memberNames) {
36 next unless /^root\/(.*)/; 39 next unless /^root\/(.*)/;
37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
38 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
39 } 42 }
40 } 43 }
41 44
42 # TODO: pango-rc file, anybody? 45 if ($^O eq "MSWin32") {
46 # relocatable
47 } else {
48 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/;
52 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
43 54
44 unshift @INC, $ENV{PAR_TEMP}; 55 mkdir "$tmp/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!";
58 print $fh $rc;
59
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
64 }
65
66 unshift @INC, $tmp;
45 } 67 }
46} 68}
47 69
48# need to do it again because that pile of garbage called PAR nukes it before main 70# need to do it again because that pile of garbage called PAR nukes it before main
49unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
… …
58use Compress::LZF; 80use Compress::LZF;
59 81
60use CFPlus; 82use CFPlus;
61use CFPlus::OpenGL (); 83use CFPlus::OpenGL ();
62use CFPlus::Protocol; 84use CFPlus::Protocol;
85use CFPlus::DB;
63use CFPlus::UI; 86use CFPlus::UI;
64use CFPlus::UI::Inventory; 87use CFPlus::UI::Inventory;
65use CFPlus::UI::SpellList; 88use CFPlus::UI::SpellList;
66use CFPlus::Pod; 89use CFPlus::Pod;
67use CFPlus::MapWidget; 90use CFPlus::MapWidget;
… …
136 159
137our $SDL_ACTIVE; 160our $SDL_ACTIVE;
138our %SDL_CB; 161our %SDL_CB;
139 162
140our $SDL_MIXER; 163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT;
166our $MUSIC_START;
167our $MUSIC_PLAYING;
168our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
141our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
142our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
143 172
144our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
145our $STATUSBOX; 174our $STATUSBOX;
… …
206 title => "Server Query", 235 title => "Server Query",
207 child => my $vbox = new CFPlus::UI::VBox, 236 child => my $vbox = new CFPlus::UI::VBox,
208 ; 237 ;
209 238
210 my @dialog = my $label = new CFPlus::UI::Label 239 my @dialog = my $label = new CFPlus::UI::Label
211 max_w => $::WIDTH * 0.4, 240 max_w => $::WIDTH * 0.8,
212 ellipsise => 0, 241 ellipsise => 0,
213 text => $prompt; 242 text => $prompt;
214 243
215 if ($flags & CS_QUERY_YESNO) { 244 if ($flags & CS_QUERY_YESNO) {
216 push @dialog, my $hbox = new CFPlus::UI::HBox; 245 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
233 ); 262 );
234 263
235 $dialog->grab_focus; 264 $dialog->grab_focus;
236 265
237 } elsif ($flags & CS_QUERY_SINGLECHAR) { 266 } 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) { 267 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
241 $MESSAGE_WINDOW->show; 268 $dialog->{tooltip} = "#charcreation_focus";
242 269
243 unshift @dialog, new CFPlus::UI::Label 270 unshift @dialog, new CFPlus::UI::Label
244 max_w => $::WIDTH * 0.4, 271 max_w => $::WIDTH * 0.8,
245 ellipsise => 0, 272 ellipsise => 0,
246 markup => "\nOr use your keyboard and the text entry below:\n"; 273 markup => "\nOr use your keyboard and the text entry below:\n";
247 274
248 unshift @dialog, my $table = new CFPlus::UI::Table; 275 unshift @dialog, my $table = new CFPlus::UI::Table;
249 276
… …
262 destroy_query_dialog $conn; 289 destroy_query_dialog $conn;
263 0 290 0
264 }, 291 },
265 ); 292 );
266 293
294 if ($conn->{chargen_race_description}) {
295 unshift @dialog, new CFPlus::UI::Label
296 max_w => $::WIDTH * 0.8,
297 ellipsise => 0,
298 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
299 ;
300 }
301
302 unshift @dialog, new CFPlus::UI::Face
303 face => $conn->{player}{face},
304 bg => [.2, .2, .2, 1],
305 min_w => 64,
306 min_h => 64,
307 ;
308
309 if ($conn->{chargen_race_title}) {
310 unshift @dialog, new CFPlus::UI::Label
311 allign => 1,
312 ellipsise => 0,
313 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
314 ;
315 }
316
267 unshift @dialog, new CFPlus::UI::Label 317 unshift @dialog, new CFPlus::UI::Label
268 max_w => $::WIDTH * 0.4, 318 max_w => $::WIDTH * 0.4,
269 ellipsise => 0, 319 ellipsise => 0,
270 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 320 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
271 ; 321 ;
… …
274 if (my $stat = delete $conn->{stat_change_with}) { 324 if (my $stat = delete $conn->{stat_change_with}) {
275 $conn->send ("reply $stat"); 325 $conn->send ("reply $stat");
276 destroy_query_dialog $conn; 326 destroy_query_dialog $conn;
277 return; 327 return;
278 } 328 }
279
280 $STATS_PAGE->show;
281 $MESSAGE_WINDOW->hide;
282 329
283 unshift @dialog, new CFPlus::UI::Label 330 unshift @dialog, new CFPlus::UI::Label
284 max_w => $::WIDTH * 0.4, 331 max_w => $::WIDTH * 0.4,
285 ellipsise => 0, 332 ellipsise => 0,
286 markup => "\nOr use your keyboard and the text entry below:\n"; 333 markup => "\nOr use your keyboard and the text entry below:\n";
… …
419 statusbox => $STATUSBOX, 466 statusbox => $STATUSBOX,
420 map => $MAP, 467 map => $MAP,
421 mapmap => $MAPMAP, 468 mapmap => $MAPMAP,
422 query => \&server_query, 469 query => \&server_query,
423 470
471 setup_req => {
472 smoothing => $CFG->{map_smoothing}*1,
473 },
474
424 sound_play => sub { 475 sound_play => sub {
425 my ($x, $y, $soundnum, $type) = @_; 476 my ($x, $y, $soundnum, $type) = @_;
426 477
427 $SDL_MIXER 478 $SDL_MIXER
428 or return; 479 or return;
… …
448 $LOGIN_BUTTON->set_text ("Login"); 499 $LOGIN_BUTTON->set_text ("Login");
449 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 500 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
450 $SETUP_DIALOG->show; 501 $SETUP_DIALOG->show;
451 $PL_WINDOW->hide; 502 $PL_WINDOW->hide;
452 $SPELL_LIST->clear_spells; 503 $SPELL_LIST->clear_spells;
504 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
505
506 &audio_music_set ([]);
453 507
454 return unless $CONN; 508 return unless $CONN;
455 509
456 status "connection closed"; 510 status "connection closed";
457 511
… …
472 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 526 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
473 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 527 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
474 can_events => 1, 528 can_events => 1,
475 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 529 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
476 530
531 my $vidmode_tooltip =
532 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
533 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
534
477 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 535 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
478 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 536 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
479 537
538 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
480 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 539 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
481 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 540 tooltip => $vidmode_tooltip);
541 $hbox->add (my $mode_label = new CFPlus::UI::Label
542 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
543 can_events => 1, tooltip => $vidmode_tooltip);
482 544
483 $mode_slider->connect (changed => sub { 545 $mode_slider->connect (changed => sub {
484 my ($self, $value) = @_; 546 my ($self, $value) = @_;
485 547
486 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 548 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
487 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 549 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
488 }); 550 });
489 $mode_slider->emit (changed => $mode_slider->{range}[0]); 551 $mode_slider->emit (changed => $mode_slider->{range}[0]);
490 552
491 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 553 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
492 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 554 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
… …
500 state => $CFG->{fast}, 562 state => $CFG->{fast},
501 tooltip => "Lower the visual quality considerably to speed up rendering.", 563 tooltip => "Lower the visual quality considerably to speed up rendering.",
502 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 564 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
503 ); 565 );
504 566
567 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
568 $table->add (1, $row++, new CFPlus::UI::Slider
569 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
570 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
571 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
572 );
573
574 $table->add (1, $row++, new CFPlus::UI::Button
575 expand => 1, align => 0, text => "Apply",
576 tooltip => "Apply the video settings above.",
577 on_activate => sub {
578 video_shutdown ();
579 video_init ();
580 0
581 }
582 );
583
505 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 584 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
506 $table->add (1, $row++, new CFPlus::UI::Slider 585 $table->add (1, $row++, new CFPlus::UI::Slider
507 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 586 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
508 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 587 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
509 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 588 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
510 ); 589 );
511 590
591 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
592 $table->add (1, $row++, new CFPlus::UI::CheckBox
593 state => $CFG->{map_smoothing},
594 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
595 . "This increases load on the graphics subsystem and works only with 2.x servers. "
596 . "Changes take effect at next connection only.",
597 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
598 );
599
512 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 600 $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 601 $table->add (1, $row++, new CFPlus::UI::CheckBox
514 state => $CFG->{fow_enable}, 602 state => $CFG->{fow_enable},
515 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 603 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
516 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 604 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
… …
521 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 609 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
522 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 610 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
523 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 611 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
524 ); 612 );
525 613
526 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 614 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smoothing");
527 $table->add (1, $row++, new CFPlus::UI::CheckBox 615 $table->add (1, $row++, new CFPlus::UI::CheckBox
528 state => $CFG->{fow_smooth}, 616 state => $CFG->{fow_smooth},
529 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 617 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
530 on_changed => sub { 618 on_changed => sub {
531 my ($self, $value) = @_; 619 my ($self, $value) = @_;
532 $CFG->{fow_smooth} = $value; 620 $CFG->{fow_smooth} = $value;
533 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
534 0 621 0
535 } 622 }
536 );
537
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 ); 623 );
544 624
545 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 625 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
546 $table->add (1, $row++, new CFPlus::UI::Slider 626 $table->add (1, $row++, new CFPlus::UI::Slider
547 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 627 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
… …
565 range => [$CFG->{gauge_size}, 0.2, 0.8], 645 range => [$CFG->{gauge_size}, 0.2, 0.8],
566 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 646 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
567 on_changed => sub { 647 on_changed => sub {
568 $CFG->{gauge_size} = $_[1]; 648 $CFG->{gauge_size} = $_[1];
569 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 649 $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 650 0
581 } 651 }
582 ); 652 );
583 653
584 $vbox 654 $vbox
… …
689 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 759 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
690 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 760 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
691 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 761 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
692 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 762 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
693 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 763 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
694 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 764 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
695
696 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
697
698 for my $x (0..2) {
699 for my $y (0 .. 2) {
700 $table->add ($x + 3, $y,
701 new CFPlus::UI::Entry
702 text => $default_smooth[$x * 3 + $y],
703 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
704 );
705 }
706 }
707 765
708 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 766 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
709 767
710 $table 768 $table
711} 769}
… …
1097 : start_game; 1155 : start_game;
1098 0 1156 0
1099 }, 1157 },
1100 ); 1158 );
1101 1159
1160 $vbox->add (new CFPlus::UI::FancyFrame
1161 label => "Server Info",
1162 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1163 );
1164
1165 $vbox
1166}
1167
1168sub client_setup {
1169 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1170
1171 my $row = 0;
1172
1102 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1173 $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 1174 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1104 text => $CFG->{say_command}, 1175 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. " 1176 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. " 1177 . "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.", 1178 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1108 on_changed => sub { 1179 on_changed => sub {
1109 my ($self, $value) = @_; 1180 my ($self, $value) = @_;
1110 $CFG->{say_command} = $value; 1181 $CFG->{say_command} = $value;
1111 0 1182 0
1112 } 1183 }
1113 ); 1184 );
1114 1185
1115 $table->add (0, 14, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1186 $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 1187 $table->add (1, $row++, new CFPlus::UI::CheckBox
1117 state => $CFG->{show_tips}, 1188 state => $CFG->{show_tips},
1118 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1189 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1119 on_changed => sub { 1190 on_changed => sub {
1120 my ($self, $value) = @_; 1191 my ($self, $value) = @_;
1121 $CFG->{show_tips} = $value; 1192 $CFG->{show_tips} = $value;
1122 0 1193 0
1123 } 1194 }
1124 ); 1195 );
1125 1196
1126 $vbox->add (new CFPlus::UI::FancyFrame 1197 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1127 label => "Server Info", 1198 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1128 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1199 text => $CFG->{logview_max_par},
1200 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1201 . "sends more messages than this number, older messages get removed to save memory and "
1202 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1203 on_changed => sub {
1204 my ($self, $value) = @_;
1205 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1206 0
1207 },
1129 ); 1208 );
1130 1209
1131 $vbox 1210 $table
1132} 1211}
1133 1212
1134sub message_window { 1213sub message_window {
1135 my $window = new CFPlus::UI::Toplevel 1214 my $window = new CFPlus::UI::Toplevel
1136 name => "message_window", 1215 name => "message_window",
… …
1193 1272
1194 $window 1273 $window
1195} 1274}
1196 1275
1197sub autopickup_setup { 1276sub autopickup_setup {
1277 my $r = new CFPlus::UI::ScrolledWindow (
1278 expand => 1,
1279 scroll_y => 1
1280 );
1198 my $table = new CFPlus::UI::Table; 1281 $r->add (my $table = new CFPlus::UI::Table
1282 row_expand => [0],
1283 col_expand => [0, 1, 0, 1],
1284 );
1199 1285
1200 for ( 1286 for (
1201 ["General", 0, 0, 1287 ["General", 0, 0,
1202 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1288 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1203 ["Inhibit autopickup" => PICKUP_INHIBIT], 1289 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1287 $::CONN->send_command ("pickup $::CFG->{pickup}") 1373 $::CONN->send_command ("pickup $::CFG->{pickup}")
1288 if defined $::CONN; 1374 if defined $::CONN;
1289 0 1375 0
1290 }); 1376 });
1291 1377
1292 $table 1378 $r
1293} 1379}
1294 1380
1295my %SORT_ORDER = ( 1381my %SORT_ORDER = (
1296 type => undef, 1382 type => undef,
1297 mtime => sub { 1383 mtime => sub {
… …
1376 has_close_button => 1 1462 has_close_button => 1
1377 ; 1463 ;
1378 1464
1379 my $ntb = 1465 my $ntb =
1380 $PL_NOTEBOOK = 1466 $PL_NOTEBOOK =
1381 new CFPlus::UI::Notebook expand => 1, debug => 1; 1467 new CFPlus::UI::Notebook expand => 1;
1382 1468
1383 $ntb->add ( 1469 $ntb->add (
1384 "Statistics (F2)" => $STATS_PAGE = stats_window, 1470 "Statistics (F2)" => $STATS_PAGE = stats_window,
1385 "Shows statistics, where all your Stats and Resistances are shown." 1471 "Shows statistics, where all your Stats and Resistances are shown."
1386 ); 1472 );
… …
1398 $ntb->add ( 1484 $ntb->add (
1399 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1485 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1400 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1486 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1401 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1487 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1402 ); 1488 );
1489 $ntb->add (Pickup => autopickup_setup,
1490 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1403 1491
1404 $ntb->set_current_page ($INVENTORY_PAGE); 1492 $ntb->set_current_page ($INVENTORY_PAGE);
1405 1493
1406 $plwin->add ($ntb); 1494 $plwin->add ($ntb);
1407 $plwin 1495 $plwin
… …
1573 1661
1574sub show_tip_of_the_day { 1662sub show_tip_of_the_day {
1575 # find all tips 1663 # find all tips
1576 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1664 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1577 1665
1578 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1666 CFPlus::DB::get state => "tip_of_the_day", sub {
1667 my ($todindex) = @_;
1579 $todindex = 0 if $todindex >= @tod; 1668 $todindex = 0 if $todindex >= @tod;
1580 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1669 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1581 1670
1582 # create dialog 1671 # create dialog
1583 my $dialog; 1672 my $dialog;
1584 1673
1585 my $close = sub { 1674 my $close = sub {
1586 $dialog->destroy; 1675 $dialog->destroy;
1676 };
1677
1678 $dialog = new CFPlus::UI::Toplevel
1679 x => "center",
1680 y => "center",
1681 z => 3,
1682 name => 'tip_of_the_day',
1683 force_w => int $WIDTH * 4/9,
1684 force_h => int $WIDTH * 2/9,
1685 title => "Tip of the day #" . (1 + $todindex),
1686 child => my $vbox = new CFPlus::UI::VBox,
1687 has_close_button => 1,
1688 on_delete => $close,
1689 ;
1690
1691 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1692 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1693 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1694
1695 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1696
1697 $table->add (0, 0, new CFPlus::UI::Button
1698 text => "Close",
1699 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>.",
1700 on_activate => $close,
1701 );
1702
1703 $table->add (2, 0, new CFPlus::UI::Button
1704 text => "Next",
1705 tooltip => "Show the next <b>Tip of the day</b>.",
1706 on_activate => sub {
1707 $close->();
1708 &show_tip_of_the_day;
1709 },
1710 );
1711
1712 $dialog->show;
1587 }; 1713 };
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} 1714}
1625 1715
1626sub sdl_init { 1716sub sdl_init {
1627 CFPlus::SDL_Init 1717 CFPlus::SDL_Init
1628 and die "SDL::Init failed!\n"; 1718 and die "SDL::Init failed!\n";
1629} 1719}
1630 1720
1631sub video_init { 1721sub video_init {
1632 sdl_init;
1633
1634 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1722 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1635 1723
1636 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1724 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1637 1725
1638 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1726 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1639 $FULLSCREEN = $CFG->{fullscreen}; 1727 $FULLSCREEN = $CFG->{fullscreen};
1640 $FAST = $CFG->{fast}; 1728 $FAST = $CFG->{fast};
1641 1729
1642 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1730 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1643 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1731 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1644 1732
1645 $SDL_ACTIVE = 1; 1733 $SDL_ACTIVE = 1;
1646 $LAST_REFRESH = time - 0.01; 1734 $LAST_REFRESH = time - 0.01;
1647 1735
… …
1708 font => $FONT_FIXED, 1796 font => $FONT_FIXED,
1709 fontsize => $::CFG->{log_fontsize}, 1797 fontsize => $::CFG->{log_fontsize},
1710 indent => -4, 1798 indent => -4,
1711 can_hover => 1, 1799 can_hover => 1,
1712 can_events => 1, 1800 can_events => 1,
1801 max_par => $CFG->{logview_max_par},
1713 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 recent messages sent by the server.",
1714 ; 1803 ;
1715 1804
1716 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1805 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1717 title => "Setup", 1806 title => "Setup",
1718 name => "setup_dialog", 1807 name => "setup_dialog",
… …
1729 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1818 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1730 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1819 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1731 1820
1732 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1821 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1733 "Configure the server to play on, your username, password and other server-related options."); 1822 "Configure the server to play on, your username, password and other server-related options.");
1734 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1823 $SETUP_NOTEBOOK->add (Client => client_setup,
1735 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1824 "Configure various client-specific settings.");
1736 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1825 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1737 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1826 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1738 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1827 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1739 "Configure the use of audio, sound effects and background music."); 1828 "Configure the use of audio, sound effects and background music.");
1740 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1829 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1918 CFPlus::OpenGL::shutdown; 2007 CFPlus::OpenGL::shutdown;
1919 2008
1920 undef $SDL_ACTIVE; 2009 undef $SDL_ACTIVE;
1921} 2010}
1922 2011
1923my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1924my $bgmusic;#TODO#hack#d#
1925
1926sub audio_channel_finished { 2012sub audio_channel_finished {
1927 my ($channel) = @_; 2013 my ($channel) = @_;
1928 2014
1929 #warn "channel $channel finished\n";#d# 2015 #warn "channel $channel finished\n";#d#
1930} 2016}
1931 2017
2018sub audio_music_set {
2019 my ($songs) = @_;
2020
2021 my @want =
2022 grep $_,
2023 map $CONN->{music_meta}{$_},
2024 @$songs;
2025
2026 if (@want) {
2027 @MUSIC_WANT = @want;
2028 &audio_music_changed ();
2029 }
2030}
2031
2032sub audio_music_start {
2033 my $path = $MUSIC_PLAYING->{path}
2034 or return;
2035
2036 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2037 # music might have changed...
2038 $path eq $MUSIC_PLAYING->{path}
2039 or return &audio_music_start ();
2040
2041 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2042
2043 my $NOW = time;
2044
2045 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2046 my $pos = $MUSIC_PLAYING->{stop_pos};
2047 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2048 $MUSIC_START = time - $pos;
2049 } else {
2050 $MUSIC_PLAYER->play (0);
2051 $MUSIC_START = time;
2052 }
2053
2054 delete $MUSIC_PLAYING->{stop_time};
2055 delete $MUSIC_PLAYING->{stop_pos};
2056 }
2057}
2058
2059sub audio_music_changed {
2060 return unless $CFG->{bgm_enable};
2061
2062 # default MUSIC_WANT == MUSIC_DEFAULT
2063 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2064
2065 # if the currently playing song is acceptable, let it continue
2066 return if $MUSIC_PLAYING
2067 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2068
2069 my $NOW = time;
2070
2071 if ($MUSIC_PLAYING) {
2072 $MUSIC_PLAYING->{stop_time} = $NOW;
2073 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2074 CFPlus::MixMusic::fade_out 1000;
2075 } else {
2076 # sort by stop time, oldest first
2077 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2078
2079 # if the most recently-played piece played very recently,
2080 # resume it, else choose the oldest piece for rotation.
2081 $MUSIC_PLAYING =
2082 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2083 ? $MUSIC_WANT[-1]
2084 : $MUSIC_WANT[0];
2085
2086 audio_music_start;
2087 }
2088}
2089
1932sub audio_music_finished { 2090sub audio_music_finished {
1933 return unless $CFG->{bgm_enable}; 2091 $MUSIC_PLAYING = undef;
2092 undef $MUSIC_PLAYER;
1934 2093
1935 # TODO: hack, do play loop and mood music 2094 audio_music_changed;
1936 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1937 $bgmusic->play (0);
1938
1939 push @bgmusic, shift @bgmusic;
1940} 2095}
1941 2096
1942sub audio_init { 2097sub audio_init {
1943 if ($CFG->{audio_enable}) { 2098 if ($CFG->{audio_enable}) {
1944 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2099 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
1994 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2149 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1995 2150
1996 $CFPlus::UI::ROOT->draw; 2151 $CFPlus::UI::ROOT->draw;
1997 2152
1998 $WANT_REFRESH = 0; 2153 $WANT_REFRESH = 0;
1999 $CAN_REFRESH = 0; 2154 $CAN_REFRESH = 0;
2000 $LAST_REFRESH = $NOW; 2155 $LAST_REFRESH = $NOW;
2001 2156
2002 CFPlus::SDL_GL_SwapBuffers; 2157 CFPlus::SDL_GL_SwapBuffers;
2003} 2158}
2004 2159
2005my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2160my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2006 $NOW = time; 2161 $NOW = time;
2007 2162
2008 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2163 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2009 for CFPlus::SDL_PollEvent; 2164 for CFPlus::poll_events;
2010 2165
2011 if (%animate_object) { 2166 if (%animate_object) {
2012 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2167 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2013 $WANT_REFRESH++; 2168 ++$WANT_REFRESH;
2014 } 2169 }
2015 2170
2016 if ($WANT_REFRESH) { 2171 if ($WANT_REFRESH) {
2017 force_refresh; 2172 force_refresh;
2018 } else { 2173 } else {
… …
2039 if $CONN; 2194 if $CONN;
2040}); 2195});
2041 2196
2042%SDL_CB = ( 2197%SDL_CB = (
2043 CFPlus::SDL_QUIT => sub { 2198 CFPlus::SDL_QUIT => sub {
2044 Event::unloop -1; 2199 exit;
2045 }, 2200 },
2046 CFPlus::SDL_VIDEORESIZE => sub { 2201 CFPlus::SDL_VIDEORESIZE => sub {
2047 }, 2202 },
2048 CFPlus::SDL_VIDEOEXPOSE => sub { 2203 CFPlus::SDL_VIDEOEXPOSE => sub {
2049 CFPlus::UI::full_refresh; 2204 CFPlus::UI::full_refresh;
2050 }, 2205 },
2051 CFPlus::SDL_ACTIVEEVENT => sub { 2206 CFPlus::SDL_ACTIVEEVENT => sub {
2052# not useful, as APPACTIVE include sonly iconified state, not unmapped 2207# not useful, as APPACTIVE include sonly iconified state, not unmapped
2053# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2208# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2209# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2054# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2210# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2055# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2211# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2056# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2212# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2057 }, 2213 },
2058 CFPlus::SDL_KEYDOWN => sub { 2214 CFPlus::SDL_KEYDOWN => sub {
… …
2082 2238
2083$SIG{INT} = $SIG{TERM} = sub { exit }; 2239$SIG{INT} = $SIG{TERM} = sub { exit };
2084 2240
2085{ 2241{
2086 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2242 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2243 CFPlus::DB::Server::run;
2244
2087 CFPlus::UI::set_layout ($::CFG->{layout}); 2245 CFPlus::UI::set_layout ($::CFG->{layout});
2088 2246
2089 my %DEF_CFG = ( 2247 my %DEF_CFG = (
2090 sdl_mode => 0, 2248 sdl_mode => 0,
2091 width => 640, 2249 width => 640,
2092 height => 480, 2250 height => 480,
2093 fullscreen => 0, 2251 fullscreen => 0,
2094 fast => 0, 2252 fast => 0,
2095 map_scale => 1, 2253 map_scale => 1,
2096 fow_enable => 1, 2254 fow_enable => 1,
2097 fow_intensity => 0.45, 2255 fow_intensity => 0,
2098 fow_smooth => 0, 2256 fow_smooth => 1,
2257 map_smoothing => 1,
2099 gui_fontsize => 1, 2258 gui_fontsize => 1,
2100 log_fontsize => 0.7, 2259 log_fontsize => 0.7,
2101 gauge_fontsize => 1, 2260 gauge_fontsize => 1,
2102 gauge_size => 0.35, 2261 gauge_size => 0.35,
2103 stat_fontsize => 0.7, 2262 stat_fontsize => 0.7,
2104 mapsize => 100, 2263 mapsize => 100,
2105 say_command => 'chat', 2264 say_command => 'chat',
2106 audio_enable => 1, 2265 audio_enable => 1,
2107 bgm_enable => 1, 2266 bgm_enable => 1,
2108 bgm_volume => 0.25, 2267 bgm_volume => 0.25,
2109 face_prefetch => 0, 2268 face_prefetch => 0,
2110 output_sync => 1, 2269 output_sync => 1,
2111 output_count => 1, 2270 output_count => 1,
2112 output_rate => "", 2271 output_rate => "",
2113 pickup => 0, 2272 pickup => 0,
2114 inv_sort => "mtime", 2273 inv_sort => "mtime",
2115 default => "profile", # default profile 2274 default => "profile", # default profile
2116 show_tips => 1, 2275 show_tips => 1,
2276 logview_max_par => 1000,
2117 ); 2277 );
2118 2278
2119 while (my ($k, $v) = each %DEF_CFG) { 2279 while (my ($k, $v) = each %DEF_CFG) {
2120 $CFG->{$k} = $v unless exists $CFG->{$k}; 2280 $CFG->{$k} = $v unless exists $CFG->{$k};
2121 } 2281 }
… …
2135 } 2295 }
2136 } 2296 }
2137 2297
2138 sdl_init; 2298 sdl_init;
2139 2299
2140 @SDL_MODES = reverse 2300 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2141 grep $_->[0] >= 640 && $_->[1] >= 480, 2301 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2142 CFPlus::SDL_ListModes;
2143
2144 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2302 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2145 2303
2146 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2304 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2147 2305
2148 { 2306 {
… …
2190 2348
2191Event::loop; 2349Event::loop;
2192#CFPlus::SDL_Quit; 2350#CFPlus::SDL_Quit;
2193#CFPlus::_exit 0; 2351#CFPlus::_exit 0;
2194 2352
2353END {
2195END { CFPlus::SDL_Quit } 2354 CFPlus::SDL_Quit;
2355 CFPlus::DB::Server::stop;
2356}
2196 2357
2197=head1 NAME 2358=head1 NAME
2198 2359
2199cfplus - A Crossfire+ and Crossfire game client 2360cfplus - A Crossfire+ and Crossfire game client
2200 2361

Diff Legend

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