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

Diff Legend

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