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.180 by root, Sat Jul 21 13:37:09 2007 UTC vs.
Revision 1.218 by root, Sun Aug 19 14:17:05 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 $INVR_HB;
180 173
181our $PICKUP_CFG; 174#############################################################################
182
183our $IN_BUILD_MODE;
184our $BUILD_BUTTON;
185 175
186sub status { 176sub status {
187 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 177 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
188} 178}
189 179
… …
191 $DEBUG_STATUS->set_text ($_[0]); 181 $DEBUG_STATUS->set_text ($_[0]);
192} 182}
193 183
194sub message { 184sub message {
195 my ($para) = @_; 185 my ($para) = @_;
196 186 $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} 187}
188
189#############################################################################
190#TODO: maybe move into own audio module...
191
192our $SDL_MIXER;
193
194our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
195our $MUSIC_WANT; # arryref of ambient music we want to play
196our @MUSIC_HAVE; # ambient music we have on disk
197our $MUSIC_START;
198our @MUSIC_JINGLE; # which jingles to play next
199our $MUSIC_PLAYING_DATA;
200our $MUSIC_PLAYING_META;
201our $MUSIC_PLAYER;
202our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
203
204our %AUDIO_CHUNK; # audio "files"
205our %AUDIO_PLAY; # which audio faces should be played
206
207sub audio_channel_finished {
208 my ($channel) = @_;
209
210# warn "channel $channel finished\n";#d#
211}
212
213sub audio_sound_push($) {
214 my ($face) = @_;
215
216 $CFG->{effects_enable}
217 or return;
218
219 $AUDIO_PLAY{$face}
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 $channel->set_position_r ($dx, $dy, 20);
229 $chunk->play ($channel);
230 }
231 } else {
232 # sound_meta not set means data is in flight either way
233 my $meta = $CONN->{sound_meta}{$face}
234 or return;
235
236 # if its a jingle, play it as ambient music
237 if ($meta->{meta}{jingle}) {
238 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
239 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
240 &audio_music_push ($face);
241 }
242 } else {
243 # fetch from database
244 CFPlus::DB::get res_data => $meta->{name}, sub {
245 my $rwops = new CFPlus::RW $_[0];
246 my $chunk = new CFPlus::MixChunk $rwops
247 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
248 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
249 $AUDIO_CHUNK{$face} = $chunk;
250
251 audio_sound_push ($face);
252 };
253 }
254 }
255}
256
257sub audio_sound_play {
258 my ($face, $dx, $dy, $vol) = @_;
259
260 $SDL_MIXER
261 or return;
262 $CFG->{effects_enable}
263 or return;
264
265 my $queue = $AUDIO_PLAY{$face} ||= [];
266 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
267 audio_sound_push $face
268 unless @$queue > 1;
269}
270
271sub audio_music_set_meta {
272 my ($meta) = @_;
273
274 $MUSIC_PLAYING_META = $meta;
275 $MUSIC_PLAYING_WIDGET->set_markup (
276 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
277 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
278 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
279 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
280 );
281}
282
283sub audio_music_update_volume {
284 return unless $MUSIC_PLAYING_META;
285 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
286 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
287 CFPlus::MixMusic::volume $base * $volume * 128;
288}
289
290sub audio_music_start {
291 my $meta = $MUSIC_PLAYING_META;
292
293 CFPlus::DB::get res_data => $meta->{name}, sub {
294 return unless $SDL_MIXER;
295
296 # music might have changed...
297 $meta eq $MUSIC_PLAYING_META
298 or return &audio_music_start ();
299
300 audio_music_update_volume;
301
302 $MUSIC_PLAYING_DATA = \$_[0];
303
304 my $rwops = $meta->{path}
305 ? new_from_file CFPlus::RW $meta->{path}
306 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
307
308 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
309 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
310
311 my $NOW = time;
312
313 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
314 my $pos = $MUSIC_PLAYING_META->{stop_pos};
315 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
316 $MUSIC_START = time - $pos;
317 } else {
318 $MUSIC_PLAYER->play (0);
319 $MUSIC_START = time;
320 }
321
322 delete $meta->{stop_time};
323 delete $meta->{stop_pos};
324 }
325}
326
327sub audio_music_push {
328 return unless $SDL_MIXER;
329
330 my $fade_out;
331
332 if (@MUSIC_JINGLE) {
333 @MUSIC_HAVE = $MUSIC_JINGLE[0];
334 $fade_out = 333;
335 } else {
336 return unless $CFG->{bgm_enable};
337
338 my @have =
339 grep $_,
340 map $CONN->{music_meta}{$_},
341 @$MUSIC_WANT;
342
343 @MUSIC_HAVE = @have
344 if @have;
345
346 # default MUSIC_HAVE == MUSIC_DEFAULT
347 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
348 $fade_out = 1000;
349 }
350
351 # if the currently playing song is acceptable, let it continue
352 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
353
354 my $NOW = time;
355
356 if ($MUSIC_PLAYING_META) {
357 $MUSIC_PLAYING_META->{stop_time} = $NOW;
358 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
359 CFPlus::MixMusic::fade_out $fade_out;
360 } else {
361 # sort by stop time, oldest first
362 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
363
364 # if the most recently-played piece played very recently,
365 # resume it, else choose the oldest piece for rotation.
366 audio_music_set_meta
367 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
368 ? $MUSIC_HAVE[-1]
369 : $MUSIC_HAVE[0];
370
371 audio_music_start;
372 }
373}
374
375sub audio_music_set_ambient {
376 my ($songs) = @_;
377
378 $MUSIC_WANT = $songs;
379 audio_music_push;
380}
381
382sub audio_music_finished {
383 # we compress multiple jingles of the same type
384 shift @MUSIC_JINGLE
385 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
386
387 $MUSIC_PLAYING_WIDGET->clear;
388
389 undef $MUSIC_PLAYER;
390 undef $MUSIC_PLAYING_META;
391 undef $MUSIC_PLAYING_DATA;
392
393 audio_music_push;
394}
395
396sub audio_init {
397 if ($CFG->{audio_enable}) {
398 $ENV{MIX_EFFECTSMAXSPEED} = 1;
399 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
400
401 unless ($SDL_MIXER) {
402 status "Unable to open sound device: there will be no sound";
403 return;
404 }
405
406 CFPlus::Mix_AllocateChannels 16;
407
408 audio_music_finished;
409 } else {
410 undef $SDL_MIXER;
411 }
412}
413
414sub audio_shutdown {
415 undef $MUSIC_PLAYER;
416 undef $MUSIC_PLAYING_META;
417 undef $MUSIC_PLAYING_DATA;
418
419 $MUSIC_WANT = [];
420 @MUSIC_JINGLE = ();
421 %AUDIO_PLAY = ();
422 %AUDIO_CHUNK = ();
423
424 CFPlus::Mix_CloseAudio if $SDL_MIXER;
425 undef $SDL_MIXER;
426}
427
428#############################################################################
204 429
205sub destroy_query_dialog { 430sub destroy_query_dialog {
206 (delete $_[0]{query_dialog})->destroy 431 (delete $_[0]{query_dialog})->destroy
207 if $_[0]{query_dialog}; 432 if $_[0]{query_dialog};
208} 433}
… …
460 maph => $mapsize, 685 maph => $mapsize,
461 686
462 client => "cfplus $CFPlus::VERSION $] $^O", 687 client => "cfplus $CFPlus::VERSION $] $^O",
463 688
464 map_widget => $MAPWIDGET, 689 map_widget => $MAPWIDGET,
465 logview => $LOGVIEW,
466 statusbox => $STATUSBOX, 690 statusbox => $STATUSBOX,
467 map => $MAP, 691 map => $MAP,
468 mapmap => $MAPMAP, 692 mapmap => $MAPMAP,
469 query => \&server_query, 693 query => \&server_query,
470 694
471 setup_req => { 695 setup_req => {
472 smoothing => $CFG->{map_smoothing}*1, 696 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 }, 697 },
486 }; 698 };
487 699
488 if ($CONN) { 700 if ($CONN) {
489 CFPlus::lowdelay fileno $CONN->{fh}; 701 CFPlus::lowdelay fileno $CONN->{fh};
… …
501 $SETUP_DIALOG->show; 713 $SETUP_DIALOG->show;
502 $PL_WINDOW->hide; 714 $PL_WINDOW->hide;
503 $SPELL_LIST->clear_spells; 715 $SPELL_LIST->clear_spells;
504 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 716 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
505 717
506 &audio_music_set ([]); 718 &audio_music_set_ambient ([]);
507 719
508 return unless $CONN; 720 return unless $CONN;
509 721
510 status "connection closed"; 722 status "connection closed";
511 723
… …
553 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 765 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
554 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 766 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
555 state => $CFG->{fullscreen}, 767 state => $CFG->{fullscreen},
556 tooltip => "Bring the client into fullscreen mode.", 768 tooltip => "Bring the client into fullscreen mode.",
557 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 769 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
770 );
771
772 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
773 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
774 state => $CFG->{force_opengl11},
775 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
776 . "higher memory usage and slower performance. It will, however, help tremendously on "
777 . "cards that claim to support a feature but fall back to software rendering. "
778 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
779 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
780 . "experience extremely low framerates and your card should do better, try this option.</b>",
781 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
782 );
783
784 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
785 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
786 state => $CFG->{texture_compression},
787 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
788 . "will save a lot of memory and increase performance. The compression algorithm "
789 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
790 . "forced OpenGL 1.1 mode.",
791 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
558 ); 792 );
559 793
560 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 794 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
561 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 795 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
562 state => $CFG->{fast}, 796 state => $CFG->{fast},
… …
590 824
591 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 825 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
592 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 826 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
593 state => $CFG->{map_smoothing}, 827 state => $CFG->{map_smoothing},
594 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 828 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. " 829 . "This increases load on the graphics subsystem and works only with TRT servers. "
596 . "Changes take effect at next connection only.", 830 . "Changes take effect at next login only.",
597 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 831 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
598 ); 832 );
599 833
600 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 834 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
601 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 835 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
612 ); 846 );
613 847
614 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 848 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
615 $table->add_at (1, $row++, new CFPlus::UI::Slider 849 $table->add_at (1, $row++, new CFPlus::UI::Slider
616 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 850 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.", 851 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
852 . "but you still need to press apply to correctly re-layout the widget.",
618 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 853 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
619 ); 854 );
620 855
621 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 856 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
622 $table->add_at (1, $row++, new CFPlus::UI::Slider 857 $table->add_at (1, $row++, new CFPlus::UI::Slider
623 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 858 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
… …
644} 879}
645 880
646sub audio_setup { 881sub audio_setup {
647 my $vbox = new CFPlus::UI::VBox; 882 my $vbox = new CFPlus::UI::VBox;
648 883
649 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 884 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
650 885
651 my $row = 0; 886 my $row = 0;
652 887
653 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 888 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
654 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 889 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
658 ); 893 );
659# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 894# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
660# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 895# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
661# $CFG->{effects_volume} = $_[1]; 896# $CFG->{effects_volume} = $_[1];
662# }); 897# });
898
899 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
900 $table->add_at (1, $row, new CFPlus::UI::CheckBox
901 expand => 1, state => $CFG->{effects_enable},
902 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
903 on_changed => sub {
904 $CFG->{effects_enable} = $_[1];
905 $CONN->update_fx_want if $CONN;
906 0
907 }
908 );
909 $table->add_at (2, $row++, new CFPlus::UI::Slider
910 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
911 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
912 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
913 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
914 );
915
663 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 916 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
664 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox); 917 $table->add_at (1, $row, new CFPlus::UI::CheckBox
665 $hbox->add (new CFPlus::UI::CheckBox
666 expand => 1, state => $CFG->{bgm_enable}, 918 expand => 1, state => $CFG->{bgm_enable},
667 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 919 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 } 920 on_changed => sub {
921 $CFG->{bgm_enable} = $_[1];
922 $CONN->update_fx_want if $CONN;
923 0
924 }
669 ); 925 );
670 $hbox->add (new CFPlus::UI::Slider 926 $table->add_at (2, $row++, new CFPlus::UI::Slider
671 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 927 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
672 tooltip => "The volume of the background music. Changes are instant.", 928 tooltip => "The volume of the background music. Changes are instant.",
673 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 929 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
674 ); 930 );
675 931
676 $table->add_at (1, $row++, new CFPlus::UI::Button 932 $table->add_at (1, $row++, new CFPlus::UI::Button
677 expand => 1, align => 0, text => "Apply", 933 c_colspan => 2, expand => 1, align => 0, text => "Apply",
678 tooltip => "Apply the audio settings", 934 tooltip => "Apply the audio settings",
679 on_activate => sub { 935 on_activate => sub {
680 audio_shutdown (); 936 audio_shutdown ();
681 audio_init (); 937 audio_init ();
682 0 938 0
… …
752 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1008 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
753 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 1009 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
754 1010
755 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1011 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
756 1012
757 $table->add_at (7,7, my $t = new CFPlus::UI::Table); 1013 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
758 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2); 1014 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
759 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1); 1015 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
760 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2); 1016 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
761 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1); 1017 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
762 $t->add_at (1,1, new CFPlus::UI::Label text => "e"); 1018 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
1019
1020 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1021
1022 $c->add_items ({
1023 type => "line_loop",
1024 color => [0, 1, 0],
1025 width => 9,
1026 coord_mode => "abs",
1027 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
1028 });
1029
1030 $c->add_items ({
1031 type => "lines",
1032 color => [1, 1, 0],
1033 width => 2,
1034 coord_mode => "rel",
1035 coord => [[0,0], [1,1], [1,0], [0,1]],
1036 });
1037
1038 $c->add_items ({
1039 type => "polygon",
1040 color => [0, 0.43, 0],
1041 width => 2,
1042 coord_mode => "rel",
1043 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1044 });
763 1045
764 $table 1046 $table
765} 1047}
766 1048
767sub stats_window { 1049sub stats_window {
… …
1065 text => $CFG->{profile}{default}{host}, 1347 text => $CFG->{profile}{default}{host},
1066 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1348 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1067 on_changed => sub { 1349 on_changed => sub {
1068 my ($self, $value) = @_; 1350 my ($self, $value) = @_;
1069 $CFG->{profile}{default}{host} = $value; 1351 $CFG->{profile}{default}{host} = $value;
1070 0 1352 1
1071 } 1353 }
1072 ); 1354 );
1073 1355
1074 $vbox->add (new CFPlus::UI::Button 1356 $vbox->add (new CFPlus::UI::Button
1075 expand => 1, 1357 expand => 1,
1076 text => "Server List", 1358 text => "Server List",
1077 other => $METASERVER, 1359 other => $METASERVER,
1078 tooltip => "Show a list of available crossfire servers", 1360 tooltip => "Show a list of available crossfire servers",
1079 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1361 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1080 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1362 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1081 ); 1363 );
1082 } 1364 }
1083 1365
1084 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1366 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1085 $table->add_at (1, 4, new CFPlus::UI::Entry 1367 $table->add_at (1, 4, new CFPlus::UI::Entry
1086 text => $CFG->{profile}{default}{user}, 1368 text => $CFG->{profile}{default}{user},
1087 tooltip => "The name of your character on the server", 1369 tooltip => "The name of your character on the server",
1088 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1370 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1089 ); 1371 );
1090 1372
1091 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1373 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1092 $table->add_at (1, 5, new CFPlus::UI::Entry 1374 $table->add_at (1, 5, new CFPlus::UI::Entry
1093 text => $CFG->{profile}{default}{password}, 1375 text => $CFG->{profile}{default}{password},
1094 hidden => 1, 1376 hidden => 1,
1095 tooltip => "The password for your character", 1377 tooltip => "The password for your character",
1096 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1378 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1097 ); 1379 );
1098 1380
1099 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1381 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1100 $table->add_at (1, 7, new CFPlus::UI::Slider 1382 $table->add_at (1, 7, new CFPlus::UI::Slider
1101 force_w => 100, 1383 force_w => 100,
1102 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1384 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1103 tooltip => "This is the size of the portion of the map update the server sends you. " 1385 tooltip => "This is the size of the portion of the map update the server sends you. "
1104 . "If you set this to a high value you will be able to see further, " 1386 . "If you set this to a high value you will be able to see further, "
1105 . "but you also increase bandwidth requirements and latency. " 1387 . "but you also increase bandwidth requirements and latency. "
1106 . "This option is only used once at log-in.", 1388 . "This option is only used once at log-in.",
1107 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1389 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1108 ); 1390 );
1109 1391
1110 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1111 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1112 state => $CFG->{face_prefetch},
1113 tooltip => "<b>Background Image Prefetch</b>\n\n"
1114 . "If enabled, the client automatically pre-fetches images from the server. "
1115 . "This might increase or create lag, but increases the chances "
1116 . "of faces being ready for display when you encounter them. "
1117 . "It also uses up server bandwidth on every connect, "
1118 . "so only set it if you really need to prefetch images. "
1119 . "This option can be set and unset any time.",
1120 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1121 );
1122
1123 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1392 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1393 $table->add_at (1, 8, new CFPlus::UI::Entry
1394 text => $CFG->{output_rate},
1395 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1396 . "when sending data. When 0 or unset, the server "
1397 . "default will be used, which is usually around 100kb/s. Most servers will "
1398 . "dynamically find an optimal rate, so adjust this only when necessary.",
1399 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1400 );
1401
1402 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1124 $table->add_at (1, 9, new CFPlus::UI::Entry 1403 $table->add_at (1, 9, new CFPlus::UI::Entry
1125 text => $CFG->{output_rate},
1126 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1127 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1128 . "default will be used, which is usually around 100kb/s.",
1129 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1130 );
1131
1132 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1133 $table->add_at (1, 10, new CFPlus::UI::Entry
1134 text => $CFG->{output_count}, 1404 text => $CFG->{output_count},
1135 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1405 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1136 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1406 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1137 ); 1407 );
1138 1408
1139 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1409 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1140 $table->add_at (1, 11, new CFPlus::UI::Entry 1410 $table->add_at (1, 10, new CFPlus::UI::Entry
1141 text => $CFG->{output_sync}, 1411 text => $CFG->{output_sync},
1142 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1412 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1143 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1413 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1144 ); 1414 );
1145 1415
1146 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1416 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1147 expand => 1, 1417 expand => 1,
1148 align => 0, 1418 align => 0,
1149 text => "Login", 1419 text => "Login",
1150 on_activate => sub { 1420 on_activate => sub {
1151 $CONN ? stop_game 1421 $CONN ? stop_game
1152 : start_game; 1422 : start_game;
1153 0 1423 1
1154 }, 1424 },
1155 ); 1425 );
1156 1426
1157 $vbox->add (new CFPlus::UI::FancyFrame 1427 $vbox->add (new CFPlus::UI::FancyFrame
1158 label => "Server Info", 1428 label => "Server Info",
… …
1164 1434
1165sub client_setup { 1435sub client_setup {
1166 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1436 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1167 1437
1168 my $row = 0; 1438 my $row = 0;
1169
1170 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1171 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1172 text => $CFG->{say_command},
1173 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. "
1174 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1175 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1176 on_changed => sub {
1177 my ($self, $value) = @_;
1178 $CFG->{say_command} = $value;
1179 0
1180 }
1181 );
1182 1439
1183 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1440 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1184 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 1441 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1185 state => $CFG->{show_tips}, 1442 state => $CFG->{show_tips},
1186 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1443 tooltip => "Show the <b>Tip of the day</b> window at startup?",
… …
1197 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1454 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1198 . "sends more messages than this number, older messages get removed to save memory and " 1455 . "sends more messages than this number, older messages get removed to save memory and "
1199 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1456 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1200 on_changed => sub { 1457 on_changed => sub {
1201 my ($self, $value) = @_; 1458 my ($self, $value) = @_;
1202 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1459 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1203 0 1460 0
1204 }, 1461 },
1205 ); 1462 );
1206 1463
1207 $table 1464 $table
1208}
1209
1210sub message_window {
1211 my $window = new CFPlus::UI::Toplevel
1212 name => "message_window",
1213 title => "Messages",
1214 border_bg => [1, 1, 1, 1],
1215 x => "max",
1216 y => 0,
1217 force_w => $::WIDTH * 0.4,
1218 force_h => $::HEIGHT * 0.5,
1219 child => (my $vbox = new CFPlus::UI::VBox),
1220 has_close_button => 1;
1221
1222 $vbox->add ($LOGVIEW);
1223
1224 $vbox->add (my $input = new CFPlus::UI::Entry
1225 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1226 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1227 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1228 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1229 on_focus_in => sub {
1230 my ($input, $prev_focus) = @_;
1231
1232 delete $input->{refocus_map};
1233
1234 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1235 $input->{refocus_map} = 1;
1236 }
1237 delete $input->{auto_activated};
1238
1239 0
1240 },
1241 on_activate => sub {
1242 my ($input, $text) = @_;
1243 $input->set_text ('');
1244
1245 if ($text =~ /^\/(.*)/) {
1246 $::CONN->user_send ($1);
1247 } else {
1248 my $say_cmd = $::CFG->{say_command} || 'say';
1249 $::CONN->user_send ("$say_cmd $text");
1250 }
1251 if ($input->{refocus_map}) {
1252 delete $input->{refocus_map};
1253 $MAPWIDGET->focus_in
1254 }
1255
1256 0
1257 },
1258 on_escape => sub {
1259 $MAPWIDGET->grab_focus;
1260
1261 0
1262 },
1263 );
1264
1265 $CONSOLE = {
1266 window => $window,
1267 input => $input,
1268 };
1269
1270 $window
1271} 1465}
1272 1466
1273sub autopickup_setup { 1467sub autopickup_setup {
1274 my $r = new CFPlus::UI::ScrolledWindow ( 1468 my $r = new CFPlus::UI::ScrolledWindow (
1275 expand => 1, 1469 expand => 1,
… …
1424 $sw1->add ($INV = new CFPlus::UI::Inventory); 1618 $sw1->add ($INV = new CFPlus::UI::Inventory);
1425 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1619 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1426 1620
1427 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1621 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1428 1622
1429 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1623 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1430 1624
1431 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1625 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1432 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1626 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1433 1627
1434 # XXX: Call after $INVR = ... because set_opencont sets the items 1628 # XXX: Call after $INVR = ... because set_opencont sets the items
1435 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1629 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1436 1630
1437 $hb 1631 $hb
1632}
1633
1634sub media_window {
1635 my $vb = new CFPlus::UI::VBox;
1636
1637 $vb->add (new CFPlus::UI::FancyFrame
1638 label => "Currently playing music",
1639 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1640 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1641 );
1642
1643 $vb->add (new CFPlus::UI::FancyFrame
1644 label => "Other media used in this session",
1645 expand => 1,
1646 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1647 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1648 );
1649
1650 $vb
1651}
1652
1653sub add_license {
1654 my ($meta) = @_;
1655
1656 $meta = $meta->{meta}
1657 or return;
1658
1659 $meta->{license} || $meta->{author} || $meta->{source}
1660 or return;
1661
1662 $LICENSE_WIDGET->add_paragraph ({
1663 fg => [1, 1, 1, 1],
1664 markup => "<small>"
1665 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1666 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1667 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1668 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1669 . "</small>",
1670 });
1671 $LICENSE_WIDGET->scroll_to_bottom;
1438} 1672}
1439 1673
1440sub toggle_player_page { 1674sub toggle_player_page {
1441 my ($widget) = @_; 1675 my ($widget) = @_;
1442 1676
… …
1461 1695
1462 my $ntb = 1696 my $ntb =
1463 $PL_NOTEBOOK = 1697 $PL_NOTEBOOK =
1464 new CFPlus::UI::Notebook expand => 1; 1698 new CFPlus::UI::Notebook expand => 1;
1465 1699
1466 $ntb->add ( 1700 $ntb->add_tab (
1467 "Statistics (F2)" => $STATS_PAGE = stats_window, 1701 "Statistics (F2)" => $STATS_PAGE = stats_window,
1468 "Shows statistics, where all your Stats and Resistances are shown." 1702 "Shows statistics, where all your Stats and Resistances are shown."
1469 ); 1703 );
1470 $ntb->add ( 1704 $ntb->add_tab (
1471 "Skills (F3)" => $SKILL_PAGE = skill_window, 1705 "Skills (F3)" => $SKILL_PAGE = skill_window,
1472 "Shows all your Skills." 1706 "Shows all your Skills."
1473 ); 1707 );
1474 1708
1475 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1709 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1476 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1710 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1477 $ntb->add ( 1711 $ntb->add_tab (
1478 "Spellbook (F4)" => $spellsw, 1712 "Spellbook (F4)" => $spellsw,
1479 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1713 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1480 ); 1714 );
1481 $ntb->add ( 1715 $ntb->add_tab (
1482 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1716 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1483 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1717 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1484 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1718 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1485 ); 1719 );
1486 $ntb->add (Pickup => autopickup_setup, 1720 $ntb->add_tab (Pickup => autopickup_setup,
1487 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1721 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1722
1723 $ntb->add_tab (Media => media_window,
1724 "License, Author and Source info for media sent by the server.");
1488 1725
1489 $ntb->set_current_page ($INVENTORY_PAGE); 1726 $ntb->set_current_page ($INVENTORY_PAGE);
1490 1727
1491 $plwin->add ($ntb); 1728 $plwin->add ($ntb);
1492 $plwin 1729 $plwin
… …
1646 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1883 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1647 ); 1884 );
1648 $hb->add (new CFPlus::UI::Button 1885 $hb->add (new CFPlus::UI::Button
1649 text => "Quit anyway", 1886 text => "Quit anyway",
1650 expand => 1, 1887 expand => 1,
1651 on_activate => sub { exit }, 1888 on_activate => sub { Event::unloop_all },
1652 ); 1889 );
1653 } 1890 }
1654 1891
1655 $QUIT_DIALOG->show; 1892 $QUIT_DIALOG->show;
1656 $QUIT_DIALOG->grab_focus; 1893 $QUIT_DIALOG->grab_focus;
… …
1774 2011
1775 $MAPWIDGET = new CFPlus::MapWidget; 2012 $MAPWIDGET = new CFPlus::MapWidget;
1776 $MAPWIDGET->connect (activate_console => sub { 2013 $MAPWIDGET->connect (activate_console => sub {
1777 my ($mapwidget, $preset) = @_; 2014 my ($mapwidget, $preset) = @_;
1778 2015
1779 if ($CONSOLE) { 2016 $MESSAGE_WINDOW->activate_console ($preset)
1780 $CONSOLE->{input}->{auto_activated} = 1; 2017 if $MESSAGE_WINDOW;
1781 $CONSOLE->{input}->grab_focus;
1782
1783 if ($preset && $CONSOLE->{input}->get_text eq '') {
1784 $CONSOLE->{input}->set_text ($preset);
1785 }
1786 }
1787 }); 2018 });
1788 $MAPWIDGET->show; 2019 $MAPWIDGET->show;
1789 $MAPWIDGET->grab_focus; 2020 $MAPWIDGET->grab_focus;
1790
1791 $LOGVIEW = new CFPlus::UI::TextScroller
1792 expand => 1,
1793 font => $FONT_FIXED,
1794 fontsize => $::CFG->{log_fontsize},
1795 indent => -4,
1796 can_hover => 1,
1797 can_events => 1,
1798 max_par => $CFG->{logview_max_par},
1799 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1800 ;
1801 2021
1802 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2022 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1803 title => "Setup", 2023 title => "Setup",
1804 name => "setup_dialog", 2024 name => "setup_dialog",
1805 x => 'center', 2025 x => 'center',
… …
1809 force_h => $::HEIGHT * 0.6, 2029 force_h => $::HEIGHT * 0.6,
1810 has_close_button => 1, 2030 has_close_button => 1,
1811 ; 2031 ;
1812 2032
1813 $METASERVER = metaserver_dialog; 2033 $METASERVER = metaserver_dialog;
2034 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1814 2035
1815 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2036 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1816 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2037 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1817 2038
1818 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2039 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1819 "Configure the server to play on, your username, password and other server-related options."); 2040 "Configure the server to play on, your username, password and other server-related options.");
1820 $SETUP_NOTEBOOK->add (Client => client_setup, 2041 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1821 "Configure various client-specific settings."); 2042 "Configure various client-specific settings.");
1822 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2043 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1823 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2044 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1824 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2045 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1825 "Configure the use of audio, sound effects and background music."); 2046 "Configure the use of audio, sound effects and background music.");
1826 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2047 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1827 "Lets you define, edit and delete key bindings." 2048 "Lets you define, edit and delete key bindings."
1828 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2049 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1829 . "with nothing set and the recording started. After doing the actions you " 2050 . "with nothing set and the recording started. After doing the actions you "
1830 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2051 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1831 . "After pressing the combo the binding will be saved automatically and the " 2052 . "After pressing the combo the binding will be saved automatically and the "
1832 . "binding editor closes"); 2053 . "binding editor closes");
1833 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2054 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1834 "Some debuggin' options. Do not ask."); 2055 "Some debuggin' options. Do not ask.");
1835 2056
1836 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2057 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1837 2058
1838 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2059 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1839 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2060 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1840 2061
1841 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2062 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1842 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2063 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1843 2064
1844 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 2065 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
1845 2066
1846 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2067 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1866 tooltip => "Terminates the program", 2087 tooltip => "Terminates the program",
1867 on_activate => sub { 2088 on_activate => sub {
1868 if ($CONN) { 2089 if ($CONN) {
1869 open_quit_dialog; 2090 open_quit_dialog;
1870 } else { 2091 } else {
1871 exit; 2092 Event::unloop_all;
1872 } 2093 }
1873 0 2094 0
1874 }, 2095 },
1875 ); 2096 );
1876 2097
1877 $BUTTONBAR->show; 2098 $BUTTONBAR->show;
1878 $SETUP_DIALOG->show; 2099 $SETUP_DIALOG->show;
2100 $MESSAGE_WINDOW->show;
1879 } 2101 }
1880 2102
1881 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2103 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1882}
1883
1884sub setup_build_button {
1885 my ($enabled) = @_;
1886 if ($enabled) {
1887 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1888 $BUILD_BUTTON ||= new CFPlus::UI::Button
1889 text => "Build",
1890 tooltip => "Opens the ingame builder",
1891 on_activate => sub {
1892 if ($CONN) {
1893 $CONN->send_ext_req (builder_player_items => sub {
1894 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1895 });
1896 }
1897 0
1898 };
1899 $BUTTONBAR->add ($BUILD_BUTTON);
1900 } else {
1901 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1902 }
1903}
1904
1905sub open_ingame_editor {
1906 my ($msg) = @_;
1907
1908 my $win = new CFPlus::UI::Toplevel
1909 x => 0,
1910 y => 'center',
1911 z => 4,
1912 name => 'builder_window',
1913 force_w => int $WIDTH * 1/4,
1914 force_h => int $HEIGHT * 3/4,
1915 title => "In game builder",
1916 has_close_button => 1;
1917
1918 my $r = new CFPlus::UI::ScrolledWindow (
1919 expand => 1,
1920 scroll_y => 1
1921 );
1922 $r->add (my $vb = new CFPlus::UI::VBox);
1923 $win->add ($r);
1924
1925
1926 $vb->add (
1927 new CFPlus::UI::Button
1928 text => "Disable build mode",
1929 on_activate => sub { $::IN_BUILD_MODE = undef }
1930 );
1931 $vb->add (
1932 new CFPlus::UI::Button
1933 text => "ERASE",
1934 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1935 );
1936
1937 for my $itemarchname (
1938 sort {
1939 $msg->{items}->{$a}->{build_arch_name}
1940 cmp $msg->{items}->{$b}->{build_arch_name}
1941 } keys %{$msg->{items}}
1942 ) {
1943 my $info = $msg->{items}->{$itemarchname};
1944 $vb->add (
1945 new CFPlus::UI::Button text => $info->{build_arch_name},
1946 on_activate => sub {
1947 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1948
1949 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1950 build_mode_query_arch_info ();
1951 }
1952 }
1953 );
1954 }
1955
1956 $win->show;
1957}
1958
1959sub build_mode_query_arch_info {
1960 my ($iteminfo) = $::IN_BUILD_MODE;
1961 my $itemarchname = $iteminfo->{item};
1962 my $info = $iteminfo->{info};
1963
1964 my $dialog = new CFPlus::UI::Toplevel
1965 x => "center",
1966 y => "center",
1967 z => 50,
1968 force_w => int $WIDTH * 1/2,
1969 title => "Enter information for placement of '$itemarchname'",
1970 has_close_button => 1;
1971
1972 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1973
1974 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1975 my $row = 0;
1976 if ($info->{has_name}) {
1977 $table->add_at (0, $row, new CFPlus::UI::Label text => "Name:");
1978 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1979 }
1980 if ($info->{has_text}) {
1981 $table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
1982 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1983 }
1984 if ($info->{has_connection}) {
1985 $table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1986 $table->add_at (1, $row++,
1987 new CFPlus::UI::Entry
1988 expand => 1,
1989 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1990 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1991 );
1992 }
1993
1994 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1995 $hb->add (new CFPlus::UI::Button
1996 text => "Close",
1997 expand => 1,
1998 on_activate => sub { $dialog->hide; 0 },
1999 );
2000 $dialog->show;
2001} 2104}
2002 2105
2003sub video_shutdown { 2106sub video_shutdown {
2004 CFPlus::OpenGL::shutdown; 2107 CFPlus::OpenGL::shutdown;
2005 2108
2006 undef $SDL_ACTIVE; 2109 undef $SDL_ACTIVE;
2007} 2110}
2008 2111
2009sub audio_channel_finished {
2010 my ($channel) = @_;
2011
2012 #warn "channel $channel finished\n";#d#
2013}
2014
2015sub audio_music_set {
2016 my ($songs) = @_;
2017
2018 my @want =
2019 grep $_,
2020 map $CONN->{music_meta}{$_},
2021 @$songs;
2022
2023 if (@want) {
2024 @MUSIC_WANT = @want;
2025 &audio_music_changed ();
2026 }
2027}
2028
2029sub audio_music_start {
2030 my $path = $MUSIC_PLAYING->{path}
2031 or return;
2032
2033 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2034 # music might have changed...
2035 $path eq $MUSIC_PLAYING->{path}
2036 or return &audio_music_start ();
2037
2038 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2039
2040 my $NOW = time;
2041
2042 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2043 my $pos = $MUSIC_PLAYING->{stop_pos};
2044 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2045 $MUSIC_START = time - $pos;
2046 } else {
2047 $MUSIC_PLAYER->play (0);
2048 $MUSIC_START = time;
2049 }
2050
2051 delete $MUSIC_PLAYING->{stop_time};
2052 delete $MUSIC_PLAYING->{stop_pos};
2053 }
2054}
2055
2056sub audio_music_changed {
2057 return unless $CFG->{bgm_enable};
2058
2059 # default MUSIC_WANT == MUSIC_DEFAULT
2060 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2061
2062 # if the currently playing song is acceptable, let it continue
2063 return if $MUSIC_PLAYING
2064 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2065
2066 my $NOW = time;
2067
2068 if ($MUSIC_PLAYING) {
2069 $MUSIC_PLAYING->{stop_time} = $NOW;
2070 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2071 CFPlus::MixMusic::fade_out 1000;
2072 } else {
2073 # sort by stop time, oldest first
2074 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2075
2076 # if the most recently-played piece played very recently,
2077 # resume it, else choose the oldest piece for rotation.
2078 $MUSIC_PLAYING =
2079 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2080 ? $MUSIC_WANT[-1]
2081 : $MUSIC_WANT[0];
2082
2083 audio_music_start;
2084 }
2085}
2086
2087sub audio_music_finished {
2088 $MUSIC_PLAYING = undef;
2089 undef $MUSIC_PLAYER;
2090
2091 audio_music_changed;
2092}
2093
2094sub audio_init {
2095 if ($CFG->{audio_enable}) {
2096 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
2097 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2098
2099 unless ($SDL_MIXER) {
2100 status "Unable to open sound device: there will be no sound";
2101 return;
2102 }
2103
2104 CFPlus::Mix_AllocateChannels 8;
2105 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2106
2107 audio_music_finished;
2108
2109 local $_;
2110 while (<$fh>) {
2111 next if /^\s*#/;
2112 next if /^\s*$/;
2113
2114 my ($file, $volume, $event) = split /\s+/, $_, 3;
2115
2116 push @SOUNDS, "$volume,$file";
2117
2118 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2119 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2120 $chunk->volume ($volume * 128 / 100);
2121 $chunk
2122 };
2123 }
2124 } else {
2125 status "unable to open sound config: $!";
2126 }
2127 }
2128}
2129
2130sub audio_shutdown {
2131 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2132 undef $SDL_MIXER;
2133 @SOUNDS = ();
2134 %AUDIO_CHUNKS = ();
2135}
2136
2137my %animate_object; 2112my %animate_object;
2138my $animate_timer; 2113my $animate_timer;
2139 2114
2140my $fps = 9; 2115my $fps = 9;
2141 2116
2142my %demo;#d#
2143
2144sub force_refresh { 2117sub force_refresh {
2118 if ($ENV{CFPLUS_DEBUG} & 4) {
2145 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2119 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2146 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2120 debug sprintf "%3.2f", $fps;
2121 }
2147 2122
2148 $CFPlus::UI::ROOT->draw; 2123 $CFPlus::UI::ROOT->draw;
2149 2124 CFPlus::SDL_GL_SwapBuffers;
2150 $WANT_REFRESH = 0;
2151 $CAN_REFRESH = 0;
2152 $LAST_REFRESH = $NOW; 2125 $LAST_REFRESH = $NOW;
2153 2126 $WANT_REFRESH->stop;
2154 CFPlus::SDL_GL_SwapBuffers;
2155} 2127}
2156 2128
2129$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2130
2157my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2131my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2158 $NOW = time; 2132 $NOW = time;
2159 2133
2160 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2134 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2161 for CFPlus::poll_events; 2135 for CFPlus::poll_events;
2162 2136
2163 if (%animate_object) { 2137 if (%animate_object) {
2164 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2138 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2165 ++$WANT_REFRESH; 2139 $WANT_REFRESH->start;
2166 }
2167
2168 if ($WANT_REFRESH) {
2169 force_refresh;
2170 } else {
2171 $CAN_REFRESH = 1;
2172 } 2140 }
2173}); 2141});
2174 2142
2175sub animation_start { 2143sub animation_start {
2176 my ($widget) = @_; 2144 my ($widget) = @_;
… …
2179 2147
2180sub animation_stop { 2148sub animation_stop {
2181 my ($widget) = @_; 2149 my ($widget) = @_;
2182 delete $animate_object{$widget}; 2150 delete $animate_object{$widget};
2183} 2151}
2184
2185# check once/second for faces that need to be prefetched
2186# this should, of course, only run on demand, but
2187# SDL forces worse things on us....
2188
2189Event->timer (after => 1, interval => 0.25, cb => sub {
2190 $CONN->face_prefetch
2191 if $CONN;
2192});
2193 2152
2194%SDL_CB = ( 2153%SDL_CB = (
2195 CFPlus::SDL_QUIT => sub { 2154 CFPlus::SDL_QUIT => sub {
2196 exit; 2155 exit;
2197 }, 2156 },
… …
2240 CFPlus::DB::Server::run; 2199 CFPlus::DB::Server::run;
2241 2200
2242 CFPlus::UI::set_layout ($::CFG->{layout}); 2201 CFPlus::UI::set_layout ($::CFG->{layout});
2243 2202
2244 my %DEF_CFG = ( 2203 my %DEF_CFG = (
2245 sdl_mode => 0, 2204 sdl_mode => 0,
2246 width => 640,
2247 height => 480,
2248 fullscreen => 0, 2205 fullscreen => 0,
2249 fast => 0, 2206 fast => 0,
2207 force_opengl11 => undef,
2208 texture_compression => 1,
2250 map_scale => 1, 2209 map_scale => 1,
2251 fow_enable => 1, 2210 fow_enable => 1,
2252 fow_intensity => 0, 2211 fow_intensity => 0,
2253 map_smoothing => 1, 2212 map_smoothing => 1,
2254 gui_fontsize => 1, 2213 gui_fontsize => 1,
2255 log_fontsize => 0.7, 2214 log_fontsize => 0.7,
2256 gauge_fontsize => 1, 2215 gauge_fontsize => 1,
2257 gauge_size => 0.35, 2216 gauge_size => 0.35,
2258 stat_fontsize => 0.7, 2217 stat_fontsize => 0.7,
2259 mapsize => 100, 2218 mapsize => 100,
2260 say_command => 'chat',
2261 audio_enable => 1, 2219 audio_enable => 1,
2220 effects_enable => 1,
2221 effects_volume => 1,
2262 bgm_enable => 1, 2222 bgm_enable => 1,
2263 bgm_volume => 0.25, 2223 bgm_volume => 0.5,
2264 face_prefetch => 0,
2265 output_sync => 1, 2224 output_sync => 1,
2266 output_count => 1, 2225 output_count => 1,
2267 output_rate => "", 2226 output_rate => "",
2268 pickup => 0, 2227 pickup => 0,
2269 inv_sort => "mtime", 2228 inv_sort => "mtime",
2270 default => "profile", # default profile 2229 default => "profile", # default profile
2271 show_tips => 1, 2230 show_tips => 1,
2272 logview_max_par => 1000, 2231 logview_max_par => 1000,
2273 ); 2232 );
2274 2233
2275 while (my ($k, $v) = each %DEF_CFG) { 2234 while (my ($k, $v) = each %DEF_CFG) {
2276 $CFG->{$k} = $v unless exists $CFG->{$k}; 2235 $CFG->{$k} = $v unless exists $CFG->{$k};
2277 } 2236 }
… …
2343} 2302}
2344 2303
2345show_tip_of_the_day if $CFG->{show_tips}; 2304show_tip_of_the_day if $CFG->{show_tips};
2346 2305
2347Event::loop; 2306Event::loop;
2307
2308#video_shutdown;
2309#audio_shutdown;
2348#CFPlus::SDL_Quit; 2310CFPlus::SDL_Quit;
2349#CFPlus::_exit 0;
2350
2351END {
2352 CFPlus::SDL_Quit;
2353 CFPlus::DB::Server::stop; 2311CFPlus::DB::Server::stop;
2354}
2355 2312
2356=head1 NAME 2313=head1 NAME
2357 2314
2358cfplus - A Crossfire+ and Crossfire game client 2315cfplus - A Crossfire TRT and Crossfire game client
2359 2316
2360=head1 SYNOPSIS 2317=head1 SYNOPSIS
2361 2318
2362Just run it - no commandline arguments are supported. 2319Just run it - no commandline arguments are supported.
2363 2320
2364=head1 USAGE 2321=head1 USAGE
2365 2322
2366cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2323cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2367fullscreen and interactively. 2324be used in fullscreen mode and interactively.
2368 2325
2369=head1 DEBUGGING 2326=head1 DEBUGGING
2370 2327
2371 2328
2372CFPLUS_DEBUG - environment variable 2329CFPLUS_DEBUG - environment variable

Diff Legend

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