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.197 by root, Tue Jul 31 02:25:52 2007 UTC vs.
Revision 1.223 by root, Tue Aug 28 01:23:47 2007 UTC

… …
113our $CONN; 113our $CONN;
114our $PROFILE; # current profile 114our $PROFILE; # current profile
115our $FAST; # fast, low-quality mode, possibly useful for software-rendering 115our $FAST; # fast, low-quality mode, possibly useful for software-rendering
116 116
117our $WANT_REFRESH; 117our $WANT_REFRESH;
118our $CAN_REFRESH;
119 118
120our @SDL_MODES; 119our @SDL_MODES;
121our $WIDTH; 120our $WIDTH;
122our $HEIGHT; 121our $HEIGHT;
123our $FULLSCREEN; 122our $FULLSCREEN;
… …
127our $FONT_FIXED; 126our $FONT_FIXED;
128 127
129our $MAP; 128our $MAP;
130our $MAPMAP; 129our $MAPMAP;
131our $MAPWIDGET; 130our $MAPWIDGET;
131our $COMPLETER;
132our $BUTTONBAR; 132our $BUTTONBAR;
133our $METASERVER; 133our $METASERVER;
134our $LOGIN_BUTTON; 134our $LOGIN_BUTTON;
135our $QUIT_DIALOG; 135our $QUIT_DIALOG;
136our $HOST_ENTRY; 136our $HOST_ENTRY;
… …
144our $SETUP_KEYBOARD; 144our $SETUP_KEYBOARD;
145 145
146our $PL_NOTEBOOK; 146our $PL_NOTEBOOK;
147our $PL_WINDOW; 147our $PL_WINDOW;
148 148
149our $MUSIC_PLAYING_WIDGET;
150our $LICENSE_WIDGET;
151
152our $PICKUP_PAGE;
149our $INVENTORY_PAGE; 153our $INVENTORY_PAGE;
150our $STATS_PAGE; 154our $STATS_PAGE;
151our $SKILL_PAGE; 155our $SKILL_PAGE;
152our $SPELL_PAGE; 156our $SPELL_PAGE;
153our $SPELL_LIST; 157our $SPELL_LIST;
… …
159our $STATWIDS; 163our $STATWIDS;
160 164
161our $SDL_ACTIVE; 165our $SDL_ACTIVE;
162our %SDL_CB; 166our %SDL_CB;
163 167
168our $ALT_ENTER_MESSAGE;
169our $STATUSBOX;
170our $DEBUG_STATUS;
171
172our $INV;
173our $INVR;
174our $INVR_HB;
175
176#############################################################################
177
178sub status {
179 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
180}
181
182sub debug {
183 $DEBUG_STATUS->set_text ($_[0]);
184}
185
186sub message {
187 my ($para) = @_;
188 $MESSAGE_WINDOW->message ($para);
189}
190
191#############################################################################
192#TODO: maybe move into own audio module...
193
164our $SDL_MIXER; 194our $SDL_MIXER;
195
165our $MUSIC_DEFAULT = "in_a_heartbeat.ogg"; 196our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
166our $MUSIC_WANT; # arryref of ambient music 197our $MUSIC_WANT; # arryref of ambient music we want to play
167our @MUSIC_HAVE; # ambient music we want now 198our @MUSIC_HAVE; # ambient music we have on disk
168our $MUSIC_START; 199our $MUSIC_START;
169our @MUSIC_JINGLE; # which jingles to play 200our @MUSIC_JINGLE; # which jingles to play next
170our $MUSIC_PLAYING_DATA; 201our $MUSIC_PLAYING_DATA;
171our $MUSIC_PLAYING_META; 202our $MUSIC_PLAYING_META;
172our $MUSIC_PLAYER; 203our $MUSIC_PLAYER;
173our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before 204our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
174our @SOUNDS; # event => file mapping 205
175our %AUDIO_CHUNK; # audio files 206our %AUDIO_CHUNK; # audio "files"
176 207our %AUDIO_PLAY; # which audio faces should be played
177our $ALT_ENTER_MESSAGE;
178our $STATUSBOX;
179our $DEBUG_STATUS;
180
181our $INV;
182our $INVR;
183our $INV_RIGHT_HB;
184
185our $PICKUP_CFG;
186
187#############################################################################
188#TODO: maybe move into own audio module...
189 208
190sub audio_channel_finished { 209sub audio_channel_finished {
191 my ($channel) = @_; 210 my ($channel) = @_;
192 211
193# warn "channel $channel finished\n";#d# 212# warn "channel $channel finished\n";#d#
194} 213}
195 214
196our %AUDIO_PLAY;
197our %AUDIO_CHUNK;
198
199sub audio_sound_push($) { 215sub audio_sound_push($) {
200 my ($face) = @_; 216 my ($face) = @_;
217
218 $CFG->{effects_enable}
219 or return;
220
221 $AUDIO_PLAY{$face}
222 or return;
201 223
202 if (my $chunk = $AUDIO_CHUNK{$face}) { 224 if (my $chunk = $AUDIO_CHUNK{$face}) {
203 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) { 225 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
204 my (undef, $dx, $dy, $vol) = @$_; 226 my (undef, $dx, $dy, $vol) = @$_;
205 227
206 my $channel = CFPlus::Channel::find; 228 my $channel = CFPlus::Channel::find;
207 $channel->volume ($vol * 128 / 255); 229 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
208 $dx = $dx / 10 * 255;
209 $channel->set_panning (255 - $dx, 255 + $dx);
210
211# my $angle = $dx ? : $dx < 0 ?
212# my $distance = -$vol;
213# $channel->set_position ($angle, $distance); 230 $channel->set_position_r ($dx, $dy, 20);
214
215 $chunk->play ($channel); 231 $chunk->play ($channel);
216 } 232 }
217 } else { 233 } else {
218 # sound_meta not set means data is in flight either way 234 # sound_meta not set means data is in flight either way
219 my $meta = $CONN->{sound_meta}{$face} 235 my $meta = $CONN->{face}[$face]
220 or return; 236 or return;
221 237
238 $meta->{data}
239 or return;
240
222 # if its a jingle, play it as ambient music 241 # if its a jingle, play it as ambient music
223 if ($meta->{meta}{jingle}) { 242 if ($meta->{data}{jingle}) {
224 push @MUSIC_JINGLE, $meta; 243 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
225 delete $AUDIO_PLAY{$face}; 244 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
226 &audio_music_push ($face); 245 &audio_music_push ($face);
246 }
227 } else { 247 } else {
228 # fetch from database 248 # fetch from database
229 CFPlus::DB::get res_data => $meta->{name}, sub { 249 CFPlus::DB::get res_data => $meta->{name}, sub {
230 my $rwops = new CFPlus::RW $_[0]; 250 my $rwops = new CFPlus::RW $_[0];
231 my $chunk = new CFPlus::MixChunk $rwops; 251 my $chunk = new CFPlus::MixChunk $rwops
252 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
232 $chunk->volume (($meta->{meta}{volume} || 1) * 128); 253 $chunk->volume (($meta->{data}{volume} || 1) * 128);
233 $AUDIO_CHUNK{$face} = $chunk; 254 $AUDIO_CHUNK{$face} = $chunk;
234 255
235 audio_sound_push ($face); 256 audio_sound_push ($face);
236 }; 257 };
237 } 258 }
… …
241sub audio_sound_play { 262sub audio_sound_play {
242 my ($face, $dx, $dy, $vol) = @_; 263 my ($face, $dx, $dy, $vol) = @_;
243 264
244 $SDL_MIXER 265 $SDL_MIXER
245 or return; 266 or return;
267 $CFG->{effects_enable}
268 or return;
246 269
247 my $queue = $AUDIO_PLAY{$face} ||= []; 270 my $queue = $AUDIO_PLAY{$face} ||= [];
248 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s 271 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
249 audio_sound_push $face 272 audio_sound_push $face
250 unless @$queue > 1; 273 unless @$queue > 1;
251} 274}
252 275
276sub audio_music_set_meta {
277 my ($meta) = @_;
278
279 $MUSIC_PLAYING_META = $meta;
280 $MUSIC_PLAYING_WIDGET->set_markup (
281 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
282 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
283 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
284 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
285 );
286}
287
253sub audio_music_update_volume { 288sub audio_music_update_volume {
254 return unless $MUSIC_PLAYING_META; 289 return unless $MUSIC_PLAYING_META;
255 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1; 290 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
256 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume}; 291 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
257 CFPlus::MixMusic::volume $base * $volume * 128; 292 CFPlus::MixMusic::volume $base * $volume * 128;
258} 293}
259 294
260sub audio_music_start { 295sub audio_music_start {
261 my $meta = $MUSIC_PLAYING_META; 296 my $meta = $MUSIC_PLAYING_META;
… …
274 my $rwops = $meta->{path} 309 my $rwops = $meta->{path}
275 ? new_from_file CFPlus::RW $meta->{path} 310 ? new_from_file CFPlus::RW $meta->{path}
276 : new CFPlus::RW $$MUSIC_PLAYING_DATA; 311 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
277 312
278 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops 313 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
279 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error 314 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
280 315
281 my $NOW = time; 316 my $NOW = time;
282 317
283 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 318 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
284 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 319 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
287 } else { 322 } else {
288 $MUSIC_PLAYER->play (0); 323 $MUSIC_PLAYER->play (0);
289 $MUSIC_START = time; 324 $MUSIC_START = time;
290 } 325 }
291 326
292 delete $MUSIC_PLAYING_META->{stop_time}; 327 delete $meta->{stop_time};
293 delete $MUSIC_PLAYING_META->{stop_pos}; 328 delete $meta->{stop_pos};
294 } 329 }
295} 330}
296 331
297sub audio_music_push { 332sub audio_music_push {
298 return unless $SDL_MIXER; 333 return unless $SDL_MIXER;
… …
304 $fade_out = 333; 339 $fade_out = 333;
305 } else { 340 } else {
306 return unless $CFG->{bgm_enable}; 341 return unless $CFG->{bgm_enable};
307 342
308 my @have = 343 my @have =
309 grep $_, 344 grep $_ && $_->{data},
310 map $CONN->{music_meta}{$_}, 345 map $CONN->{face}[$_],
311 @$MUSIC_WANT; 346 @$MUSIC_WANT;
312 347
313 @MUSIC_HAVE = @have 348 @MUSIC_HAVE = @have
314 if @have; 349 if @have;
315 350
… …
317 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE; 352 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
318 $fade_out = 1000; 353 $fade_out = 1000;
319 } 354 }
320 355
321 # if the currently playing song is acceptable, let it continue 356 # if the currently playing song is acceptable, let it continue
322 return if $MUSIC_PLAYING_META
323 && grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; 357 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
324 358
325 my $NOW = time; 359 my $NOW = time;
326 360
327 if ($MUSIC_PLAYING_META) { 361 if ($MUSIC_PLAYING_META) {
328 $MUSIC_PLAYING_META->{stop_time} = $NOW; 362 $MUSIC_PLAYING_META->{stop_time} = $NOW;
… …
332 # sort by stop time, oldest first 366 # sort by stop time, oldest first
333 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE; 367 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
334 368
335 # if the most recently-played piece played very recently, 369 # if the most recently-played piece played very recently,
336 # resume it, else choose the oldest piece for rotation. 370 # resume it, else choose the oldest piece for rotation.
337 $MUSIC_PLAYING_META = 371 audio_music_set_meta
338 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME 372 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
339 ? $MUSIC_HAVE[-1] 373 ? $MUSIC_HAVE[-1]
340 : $MUSIC_HAVE[0]; 374 : $MUSIC_HAVE[0];
341 375
342 audio_music_start; 376 audio_music_start;
… …
349 $MUSIC_WANT = $songs; 383 $MUSIC_WANT = $songs;
350 audio_music_push; 384 audio_music_push;
351} 385}
352 386
353sub audio_music_finished { 387sub audio_music_finished {
388 # we compress multiple jingles of the same type
354 shift @MUSIC_JINGLE 389 shift @MUSIC_JINGLE
355 if $MUSIC_PLAYING_META == $MUSIC_JINGLE[0]; 390 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
391
392 $MUSIC_PLAYING_WIDGET->clear;
356 393
357 undef $MUSIC_PLAYER; 394 undef $MUSIC_PLAYER;
358 undef $MUSIC_PLAYING_META; 395 undef $MUSIC_PLAYING_META;
359 undef $MUSIC_PLAYING_DATA; 396 undef $MUSIC_PLAYING_DATA;
360 397
361 audio_music_push; 398 audio_music_push;
362} 399}
363 400
401sub audio_init {
402 if ($CFG->{audio_enable}) {
403 $ENV{MIX_EFFECTSMAXSPEED} = 1;
404 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
405
406 unless ($SDL_MIXER) {
407 status "Unable to open sound device: there will be no sound";
408 return;
409 }
410
411 CFPlus::Mix_AllocateChannels 16;
412
413 audio_music_finished;
414 } else {
415 undef $SDL_MIXER;
416 }
417}
418
419sub audio_shutdown {
420 undef $MUSIC_PLAYER;
421 undef $MUSIC_PLAYING_META;
422 undef $MUSIC_PLAYING_DATA;
423
424 $MUSIC_WANT = [];
425 @MUSIC_JINGLE = ();
426 %AUDIO_PLAY = ();
427 %AUDIO_CHUNK = ();
428
429 CFPlus::Mix_CloseAudio if $SDL_MIXER;
430 undef $SDL_MIXER;
431}
432
364############################################################################# 433#############################################################################
365
366sub status {
367 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
368}
369
370sub debug {
371 $DEBUG_STATUS->set_text ($_[0]);
372}
373
374sub message {
375 my ($para) = @_;
376 $MESSAGE_WINDOW->message ($para);
377}
378 434
379sub destroy_query_dialog { 435sub destroy_query_dialog {
380 (delete $_[0]{query_dialog})->destroy 436 (delete $_[0]{query_dialog})->destroy
381 if $_[0]{query_dialog}; 437 if $_[0]{query_dialog};
382} 438}
… …
716 state => $CFG->{fullscreen}, 772 state => $CFG->{fullscreen},
717 tooltip => "Bring the client into fullscreen mode.", 773 tooltip => "Bring the client into fullscreen mode.",
718 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 774 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
719 ); 775 );
720 776
777 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
778 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
779 state => $CFG->{force_opengl11},
780 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
781 . "higher memory usage and slower performance. It will, however, help tremendously on "
782 . "cards that claim to support a feature but fall back to software rendering. "
783 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
784 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
785 . "experience extremely low framerates and your card should do better, try this option.</b>",
786 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
787 );
788
789 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
790 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
791 state => $CFG->{texture_compression},
792 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
793 . "will save a lot of memory and increase performance. The compression algorithm "
794 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
795 . "forced OpenGL 1.1 mode.",
796 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
797 );
798
721 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 799 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
722 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 800 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
723 state => $CFG->{fast}, 801 state => $CFG->{fast},
724 tooltip => "Lower the visual quality considerably to speed up rendering.", 802 tooltip => "Lower the visual quality considerably to speed up rendering.",
725 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 803 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
… …
751 829
752 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 830 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
753 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 831 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
754 state => $CFG->{map_smoothing}, 832 state => $CFG->{map_smoothing},
755 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 833 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
756 . "This increases load on the graphics subsystem and works only with 2.x servers. " 834 . "This increases load on the graphics subsystem and works only with TRT servers. "
757 . "Changes take effect at next connection only.", 835 . "Changes take effect at next login only.",
758 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 836 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
759 ); 837 );
760 838
761 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 839 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
762 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 840 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
773 ); 851 );
774 852
775 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 853 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
776 $table->add_at (1, $row++, new CFPlus::UI::Slider 854 $table->add_at (1, $row++, new CFPlus::UI::Slider
777 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 855 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
778 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 856 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
857 . "but you still need to press apply to correctly re-layout the widget.",
779 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 858 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
780 ); 859 );
781 860
782 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 861 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
783 $table->add_at (1, $row++, new CFPlus::UI::Slider 862 $table->add_at (1, $row++, new CFPlus::UI::Slider
… …
805} 884}
806 885
807sub audio_setup { 886sub audio_setup {
808 my $vbox = new CFPlus::UI::VBox; 887 my $vbox = new CFPlus::UI::VBox;
809 888
810 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 889 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
811 890
812 my $row = 0; 891 my $row = 0;
813 892
814 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 893 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
815 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 894 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
819 ); 898 );
820# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 899# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
821# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 900# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
822# $CFG->{effects_volume} = $_[1]; 901# $CFG->{effects_volume} = $_[1];
823# }); 902# });
903
904 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
905 $table->add_at (1, $row, new CFPlus::UI::CheckBox
906 expand => 1, state => $CFG->{effects_enable},
907 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
908 on_changed => sub {
909 $CFG->{effects_enable} = $_[1];
910 $CONN->update_fx_want if $CONN;
911 0
912 }
913 );
914 $table->add_at (2, $row++, new CFPlus::UI::Slider
915 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
916 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
917 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
918 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
919 );
920
824 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 921 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
825 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox); 922 $table->add_at (1, $row, new CFPlus::UI::CheckBox
826 $hbox->add (new CFPlus::UI::CheckBox
827 expand => 1, state => $CFG->{bgm_enable}, 923 expand => 1, state => $CFG->{bgm_enable},
828 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 924 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
829 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 925 on_changed => sub {
926 $CFG->{bgm_enable} = $_[1];
927 $CONN->update_fx_want if $CONN;
928 audio_music_push;
929 0
930 }
830 ); 931 );
831 $hbox->add (new CFPlus::UI::Slider 932 $table->add_at (2, $row++, new CFPlus::UI::Slider
832 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 933 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
833 tooltip => "The volume of the background music. Changes are instant.", 934 tooltip => "The volume of the background music. Changes are instant.",
834 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 935 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
835 ); 936 );
836 937
837 $table->add_at (1, $row++, new CFPlus::UI::Button 938 $table->add_at (1, $row++, new CFPlus::UI::Button
838 expand => 1, align => 0, text => "Apply", 939 c_colspan => 2, expand => 1, align => 0, text => "Apply",
839 tooltip => "Apply the audio settings", 940 tooltip => "Apply the audio settings",
840 on_activate => sub { 941 on_activate => sub {
841 audio_shutdown (); 942 audio_shutdown ();
842 audio_init (); 943 audio_init ();
843 0 944 0
… …
885 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 986 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
886 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 987 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
887 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 988 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
888 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food"); 989 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
889 990
890 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 991 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
992 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
993 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
891 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 994 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
892 995
893 $GAUGES = { 996 $GAUGES = {
997 exp => $exp, prg => $prg, sklprg => $sklprg,
894 exp => $exp, win => $win, range => $rng, 998 win => $win, range => $rng,
895 food => $fg, mana => $mg, hp => $hg, grace => $gg 999 hp => $hg, mana => $mg, grace => $gg, food => $fg,
896 }; 1000 };
897 1001
898 &set_gauge_window_fontsize; 1002 &set_gauge_window_fontsize;
899 1003
900 $win 1004 $win
… …
914 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 1018 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
915 1019
916 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1020 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
917 1021
918 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0); 1022 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
919 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2); 1023 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
920 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1); 1024 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
921 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2); 1025 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
922 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1); 1026 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
923 $t->add_at (1,1, new CFPlus::UI::Label text => "e"); 1027 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
924 1028
925 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); 1029 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
926 1030
927 $c->add_items ({ 1031 $c->add_items ({
… …
1101 $r 1205 $r
1102} 1206}
1103 1207
1104sub skill_window { 1208sub skill_window {
1105 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1209 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1210
1106 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1211 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1212
1107 $sw 1213 $sw
1108} 1214}
1109 1215
1110sub formsep($) { 1216sub formsep($) {
1111 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1217 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
1523 $sw1->add ($INV = new CFPlus::UI::Inventory); 1629 $sw1->add ($INV = new CFPlus::UI::Inventory);
1524 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1630 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1525 1631
1526 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1632 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1527 1633
1528 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1634 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1529 1635
1530 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1636 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1531 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1637 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1532 1638
1533 # XXX: Call after $INVR = ... because set_opencont sets the items 1639 # XXX: Call after $INVR = ... because set_opencont sets the items
1534 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1640 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1535 1641
1536 $hb 1642 $hb
1643}
1644
1645sub media_window {
1646 my $vb = new CFPlus::UI::VBox;
1647
1648 $vb->add (new CFPlus::UI::FancyFrame
1649 label => "Currently playing music",
1650 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1651 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1652 );
1653
1654 $vb->add (new CFPlus::UI::FancyFrame
1655 label => "Other media used in this session",
1656 expand => 1,
1657 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1658 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1659 );
1660
1661 $vb
1662}
1663
1664sub add_license {
1665 my ($meta) = @_;
1666
1667 $meta = $meta->{data}
1668 or return;
1669
1670 $meta->{license} || $meta->{author} || $meta->{source}
1671 or return;
1672
1673 $LICENSE_WIDGET->add_paragraph ({
1674 fg => [1, 1, 1, 1],
1675 markup => "<small>"
1676 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1677 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1678 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1679 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1680 . "</small>",
1681 });
1682 $LICENSE_WIDGET->scroll_to_bottom;
1537} 1683}
1538 1684
1539sub toggle_player_page { 1685sub toggle_player_page {
1540 my ($widget) = @_; 1686 my ($widget) = @_;
1541 1687
… …
1580 $ntb->add_tab ( 1726 $ntb->add_tab (
1581 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1727 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1582 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1728 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1583 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1729 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1584 ); 1730 );
1585 $ntb->add_tab (Pickup => autopickup_setup, 1731 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1586 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1732 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1733
1734 $ntb->add_tab (Media => media_window,
1735 "License, Author and Source info for media sent by the server.");
1587 1736
1588 $ntb->set_current_page ($INVENTORY_PAGE); 1737 $ntb->set_current_page ($INVENTORY_PAGE);
1589 1738
1590 $plwin->add ($ntb); 1739 $plwin->add ($ntb);
1591 $plwin 1740 $plwin
… …
1745 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1894 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1746 ); 1895 );
1747 $hb->add (new CFPlus::UI::Button 1896 $hb->add (new CFPlus::UI::Button
1748 text => "Quit anyway", 1897 text => "Quit anyway",
1749 expand => 1, 1898 expand => 1,
1750 on_activate => sub { exit }, 1899 on_activate => sub { Event::unloop_all },
1751 ); 1900 );
1752 } 1901 }
1753 1902
1754 $QUIT_DIALOG->show; 1903 $QUIT_DIALOG->show;
1755 $QUIT_DIALOG->grab_focus; 1904 $QUIT_DIALOG->grab_focus;
… …
1828 1977
1829 $SDL_ACTIVE = 1; 1978 $SDL_ACTIVE = 1;
1830 $LAST_REFRESH = time - 0.01; 1979 $LAST_REFRESH = time - 0.01;
1831 1980
1832 CFPlus::OpenGL::init; 1981 CFPlus::OpenGL::init;
1982 CFPlus::Macro::init;
1833 1983
1834 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1984 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1835 1985
1836 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1986 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1837 1987
1838 ############################################################################# 1988 #############################################################################
1839 1989
1840 if ($DEBUG_STATUS) { 1990 if ($DEBUG_STATUS) {
1841 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1991 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1842 } else { 1992 } else {
1843 # create the widgets 1993 # create/configure the widgets
1994
1995 $CFPlus::UI::ROOT->connect (key_down => sub {
1996 my (undef, $ev) = @_;
1997
1998 if (my @macros = CFPlus::Macro::find $ev) {
1999 CFPlus::Macro::execute $_ for @macros;
2000
2001 return 1;
2002 }
2003
2004 0
2005 });
1844 2006
1845 $DEBUG_STATUS = new CFPlus::UI::Label 2007 $DEBUG_STATUS = new CFPlus::UI::Label
1846 padding => 0, 2008 padding => 0,
1847 z => 100, 2009 z => 100,
1848 force_x => "max", 2010 force_x => "max",
… …
1878 $MESSAGE_WINDOW->activate_console ($preset) 2040 $MESSAGE_WINDOW->activate_console ($preset)
1879 if $MESSAGE_WINDOW; 2041 if $MESSAGE_WINDOW;
1880 }); 2042 });
1881 $MAPWIDGET->show; 2043 $MAPWIDGET->show;
1882 $MAPWIDGET->grab_focus; 2044 $MAPWIDGET->grab_focus;
2045
2046 $COMPLETER = new CFPlus::MapWidget::Command::
2047 command => { },
2048 tooltip => "#completer_help",
2049 ;
1883 2050
1884 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2051 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1885 title => "Setup", 2052 title => "Setup",
1886 name => "setup_dialog", 2053 name => "setup_dialog",
1887 x => 'center', 2054 x => 'center',
… …
1949 tooltip => "Terminates the program", 2116 tooltip => "Terminates the program",
1950 on_activate => sub { 2117 on_activate => sub {
1951 if ($CONN) { 2118 if ($CONN) {
1952 open_quit_dialog; 2119 open_quit_dialog;
1953 } else { 2120 } else {
1954 exit; 2121 Event::unloop_all;
1955 } 2122 }
1956 0 2123 0
1957 }, 2124 },
1958 ); 2125 );
1959 2126
1960 $BUTTONBAR->show; 2127 $BUTTONBAR->show;
1961 $SETUP_DIALOG->show; 2128 $SETUP_DIALOG->show;
2129 $MESSAGE_WINDOW->show;
1962 } 2130 }
1963 2131
1964 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2132 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1965} 2133}
1966 2134
… …
1968 CFPlus::OpenGL::shutdown; 2136 CFPlus::OpenGL::shutdown;
1969 2137
1970 undef $SDL_ACTIVE; 2138 undef $SDL_ACTIVE;
1971} 2139}
1972 2140
1973sub audio_init {
1974 if ($CFG->{audio_enable}) {
1975 $ENV{MIX_EFFECTSMAXSPEED} = 1;
1976 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1977
1978 unless ($SDL_MIXER) {
1979 status "Unable to open sound device: there will be no sound";
1980 return;
1981 }
1982
1983 CFPlus::Mix_AllocateChannels 16;
1984
1985 audio_music_finished;
1986 } else {
1987 undef $SDL_MIXER;
1988 }
1989}
1990
1991sub audio_shutdown {
1992 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1993 undef $SDL_MIXER;
1994 @SOUNDS = ();
1995 %AUDIO_CHUNK = ();
1996}
1997
1998my %animate_object; 2141my %animate_object;
1999my $animate_timer; 2142my $animate_timer;
2000 2143
2001my $fps = 9; 2144my $fps = 9;
2002 2145
2003sub force_refresh { 2146sub force_refresh {
2147 if ($ENV{CFPLUS_DEBUG} & 4) {
2004 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2148 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2005 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2149 debug sprintf "%3.2f", $fps;
2150 }
2006 2151
2007 $CFPlus::UI::ROOT->draw; 2152 $CFPlus::UI::ROOT->draw;
2008 2153 CFPlus::SDL_GL_SwapBuffers;
2009 $WANT_REFRESH = 0;
2010 $CAN_REFRESH = 0;
2011 $LAST_REFRESH = $NOW; 2154 $LAST_REFRESH = $NOW;
2012 2155 $WANT_REFRESH->stop;
2013 CFPlus::SDL_GL_SwapBuffers;
2014} 2156}
2015 2157
2158$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2159
2016my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2160my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2017 $NOW = time; 2161 $NOW = time;
2018 2162
2019 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2163 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2020 for CFPlus::poll_events; 2164 for CFPlus::poll_events;
2021 2165
2022 if (%animate_object) { 2166 if (%animate_object) {
2023 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2167 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2024 ++$WANT_REFRESH; 2168 $WANT_REFRESH->start;
2025 }
2026
2027 if ($WANT_REFRESH) {
2028 force_refresh;
2029 } else {
2030 $CAN_REFRESH = 1;
2031 } 2169 }
2032}); 2170});
2033 2171
2034sub animation_start { 2172sub animation_start {
2035 my ($widget) = @_; 2173 my ($widget) = @_;
… …
2041 delete $animate_object{$widget}; 2179 delete $animate_object{$widget};
2042} 2180}
2043 2181
2044%SDL_CB = ( 2182%SDL_CB = (
2045 CFPlus::SDL_QUIT => sub { 2183 CFPlus::SDL_QUIT => sub {
2046 exit; 2184 Event::unloop_all;
2047 }, 2185 },
2048 CFPlus::SDL_VIDEORESIZE => sub { 2186 CFPlus::SDL_VIDEORESIZE => sub {
2049 }, 2187 },
2050 CFPlus::SDL_VIDEOEXPOSE => sub { 2188 CFPlus::SDL_VIDEOEXPOSE => sub {
2051 CFPlus::UI::full_refresh; 2189 CFPlus::UI::full_refresh;
… …
2090 CFPlus::DB::Server::run; 2228 CFPlus::DB::Server::run;
2091 2229
2092 CFPlus::UI::set_layout ($::CFG->{layout}); 2230 CFPlus::UI::set_layout ($::CFG->{layout});
2093 2231
2094 my %DEF_CFG = ( 2232 my %DEF_CFG = (
2095 sdl_mode => 0, 2233 sdl_mode => 0,
2096 fullscreen => 0, 2234 fullscreen => 0,
2097 fast => 0, 2235 fast => 0,
2236 force_opengl11 => undef,
2237 texture_compression => 1,
2098 map_scale => 1, 2238 map_scale => 1,
2099 fow_enable => 1, 2239 fow_enable => 1,
2100 fow_intensity => 0, 2240 fow_intensity => 0,
2101 map_smoothing => 1, 2241 map_smoothing => 1,
2102 gui_fontsize => 1, 2242 gui_fontsize => 1,
2103 log_fontsize => 0.7, 2243 log_fontsize => 0.7,
2104 gauge_fontsize => 1, 2244 gauge_fontsize => 1,
2105 gauge_size => 0.35, 2245 gauge_size => 0.35,
2106 stat_fontsize => 0.7, 2246 stat_fontsize => 0.7,
2107 mapsize => 100, 2247 mapsize => 100,
2108 audio_enable => 1, 2248 audio_enable => 1,
2249 effects_enable => 1,
2250 effects_volume => 1,
2109 bgm_enable => 1, 2251 bgm_enable => 1,
2110 bgm_volume => 0.25, 2252 bgm_volume => 0.5,
2111 output_sync => 1, 2253 output_sync => 1,
2112 output_count => 1, 2254 output_count => 1,
2113 output_rate => "", 2255 output_rate => "",
2114 pickup => 0, 2256 pickup => 0,
2115 inv_sort => "mtime", 2257 inv_sort => "mtime",
2116 default => "profile", # default profile 2258 default => "profile", # default profile
2117 show_tips => 1, 2259 show_tips => 1,
2118 logview_max_par => 1000, 2260 logview_max_par => 1000,
2119 ); 2261 );
2120 2262
2121 while (my ($k, $v) = each %DEF_CFG) { 2263 while (my ($k, $v) = each %DEF_CFG) {
2122 $CFG->{$k} = $v unless exists $CFG->{$k}; 2264 $CFG->{$k} = $v unless exists $CFG->{$k};
2123 } 2265 }
… …
2180# } 2322# }
2181# my $t2 = Time::HiRes::time; 2323# my $t2 = Time::HiRes::time;
2182# warn $t2-$t1; 2324# warn $t2-$t1;
2183# } 2325# }
2184 2326
2185 $startup_done->();
2186
2187 video_init; 2327 video_init;
2188 audio_init; 2328 audio_init;
2189} 2329}
2190 2330
2191show_tip_of_the_day if $CFG->{show_tips}; 2331show_tip_of_the_day if $CFG->{show_tips};
2192 2332
2333Event->idle (cb => sub {
2334 $_[0]->w->cancel;
2335 $startup_done->();
2336});
2337
2193Event::loop; 2338Event::loop;
2339
2340#video_shutdown;
2341#audio_shutdown;
2194#CFPlus::SDL_Quit; 2342CFPlus::SDL_Quit;
2195#CFPlus::_exit 0;
2196
2197END {
2198 CFPlus::SDL_Quit;
2199 CFPlus::DB::Server::stop; 2343CFPlus::DB::Server::stop;
2200}
2201 2344
2202=head1 NAME 2345=head1 NAME
2203 2346
2204cfplus - A Crossfire+ and Crossfire game client 2347cfplus - A Crossfire TRT and Crossfire game client
2205 2348
2206=head1 SYNOPSIS 2349=head1 SYNOPSIS
2207 2350
2208Just run it - no commandline arguments are supported. 2351Just run it - no commandline arguments are supported.
2209 2352
2210=head1 USAGE 2353=head1 USAGE
2211 2354
2212cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2355cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2213fullscreen and interactively. 2356be used in fullscreen mode and interactively.
2214 2357
2215=head1 DEBUGGING 2358=head1 DEBUGGING
2216 2359
2217 2360
2218CFPLUS_DEBUG - environment variable 2361CFPLUS_DEBUG - environment variable

Diff Legend

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