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.120 by root, Sun Oct 1 14:48:51 2006 UTC vs.
Revision 1.162 by root, Thu Jul 5 07:06:05 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4our $PANGO = "1.5.0";
5
6# do splash-screen thingy on win32
7BEGIN {
8 if (%PAR::LibCache && $^O eq "MSWin32") {
9 while (my ($filename, $zip) = each %PAR::LibCache) {
10 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
11 }
12
13 require Win32::GUI::SplashScreen;
14
15 Win32::GUI::SplashScreen::Show (
16 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
17 );
18
19 $startup_done = sub {
20 Win32::GUI::SplashScreen::Done (1);
21 };
22 }
23}
2 24
3use strict; 25use strict;
4use utf8; 26use utf8;
27
28use Carp 'verbose';
5 29
6# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
7BEGIN { 31BEGIN {
8 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
9 @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
10 34
35 my $tmp = $ENV{PAR_TEMP};
36
11 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 38 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 39 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
16 } 42 }
17 } 43 }
18 44
19 # 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
20 54
21 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;
22 } 67 }
23} 68}
24 69
25# 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
26unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
… …
35use Compress::LZF; 80use Compress::LZF;
36 81
37use CFPlus; 82use CFPlus;
38use CFPlus::OpenGL (); 83use CFPlus::OpenGL ();
39use CFPlus::Protocol; 84use CFPlus::Protocol;
85use CFPlus::DB;
40use CFPlus::UI; 86use CFPlus::UI;
87use CFPlus::UI::Inventory;
88use CFPlus::UI::SpellList;
41use CFPlus::Pod; 89use CFPlus::Pod;
42use CFPlus::BindingEditor;
43use CFPlus::MapWidget; 90use CFPlus::MapWidget;
91use CFPlus::Macro;
44 92
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 93$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 94$SIG{PIPE} = 'IGNORE';
47 95
48$Event::Eval = 0; 96$Event::Eval = 1;
49$Event::DIED = sub { 97$Event::DIED = sub {
50 # TODO: display dialog box or so 98 CFPlus::fatal Carp::longmess $_[1]
51 Carp::cluck $_[1];#d#TODO: remove when stable
52 return;#d#
53 CFPlus::fatal ($_[1]);
54}; 99};
55
56our $VERSION = '0.9';
57 100
58my $MAX_FPS = 60; 101my $MAX_FPS = 60;
59my $MIN_FPS = 5; # unused as of yet 102my $MIN_FPS = 5; # unused as of yet
60 103
61our $META_SERVER = "crossfire.real-time.com:13326"; 104our $META_SERVER = "http://metaserver.schmorp.de/current.json";
62 105
63our $LAST_REFRESH; 106our $LAST_REFRESH;
64our $NOW; 107our $NOW;
65 108
66our $CFG; 109our $CFG;
… …
104 147
105our $INVENTORY_PAGE; 148our $INVENTORY_PAGE;
106our $STATS_PAGE; 149our $STATS_PAGE;
107our $SKILL_PAGE; 150our $SKILL_PAGE;
108our $SPELL_PAGE; 151our $SPELL_PAGE;
152our $SPELL_LIST;
109 153
110our $HELP_WINDOW; 154our $HELP_WINDOW;
111our $MESSAGE_WINDOW; 155our $MESSAGE_WINDOW;
112our $FLOORBOX; 156our $FLOORBOX;
113our $GAUGES; 157our $GAUGES;
… …
126 170
127our $INV; 171our $INV;
128our $INVR; 172our $INVR;
129our $INV_RIGHT_HB; 173our $INV_RIGHT_HB;
130 174
131our $BIND_EDITOR;
132our $BIND_UPD_CB;
133
134our $PICKUP_CFG; 175our $PICKUP_CFG;
176
177our $IN_BUILD_MODE;
178our $BUILD_BUTTON;
135 179
136sub status { 180sub status {
137 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 181 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
138} 182}
139 183
140sub debug { 184sub debug {
141 $DEBUG_STATUS->set_text ($_[0]); 185 $DEBUG_STATUS->set_text ($_[0]);
186}
187
188sub message {
189 my ($para) = @_;
190
191 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
192
193 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
194
195 $LOGVIEW->add_paragraph ($para);
196 $LOGVIEW->scroll_to_bottom;
142} 197}
143 198
144sub destroy_query_dialog { 199sub destroy_query_dialog {
145 (delete $_[0]{query_dialog})->destroy 200 (delete $_[0]{query_dialog})->destroy
146 if $_[0]{query_dialog}; 201 if $_[0]{query_dialog};
147} 202}
148 203
204# FIXME: a very ugly hack to wait for stat update look below! #d#
205our $QUERY_TIMER; #d#
206
149# server query dialog 207# server query dialog
150sub server_query { 208sub server_query {
151 my ($conn, $flags, $prompt) = @_; 209 my ($conn, $flags, $prompt) = @_;
210
211 # FIXME: a very ugly hack to wait for stat update #d#
212 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
213 unless ($QUERY_TIMER) {
214 $QUERY_TIMER =
215 Event->timer (
216 after => 1,
217 cb => sub {
218 server_query ($conn, $flags, $prompt, 1);
219 $QUERY_TIMER = undef
220 }
221 );
222 return;
223 }
224 }
152 225
153 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 226 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
154 x => "center", 227 x => "center",
155 y => "center", 228 y => "center",
156 title => "Server Query", 229 title => "Server Query",
157 child => my $vbox = new CFPlus::UI::VBox, 230 child => my $vbox = new CFPlus::UI::VBox,
158 ; 231 ;
159 232
160 my @dialog = my $label = new CFPlus::UI::Label 233 my @dialog = my $label = new CFPlus::UI::Label
161 max_w => $::WIDTH * 0.4, 234 max_w => $::WIDTH * 0.8,
162 ellipsise => 0, 235 ellipsise => 0,
163 text => $prompt; 236 text => $prompt;
164 237
165 if ($flags & CS_QUERY_YESNO) { 238 if ($flags & CS_QUERY_YESNO) {
166 push @dialog, my $hbox = new CFPlus::UI::HBox; 239 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
183 ); 256 );
184 257
185 $dialog->grab_focus; 258 $dialog->grab_focus;
186 259
187 } elsif ($flags & CS_QUERY_SINGLECHAR) { 260 } elsif ($flags & CS_QUERY_SINGLECHAR) {
188 $dialog->{tooltip} = "#charcreation_focus";
189
190 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 261 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
191 $MESSAGE_WINDOW->show; 262 $dialog->{tooltip} = "#charcreation_focus";
192 263
193 unshift @dialog, new CFPlus::UI::Label 264 unshift @dialog, new CFPlus::UI::Label
194 max_w => $::WIDTH * 0.4, 265 max_w => $::WIDTH * 0.8,
195 ellipsise => 0, 266 ellipsise => 0,
196 markup => "\nOr use your keyboard and the text entry below:\n"; 267 markup => "\nOr use your keyboard and the text entry below:\n";
197 268
198 unshift @dialog, my $table = new CFPlus::UI::Table; 269 unshift @dialog, my $table = new CFPlus::UI::Table;
199 270
… …
211 $conn->send ("reply d"); 282 $conn->send ("reply d");
212 destroy_query_dialog $conn; 283 destroy_query_dialog $conn;
213 0 284 0
214 }, 285 },
215 ); 286 );
287
288 if ($conn->{chargen_race_description}) {
289 unshift @dialog, new CFPlus::UI::Label
290 max_w => $::WIDTH * 0.8,
291 ellipsise => 0,
292 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
293 ;
294 }
295
296 unshift @dialog, new CFPlus::UI::Face
297 face => $conn->{player}{face},
298 bg => [.2, .2, .2, 1],
299 min_w => 64,
300 min_h => 64,
301 ;
302
303 if ($conn->{chargen_race_title}) {
304 unshift @dialog, new CFPlus::UI::Label
305 allign => 1,
306 ellipsise => 0,
307 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
308 ;
309 }
216 310
217 unshift @dialog, new CFPlus::UI::Label 311 unshift @dialog, new CFPlus::UI::Label
218 max_w => $::WIDTH * 0.4, 312 max_w => $::WIDTH * 0.4,
219 ellipsise => 0, 313 ellipsise => 0,
220 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 314 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
… …
345 status "logging in..."; 439 status "logging in...";
346 440
347 $LOGIN_BUTTON->set_text ("Logout"); 441 $LOGIN_BUTTON->set_text ("Logout");
348 $SETUP_DIALOG->hide; 442 $SETUP_DIALOG->hide;
349 443
350 $PROFILE = $CFG->{profile}{default};
351
352 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 444 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
353 445
354 my ($host, $port) = split /:/, $PROFILE->{host}; 446 my ($host, $port) = split /:/, $PROFILE->{host};
355 447
356 $MAP = new CFPlus::Map $mapsize, $mapsize; 448 $MAP = new CFPlus::Map;
357 449
358 $CONN = eval { 450 $CONN = eval {
359 new CFPlus::Protocol 451 new CFPlus::Protocol
360 host => $host, 452 host => $host,
361 port => $port || 13327, 453 port => $port || 13327,
362 user => $PROFILE->{user}, 454 user => $PROFILE->{user},
363 pass => $PROFILE->{password}, 455 pass => $PROFILE->{password},
364 mapw => $mapsize, 456 mapw => $mapsize,
365 maph => $mapsize, 457 maph => $mapsize,
366 458
367 client => "cfplus $VERSION $] $^O", 459 client => "cfplus $CFPlus::VERSION $] $^O",
368 460
369 map_widget => $MAPWIDGET, 461 map_widget => $MAPWIDGET,
370 logview => $LOGVIEW, 462 logview => $LOGVIEW,
371 statusbox => $STATUSBOX, 463 statusbox => $STATUSBOX,
372 map => $MAP, 464 map => $MAP,
373 mapmap => $MAPMAP, 465 mapmap => $MAPMAP,
374 query => \&server_query, 466 query => \&server_query,
375 467
468 setup_req => {
469 smoothing => $CFG->{map_smoothing}*1,
470 },
471
376 sound_play => sub { 472 sound_play => sub {
377 my ($x, $y, $soundnum, $type) = @_; 473 my ($x, $y, $soundnum, $type) = @_;
378 474
379 $SDL_MIXER 475 $SDL_MIXER
380 or return; 476 or return;
… …
399sub stop_game { 495sub stop_game {
400 $LOGIN_BUTTON->set_text ("Login"); 496 $LOGIN_BUTTON->set_text ("Login");
401 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 497 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
402 $SETUP_DIALOG->show; 498 $SETUP_DIALOG->show;
403 $PL_WINDOW->hide; 499 $PL_WINDOW->hide;
404 $SPELL_PAGE->clear_spells; 500 $SPELL_LIST->clear_spells;
501 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
405 502
406 return unless $CONN; 503 return unless $CONN;
407 504
408 status "connection closed"; 505 status "connection closed";
409 506
410 destroy_query_dialog $CONN; 507 destroy_query_dialog $CONN;
411 $CONN->destroy; 508 $CONN->destroy;
412 $CONN = 0; # false, does not autovivify 509 $CONN = 0; # false, does not autovivify
413 510
414 undef $MAP; 511 undef $MAP;
415 undef $PROFILE;
416} 512}
417 513
418sub graphics_setup { 514sub graphics_setup {
419 my $vbox = new CFPlus::UI::VBox; 515 my $vbox = new CFPlus::UI::VBox;
420 516
421 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 517 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
422 518
519 my $row = 0;
520
521 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
522 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
523 can_events => 1,
524 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
525
423 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 526 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
424 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 527 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
425 528
426 $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]); 529 $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]);
427 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 530 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
428 531
429 $mode_slider->connect (changed => sub { 532 $mode_slider->connect (changed => sub {
… …
431 534
432 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 535 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
433 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 536 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
434 }); 537 });
435 $mode_slider->emit (changed => $mode_slider->{range}[0]); 538 $mode_slider->emit (changed => $mode_slider->{range}[0]);
436
437 my $row = 1;
438 539
439 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 540 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
440 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 541 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
441 state => $CFG->{fullscreen}, 542 state => $CFG->{fullscreen},
442 tooltip => "Bring the client into fullscreen mode.", 543 tooltip => "Bring the client into fullscreen mode.",
… …
448 state => $CFG->{fast}, 549 state => $CFG->{fast},
449 tooltip => "Lower the visual quality considerably to speed up rendering.", 550 tooltip => "Lower the visual quality considerably to speed up rendering.",
450 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 551 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
451 ); 552 );
452 553
554 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
555 $table->add (1, $row++, new CFPlus::UI::Slider
556 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
557 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
558 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
559 );
560
561 $table->add (1, $row++, new CFPlus::UI::Button
562 expand => 1, align => 0, text => "Apply",
563 tooltip => "Apply the video settings above.",
564 on_activate => sub {
565 video_shutdown ();
566 video_init ();
567 0
568 }
569 );
570
453 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 571 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
454 $table->add (1, $row++, new CFPlus::UI::Slider 572 $table->add (1, $row++, new CFPlus::UI::Slider
455 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 573 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
456 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 574 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
457 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 575 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
576 );
577
578 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
579 $table->add (1, $row++, new CFPlus::UI::CheckBox
580 state => $CFG->{map_smoothing},
581 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
582 . "This increases load on the graphics subsystem and works only with 2.x servers. "
583 . "Changes take effect at next connection only.",
584 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
458 ); 585 );
459 586
460 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 587 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
461 $table->add (1, $row++, new CFPlus::UI::CheckBox 588 $table->add (1, $row++, new CFPlus::UI::CheckBox
462 state => $CFG->{fow_enable}, 589 state => $CFG->{fow_enable},
… …
481 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; 608 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
482 0 609 0
483 } 610 }
484 ); 611 );
485 612
486 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
487 $table->add (1, $row++, new CFPlus::UI::Slider
488 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
489 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
490 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
491 );
492
493 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 613 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
494 $table->add (1, $row++, new CFPlus::UI::Slider 614 $table->add (1, $row++, new CFPlus::UI::Slider
495 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 615 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
496 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 616 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
497 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 617 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
… …
513 range => [$CFG->{gauge_size}, 0.2, 0.8], 633 range => [$CFG->{gauge_size}, 0.2, 0.8],
514 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 634 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
515 on_changed => sub { 635 on_changed => sub {
516 $CFG->{gauge_size} = $_[1]; 636 $CFG->{gauge_size} = $_[1];
517 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 637 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
518 0
519 }
520 );
521
522 $table->add (1, $row++, new CFPlus::UI::Button
523 expand => 1, align => 0, text => "Apply",
524 tooltip => "Apply the video settings",
525 on_activate => sub {
526 video_shutdown ();
527 video_init ();
528 0 638 0
529 } 639 }
530 ); 640 );
531 641
532 $vbox 642 $vbox
… …
637 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 747 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
638 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 748 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
639 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 749 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
640 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 750 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
641 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 751 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
752 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
642 753
643 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 754 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
644 755
645 for my $x (0..2) { 756 for my $x (0..2) {
646 for my $y (0 .. 2) { 757 for my $y (0 .. 2) {
… …
650 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 761 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
651 ); 762 );
652 } 763 }
653 } 764 }
654 765
766 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
655 767
656 $table 768 $table
657} 769}
658 770
659sub stats_window { 771sub stats_window {
… …
828 940
829 my $table = $METASERVER->{table}; 941 my $table = $METASERVER->{table};
830 $table->clear; 942 $table->clear;
831 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 943 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
832 944
833 my $buf; 945 my $ok = 0;
834 946
835 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 947 CFPlus::background {
948 my $ua = CFPlus::lwp_useragent;
836 949
837 unless ($fh) { 950 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
838 $label->set_text ("unable to contact metaserver: $!"); 951 } sub {
839 return; 952 my ($msg) = @_;
840 } 953 if ($msg) {
841
842 Event->io (fd => $fh, poll => 'r', cb => sub {
843 my $res = sysread $fh, $buf, 8192, length $buf;
844
845 if (!defined $res) {
846 $_[0]->w->cancel;
847 $label->set_text ("error while retrieving server list: $!");
848 } elsif ($res == 0) {
849 $_[0]->w->cancel;
850 status "server list retrieved";
851
852 utf8::decode $buf if utf8::valid $buf;
853
854 $table->clear; 954 $table->clear;
855 955
856 my @tip = ( 956 my @tip = (
857 "The current number of users logged in on the server.", 957 "The current number of users logged in on the server.",
858 "The hostname of the server.", 958 "The hostname of the server.",
… …
868 for 0 .. $#col; 968 for 0 .. $#col;
869 969
870 my @align = qw(1 0 1 1 -1); 970 my @align = qw(1 0 1 1 -1);
871 971
872 my $y = 0; 972 my $y = 0;
873 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 973 for my $m (@{ $msg->{servers} }) {
874 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 974 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
975 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
875 976
876 for ($desc) { 977 for ($desc) {
877 s/<br>/\n/gi; 978 s/<br>/\n/gi;
878 s/<li>/\n· /gi; 979 s/<li>/\n· /gi;
879 s/<.*?>//sgi; 980 s/<.*?>//sgi;
880 s/&/&amp;/g; 981 s/&amp;/&/g;
881 s/</&lt;/g; 982 s/&lt;/</g;
882 s/>/&gt;/g; 983 s/&gt;/>/g;
883 } 984 }
884 985
885 $uptime = sprintf "%dd %02d:%02d:%02d", 986 $uptime = sprintf "%dd %02d:%02d:%02d",
886 (int $m->[8] / 86400), 987 (int $uptime / 86400),
887 (int $m->[8] / 3600) % 24, 988 (int $uptime / 3600) % 24,
888 (int $m->[8] / 60) % 60, 989 (int $uptime / 60) % 60,
889 $m->[8] % 60; 990 $uptime % 60;
890 991
891 $m = [$users, $host, $uptime, $version, $desc]; 992 $m = [$users, $host, $uptime, $version, $desc];
892 993
893 $y++; 994 $y++;
894 995
… …
904 ), 1005 ),
905 (new CFPlus::UI::Empty expand => 1), 1006 (new CFPlus::UI::Empty expand => 1),
906 ]); 1007 ]);
907 1008
908 $table->add ($_, $y, new CFPlus::UI::Label 1009 $table->add ($_, $y, new CFPlus::UI::Label
1010 max_w => $::WIDTH * 0.4,
909 ellipsise => 0, 1011 ellipsise => 0,
910 align => $align[$_], 1012 align => $align[$_],
911 text => $m->[$_], 1013 text => $m->[$_],
912 tooltip => $tip[$_], 1014 tooltip => $tip[$_],
1015 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
913 can_hover => 1, 1016 can_hover => 1,
914 can_events => 1, 1017 can_events => 1,
915 fontsize => 0.8) 1018 fontsize => 0.8)
916 for 0 .. $#$m; 1019 for 0 .. $#$m;
917 } 1020 }
1021 } else {
1022 $ok or $label->set_text ("error while contacting metaserver");
918 } 1023 }
919 }); 1024 };
1025
920} 1026}
921 1027
922sub metaserver_dialog { 1028sub metaserver_dialog {
923 my $vbox = new CFPlus::UI::VBox; 1029 my $vbox = new CFPlus::UI::VBox;
924 my $table = new CFPlus::UI::Table; 1030 my $table = new CFPlus::UI::Table;
… …
928 title => "Server List", 1034 title => "Server List",
929 name => 'metaserver_dialog', 1035 name => 'metaserver_dialog',
930 x => 'center', 1036 x => 'center',
931 y => 'center', 1037 y => 'center',
932 z => 3, 1038 z => 3,
1039 force_w => $::WIDTH * 0.9,
933 force_h => $::HEIGHT * 0.4, 1040 force_h => $::HEIGHT * 0.7,
934 child => $vbox, 1041 child => $vbox,
935 has_close_button => 1, 1042 has_close_button => 1,
936 table => $table, 1043 table => $table,
937 on_visibility_change => sub { 1044 on_visibility_change => sub {
938 update_metaserver ($_[0]) if $_[1]; 1045 update_metaserver ($_[0]) if $_[1];
… …
1014 . "so only set it if you really need to prefetch images. " 1121 . "so only set it if you really need to prefetch images. "
1015 . "This option can be set and unset any time.", 1122 . "This option can be set and unset any time.",
1016 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1123 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1017 ); 1124 );
1018 1125
1019 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1126 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1020 $table->add (1, 9, new CFPlus::UI::Entry 1127 $table->add (1, 9, new CFPlus::UI::Entry
1128 text => $CFG->{output_rate},
1129 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1130 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1131 . "default will be used, which is usually around 100kb/s.",
1132 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1133 );
1134
1135 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1136 $table->add (1, 10, new CFPlus::UI::Entry
1021 text => $CFG->{output_count}, 1137 text => $CFG->{output_count},
1022 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1138 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1023 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1139 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1024 ); 1140 );
1025 1141
1026 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1142 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1027 $table->add (1, 10, new CFPlus::UI::Entry 1143 $table->add (1, 11, new CFPlus::UI::Entry
1028 text => $CFG->{output_sync}, 1144 text => $CFG->{output_sync},
1029 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1145 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1030 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1146 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1031 ); 1147 );
1032 1148
1033 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1149 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1034 expand => 1, 1150 expand => 1,
1035 align => 0, 1151 align => 0,
1036 text => "Login", 1152 text => "Login",
1037 on_activate => sub { 1153 on_activate => sub {
1038 $CONN ? stop_game 1154 $CONN ? stop_game
1039 : start_game; 1155 : start_game;
1040 0 1156 0
1041 }, 1157 },
1042 ); 1158 );
1043 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
1044 $table->add (0, 12, 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");
1045 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1174 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1046 text => $CFG->{say_command}, 1175 text => $CFG->{say_command},
1047 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. "
1048 . "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. "
1049 . "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.",
1050 on_changed => sub { 1179 on_changed => sub {
1051 my ($self, $value) = @_; 1180 my ($self, $value) = @_;
1052 $CFG->{say_command} = $value; 1181 $CFG->{say_command} = $value;
1053 0 1182 0
1054 } 1183 }
1055 ); 1184 );
1056 1185
1057 $table->add (0, 13, 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");
1058 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1187 $table->add (1, $row++, new CFPlus::UI::CheckBox
1059 state => $CFG->{show_tips}, 1188 state => $CFG->{show_tips},
1060 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?",
1061 on_changed => sub { 1190 on_changed => sub {
1062 my ($self, $value) = @_; 1191 my ($self, $value) = @_;
1063 $CFG->{shop_tips} = $value; 1192 $CFG->{show_tips} = $value;
1064 0 1193 0
1065 } 1194 }
1066 ); 1195 );
1067 1196
1068 $vbox->add (new CFPlus::UI::FancyFrame 1197 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1069 label => "Server Info", 1198 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1070 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 },
1071 ); 1208 );
1072 1209
1073 $vbox 1210 $table
1074} 1211}
1075 1212
1076sub message_window { 1213sub message_window {
1077 my $window = new CFPlus::UI::Toplevel 1214 my $window = new CFPlus::UI::Toplevel
1078 name => "message_window", 1215 name => "message_window",
… …
1159 ["Boots" => PICKUP_BOOTS], 1296 ["Boots" => PICKUP_BOOTS],
1160 ["Gloves" => PICKUP_GLOVES], 1297 ["Gloves" => PICKUP_GLOVES],
1161 ["Cloaks" => PICKUP_CLOAK], 1298 ["Cloaks" => PICKUP_CLOAK],
1162 ], 1299 ],
1163 1300
1164 ["Readables", 2, 2, 1301 ["Readables", 2, 0,
1165 ["Spellbooks" => PICKUP_SPELLBOOK], 1302 ["Spellbooks" => PICKUP_SPELLBOOK],
1166 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1303 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1167 ["Normal Books/Scrolls" => PICKUP_READABLES], 1304 ["Normal Books/Scrolls" => PICKUP_READABLES],
1168 ], 1305 ],
1169 ["Misc", 2, 7, 1306 ["Misc", 2, 5,
1170 ["Food" => PICKUP_FOOD], 1307 ["Food" => PICKUP_FOOD],
1171 ["Drinks" => PICKUP_DRINK], 1308 ["Drinks" => PICKUP_DRINK],
1172 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1309 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1173 ["Keys" => PICKUP_KEY], 1310 ["Keys" => PICKUP_KEY],
1174 ["Magical Items" => PICKUP_MAGICAL], 1311 ["Magical Items" => PICKUP_MAGICAL],
1175 ["Potions" => PICKUP_POTION], 1312 ["Potions" => PICKUP_POTION],
1176 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1313 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1177 ["Ignore cursed" => PICKUP_NOT_CURSED], 1314 ["Ignore cursed" => PICKUP_NOT_CURSED],
1178 ["Jewelery" => PICKUP_JEWELS], 1315 ["Jewelery" => PICKUP_JEWELS],
1316 ["Flesh" => PICKUP_FLESH],
1179 ], 1317 ],
1180 ["Weight/Value ratio", 2, 17] 1318 ["Weight/Value ratio", 2, 17]
1181 ) 1319 )
1182 { 1320 {
1183 my ($title, $x, $y, @bits) = @$_; 1321 my ($title, $x, $y, @bits) = @$_;
… …
1233 $table 1371 $table
1234} 1372}
1235 1373
1236my %SORT_ORDER = ( 1374my %SORT_ORDER = (
1237 type => undef, 1375 type => undef,
1238 mtime => sub { sort { 1376 mtime => sub {
1377 my $NOW = time;
1378 sort {
1379 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1380 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1381
1239 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1382 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1240 or $b->{mtime} <=> $a->{mtime} 1383 or $btime <=> $atime
1241 or $a->{type} <=> $b->{type} 1384 or $a->{type} <=> $b->{type}
1385 } @_
1242 } @_ }, 1386 },
1243 weight => sub { sort { 1387 weight => sub { sort {
1244 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1388 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1245 or $a->{type} <=> $b->{type} 1389 or $a->{type} <=> $b->{type}
1246 } @_ }, 1390 } @_ },
1247); 1391);
… …
1272 #TODO# update to weigh/maxweight 1416 #TODO# update to weigh/maxweight
1273 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1417 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1274 1418
1275 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1419 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1276 $sw1->add ($INV = new CFPlus::UI::Inventory); 1420 $sw1->add ($INV = new CFPlus::UI::Inventory);
1421 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1277 1422
1278 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1423 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1279 1424
1280 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1425 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1281 1426
… …
1310 has_close_button => 1 1455 has_close_button => 1
1311 ; 1456 ;
1312 1457
1313 my $ntb = 1458 my $ntb =
1314 $PL_NOTEBOOK = 1459 $PL_NOTEBOOK =
1315 new CFPlus::UI::Notebook expand => 1, debug => 1; 1460 new CFPlus::UI::Notebook expand => 1;
1316 1461
1317 $ntb->add ( 1462 $ntb->add (
1318 "Statistics (F2)" => $STATS_PAGE = stats_window, 1463 "Statistics (F2)" => $STATS_PAGE = stats_window,
1319 "Shows statistics, where all your Stats and Resistances are shown." 1464 "Shows statistics, where all your Stats and Resistances are shown."
1320 ); 1465 );
1321 $ntb->add ( 1466 $ntb->add (
1322 "Skills (F3)" => $SKILL_PAGE = skill_window, 1467 "Skills (F3)" => $SKILL_PAGE = skill_window,
1323 "Shows all your Skills." 1468 "Shows all your Skills."
1324 ); 1469 );
1325 1470
1326 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1471 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1327 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1472 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1328 $ntb->add ( 1473 $ntb->add (
1329 "Spellbook (F4)" => $spellsw, 1474 "Spellbook (F4)" => $spellsw,
1330 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1475 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1331 ); 1476 );
1332 $ntb->add ( 1477 $ntb->add (
1333 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1478 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1334 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1479 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1335 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1480 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1336 ); 1481 );
1482 $ntb->add (Pickup => autopickup_setup,
1483 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1337 1484
1338 $ntb->set_current_page ($INVENTORY_PAGE); 1485 $ntb->set_current_page ($INVENTORY_PAGE);
1339 1486
1340 $plwin->add ($ntb); 1487 $plwin->add ($ntb);
1341 $plwin 1488 $plwin
1342} 1489}
1343 1490
1344sub update_bindings {
1345 $BIND_UPD_CB->() if $BIND_UPD_CB;
1346}
1347
1348sub keyboard_setup { 1491sub keyboard_setup {
1349 my $binding_list = new CFPlus::UI::VBox; 1492 CFPlus::Macro::keyboard_setup
1350
1351 my $refresh;
1352 $refresh = $BIND_UPD_CB = sub {
1353 $binding_list->clear ();
1354
1355 return unless $PROFILE;
1356
1357 for my $mod (keys %{$PROFILE->{bindings}}) {
1358 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1359 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1360 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1361
1362 my $lbl = join "; ", @$cmds;
1363 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1364 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1365 $hb->add (new CFPlus::UI::Button
1366 text => "delete",
1367 tooltip => "Deletes the binding",
1368 on_activate => sub {
1369 $binding_list->remove ($hb);
1370 delete $PROFILE->{bindings}{$mod}{$sym};
1371 0
1372 });
1373
1374 $hb->add (new CFPlus::UI::Button
1375 text => "edit",
1376 tooltip => "Edits the binding",
1377 on_activate => sub {
1378 $::BIND_EDITOR->set_binding (
1379 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1380 sub {
1381 my ($nmod, $nsym, $ncmds) = @_;
1382 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1383 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1384 $refresh->();
1385 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1386 $SETUP_DIALOG->show;
1387 },
1388 sub {
1389 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1390 $SETUP_DIALOG->show;
1391 });
1392 $::BIND_EDITOR->show;
1393 $SETUP_DIALOG->hide;
1394 0
1395 });
1396
1397 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1398 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1399 }
1400 }
1401 };
1402
1403 my $vb = new CFPlus::UI::VBox;
1404 $vb->add (new CFPlus::UI::FancyFrame
1405 label => "Options",
1406 child => (my $hb = new CFPlus::UI::HBox),
1407 );
1408 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1409 $hb->add (new CFPlus::UI::CheckBox
1410 expand => 1,
1411 state => $CFG->{shift_fire_stop},
1412 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1413 on_changed => sub {
1414 my ($cbox, $value) = @_;
1415 $CFG->{shift_fire_stop} = $value;
1416 0
1417 });
1418
1419 $vb->add (new CFPlus::UI::FancyFrame
1420 label => "Bindings",
1421 child => $binding_list);
1422 $vb->add (my $hb = new CFPlus::UI::HBox);
1423
1424 $hb->add (new CFPlus::UI::Button
1425 text => "record new",
1426 expand => 1,
1427 tooltip => "This button opens the binding editor with an empty binding.",
1428 on_activate => sub {
1429 $::BIND_EDITOR->set_binding (undef, undef, [],
1430 sub {
1431 my ($mod, $sym, $cmds) = @_;
1432 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1433 $refresh->();
1434 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1435 $SETUP_DIALOG->show;
1436 },
1437 sub {
1438 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1439 $SETUP_DIALOG->show;
1440 },
1441 );
1442 $SETUP_DIALOG->hide;
1443 $::BIND_EDITOR->show;
1444 0
1445 },
1446 );
1447
1448 $hb->add (new CFPlus::UI::Button
1449 text => "close",
1450 tooltip => "Closes the binding window",
1451 expand => 1,
1452 on_activate => sub {
1453 $SETUP_DIALOG->hide;
1454 0
1455 }
1456 );
1457
1458 $refresh->();
1459
1460 $vb
1461} 1493}
1462 1494
1463sub help_window { 1495sub help_window {
1464 my $win = new CFPlus::UI::Toplevel 1496 my $win = new CFPlus::UI::Toplevel
1465 x => 'center', 1497 x => 'center',
… …
1622 1654
1623sub show_tip_of_the_day { 1655sub show_tip_of_the_day {
1624 # find all tips 1656 # find all tips
1625 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1657 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1626 1658
1627 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1659 CFPlus::DB::get state => "tip_of_the_day", sub {
1660 my ($todindex) = @_;
1628 $todindex = 0 if $todindex >= @tod; 1661 $todindex = 0 if $todindex >= @tod;
1629 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1662 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1630 1663
1631 # create dialog 1664 # create dialog
1632 my $dialog; 1665 my $dialog;
1633 1666
1634 my $close = sub { 1667 my $close = sub {
1635 $dialog->destroy; 1668 $dialog->destroy;
1669 };
1670
1671 $dialog = new CFPlus::UI::Toplevel
1672 x => "center",
1673 y => "center",
1674 z => 3,
1675 name => 'tip_of_the_day',
1676 force_w => int $WIDTH * 4/9,
1677 force_h => int $WIDTH * 2/9,
1678 title => "Tip of the day #" . (1 + $todindex),
1679 child => my $vbox = new CFPlus::UI::VBox,
1680 has_close_button => 1,
1681 on_delete => $close,
1682 ;
1683
1684 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1685 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1686 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1687
1688 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1689
1690 $table->add (0, 0, new CFPlus::UI::Button
1691 text => "Close",
1692 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>.",
1693 on_activate => $close,
1694 );
1695
1696 $table->add (2, 0, new CFPlus::UI::Button
1697 text => "Next",
1698 tooltip => "Show the next <b>Tip of the day</b>.",
1699 on_activate => sub {
1700 $close->();
1701 &show_tip_of_the_day;
1702 },
1703 );
1704
1705 $dialog->show;
1636 }; 1706 };
1637
1638 $dialog = new CFPlus::UI::Toplevel
1639 x => "center",
1640 y => "center",
1641 z => 3,
1642 name => 'tip_of_the_day',
1643 force_w => int $WIDTH * 4/9,
1644 force_h => int $WIDTH * 2/9,
1645 title => "Tip of the day #" . (1 + $todindex),
1646 child => my $vbox = new CFPlus::UI::VBox,
1647 has_close_button => 1,
1648 on_delete => $close,
1649 ;
1650
1651 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1652 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1653 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1654
1655 $vbox->add (my $table = new CFPlus::UI::Table);
1656
1657 $table->add (0, 0, new CFPlus::UI::Button
1658 text => "Close",
1659 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>.",
1660 on_activate => $close,
1661 );
1662
1663 $table->add (2, 0, new CFPlus::UI::Button
1664 text => "Next",
1665 tooltip => "Show the next <b>Tip of the day</b>.",
1666 on_activate => sub {
1667 $close->();
1668 &show_tip_of_the_day;
1669 },
1670 );
1671
1672 $dialog->show;
1673} 1707}
1674 1708
1675sub sdl_init { 1709sub sdl_init {
1676 CFPlus::SDL_Init 1710 CFPlus::SDL_Init
1677 and die "SDL::Init failed!\n"; 1711 and die "SDL::Init failed!\n";
… …
1711 padding => 0, 1745 padding => 0,
1712 z => 100, 1746 z => 100,
1713 force_x => "max", 1747 force_x => "max",
1714 force_y => 0; 1748 force_y => 0;
1715 $DEBUG_STATUS->show; 1749 $DEBUG_STATUS->show;
1716
1717 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1718 1750
1719 $STATUSBOX = new CFPlus::UI::Statusbox; 1751 $STATUSBOX = new CFPlus::UI::Statusbox;
1720 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1752 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1721 1753
1722 (new CFPlus::UI::Frame 1754 (new CFPlus::UI::Frame
… …
1759 font => $FONT_FIXED, 1791 font => $FONT_FIXED,
1760 fontsize => $::CFG->{log_fontsize}, 1792 fontsize => $::CFG->{log_fontsize},
1761 indent => -4, 1793 indent => -4,
1762 can_hover => 1, 1794 can_hover => 1,
1763 can_events => 1, 1795 can_events => 1,
1796 max_par => $CFG->{logview_max_par},
1764 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1797 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1765 ; 1798 ;
1766 1799
1767 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1800 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1768 title => "Setup", 1801 title => "Setup",
1769 name => "setup_dialog", 1802 name => "setup_dialog",
… …
1780 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1813 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1781 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1814 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1782 1815
1783 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1816 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1784 "Configure the server to play on, your username, password and other server-related options."); 1817 "Configure the server to play on, your username, password and other server-related options.");
1785 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1818 $SETUP_NOTEBOOK->add (Client => client_setup,
1786 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1819 "Configure various client-specific settings.");
1787 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1820 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1788 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1821 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1789 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1822 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1790 "Configure the use of audio, sound effects and background music."); 1823 "Configure the use of audio, sound effects and background music.");
1791 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1824 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1823 ); 1856 );
1824 1857
1825 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1858 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1826 tooltip => "View Documentation"); 1859 tooltip => "View Documentation");
1827 1860
1861
1828 $BUTTONBAR->add (new CFPlus::UI::Button 1862 $BUTTONBAR->add (new CFPlus::UI::Button
1829 text => "Quit", 1863 text => "Quit",
1830 tooltip => "Terminates the program", 1864 tooltip => "Terminates the program",
1831 on_activate => sub { 1865 on_activate => sub {
1832 if ($CONN) { 1866 if ($CONN) {
… …
1843 } 1877 }
1844 1878
1845 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1879 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1846} 1880}
1847 1881
1882sub setup_build_button {
1883 my ($enabled) = @_;
1884 if ($enabled) {
1885 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1886 $BUILD_BUTTON ||= new CFPlus::UI::Button
1887 text => "Build",
1888 tooltip => "Opens the ingame builder",
1889 on_activate => sub {
1890 if ($CONN) {
1891 $CONN->send_ext_req (builder_player_items => sub {
1892 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1893 });
1894 }
1895 0
1896 };
1897 $BUTTONBAR->add ($BUILD_BUTTON);
1898 } else {
1899 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1900 }
1901}
1902
1903sub open_ingame_editor {
1904 my ($msg) = @_;
1905
1906 my $win = new CFPlus::UI::Toplevel
1907 x => 0,
1908 y => 'center',
1909 z => 4,
1910 name => 'builder_window',
1911 force_w => int $WIDTH * 1/4,
1912 force_h => int $HEIGHT * 3/4,
1913 title => "In game builder",
1914 has_close_button => 1;
1915
1916 my $r = new CFPlus::UI::ScrolledWindow (
1917 expand => 1,
1918 scroll_y => 1
1919 );
1920 $r->add (my $vb = new CFPlus::UI::VBox);
1921 $win->add ($r);
1922
1923
1924 $vb->add (
1925 new CFPlus::UI::Button
1926 text => "Disable build mode",
1927 on_activate => sub { $::IN_BUILD_MODE = undef }
1928 );
1929 $vb->add (
1930 new CFPlus::UI::Button
1931 text => "ERASE",
1932 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1933 );
1934
1935 for my $itemarchname (
1936 sort {
1937 $msg->{items}->{$a}->{build_arch_name}
1938 cmp $msg->{items}->{$b}->{build_arch_name}
1939 } keys %{$msg->{items}}
1940 ) {
1941 my $info = $msg->{items}->{$itemarchname};
1942 $vb->add (
1943 new CFPlus::UI::Button text => $info->{build_arch_name},
1944 on_activate => sub {
1945 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1946
1947 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1948 build_mode_query_arch_info ();
1949 }
1950 }
1951 );
1952 }
1953
1954 $win->show;
1955}
1956
1957sub build_mode_query_arch_info {
1958 my ($iteminfo) = $::IN_BUILD_MODE;
1959 my $itemarchname = $iteminfo->{item};
1960 my $info = $iteminfo->{info};
1961
1962 my $dialog = new CFPlus::UI::Toplevel
1963 x => "center",
1964 y => "center",
1965 z => 50,
1966 force_w => int $WIDTH * 1/2,
1967 title => "Enter information for placement of '$itemarchname'",
1968 has_close_button => 1;
1969
1970 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1971
1972 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1973 my $row = 0;
1974 if ($info->{has_name}) {
1975 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1976 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1977 }
1978 if ($info->{has_text}) {
1979 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1980 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1981 }
1982 if ($info->{has_connection}) {
1983 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1984 $table->add (1, $row++,
1985 new CFPlus::UI::Entry
1986 expand => 1,
1987 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1988 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1989 );
1990 }
1991
1992 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1993 $hb->add (new CFPlus::UI::Button
1994 text => "Close",
1995 expand => 1,
1996 on_activate => sub { $dialog->hide; 0 },
1997 );
1998 $dialog->show;
1999}
2000
1848sub video_shutdown { 2001sub video_shutdown {
1849 CFPlus::OpenGL::shutdown; 2002 CFPlus::OpenGL::shutdown;
1850 2003
1851 undef $SDL_ACTIVE; 2004 undef $SDL_ACTIVE;
1852} 2005}
… …
1883 CFPlus::Mix_AllocateChannels 8; 2036 CFPlus::Mix_AllocateChannels 8;
1884 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 2037 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1885 2038
1886 audio_music_finished; 2039 audio_music_finished;
1887 2040
2041 local $_;
1888 while (<$fh>) { 2042 while (<$fh>) {
1889 next if /^\s*#/; 2043 next if /^\s*#/;
1890 next if /^\s*$/; 2044 next if /^\s*$/;
1891 2045
1892 my ($file, $volume, $event) = split /\s+/, $_, 3; 2046 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1969 if $CONN; 2123 if $CONN;
1970}); 2124});
1971 2125
1972%SDL_CB = ( 2126%SDL_CB = (
1973 CFPlus::SDL_QUIT => sub { 2127 CFPlus::SDL_QUIT => sub {
1974 Event::unloop -1; 2128 exit;
1975 }, 2129 },
1976 CFPlus::SDL_VIDEORESIZE => sub { 2130 CFPlus::SDL_VIDEORESIZE => sub {
1977 }, 2131 },
1978 CFPlus::SDL_VIDEOEXPOSE => sub { 2132 CFPlus::SDL_VIDEOEXPOSE => sub {
1979 CFPlus::UI::full_refresh; 2133 CFPlus::UI::full_refresh;
1980 }, 2134 },
1981 CFPlus::SDL_ACTIVEEVENT => sub { 2135 CFPlus::SDL_ACTIVEEVENT => sub {
1982# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2136# not useful, as APPACTIVE include sonly iconified state, not unmapped
2137# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2138# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2139# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2140# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1983 }, 2141 },
1984 CFPlus::SDL_KEYDOWN => sub { 2142 CFPlus::SDL_KEYDOWN => sub {
1985 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2143 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1986 # alt-enter 2144 # alt-enter
1987 $FULLSCREEN_ENABLE->toggle; 2145 $FULLSCREEN_ENABLE->toggle;
… …
2008 2166
2009$SIG{INT} = $SIG{TERM} = sub { exit }; 2167$SIG{INT} = $SIG{TERM} = sub { exit };
2010 2168
2011{ 2169{
2012 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2170 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2171 CFPlus::DB::Server::run;
2172
2013 CFPlus::UI::set_layout ($::CFG->{layout}); 2173 CFPlus::UI::set_layout ($::CFG->{layout});
2014 2174
2015 my %DEF_CFG = ( 2175 my %DEF_CFG = (
2016 sdl_mode => 0, 2176 sdl_mode => 0,
2017 width => 640, 2177 width => 640,
2018 height => 480, 2178 height => 480,
2019 fullscreen => 0, 2179 fullscreen => 0,
2020 fast => 0, 2180 fast => 0,
2021 map_scale => 1, 2181 map_scale => 1,
2022 fow_enable => 1, 2182 fow_enable => 1,
2023 fow_intensity => 0.45, 2183 fow_intensity => 0.45,
2024 fow_smooth => 0, 2184 fow_smooth => 0,
2185 map_smoothing => 1,
2025 gui_fontsize => 1, 2186 gui_fontsize => 1,
2026 log_fontsize => 0.7, 2187 log_fontsize => 0.7,
2027 gauge_fontsize => 1, 2188 gauge_fontsize => 1,
2028 gauge_size => 0.35, 2189 gauge_size => 0.35,
2029 stat_fontsize => 0.7, 2190 stat_fontsize => 0.7,
2030 mapsize => 100, 2191 mapsize => 100,
2031 say_command => 'say', 2192 say_command => 'chat',
2032 audio_enable => 1, 2193 audio_enable => 1,
2033 bgm_enable => 1, 2194 bgm_enable => 1,
2034 bgm_volume => 0.25, 2195 bgm_volume => 0.25,
2035 face_prefetch => 0, 2196 face_prefetch => 0,
2036 output_sync => 1, 2197 output_sync => 1,
2037 output_count => 1, 2198 output_count => 1,
2199 output_rate => "",
2038 pickup => 0, 2200 pickup => 0,
2039 inv_sort => "mtime", 2201 inv_sort => "mtime",
2040 default => "profile", # default profile 2202 default => "profile", # default profile
2041 show_tips => 1, 2203 show_tips => 1,
2204 logview_max_par => 1000,
2042 ); 2205 );
2043 2206
2044 while (my ($k, $v) = each %DEF_CFG) { 2207 while (my ($k, $v) = each %DEF_CFG) {
2045 $CFG->{$k} = $v unless exists $CFG->{$k}; 2208 $CFG->{$k} = $v unless exists $CFG->{$k};
2046 } 2209 }
2047 2210
2048 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2211 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2212 $PROFILE = $CFG->{profile}{default};
2213
2214 # convert old bindings (only default profile matters)
2215 if (my $bindings = delete $PROFILE->{bindings}) {
2216 while (my ($mod, $syms) = each %$bindings) {
2217 while (my ($sym, $cmds) = each %$syms) {
2218 push @{ $PROFILE->{macro} }, {
2219 accelkey => [$mod*1, $sym*1],
2220 action => $cmds,
2221 };
2222 }
2223 }
2224 }
2049 2225
2050 sdl_init; 2226 sdl_init;
2051 2227
2052 @SDL_MODES = reverse 2228 @SDL_MODES = reverse
2053 grep $_->[0] >= 640 && $_->[1] >= 480, 2229 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2090# } 2266# }
2091# my $t2 = Time::HiRes::time; 2267# my $t2 = Time::HiRes::time;
2092# warn $t2-$t1; 2268# warn $t2-$t1;
2093# } 2269# }
2094 2270
2271 $startup_done->();
2272
2095 video_init; 2273 video_init;
2096 audio_init; 2274 audio_init;
2097} 2275}
2098 2276
2099show_tip_of_the_day if $CFG->{show_tips}; 2277show_tip_of_the_day if $CFG->{show_tips};
2100
2101use Data::Dumper; warn Dumper [CFPlus::win32_proxy_info()];#d#
2102 2278
2103Event::loop; 2279Event::loop;
2104#CFPlus::SDL_Quit; 2280#CFPlus::SDL_Quit;
2105#CFPlus::_exit 0; 2281#CFPlus::_exit 0;
2106 2282
2283END {
2107END { CFPlus::SDL_Quit } 2284 CFPlus::SDL_Quit;
2285 CFPlus::DB::Server::stop;
2286}
2108 2287
2109=head1 NAME 2288=head1 NAME
2110 2289
2111cfplus - A Crossfire+ and Crossfire game client 2290cfplus - A Crossfire+ and Crossfire game client
2112 2291

Diff Legend

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