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.177 by root, Thu Jul 19 15:43:14 2007 UTC vs.
Revision 1.209 by root, Sat Aug 11 14:41:38 2007 UTC

71unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
72 if %PAR::LibCache; 72 if %PAR::LibCache;
73 73
74use Time::HiRes 'time'; 74use Time::HiRes 'time';
75use Event; 75use Event;
76use List::Util qw(max min);
76 77
77use Crossfire; 78use Crossfire;
78use Crossfire::Protocol::Constants; 79use Crossfire::Protocol::Constants;
79 80
80use Compress::LZF; 81use Compress::LZF;
82use CFPlus; 83use CFPlus;
83use CFPlus::OpenGL (); 84use CFPlus::OpenGL ();
84use CFPlus::Protocol; 85use CFPlus::Protocol;
85use CFPlus::DB; 86use CFPlus::DB;
86use CFPlus::UI; 87use CFPlus::UI;
88use CFPlus::UI::Canvas;
87use CFPlus::UI::Inventory; 89use CFPlus::UI::Inventory;
88use CFPlus::UI::SpellList; 90use CFPlus::UI::SpellList;
91use CFPlus::UI::MessageWindow;
89use CFPlus::Pod; 92use CFPlus::Pod;
90use CFPlus::MapWidget; 93use CFPlus::MapWidget;
91use CFPlus::Macro; 94use CFPlus::Macro;
92 95
93$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 96$SIG{QUIT} = sub { Carp::cluck "QUIT" };
110our $CONN; 113our $CONN;
111our $PROFILE; # current profile 114our $PROFILE; # current profile
112our $FAST; # fast, low-quality mode, possibly useful for software-rendering 115our $FAST; # fast, low-quality mode, possibly useful for software-rendering
113 116
114our $WANT_REFRESH; 117our $WANT_REFRESH;
115our $CAN_REFRESH;
116 118
117our @SDL_MODES; 119our @SDL_MODES;
118our $WIDTH; 120our $WIDTH;
119our $HEIGHT; 121our $HEIGHT;
120our $FULLSCREEN; 122our $FULLSCREEN;
125 127
126our $MAP; 128our $MAP;
127our $MAPMAP; 129our $MAPMAP;
128our $MAPWIDGET; 130our $MAPWIDGET;
129our $BUTTONBAR; 131our $BUTTONBAR;
130our $LOGVIEW;
131our $CONSOLE;
132our $METASERVER; 132our $METASERVER;
133our $LOGIN_BUTTON; 133our $LOGIN_BUTTON;
134our $QUIT_DIALOG; 134our $QUIT_DIALOG;
135our $HOST_ENTRY; 135our $HOST_ENTRY;
136our $FULLSCREEN_ENABLE; 136our $FULLSCREEN_ENABLE;
143our $SETUP_KEYBOARD; 143our $SETUP_KEYBOARD;
144 144
145our $PL_NOTEBOOK; 145our $PL_NOTEBOOK;
146our $PL_WINDOW; 146our $PL_WINDOW;
147 147
148our $MUSIC_PLAYING_WIDGET;
149our $LICENSE_WIDGET;
150
148our $INVENTORY_PAGE; 151our $INVENTORY_PAGE;
149our $STATS_PAGE; 152our $STATS_PAGE;
150our $SKILL_PAGE; 153our $SKILL_PAGE;
151our $SPELL_PAGE; 154our $SPELL_PAGE;
152our $SPELL_LIST; 155our $SPELL_LIST;
158our $STATWIDS; 161our $STATWIDS;
159 162
160our $SDL_ACTIVE; 163our $SDL_ACTIVE;
161our %SDL_CB; 164our %SDL_CB;
162 165
163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT;
166our $MUSIC_START;
167our $MUSIC_PLAYING;
168our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
170our @SOUNDS; # event => file mapping
171our %AUDIO_CHUNKS; # audio files
172
173our $ALT_ENTER_MESSAGE; 166our $ALT_ENTER_MESSAGE;
174our $STATUSBOX; 167our $STATUSBOX;
175our $DEBUG_STATUS; 168our $DEBUG_STATUS;
176 169
177our $INV; 170our $INV;
178our $INVR; 171our $INVR;
179our $INV_RIGHT_HB; 172our $INV_RIGHT_HB;
180 173
181our $PICKUP_CFG; 174our $PICKUP_CFG;
182 175
183our $IN_BUILD_MODE; 176#############################################################################
184our $BUILD_BUTTON;
185 177
186sub status { 178sub status {
187 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 179 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
188} 180}
189 181
191 $DEBUG_STATUS->set_text ($_[0]); 183 $DEBUG_STATUS->set_text ($_[0]);
192} 184}
193 185
194sub message { 186sub message {
195 my ($para) = @_; 187 my ($para) = @_;
196 188 $MESSAGE_WINDOW->message ($para);
197 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
198
199 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
200
201 $LOGVIEW->add_paragraph ($para);
202 $LOGVIEW->scroll_to_bottom;
203} 189}
190
191#############################################################################
192#TODO: maybe move into own audio module...
193
194our $SDL_MIXER;
195
196our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
197our $MUSIC_WANT; # arryref of ambient music we want to play
198our @MUSIC_HAVE; # ambient music we have on disk
199our $MUSIC_START;
200our @MUSIC_JINGLE; # which jingles to play next
201our $MUSIC_PLAYING_DATA;
202our $MUSIC_PLAYING_META;
203our $MUSIC_PLAYER;
204our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
205
206our %AUDIO_CHUNK; # audio "files"
207our %AUDIO_PLAY; # which audio faces should be played
208
209sub audio_channel_finished {
210 my ($channel) = @_;
211
212# warn "channel $channel finished\n";#d#
213}
214
215sub audio_sound_push($) {
216 my ($face) = @_;
217
218 $CFG->{effects_enable}
219 or return;
220
221 $AUDIO_PLAY{$face}
222 or return;
223
224 if (my $chunk = $AUDIO_CHUNK{$face}) {
225 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
226 my (undef, $dx, $dy, $vol) = @$_;
227
228 my $channel = CFPlus::Channel::find;
229 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
230 $channel->set_position_r ($dx, $dy, 20);
231 $chunk->play ($channel);
232 }
233 } else {
234 # sound_meta not set means data is in flight either way
235 my $meta = $CONN->{sound_meta}{$face}
236 or return;
237
238 # if its a jingle, play it as ambient music
239 if ($meta->{meta}{jingle}) {
240 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
241 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
242 &audio_music_push ($face);
243 }
244 } else {
245 # fetch from database
246 CFPlus::DB::get res_data => $meta->{name}, sub {
247 my $rwops = new CFPlus::RW $_[0];
248 my $chunk = new CFPlus::MixChunk $rwops
249 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
250 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
251 $AUDIO_CHUNK{$face} = $chunk;
252
253 audio_sound_push ($face);
254 };
255 }
256 }
257}
258
259sub audio_sound_play {
260 my ($face, $dx, $dy, $vol) = @_;
261
262 $SDL_MIXER
263 or return;
264 $CFG->{effects_enable}
265 or return;
266
267 my $queue = $AUDIO_PLAY{$face} ||= [];
268 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
269 audio_sound_push $face
270 unless @$queue > 1;
271}
272
273sub audio_music_set_meta {
274 my ($meta) = @_;
275
276 $MUSIC_PLAYING_META = $meta;
277 $MUSIC_PLAYING_WIDGET->set_markup (
278 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
279 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
280 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
281 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
282 );
283}
284
285sub audio_music_update_volume {
286 return unless $MUSIC_PLAYING_META;
287 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
288 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
289 CFPlus::MixMusic::volume $base * $volume * 128;
290}
291
292sub audio_music_start {
293 my $meta = $MUSIC_PLAYING_META;
294
295 CFPlus::DB::get res_data => $meta->{name}, sub {
296 return unless $SDL_MIXER;
297
298 # music might have changed...
299 $meta eq $MUSIC_PLAYING_META
300 or return &audio_music_start ();
301
302 audio_music_update_volume;
303
304 $MUSIC_PLAYING_DATA = \$_[0];
305
306 my $rwops = $meta->{path}
307 ? new_from_file CFPlus::RW $meta->{path}
308 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
309
310 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
311 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
312
313 my $NOW = time;
314
315 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
316 my $pos = $MUSIC_PLAYING_META->{stop_pos};
317 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
318 $MUSIC_START = time - $pos;
319 } else {
320 $MUSIC_PLAYER->play (0);
321 $MUSIC_START = time;
322 }
323
324 delete $meta->{stop_time};
325 delete $meta->{stop_pos};
326 }
327}
328
329sub audio_music_push {
330 return unless $SDL_MIXER;
331
332 my $fade_out;
333
334 if (@MUSIC_JINGLE) {
335 @MUSIC_HAVE = $MUSIC_JINGLE[0];
336 $fade_out = 333;
337 } else {
338 return unless $CFG->{bgm_enable};
339
340 my @have =
341 grep $_,
342 map $CONN->{music_meta}{$_},
343 @$MUSIC_WANT;
344
345 @MUSIC_HAVE = @have
346 if @have;
347
348 # default MUSIC_HAVE == MUSIC_DEFAULT
349 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
350 $fade_out = 1000;
351 }
352
353 # if the currently playing song is acceptable, let it continue
354 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
355
356 my $NOW = time;
357
358 if ($MUSIC_PLAYING_META) {
359 $MUSIC_PLAYING_META->{stop_time} = $NOW;
360 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
361 CFPlus::MixMusic::fade_out $fade_out;
362 } else {
363 # sort by stop time, oldest first
364 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
365
366 # if the most recently-played piece played very recently,
367 # resume it, else choose the oldest piece for rotation.
368 audio_music_set_meta
369 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
370 ? $MUSIC_HAVE[-1]
371 : $MUSIC_HAVE[0];
372
373 audio_music_start;
374 }
375}
376
377sub audio_music_set_ambient {
378 my ($songs) = @_;
379
380 $MUSIC_WANT = $songs;
381 audio_music_push;
382}
383
384sub audio_music_finished {
385 # we compress multiple jingles of the same type
386 shift @MUSIC_JINGLE
387 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
388
389 $MUSIC_PLAYING_WIDGET->clear;
390
391 undef $MUSIC_PLAYER;
392 undef $MUSIC_PLAYING_META;
393 undef $MUSIC_PLAYING_DATA;
394
395 audio_music_push;
396}
397
398sub audio_init {
399 if ($CFG->{audio_enable}) {
400 $ENV{MIX_EFFECTSMAXSPEED} = 1;
401 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
402
403 unless ($SDL_MIXER) {
404 status "Unable to open sound device: there will be no sound";
405 return;
406 }
407
408 CFPlus::Mix_AllocateChannels 16;
409
410 audio_music_finished;
411 } else {
412 undef $SDL_MIXER;
413 }
414}
415
416sub audio_shutdown {
417 undef $MUSIC_PLAYER;
418 undef $MUSIC_PLAYING_META;
419 undef $MUSIC_PLAYING_DATA;
420
421 $MUSIC_WANT = [];
422 @MUSIC_JINGLE = ();
423 %AUDIO_PLAY = ();
424 %AUDIO_CHUNK = ();
425
426 CFPlus::Mix_CloseAudio if $SDL_MIXER;
427 undef $SDL_MIXER;
428}
429
430#############################################################################
204 431
205sub destroy_query_dialog { 432sub destroy_query_dialog {
206 (delete $_[0]{query_dialog})->destroy 433 (delete $_[0]{query_dialog})->destroy
207 if $_[0]{query_dialog}; 434 if $_[0]{query_dialog};
208} 435}
272 ellipsise => 0, 499 ellipsise => 0,
273 markup => "\nOr use your keyboard and the text entry below:\n"; 500 markup => "\nOr use your keyboard and the text entry below:\n";
274 501
275 unshift @dialog, my $table = new CFPlus::UI::Table; 502 unshift @dialog, my $table = new CFPlus::UI::Table;
276 503
277 $table->add (0, 0, new CFPlus::UI::Button 504 $table->add_at (0, 0, new CFPlus::UI::Button
278 text => "Next Race", 505 text => "Next Race",
279 on_activate => sub { 506 on_activate => sub {
280 $conn->send ("reply n"); 507 $conn->send ("reply n");
281 destroy_query_dialog $conn; 508 destroy_query_dialog $conn;
282 0 509 0
283 }, 510 },
284 ); 511 );
285 $table->add (2, 0, new CFPlus::UI::Button 512 $table->add_at (2, 0, new CFPlus::UI::Button
286 text => "Accept", 513 text => "Accept",
287 on_activate => sub { 514 on_activate => sub {
288 $conn->send ("reply d"); 515 $conn->send ("reply d");
289 destroy_query_dialog $conn; 516 destroy_query_dialog $conn;
290 0 517 0
333 markup => "\nOr use your keyboard and the text entry below:\n"; 560 markup => "\nOr use your keyboard and the text entry below:\n";
334 561
335 unshift @dialog, my $table = new CFPlus::UI::Table; 562 unshift @dialog, my $table = new CFPlus::UI::Table;
336 563
337 # left: re-roll 564 # left: re-roll
338 $table->add (0, 0, new CFPlus::UI::Button 565 $table->add_at (0, 0, new CFPlus::UI::Button
339 text => "Roll Again", 566 text => "Roll Again",
340 on_activate => sub { 567 on_activate => sub {
341 $conn->send ("reply y"); 568 $conn->send ("reply y");
342 destroy_query_dialog $conn; 569 destroy_query_dialog $conn;
343 0 570 0
357 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 584 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
358 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 585 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
359 ], 586 ],
360 ), 1 .. 2; 587 ), 1 .. 2;
361 588
362 $table->add (2, 0, new CFPlus::UI::Button 589 $table->add_at (2, 0, new CFPlus::UI::Button
363 text => "Swap Stats", 590 text => "Swap Stats",
364 on_activate => sub { 591 on_activate => sub {
365 $conn->{stat_change_with} = $sw2->{value}; 592 $conn->{stat_change_with} = $sw2->{value};
366 $conn->send ("reply $sw1->{value}"); 593 $conn->send ("reply $sw1->{value}");
367 destroy_query_dialog $conn; 594 destroy_query_dialog $conn;
368 0 595 0
369 }, 596 },
370 ); 597 );
371 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 598 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
372 599
373 # right: accept 600 # right: accept
374 $table->add (4, 0, new CFPlus::UI::Button 601 $table->add_at (4, 0, new CFPlus::UI::Button
375 text => "Accept", 602 text => "Accept",
376 on_activate => sub { 603 on_activate => sub {
377 $conn->send ("reply n"); 604 $conn->send ("reply n");
378 $STATS_PAGE->hide; 605 $STATS_PAGE->hide;
379 destroy_query_dialog $conn; 606 destroy_query_dialog $conn;
460 maph => $mapsize, 687 maph => $mapsize,
461 688
462 client => "cfplus $CFPlus::VERSION $] $^O", 689 client => "cfplus $CFPlus::VERSION $] $^O",
463 690
464 map_widget => $MAPWIDGET, 691 map_widget => $MAPWIDGET,
465 logview => $LOGVIEW,
466 statusbox => $STATUSBOX, 692 statusbox => $STATUSBOX,
467 map => $MAP, 693 map => $MAP,
468 mapmap => $MAPMAP, 694 mapmap => $MAPMAP,
469 query => \&server_query, 695 query => \&server_query,
470 696
471 setup_req => { 697 setup_req => {
472 smoothing => $CFG->{map_smoothing}*1, 698 smoothing => $CFG->{map_smoothing}*1,
473 },
474
475 sound_play => sub {
476 my ($x, $y, $soundnum, $type) = @_;
477
478 $SDL_MIXER
479 or return;
480
481 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
482 or return;
483
484 $chunk->play;
485 }, 699 },
486 }; 700 };
487 701
488 if ($CONN) { 702 if ($CONN) {
489 CFPlus::lowdelay fileno $CONN->{fh}; 703 CFPlus::lowdelay fileno $CONN->{fh};
501 $SETUP_DIALOG->show; 715 $SETUP_DIALOG->show;
502 $PL_WINDOW->hide; 716 $PL_WINDOW->hide;
503 $SPELL_LIST->clear_spells; 717 $SPELL_LIST->clear_spells;
504 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 718 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
505 719
506 &audio_music_set ([]); 720 &audio_music_set_ambient ([]);
507 721
508 return unless $CONN; 722 return unless $CONN;
509 723
510 status "connection closed"; 724 status "connection closed";
511 725
521 735
522 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 736 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
523 737
524 my $row = 0; 738 my $row = 0;
525 739
526 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 740 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
527 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 741 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
528 can_events => 1, 742 can_events => 1,
529 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 743 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
530 744
531 my $vidmode_tooltip = 745 my $vidmode_tooltip =
532 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 746 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
533 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 747 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
534 748
535 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 749 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
536 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 750 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
537 751
538 $hbox->add (my $mode_slider = new CFPlus::UI::Slider 752 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
539 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 753 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
540 tooltip => $vidmode_tooltip); 754 tooltip => $vidmode_tooltip);
541 $hbox->add (my $mode_label = new CFPlus::UI::Label 755 $hbox->add (my $mode_label = new CFPlus::UI::Label
548 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 762 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
549 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 763 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
550 }); 764 });
551 $mode_slider->emit (changed => $mode_slider->{range}[0]); 765 $mode_slider->emit (changed => $mode_slider->{range}[0]);
552 766
553 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 767 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
554 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 768 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
555 state => $CFG->{fullscreen}, 769 state => $CFG->{fullscreen},
556 tooltip => "Bring the client into fullscreen mode.", 770 tooltip => "Bring the client into fullscreen mode.",
557 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 771 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
558 ); 772 );
559 773
560 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 774 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
561 $table->add (1, $row++, new CFPlus::UI::CheckBox 775 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
562 state => $CFG->{fast}, 776 state => $CFG->{fast},
563 tooltip => "Lower the visual quality considerably to speed up rendering.", 777 tooltip => "Lower the visual quality considerably to speed up rendering.",
564 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 778 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
565 ); 779 );
566 780
567 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 781 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
568 $table->add (1, $row++, new CFPlus::UI::Slider 782 $table->add_at (1, $row++, new CFPlus::UI::Slider
569 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 783 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
570 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 784 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
571 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 785 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
572 ); 786 );
573 787
574 $table->add (1, $row++, new CFPlus::UI::Button 788 $table->add_at (1, $row++, new CFPlus::UI::Button
575 expand => 1, align => 0, text => "Apply", 789 expand => 1, align => 0, text => "Apply",
576 tooltip => "Apply the video settings above.", 790 tooltip => "Apply the video settings above.",
577 on_activate => sub { 791 on_activate => sub {
578 video_shutdown (); 792 video_shutdown ();
579 video_init (); 793 video_init ();
580 0 794 0
581 } 795 }
582 ); 796 );
583 797
584 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 798 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
585 $table->add (1, $row++, new CFPlus::UI::Slider 799 $table->add_at (1, $row++, new CFPlus::UI::Slider
586 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 800 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
587 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 801 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
588 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 802 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
589 ); 803 );
590 804
591 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 805 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
592 $table->add (1, $row++, new CFPlus::UI::CheckBox 806 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
593 state => $CFG->{map_smoothing}, 807 state => $CFG->{map_smoothing},
594 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 808 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
595 . "This increases load on the graphics subsystem and works only with 2.x servers. " 809 . "This increases load on the graphics subsystem and works only with TRT servers. "
596 . "Changes take effect at next connection only.", 810 . "Changes take effect at next connection only.",
597 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 811 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
598 ); 812 );
599 813
600 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 814 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
601 $table->add (1, $row++, new CFPlus::UI::CheckBox 815 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
602 state => $CFG->{fow_enable}, 816 state => $CFG->{fow_enable},
603 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 817 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
604 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 818 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
605 ); 819 );
606 820
607 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 821 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
608 $table->add (1, $row++, new CFPlus::UI::Slider 822 $table->add_at (1, $row++, new CFPlus::UI::Slider
609 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 823 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
610 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 824 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
611 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 825 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
612 ); 826 );
613 827
614 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 828 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
615 $table->add (1, $row++, new CFPlus::UI::Slider 829 $table->add_at (1, $row++, new CFPlus::UI::Slider
616 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 830 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
617 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 831 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
618 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 832 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
619 ); 833 );
620 834
621 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 835 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
622 $table->add (1, $row++, new CFPlus::UI::Slider 836 $table->add_at (1, $row++, new CFPlus::UI::Slider
623 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 837 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
624 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 838 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
625 on_changed => sub { 839 on_changed => sub {
626 $CFG->{gauge_fontsize} = $_[1]; 840 $CFG->{gauge_fontsize} = $_[1];
627 &set_gauge_window_fontsize; 841 &set_gauge_window_fontsize;
628 0 842 0
629 } 843 }
630 ); 844 );
631 845
632 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 846 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
633 $table->add (1, $row++, new CFPlus::UI::Slider 847 $table->add_at (1, $row++, new CFPlus::UI::Slider
634 range => [$CFG->{gauge_size}, 0.2, 0.8], 848 range => [$CFG->{gauge_size}, 0.2, 0.8],
635 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 849 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
636 on_changed => sub { 850 on_changed => sub {
637 $CFG->{gauge_size} = $_[1]; 851 $CFG->{gauge_size} = $_[1];
638 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 852 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
644} 858}
645 859
646sub audio_setup { 860sub audio_setup {
647 my $vbox = new CFPlus::UI::VBox; 861 my $vbox = new CFPlus::UI::VBox;
648 862
649 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 863 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
650 864
651 my $row = 0; 865 my $row = 0;
652 866
653 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 867 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
654 $table->add (1, $row++, new CFPlus::UI::CheckBox 868 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
655 state => $CFG->{audio_enable}, 869 state => $CFG->{audio_enable},
656 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 870 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
657 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 871 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
658 ); 872 );
659# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 873# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
660# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 874# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
661# $CFG->{effects_volume} = $_[1]; 875# $CFG->{effects_volume} = $_[1];
662# }); 876# });
877
878 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
879 $table->add_at (1, $row, new CFPlus::UI::CheckBox
880 expand => 1, state => $CFG->{effects_enable},
881 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
882 on_changed => sub {
883 $CFG->{effects_enable} = $_[1];
884 $CONN->update_fx_want if $CONN;
885 0
886 }
887 );
888 $table->add_at (2, $row++, new CFPlus::UI::Slider
889 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
890 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
891 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
892 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
893 );
894
663 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 895 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
664 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
665 $hbox->add (new CFPlus::UI::CheckBox 896 $table->add_at (1, $row, new CFPlus::UI::CheckBox
666 expand => 1, state => $CFG->{bgm_enable}, 897 expand => 1, state => $CFG->{bgm_enable},
667 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 898 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
668 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 899 on_changed => sub {
900 $CFG->{bgm_enable} = $_[1];
901 $CONN->update_fx_want if $CONN;
902 0
903 }
669 ); 904 );
670 $hbox->add (new CFPlus::UI::Slider 905 $table->add_at (2, $row++, new CFPlus::UI::Slider
671 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 906 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
672 tooltip => "The volume of the background music. Changes are instant.", 907 tooltip => "The volume of the background music. Changes are instant.",
673 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 908 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
674 ); 909 );
675 910
676 $table->add (1, $row++, new CFPlus::UI::Button 911 $table->add_at (1, $row++, new CFPlus::UI::Button
677 expand => 1, align => 0, text => "Apply", 912 c_colspan => 2, expand => 1, align => 0, text => "Apply",
678 tooltip => "Apply the audio settings", 913 tooltip => "Apply the audio settings",
679 on_activate => sub { 914 on_activate => sub {
680 audio_shutdown (); 915 audio_shutdown ();
681 audio_init (); 916 audio_init ();
682 0 917 0
740} 975}
741 976
742sub debug_setup { 977sub debug_setup {
743 my $table = new CFPlus::UI::Table; 978 my $table = new CFPlus::UI::Table;
744 979
745 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 980 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
746 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 981 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
747 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 982 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
748 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 983 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
749 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 984 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
750 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 985 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
751 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 986 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
752 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 987 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
753 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 988 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
754 989
755 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 990 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
991
992 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
993 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
994 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
995 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
996 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
997 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
998
999 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1000
1001 $c->add_items ({
1002 type => "line_loop",
1003 color => [0, 1, 0],
1004 width => 9,
1005 coord_mode => "abs",
1006 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
1007 });
1008
1009 $c->add_items ({
1010 type => "lines",
1011 color => [1, 1, 0],
1012 width => 2,
1013 coord_mode => "rel",
1014 coord => [[0,0], [1,1], [1,0], [0,1]],
1015 });
1016
1017 $c->add_items ({
1018 type => "polygon",
1019 color => [0, 0.43, 0],
1020 width => 2,
1021 coord_mode => "rel",
1022 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1023 });
756 1024
757 $table 1025 $table
758} 1026}
759 1027
760sub stats_window { 1028sub stats_window {
808 [2, 4, st_spd => "Spd", 10.54], 1076 [2, 4, st_spd => "Spd", 10.54],
809 [2, 5, st_wspd => "WSp", 10.54], 1077 [2, 5, st_wspd => "WSp", 10.54],
810 ) { 1078 ) {
811 my ($col, $row, $id, $label, $template) = @$_; 1079 my ($col, $row, $id, $label, $template) = @$_;
812 1080
813 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1081 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
814 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1082 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
815 align => +1, template => $template, tooltip => "#stat_$label"); 1083 align => +1, template => $template, tooltip => "#stat_$label");
816 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1084 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
817 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1085 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
818 align => -1, text => $label, tooltip => "#stat_$label"); 1086 align => -1, text => $label, tooltip => "#stat_$label");
819 } 1087 }
820 1088
821 $vb->add (new CFPlus::UI::FancyFrame 1089 $vb->add (new CFPlus::UI::FancyFrame
862 cold => ["Cold", 1130 cold => ["Cold",
863 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1131 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
864 ghit => ["Ghost hit", 1132 ghit => ["Ghost hit",
865 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1133 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
866 ); 1134 );
1135
867 for (qw/slow holyw conf fire depl magic 1136 for (qw/slow holyw conf fire depl magic
868 drain acid pois para deat phys 1137 drain acid pois para deat phys
869 blind fear tund elec cold ghit/) 1138 blind fear tund elec cold ghit/)
870 { 1139 {
871 $tbl2->add ($col, $row, 1140 $tbl2->add_at ($col, $row,
872 $STATWIDS->{"res_$_"} = 1141 $STATWIDS->{"res_$_"} =
873 new CFPlus::UI::Label 1142 new CFPlus::UI::Label
874 font => $FONT_FIXED, 1143 font => $FONT_FIXED,
875 template => "-100%", 1144 template => "-100%",
876 align => +1, 1145 align => +1,
877 valign => 0, 1146 valign => 0,
878 can_events => 1, 1147 can_events => 1,
879 can_hover => 1, 1148 can_hover => 1,
880 tooltip => $resist_names{$_}->[1], 1149 tooltip => $resist_names{$_}->[1],
881 ); 1150 );
882 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1151 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
883 font => $FONT_FIXED, 1152 font => $FONT_FIXED,
884 can_hover => 1, 1153 can_hover => 1,
885 can_events => 1, 1154 can_events => 1,
886 path => "ui/resist/resist_$_.png", 1155 path => "ui/resist/resist_$_.png",
887 tooltip => $resist_names{$_}->[1], 1156 tooltip => $resist_names{$_}->[1],
888 ); 1157 );
889 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1158 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
890 text => $resist_names{$_}->[0], 1159 text => $resist_names{$_}->[0],
891 font => $FONT_FIXED, 1160 font => $FONT_FIXED,
892 can_hover => 1, 1161 can_hover => 1,
893 can_events => 1, 1162 can_events => 1,
894 tooltip => $resist_names{$_}->[1], 1163 tooltip => $resist_names{$_}->[1],
927 return if $METASERVER_ATIME > time; 1196 return if $METASERVER_ATIME > time;
928 $METASERVER_ATIME = time + 60; 1197 $METASERVER_ATIME = time + 60;
929 1198
930 my $table = $METASERVER->{table}; 1199 my $table = $METASERVER->{table};
931 $table->clear; 1200 $table->clear;
932 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1201 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
933 1202
934 my $ok = 0; 1203 my $ok = 0;
935 1204
936 CFPlus::background { 1205 CFPlus::background {
937 my $ua = CFPlus::lwp_useragent; 1206 my $ua = CFPlus::lwp_useragent;
948 "The time this server has been running without being restarted.", 1217 "The time this server has been running without being restarted.",
949 "The server software version - a '+' indicates a Crossfire+ server.", 1218 "The server software version - a '+' indicates a Crossfire+ server.",
950 "Short information about this server provided by its admins.", 1219 "Short information about this server provided by its admins.",
951 ); 1220 );
952 my @col = qw(#Users Host Uptime Version Description); 1221 my @col = qw(#Users Host Uptime Version Description);
953 $table->add ($_, 0, new CFPlus::UI::Label 1222 $table->add_at ($_, 0, new CFPlus::UI::Label
954 can_hover => 1, can_events => 1, 1223 can_hover => 1, can_events => 1,
955 align => 0, fg => [1, 1, 0], 1224 align => 0, fg => [1, 1, 0],
956 text => $col[$_], tooltip => $tip[$_]) 1225 text => $col[$_], tooltip => $tip[$_])
957 for 0 .. $#col; 1226 for 0 .. $#col;
958 1227
980 1249
981 $m = [$users, $host, $uptime, $version, $desc]; 1250 $m = [$users, $host, $uptime, $version, $desc];
982 1251
983 $y++; 1252 $y++;
984 1253
985 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1254 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
986 (new CFPlus::UI::Button 1255 (new CFPlus::UI::Button
987 text => "Use", 1256 text => "Use",
988 tooltip => "Put this server into the <b>Host:Port</b> field", 1257 tooltip => "Put this server into the <b>Host:Port</b> field",
989 on_activate => sub { 1258 on_activate => sub {
990 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1259 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
993 }, 1262 },
994 ), 1263 ),
995 (new CFPlus::UI::Empty expand => 1), 1264 (new CFPlus::UI::Empty expand => 1),
996 ]); 1265 ]);
997 1266
998 $table->add ($_, $y, new CFPlus::UI::Label 1267 $table->add_at ($_, $y, new CFPlus::UI::Label
999 max_w => $::WIDTH * 0.4, 1268 max_w => $::WIDTH * 0.4,
1000 ellipsise => 0, 1269 ellipsise => 0,
1001 align => $align[$_], 1270 align => $align[$_],
1002 text => $m->[$_], 1271 text => $m->[$_],
1003 tooltip => $tip[$_], 1272 tooltip => $tip[$_],
1044 1313
1045 $vbox->add (new CFPlus::UI::FancyFrame 1314 $vbox->add (new CFPlus::UI::FancyFrame
1046 label => "Connection Settings", 1315 label => "Connection Settings",
1047 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1316 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1048 ); 1317 );
1049 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1318 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1050 1319
1051 { 1320 {
1052 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1321 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1053 1322
1054 $vbox->add ( 1323 $vbox->add (
1055 $HOST_ENTRY = new CFPlus::UI::Entry 1324 $HOST_ENTRY = new CFPlus::UI::Entry
1056 expand => 1, 1325 expand => 1,
1057 text => $CFG->{profile}{default}{host}, 1326 text => $CFG->{profile}{default}{host},
1058 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1327 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1059 on_changed => sub { 1328 on_changed => sub {
1060 my ($self, $value) = @_; 1329 my ($self, $value) = @_;
1061 $CFG->{profile}{default}{host} = $value; 1330 $CFG->{profile}{default}{host} = $value;
1062 0 1331 1
1063 } 1332 }
1064 ); 1333 );
1065 1334
1066 $vbox->add (new CFPlus::UI::Button 1335 $vbox->add (new CFPlus::UI::Button
1067 expand => 1, 1336 expand => 1,
1068 text => "Server List", 1337 text => "Server List",
1069 other => $METASERVER, 1338 other => $METASERVER,
1070 tooltip => "Show a list of available crossfire servers", 1339 tooltip => "Show a list of available crossfire servers",
1071 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1340 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1072 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1341 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1073 ); 1342 );
1074 } 1343 }
1075 1344
1076 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1345 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1077 $table->add (1, 4, new CFPlus::UI::Entry 1346 $table->add_at (1, 4, new CFPlus::UI::Entry
1078 text => $CFG->{profile}{default}{user}, 1347 text => $CFG->{profile}{default}{user},
1079 tooltip => "The name of your character on the server", 1348 tooltip => "The name of your character on the server",
1080 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1349 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1081 ); 1350 );
1082 1351
1083 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1352 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1084 $table->add (1, 5, new CFPlus::UI::Entry 1353 $table->add_at (1, 5, new CFPlus::UI::Entry
1085 text => $CFG->{profile}{default}{password}, 1354 text => $CFG->{profile}{default}{password},
1086 hidden => 1, 1355 hidden => 1,
1087 tooltip => "The password for your character", 1356 tooltip => "The password for your character",
1088 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1357 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1089 ); 1358 );
1090 1359
1091 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1360 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1092 $table->add (1, 7, new CFPlus::UI::Slider 1361 $table->add_at (1, 7, new CFPlus::UI::Slider
1093 force_w => 100, 1362 force_w => 100,
1094 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1363 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1095 tooltip => "This is the size of the portion of the map update the server sends you. " 1364 tooltip => "This is the size of the portion of the map update the server sends you. "
1096 . "If you set this to a high value you will be able to see further, " 1365 . "If you set this to a high value you will be able to see further, "
1097 . "but you also increase bandwidth requirements and latency. " 1366 . "but you also increase bandwidth requirements and latency. "
1098 . "This option is only used once at log-in.", 1367 . "This option is only used once at log-in.",
1099 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1368 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1100 ); 1369 );
1101 1370
1102 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1103 $table->add (1, 8, new CFPlus::UI::CheckBox
1104 state => $CFG->{face_prefetch},
1105 tooltip => "<b>Background Image Prefetch</b>\n\n"
1106 . "If enabled, the client automatically pre-fetches images from the server. "
1107 . "This might increase or create lag, but increases the chances "
1108 . "of faces being ready for display when you encounter them. "
1109 . "It also uses up server bandwidth on every connect, "
1110 . "so only set it if you really need to prefetch images. "
1111 . "This option can be set and unset any time.",
1112 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1113 );
1114
1115 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1371 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1116 $table->add (1, 9, new CFPlus::UI::Entry 1372 $table->add_at (1, 8, new CFPlus::UI::Entry
1117 text => $CFG->{output_rate}, 1373 text => $CFG->{output_rate},
1118 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1374 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1119 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1375 . "when sending data. When 0 or unset, the server "
1120 . "default will be used, which is usually around 100kb/s.", 1376 . "default will be used, which is usually around 100kb/s. Most servers will "
1377 . "dynamically find an optimal rate, so adjust this only when necessary.",
1121 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1378 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1122 ); 1379 );
1123 1380
1124 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1381 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1125 $table->add (1, 10, new CFPlus::UI::Entry 1382 $table->add_at (1, 9, new CFPlus::UI::Entry
1126 text => $CFG->{output_count}, 1383 text => $CFG->{output_count},
1127 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1384 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1128 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1385 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1129 ); 1386 );
1130 1387
1131 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1388 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1132 $table->add (1, 11, new CFPlus::UI::Entry 1389 $table->add_at (1, 10, new CFPlus::UI::Entry
1133 text => $CFG->{output_sync}, 1390 text => $CFG->{output_sync},
1134 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1391 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1135 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1392 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1136 ); 1393 );
1137 1394
1138 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1395 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1139 expand => 1, 1396 expand => 1,
1140 align => 0, 1397 align => 0,
1141 text => "Login", 1398 text => "Login",
1142 on_activate => sub { 1399 on_activate => sub {
1143 $CONN ? stop_game 1400 $CONN ? stop_game
1144 : start_game; 1401 : start_game;
1145 0 1402 1
1146 }, 1403 },
1147 ); 1404 );
1148 1405
1149 $vbox->add (new CFPlus::UI::FancyFrame 1406 $vbox->add (new CFPlus::UI::FancyFrame
1150 label => "Server Info", 1407 label => "Server Info",
1157sub client_setup { 1414sub client_setup {
1158 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1415 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1159 1416
1160 my $row = 0; 1417 my $row = 0;
1161 1418
1162 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1163 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1164 text => $CFG->{say_command},
1165 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. "
1166 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1167 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1168 on_changed => sub {
1169 my ($self, $value) = @_;
1170 $CFG->{say_command} = $value;
1171 0
1172 }
1173 );
1174
1175 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1419 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1176 $table->add (1, $row++, new CFPlus::UI::CheckBox 1420 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1177 state => $CFG->{show_tips}, 1421 state => $CFG->{show_tips},
1178 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1422 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1179 on_changed => sub { 1423 on_changed => sub {
1180 my ($self, $value) = @_; 1424 my ($self, $value) = @_;
1181 $CFG->{show_tips} = $value; 1425 $CFG->{show_tips} = $value;
1182 0 1426 0
1183 } 1427 }
1184 ); 1428 );
1185 1429
1186 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1430 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1187 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1431 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1188 text => $CFG->{logview_max_par}, 1432 text => $CFG->{logview_max_par},
1189 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1433 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1190 . "sends more messages than this number, older messages get removed to save memory and " 1434 . "sends more messages than this number, older messages get removed to save memory and "
1191 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1435 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1192 on_changed => sub { 1436 on_changed => sub {
1193 my ($self, $value) = @_; 1437 my ($self, $value) = @_;
1194 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1438 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1195 0 1439 0
1196 }, 1440 },
1197 ); 1441 );
1198 1442
1199 $table 1443 $table
1200}
1201
1202sub message_window {
1203 my $window = new CFPlus::UI::Toplevel
1204 name => "message_window",
1205 title => "Messages",
1206 border_bg => [1, 1, 1, 1],
1207 x => "max",
1208 y => 0,
1209 force_w => $::WIDTH * 0.4,
1210 force_h => $::HEIGHT * 0.5,
1211 child => (my $vbox = new CFPlus::UI::VBox),
1212 has_close_button => 1;
1213
1214 $vbox->add ($LOGVIEW);
1215
1216 $vbox->add (my $input = new CFPlus::UI::Entry
1217 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1218 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1219 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1220 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1221 on_focus_in => sub {
1222 my ($input, $prev_focus) = @_;
1223
1224 delete $input->{refocus_map};
1225
1226 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1227 $input->{refocus_map} = 1;
1228 }
1229 delete $input->{auto_activated};
1230
1231 0
1232 },
1233 on_activate => sub {
1234 my ($input, $text) = @_;
1235 $input->set_text ('');
1236
1237 if ($text =~ /^\/(.*)/) {
1238 $::CONN->user_send ($1);
1239 } else {
1240 my $say_cmd = $::CFG->{say_command} || 'say';
1241 $::CONN->user_send ("$say_cmd $text");
1242 }
1243 if ($input->{refocus_map}) {
1244 delete $input->{refocus_map};
1245 $MAPWIDGET->focus_in
1246 }
1247
1248 0
1249 },
1250 on_escape => sub {
1251 $MAPWIDGET->grab_focus;
1252
1253 0
1254 },
1255 );
1256
1257 $CONSOLE = {
1258 window => $window,
1259 input => $input,
1260 };
1261
1262 $window
1263} 1444}
1264 1445
1265sub autopickup_setup { 1446sub autopickup_setup {
1266 my $r = new CFPlus::UI::ScrolledWindow ( 1447 my $r = new CFPlus::UI::ScrolledWindow (
1267 expand => 1, 1448 expand => 1,
1313 ], 1494 ],
1314 ["Weight/Value ratio", 2, 17] 1495 ["Weight/Value ratio", 2, 17]
1315 ) 1496 )
1316 { 1497 {
1317 my ($title, $x, $y, @bits) = @$_; 1498 my ($title, $x, $y, @bits) = @$_;
1318 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1499 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1319 1500
1320 for (@bits) { 1501 for (@bits) {
1321 ++$y; 1502 ++$y;
1322 1503
1323 my $mask = $_->[1]; 1504 my $mask = $_->[1];
1324 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1505 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1325 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1506 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1326 state => $::CFG->{pickup} & $mask, 1507 state => $::CFG->{pickup} & $mask,
1327 on_changed => sub { 1508 on_changed => sub {
1328 my ($box, $value) = @_; 1509 my ($box, $value) = @_;
1329 1510
1330 if ($value) { 1511 if ($value) {
1341 1522
1342 ${$_->[2]} = $checkbox if $_->[2]; 1523 ${$_->[2]} = $checkbox if $_->[2];
1343 } 1524 }
1344 } 1525 }
1345 1526
1346 $table->add (2, 18, new CFPlus::UI::ValSlider 1527 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1347 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1528 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1348 template => ">= 99", 1529 template => ">= 99",
1349 to_value => sub { ">= " . 5 * $_[0] }, 1530 to_value => sub { ">= " . 5 * $_[0] },
1350 on_changed => sub { 1531 on_changed => sub {
1351 my ($slider, $value) = @_; 1532 my ($slider, $value) = @_;
1354 $::CFG->{pickup} |= int $value 1535 $::CFG->{pickup} |= int $value
1355 if $value; 1536 if $value;
1356 1; 1537 1;
1357 }); 1538 });
1358 1539
1359 $table->add (3, 18, new CFPlus::UI::Button 1540 $table->add_at (3, 18, new CFPlus::UI::Button
1360 text => "set", 1541 text => "set",
1361 on_activate => sub { 1542 on_activate => sub {
1362 $::CONN->send_command ("pickup $::CFG->{pickup}") 1543 $::CONN->send_command ("pickup $::CFG->{pickup}")
1363 if defined $::CONN; 1544 if defined $::CONN;
1364 0 1545 0
1427 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1608 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1428 1609
1429 $hb 1610 $hb
1430} 1611}
1431 1612
1613sub media_window {
1614 my $vb = new CFPlus::UI::VBox;
1615
1616 $vb->add (new CFPlus::UI::FancyFrame
1617 label => "Currently playing music",
1618 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1619 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1620 );
1621
1622 $vb->add (new CFPlus::UI::FancyFrame
1623 label => "Other media used in this session",
1624 expand => 1,
1625 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1626 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1627 );
1628
1629 $vb
1630}
1631
1632sub add_license {
1633 my ($meta) = @_;
1634
1635 $meta = $meta->{meta}
1636 or return;
1637
1638 $meta->{license} || $meta->{author} || $meta->{source}
1639 or return;
1640
1641 $LICENSE_WIDGET->add_paragraph ({
1642 fg => [1, 1, 1, 1],
1643 markup => "<small>"
1644 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1645 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1646 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1647 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1648 . "</small>",
1649 });
1650 $LICENSE_WIDGET->scroll_to_bottom;
1651}
1652
1432sub toggle_player_page { 1653sub toggle_player_page {
1433 my ($widget) = @_; 1654 my ($widget) = @_;
1434 1655
1435 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) { 1656 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1436 $PL_WINDOW->hide; 1657 $PL_WINDOW->hide;
1453 1674
1454 my $ntb = 1675 my $ntb =
1455 $PL_NOTEBOOK = 1676 $PL_NOTEBOOK =
1456 new CFPlus::UI::Notebook expand => 1; 1677 new CFPlus::UI::Notebook expand => 1;
1457 1678
1458 $ntb->add ( 1679 $ntb->add_tab (
1459 "Statistics (F2)" => $STATS_PAGE = stats_window, 1680 "Statistics (F2)" => $STATS_PAGE = stats_window,
1460 "Shows statistics, where all your Stats and Resistances are shown." 1681 "Shows statistics, where all your Stats and Resistances are shown."
1461 ); 1682 );
1462 $ntb->add ( 1683 $ntb->add_tab (
1463 "Skills (F3)" => $SKILL_PAGE = skill_window, 1684 "Skills (F3)" => $SKILL_PAGE = skill_window,
1464 "Shows all your Skills." 1685 "Shows all your Skills."
1465 ); 1686 );
1466 1687
1467 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1688 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1468 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1689 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1469 $ntb->add ( 1690 $ntb->add_tab (
1470 "Spellbook (F4)" => $spellsw, 1691 "Spellbook (F4)" => $spellsw,
1471 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1692 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1472 ); 1693 );
1473 $ntb->add ( 1694 $ntb->add_tab (
1474 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1695 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1475 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1696 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1476 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1697 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1477 ); 1698 );
1478 $ntb->add (Pickup => autopickup_setup, 1699 $ntb->add_tab (Pickup => autopickup_setup,
1479 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1700 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1701
1702 $ntb->add_tab (Media => media_window,
1703 "License, Author and Source info for media sent by the server.");
1480 1704
1481 $ntb->set_current_page ($INVENTORY_PAGE); 1705 $ntb->set_current_page ($INVENTORY_PAGE);
1482 1706
1483 $plwin->add ($ntb); 1707 $plwin->add ($ntb);
1484 $plwin 1708 $plwin
1681 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1905 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1682 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1906 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1683 1907
1684 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1908 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1685 1909
1686 $table->add (0, 0, new CFPlus::UI::Button 1910 $table->add_at (0, 0, new CFPlus::UI::Button
1687 text => "Close", 1911 text => "Close",
1688 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.", 1912 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1689 on_activate => $close, 1913 on_activate => $close,
1690 ); 1914 );
1691 1915
1692 $table->add (2, 0, new CFPlus::UI::Button 1916 $table->add_at (2, 0, new CFPlus::UI::Button
1693 text => "Next", 1917 text => "Next",
1694 tooltip => "Show the next <b>Tip of the day</b>.", 1918 tooltip => "Show the next <b>Tip of the day</b>.",
1695 on_activate => sub { 1919 on_activate => sub {
1696 $close->(); 1920 $close->();
1697 &show_tip_of_the_day; 1921 &show_tip_of_the_day;
1766 1990
1767 $MAPWIDGET = new CFPlus::MapWidget; 1991 $MAPWIDGET = new CFPlus::MapWidget;
1768 $MAPWIDGET->connect (activate_console => sub { 1992 $MAPWIDGET->connect (activate_console => sub {
1769 my ($mapwidget, $preset) = @_; 1993 my ($mapwidget, $preset) = @_;
1770 1994
1771 if ($CONSOLE) { 1995 $MESSAGE_WINDOW->activate_console ($preset)
1772 $CONSOLE->{input}->{auto_activated} = 1; 1996 if $MESSAGE_WINDOW;
1773 $CONSOLE->{input}->grab_focus;
1774
1775 if ($preset && $CONSOLE->{input}->get_text eq '') {
1776 $CONSOLE->{input}->set_text ($preset);
1777 }
1778 }
1779 }); 1997 });
1780 $MAPWIDGET->show; 1998 $MAPWIDGET->show;
1781 $MAPWIDGET->grab_focus; 1999 $MAPWIDGET->grab_focus;
1782
1783 $LOGVIEW = new CFPlus::UI::TextScroller
1784 expand => 1,
1785 font => $FONT_FIXED,
1786 fontsize => $::CFG->{log_fontsize},
1787 indent => -4,
1788 can_hover => 1,
1789 can_events => 1,
1790 max_par => $CFG->{logview_max_par},
1791 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1792 ;
1793 2000
1794 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2001 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1795 title => "Setup", 2002 title => "Setup",
1796 name => "setup_dialog", 2003 name => "setup_dialog",
1797 x => 'center', 2004 x => 'center',
1801 force_h => $::HEIGHT * 0.6, 2008 force_h => $::HEIGHT * 0.6,
1802 has_close_button => 1, 2009 has_close_button => 1,
1803 ; 2010 ;
1804 2011
1805 $METASERVER = metaserver_dialog; 2012 $METASERVER = metaserver_dialog;
2013 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1806 2014
1807 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2015 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1808 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2016 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1809 2017
1810 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2018 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1811 "Configure the server to play on, your username, password and other server-related options."); 2019 "Configure the server to play on, your username, password and other server-related options.");
1812 $SETUP_NOTEBOOK->add (Client => client_setup, 2020 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1813 "Configure various client-specific settings."); 2021 "Configure various client-specific settings.");
1814 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2022 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1815 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2023 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1816 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2024 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1817 "Configure the use of audio, sound effects and background music."); 2025 "Configure the use of audio, sound effects and background music.");
1818 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2026 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1819 "Lets you define, edit and delete key bindings." 2027 "Lets you define, edit and delete key bindings."
1820 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2028 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1821 . "with nothing set and the recording started. After doing the actions you " 2029 . "with nothing set and the recording started. After doing the actions you "
1822 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2030 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1823 . "After pressing the combo the binding will be saved automatically and the " 2031 . "After pressing the combo the binding will be saved automatically and the "
1824 . "binding editor closes"); 2032 . "binding editor closes");
1825 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2033 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1826 "Some debuggin' options. Do not ask."); 2034 "Some debuggin' options. Do not ask.");
1827 2035
1828 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2036 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1829 2037
1830 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2038 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1831 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2039 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1832 2040
1833 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2041 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1834 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2042 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1835 2043
1836 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 2044 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1837 2045
1838 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2046 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1871 } 2079 }
1872 2080
1873 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2081 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1874} 2082}
1875 2083
1876sub setup_build_button {
1877 my ($enabled) = @_;
1878 if ($enabled) {
1879 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1880 $BUILD_BUTTON ||= new CFPlus::UI::Button
1881 text => "Build",
1882 tooltip => "Opens the ingame builder",
1883 on_activate => sub {
1884 if ($CONN) {
1885 $CONN->send_ext_req (builder_player_items => sub {
1886 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1887 });
1888 }
1889 0
1890 };
1891 $BUTTONBAR->add ($BUILD_BUTTON);
1892 } else {
1893 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1894 }
1895}
1896
1897sub open_ingame_editor {
1898 my ($msg) = @_;
1899
1900 my $win = new CFPlus::UI::Toplevel
1901 x => 0,
1902 y => 'center',
1903 z => 4,
1904 name => 'builder_window',
1905 force_w => int $WIDTH * 1/4,
1906 force_h => int $HEIGHT * 3/4,
1907 title => "In game builder",
1908 has_close_button => 1;
1909
1910 my $r = new CFPlus::UI::ScrolledWindow (
1911 expand => 1,
1912 scroll_y => 1
1913 );
1914 $r->add (my $vb = new CFPlus::UI::VBox);
1915 $win->add ($r);
1916
1917
1918 $vb->add (
1919 new CFPlus::UI::Button
1920 text => "Disable build mode",
1921 on_activate => sub { $::IN_BUILD_MODE = undef }
1922 );
1923 $vb->add (
1924 new CFPlus::UI::Button
1925 text => "ERASE",
1926 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1927 );
1928
1929 for my $itemarchname (
1930 sort {
1931 $msg->{items}->{$a}->{build_arch_name}
1932 cmp $msg->{items}->{$b}->{build_arch_name}
1933 } keys %{$msg->{items}}
1934 ) {
1935 my $info = $msg->{items}->{$itemarchname};
1936 $vb->add (
1937 new CFPlus::UI::Button text => $info->{build_arch_name},
1938 on_activate => sub {
1939 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1940
1941 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1942 build_mode_query_arch_info ();
1943 }
1944 }
1945 );
1946 }
1947
1948 $win->show;
1949}
1950
1951sub build_mode_query_arch_info {
1952 my ($iteminfo) = $::IN_BUILD_MODE;
1953 my $itemarchname = $iteminfo->{item};
1954 my $info = $iteminfo->{info};
1955
1956 my $dialog = new CFPlus::UI::Toplevel
1957 x => "center",
1958 y => "center",
1959 z => 50,
1960 force_w => int $WIDTH * 1/2,
1961 title => "Enter information for placement of '$itemarchname'",
1962 has_close_button => 1;
1963
1964 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1965
1966 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1967 my $row = 0;
1968 if ($info->{has_name}) {
1969 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1970 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1971 }
1972 if ($info->{has_text}) {
1973 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1974 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1975 }
1976 if ($info->{has_connection}) {
1977 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1978 $table->add (1, $row++,
1979 new CFPlus::UI::Entry
1980 expand => 1,
1981 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1982 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1983 );
1984 }
1985
1986 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1987 $hb->add (new CFPlus::UI::Button
1988 text => "Close",
1989 expand => 1,
1990 on_activate => sub { $dialog->hide; 0 },
1991 );
1992 $dialog->show;
1993}
1994
1995sub video_shutdown { 2084sub video_shutdown {
1996 CFPlus::OpenGL::shutdown; 2085 CFPlus::OpenGL::shutdown;
1997 2086
1998 undef $SDL_ACTIVE; 2087 undef $SDL_ACTIVE;
1999} 2088}
2000 2089
2001sub audio_channel_finished {
2002 my ($channel) = @_;
2003
2004 #warn "channel $channel finished\n";#d#
2005}
2006
2007sub audio_music_set {
2008 my ($songs) = @_;
2009
2010 my @want =
2011 grep $_,
2012 map $CONN->{music_meta}{$_},
2013 @$songs;
2014
2015 if (@want) {
2016 @MUSIC_WANT = @want;
2017 &audio_music_changed ();
2018 }
2019}
2020
2021sub audio_music_start {
2022 my $path = $MUSIC_PLAYING->{path}
2023 or return;
2024
2025 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2026 # music might have changed...
2027 $path eq $MUSIC_PLAYING->{path}
2028 or return &audio_music_start ();
2029
2030 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2031
2032 my $NOW = time;
2033
2034 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2035 my $pos = $MUSIC_PLAYING->{stop_pos};
2036 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2037 $MUSIC_START = time - $pos;
2038 } else {
2039 $MUSIC_PLAYER->play (0);
2040 $MUSIC_START = time;
2041 }
2042
2043 delete $MUSIC_PLAYING->{stop_time};
2044 delete $MUSIC_PLAYING->{stop_pos};
2045 }
2046}
2047
2048sub audio_music_changed {
2049 return unless $CFG->{bgm_enable};
2050
2051 # default MUSIC_WANT == MUSIC_DEFAULT
2052 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2053
2054 # if the currently playing song is acceptable, let it continue
2055 return if $MUSIC_PLAYING
2056 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2057
2058 my $NOW = time;
2059
2060 if ($MUSIC_PLAYING) {
2061 $MUSIC_PLAYING->{stop_time} = $NOW;
2062 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2063 CFPlus::MixMusic::fade_out 1000;
2064 } else {
2065 # sort by stop time, oldest first
2066 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2067
2068 # if the most recently-played piece played very recently,
2069 # resume it, else choose the oldest piece for rotation.
2070 $MUSIC_PLAYING =
2071 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2072 ? $MUSIC_WANT[-1]
2073 : $MUSIC_WANT[0];
2074
2075 audio_music_start;
2076 }
2077}
2078
2079sub audio_music_finished {
2080 $MUSIC_PLAYING = undef;
2081 undef $MUSIC_PLAYER;
2082
2083 audio_music_changed;
2084}
2085
2086sub audio_init {
2087 if ($CFG->{audio_enable}) {
2088 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
2089 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2090
2091 unless ($SDL_MIXER) {
2092 status "Unable to open sound device: there will be no sound";
2093 return;
2094 }
2095
2096 CFPlus::Mix_AllocateChannels 8;
2097 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2098
2099 audio_music_finished;
2100
2101 local $_;
2102 while (<$fh>) {
2103 next if /^\s*#/;
2104 next if /^\s*$/;
2105
2106 my ($file, $volume, $event) = split /\s+/, $_, 3;
2107
2108 push @SOUNDS, "$volume,$file";
2109
2110 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2111 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2112 $chunk->volume ($volume * 128 / 100);
2113 $chunk
2114 };
2115 }
2116 } else {
2117 status "unable to open sound config: $!";
2118 }
2119 }
2120}
2121
2122sub audio_shutdown {
2123 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2124 undef $SDL_MIXER;
2125 @SOUNDS = ();
2126 %AUDIO_CHUNKS = ();
2127}
2128
2129my %animate_object; 2090my %animate_object;
2130my $animate_timer; 2091my $animate_timer;
2131 2092
2132my $fps = 9; 2093my $fps = 9;
2133 2094
2134my %demo;#d#
2135
2136sub force_refresh { 2095sub force_refresh {
2096 if ($ENV{CFPLUS_DEBUG} & 4) {
2137 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2097 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2138 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2098 debug sprintf "%3.2f", $fps;
2099 }
2139 2100
2140 $CFPlus::UI::ROOT->draw; 2101 $CFPlus::UI::ROOT->draw;
2141 2102 CFPlus::SDL_GL_SwapBuffers;
2142 $WANT_REFRESH = 0;
2143 $CAN_REFRESH = 0;
2144 $LAST_REFRESH = $NOW; 2103 $LAST_REFRESH = $NOW;
2145 2104 $WANT_REFRESH->stop;
2146 CFPlus::SDL_GL_SwapBuffers;
2147} 2105}
2148 2106
2107$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2108
2149my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2109my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2150 $NOW = time; 2110 $NOW = time;
2151 2111
2152 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2112 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2153 for CFPlus::poll_events; 2113 for CFPlus::poll_events;
2154 2114
2155 if (%animate_object) { 2115 if (%animate_object) {
2156 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2116 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2157 ++$WANT_REFRESH; 2117 $WANT_REFRESH->start;
2158 }
2159
2160 if ($WANT_REFRESH) {
2161 force_refresh;
2162 } else {
2163 $CAN_REFRESH = 1;
2164 } 2118 }
2165}); 2119});
2166 2120
2167sub animation_start { 2121sub animation_start {
2168 my ($widget) = @_; 2122 my ($widget) = @_;
2171 2125
2172sub animation_stop { 2126sub animation_stop {
2173 my ($widget) = @_; 2127 my ($widget) = @_;
2174 delete $animate_object{$widget}; 2128 delete $animate_object{$widget};
2175} 2129}
2176
2177# check once/second for faces that need to be prefetched
2178# this should, of course, only run on demand, but
2179# SDL forces worse things on us....
2180
2181Event->timer (after => 1, interval => 0.25, cb => sub {
2182 $CONN->face_prefetch
2183 if $CONN;
2184});
2185 2130
2186%SDL_CB = ( 2131%SDL_CB = (
2187 CFPlus::SDL_QUIT => sub { 2132 CFPlus::SDL_QUIT => sub {
2188 exit; 2133 exit;
2189 }, 2134 },
2233 2178
2234 CFPlus::UI::set_layout ($::CFG->{layout}); 2179 CFPlus::UI::set_layout ($::CFG->{layout});
2235 2180
2236 my %DEF_CFG = ( 2181 my %DEF_CFG = (
2237 sdl_mode => 0, 2182 sdl_mode => 0,
2238 width => 640,
2239 height => 480,
2240 fullscreen => 0, 2183 fullscreen => 0,
2241 fast => 0, 2184 fast => 0,
2242 map_scale => 1, 2185 map_scale => 1,
2243 fow_enable => 1, 2186 fow_enable => 1,
2244 fow_intensity => 0, 2187 fow_intensity => 0,
2247 log_fontsize => 0.7, 2190 log_fontsize => 0.7,
2248 gauge_fontsize => 1, 2191 gauge_fontsize => 1,
2249 gauge_size => 0.35, 2192 gauge_size => 0.35,
2250 stat_fontsize => 0.7, 2193 stat_fontsize => 0.7,
2251 mapsize => 100, 2194 mapsize => 100,
2252 say_command => 'chat',
2253 audio_enable => 1, 2195 audio_enable => 1,
2196 effects_enable => 1,
2197 effects_volume => 1,
2254 bgm_enable => 1, 2198 bgm_enable => 1,
2255 bgm_volume => 0.25, 2199 bgm_volume => 0.5,
2256 face_prefetch => 0,
2257 output_sync => 1, 2200 output_sync => 1,
2258 output_count => 1, 2201 output_count => 1,
2259 output_rate => "", 2202 output_rate => "",
2260 pickup => 0, 2203 pickup => 0,
2261 inv_sort => "mtime", 2204 inv_sort => "mtime",
2339Event::loop; 2282Event::loop;
2340#CFPlus::SDL_Quit; 2283#CFPlus::SDL_Quit;
2341#CFPlus::_exit 0; 2284#CFPlus::_exit 0;
2342 2285
2343END { 2286END {
2287 video_shutdown;
2288 audio_shutdown;
2344 CFPlus::SDL_Quit; 2289 CFPlus::SDL_Quit;
2345 CFPlus::DB::Server::stop; 2290 CFPlus::DB::Server::stop;
2346} 2291}
2347 2292
2348=head1 NAME 2293=head1 NAME
2349 2294
2350cfplus - A Crossfire+ and Crossfire game client 2295cfplus - A Crossfire TRT and Crossfire game client
2351 2296
2352=head1 SYNOPSIS 2297=head1 SYNOPSIS
2353 2298
2354Just run it - no commandline arguments are supported. 2299Just run it - no commandline arguments are supported.
2355 2300
2356=head1 USAGE 2301=head1 USAGE
2357 2302
2358cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2303cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2359fullscreen and interactively. 2304be used in fullscreen mode and interactively.
2360 2305
2361=head1 DEBUGGING 2306=head1 DEBUGGING
2362 2307
2363 2308
2364CFPLUS_DEBUG - environment variable 2309CFPLUS_DEBUG - environment variable

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines