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.119 by root, Fri Sep 29 00:56:06 2006 UTC vs.
Revision 1.157 by root, Tue Jun 26 05:06:01 2007 UTC

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

Diff Legend

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