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.196 by root, Tue Jul 31 02:03:13 2007 UTC vs.
Revision 1.226 by root, Sat Sep 1 07:22:21 2007 UTC

… …
86use CFPlus::DB; 86use CFPlus::DB;
87use CFPlus::UI; 87use CFPlus::UI;
88use CFPlus::UI::Canvas; 88use CFPlus::UI::Canvas;
89use CFPlus::UI::Inventory; 89use CFPlus::UI::Inventory;
90use CFPlus::UI::SpellList; 90use CFPlus::UI::SpellList;
91use CFPlus::UI::Dockable;
91use CFPlus::UI::MessageWindow; 92use CFPlus::UI::MessageWindow;
93use CFPlus::UI::ChatView;
92use CFPlus::Pod; 94use CFPlus::Pod;
93use CFPlus::MapWidget; 95use CFPlus::MapWidget;
94use CFPlus::Macro; 96use CFPlus::Macro;
95 97
96$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 98$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
113our $CONN; 115our $CONN;
114our $PROFILE; # current profile 116our $PROFILE; # current profile
115our $FAST; # fast, low-quality mode, possibly useful for software-rendering 117our $FAST; # fast, low-quality mode, possibly useful for software-rendering
116 118
117our $WANT_REFRESH; 119our $WANT_REFRESH;
118our $CAN_REFRESH;
119 120
120our @SDL_MODES; 121our @SDL_MODES;
121our $WIDTH; 122our $WIDTH;
122our $HEIGHT; 123our $HEIGHT;
123our $FULLSCREEN; 124our $FULLSCREEN;
… …
127our $FONT_FIXED; 128our $FONT_FIXED;
128 129
129our $MAP; 130our $MAP;
130our $MAPMAP; 131our $MAPMAP;
131our $MAPWIDGET; 132our $MAPWIDGET;
133our $COMPLETER;
132our $BUTTONBAR; 134our $BUTTONBAR;
133our $METASERVER; 135our $METASERVER;
134our $LOGIN_BUTTON; 136our $LOGIN_BUTTON;
135our $QUIT_DIALOG; 137our $QUIT_DIALOG;
136our $HOST_ENTRY; 138our $HOST_ENTRY;
… …
144our $SETUP_KEYBOARD; 146our $SETUP_KEYBOARD;
145 147
146our $PL_NOTEBOOK; 148our $PL_NOTEBOOK;
147our $PL_WINDOW; 149our $PL_WINDOW;
148 150
151our $MUSIC_PLAYING_WIDGET;
152our $LICENSE_WIDGET;
153
154our $PICKUP_PAGE;
149our $INVENTORY_PAGE; 155our $INVENTORY_PAGE;
150our $STATS_PAGE; 156our $STATS_PAGE;
151our $SKILL_PAGE; 157our $SKILL_PAGE;
152our $SPELL_PAGE; 158our $SPELL_PAGE;
153our $SPELL_LIST; 159our $SPELL_LIST;
… …
159our $STATWIDS; 165our $STATWIDS;
160 166
161our $SDL_ACTIVE; 167our $SDL_ACTIVE;
162our %SDL_CB; 168our %SDL_CB;
163 169
170our $ALT_ENTER_MESSAGE;
171our $STATUSBOX;
172our $DEBUG_STATUS;
173
174our $INV;
175our $INVR;
176our $INVR_HB;
177
178#############################################################################
179
180sub status {
181 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
182}
183
184sub debug {
185 $DEBUG_STATUS->set_text ($_[0]);
186}
187
188sub message {
189 $MESSAGE_WINDOW->message (@_);
190}
191
192#############################################################################
193#TODO: maybe move into own audio module...
194
164our $SDL_MIXER; 195our $SDL_MIXER;
196
165our $MUSIC_DEFAULT = "in_a_heartbeat.ogg"; 197our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
166our $MUSIC_WANT; # arryref of ambient music 198our $MUSIC_WANT; # arryref of ambient music we want to play
167our @MUSIC_HAVE; # ambient music we want now 199our @MUSIC_HAVE; # ambient music we have on disk
168our $MUSIC_START; 200our $MUSIC_START;
201our @MUSIC_JINGLE; # which jingles to play next
169our $MUSIC_PLAYING_DATA; 202our $MUSIC_PLAYING_DATA;
170our $MUSIC_PLAYING_META; 203our $MUSIC_PLAYING_META;
171our $MUSIC_PLAYER; 204our $MUSIC_PLAYER;
172our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before 205our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
173our @SOUNDS; # event => file mapping 206
174our %AUDIO_CHUNK; # audio files 207our %AUDIO_CHUNK; # audio "files"
175 208our %AUDIO_PLAY; # which audio faces should be played
176our $ALT_ENTER_MESSAGE;
177our $STATUSBOX;
178our $DEBUG_STATUS;
179
180our $INV;
181our $INVR;
182our $INV_RIGHT_HB;
183
184our $PICKUP_CFG;
185
186#############################################################################
187#TODO: maybe move into own audio module...
188 209
189sub audio_channel_finished { 210sub audio_channel_finished {
190 my ($channel) = @_; 211 my ($channel) = @_;
191 212
192# warn "channel $channel finished\n";#d# 213# warn "channel $channel finished\n";#d#
193} 214}
194 215
195our %AUDIO_PLAY;
196our %AUDIO_CHUNK;
197
198sub audio_sound_push($) { 216sub audio_sound_push($) {
199 my ($face) = @_; 217 my ($face) = @_;
218
219 $CFG->{effects_enable}
220 or return;
221
222 $AUDIO_PLAY{$face}
223 or return;
200 224
201 if (my $chunk = $AUDIO_CHUNK{$face}) { 225 if (my $chunk = $AUDIO_CHUNK{$face}) {
202 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) { 226 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
203 my (undef, $dx, $dy, $vol) = @$_; 227 my (undef, $dx, $dy, $vol) = @$_;
204 228
205 my $channel = CFPlus::Channel::find; 229 my $channel = CFPlus::Channel::find;
206 $channel->volume ($vol * 128 / 255); 230 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
207 $dx = $dx / 10 * 255;
208 $channel->set_panning (255 - $dx, 255 + $dx);
209
210# my $angle = $dx ? : $dx < 0 ?
211# my $distance = -$vol;
212# $channel->set_position ($angle, $distance); 231 $channel->set_position_r ($dx, $dy, 20);
213
214 $chunk->play ($channel); 232 $chunk->play ($channel);
215 } 233 }
216 } else { 234 } else {
217 # sound_meta not set means data is in flight either way 235 # sound_meta not set means data is in flight either way
218 my $meta = $CONN->{sound_meta}{$face} 236 my $meta = $CONN->{face}[$face]
219 or return; 237 or return;
220 238
239 $meta->{data}
240 or return;
241
242 # if its a jingle, play it as ambient music
243 if ($meta->{data}{jingle}) {
244 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
245 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
246 &audio_music_push ($face);
247 }
248 } else {
221 # fetch from database 249 # fetch from database
222 CFPlus::DB::get res_data => $meta->{name}, sub { 250 CFPlus::DB::get res_data => $meta->{name}, sub {
223 my $rwops = new CFPlus::RW $_[0]; 251 my $rwops = new CFPlus::RW $_[0];
224 my $chunk = new CFPlus::MixChunk $rwops; 252 my $chunk = new CFPlus::MixChunk $rwops
253 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
225 $chunk->volume (($meta->{meta}{volume} || 1) * 128); 254 $chunk->volume (($meta->{data}{volume} || 1) * 128);
226 $AUDIO_CHUNK{$face} = $chunk; 255 $AUDIO_CHUNK{$face} = $chunk;
227 256
228 audio_sound_push ($face); 257 audio_sound_push ($face);
258 };
229 }; 259 }
230 } 260 }
231} 261}
232 262
233sub audio_sound_play { 263sub audio_sound_play {
234 my ($face, $dx, $dy, $vol) = @_; 264 my ($face, $dx, $dy, $vol) = @_;
235 265
236 $SDL_MIXER 266 $SDL_MIXER
237 or return; 267 or return;
268 $CFG->{effects_enable}
269 or return;
238 270
239 my $queue = $AUDIO_PLAY{$face} ||= []; 271 my $queue = $AUDIO_PLAY{$face} ||= [];
240 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s 272 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
241 audio_sound_push $face 273 audio_sound_push $face
242 unless @$queue > 1; 274 unless @$queue > 1;
243} 275}
244 276
277sub audio_music_set_meta {
278 my ($meta) = @_;
279
280 $MUSIC_PLAYING_META = $meta;
281 $MUSIC_PLAYING_WIDGET->set_markup (
282 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
283 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
284 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
285 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
286 );
287}
288
245sub audio_music_update_volume { 289sub audio_music_update_volume {
246 return unless $MUSIC_PLAYING_META; 290 return unless $MUSIC_PLAYING_META;
247 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1; 291 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
248 my $base = $CFG->{bgm_volume}; 292 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
249 CFPlus::MixMusic::volume $base * $volume * 128; 293 CFPlus::MixMusic::volume $base * $volume * 128;
250}
251
252sub audio_music_push {
253 my @have =
254 grep $_,
255 map $CONN->{music_meta}{$_},
256 @$MUSIC_WANT;
257
258 if (@have) {
259 @MUSIC_HAVE = @have;
260 &audio_music_changed ();
261 }
262}
263
264sub audio_music_set_ambient {
265 my ($songs) = @_;
266
267 $MUSIC_WANT = $songs;
268
269 audio_music_push;
270} 294}
271 295
272sub audio_music_start { 296sub audio_music_start {
273 my $meta = $MUSIC_PLAYING_META; 297 my $meta = $MUSIC_PLAYING_META;
274 298
… …
286 my $rwops = $meta->{path} 310 my $rwops = $meta->{path}
287 ? new_from_file CFPlus::RW $meta->{path} 311 ? new_from_file CFPlus::RW $meta->{path}
288 : new CFPlus::RW $$MUSIC_PLAYING_DATA; 312 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
289 313
290 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops 314 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
291 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error 315 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
292 316
293 my $NOW = time; 317 my $NOW = time;
294 318
295 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 319 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
296 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 320 my $pos = $MUSIC_PLAYING_META->{stop_pos};
297 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos); 321 $MUSIC_PLAYER->fade_in_pos (0, 700, $pos);
298 $MUSIC_START = time - $pos; 322 $MUSIC_START = time - $pos;
299 } else { 323 } else {
300 $MUSIC_PLAYER->play (0); 324 $MUSIC_PLAYER->play (0);
301 $MUSIC_START = time; 325 $MUSIC_START = time;
302 } 326 }
303 327
304 delete $MUSIC_PLAYING_META->{stop_time}; 328 delete $meta->{stop_time};
305 delete $MUSIC_PLAYING_META->{stop_pos}; 329 delete $meta->{stop_pos};
306 } 330 }
307} 331}
308 332
309sub audio_music_changed { 333sub audio_music_push {
310 return unless $CFG->{bgm_enable};
311 return unless $SDL_MIXER; 334 return unless $SDL_MIXER;
312 335
336 my $fade_out;
337
338 if (@MUSIC_JINGLE) {
339 @MUSIC_HAVE = $MUSIC_JINGLE[0];
340 $fade_out = 333;
341 } else {
342 return unless $CFG->{bgm_enable};
343
344 my @have =
345 grep $_ && $_->{data},
346 map $CONN->{face}[$_],
347 @$MUSIC_WANT;
348
349 # randomize music a bit so that the order is not always the same
350 $_->{stop_time} ||= rand for @have;
351
352 @MUSIC_HAVE = @have
353 if @have;
354
313 # default MUSIC_HAVE == MUSIC_DEFAULT 355 # default MUSIC_HAVE == MUSIC_DEFAULT
314 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE; 356 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
357 $fade_out = 700;
358 }
315 359
316 # if the currently playing song is acceptable, let it continue 360 # if the currently playing song is acceptable, let it continue
317 return if $MUSIC_PLAYING_META
318 && grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; 361 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
319 362
320 my $NOW = time; 363 my $NOW = time;
321 364
322 if ($MUSIC_PLAYING_META) { 365 if ($MUSIC_PLAYING_META) {
323 $MUSIC_PLAYING_META->{stop_time} = $NOW; 366 $MUSIC_PLAYING_META->{stop_time} = $NOW;
324 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START; 367 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
325 CFPlus::MixMusic::fade_out 1000; 368 CFPlus::MixMusic::fade_out $fade_out;
326 } else { 369 } else {
327 # sort by stop time, oldest first 370 # sort by stop time, oldest first
328 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE; 371 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
329 372
330 # if the most recently-played piece played very recently, 373 # if the most recently-played piece played very recently,
331 # resume it, else choose the oldest piece for rotation. 374 # resume it, else choose the oldest piece for rotation.
332 $MUSIC_PLAYING_META = 375 audio_music_set_meta
333 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME 376 $MUSIC_HAVE[-1]{stop_pos} && $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
334 ? $MUSIC_HAVE[-1] 377 ? $MUSIC_HAVE[-1]
335 : $MUSIC_HAVE[0]; 378 : $MUSIC_HAVE[0];
336 379
337 audio_music_start; 380 audio_music_start;
338 } 381 }
339} 382}
340 383
384sub audio_music_set_ambient {
385 my ($songs) = @_;
386
387 $MUSIC_WANT = $songs;
388 audio_music_push;
389}
390
341sub audio_music_finished { 391sub audio_music_finished {
392 if ($MUSIC_PLAYING_META) {
393 $MUSIC_PLAYING_META->{stop_time} = time;
394 }
395
396 # we compress multiple jingles of the same type
397 shift @MUSIC_JINGLE
398 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
399
400 $MUSIC_PLAYING_WIDGET->clear;
401
342 undef $MUSIC_PLAYER; 402 undef $MUSIC_PLAYER;
343 undef $MUSIC_PLAYING_META; 403 undef $MUSIC_PLAYING_META;
344 undef $MUSIC_PLAYING_DATA; 404 undef $MUSIC_PLAYING_DATA;
345 405
346 audio_music_changed; 406 audio_music_push;
407}
408
409sub audio_init {
410 if ($CFG->{audio_enable}) {
411 $ENV{MIX_EFFECTSMAXSPEED} = 1;
412 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
413
414 unless ($SDL_MIXER) {
415 status "Unable to open sound device: there will be no sound";
416 return;
417 }
418
419 CFPlus::Mix_AllocateChannels 16;
420
421 audio_music_finished;
422 } else {
423 undef $SDL_MIXER;
424 }
425}
426
427sub audio_shutdown {
428 undef $MUSIC_PLAYER;
429 undef $MUSIC_PLAYING_META;
430 undef $MUSIC_PLAYING_DATA;
431
432 $MUSIC_WANT = [];
433 @MUSIC_JINGLE = ();
434 %AUDIO_PLAY = ();
435 %AUDIO_CHUNK = ();
436
437 CFPlus::Mix_CloseAudio if $SDL_MIXER;
438 undef $SDL_MIXER;
347} 439}
348 440
349############################################################################# 441#############################################################################
350
351sub status {
352 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
353}
354
355sub debug {
356 $DEBUG_STATUS->set_text ($_[0]);
357}
358
359sub message {
360 my ($para) = @_;
361 $MESSAGE_WINDOW->message ($para);
362}
363 442
364sub destroy_query_dialog { 443sub destroy_query_dialog {
365 (delete $_[0]{query_dialog})->destroy 444 (delete $_[0]{query_dialog})->destroy
366 if $_[0]{query_dialog}; 445 if $_[0]{query_dialog};
367} 446}
… …
701 state => $CFG->{fullscreen}, 780 state => $CFG->{fullscreen},
702 tooltip => "Bring the client into fullscreen mode.", 781 tooltip => "Bring the client into fullscreen mode.",
703 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 782 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
704 ); 783 );
705 784
785 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
786 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
787 state => $CFG->{force_opengl11},
788 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
789 . "higher memory usage and slower performance. It will, however, help tremendously on "
790 . "cards that claim to support a feature but fall back to software rendering. "
791 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
792 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
793 . "experience extremely low framerates and your card should do better, try this option.</b>",
794 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
795 );
796
797 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
798 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
799 state => $CFG->{texture_compression},
800 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
801 . "will save a lot of memory and increase performance. The compression algorithm "
802 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
803 . "forced OpenGL 1.1 mode.",
804 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
805 );
806
706 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 807 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
707 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 808 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
708 state => $CFG->{fast}, 809 state => $CFG->{fast},
709 tooltip => "Lower the visual quality considerably to speed up rendering.", 810 tooltip => "Lower the visual quality considerably to speed up rendering.",
710 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 811 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
… …
736 837
737 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 838 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
738 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 839 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
739 state => $CFG->{map_smoothing}, 840 state => $CFG->{map_smoothing},
740 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 841 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
741 . "This increases load on the graphics subsystem and works only with 2.x servers. " 842 . "This increases load on the graphics subsystem and works only with TRT servers. "
742 . "Changes take effect at next connection only.", 843 . "Changes take effect at next login only.",
743 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 844 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
744 ); 845 );
745 846
746 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 847 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
747 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 848 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
758 ); 859 );
759 860
760 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 861 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
761 $table->add_at (1, $row++, new CFPlus::UI::Slider 862 $table->add_at (1, $row++, new CFPlus::UI::Slider
762 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 863 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
763 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 864 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
865 . "but you still need to press apply to correctly re-layout the widget.",
764 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 866 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
765 ); 867 );
766 868
767 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 869 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
768 $table->add_at (1, $row++, new CFPlus::UI::Slider 870 $table->add_at (1, $row++, new CFPlus::UI::Slider
… …
790} 892}
791 893
792sub audio_setup { 894sub audio_setup {
793 my $vbox = new CFPlus::UI::VBox; 895 my $vbox = new CFPlus::UI::VBox;
794 896
795 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 897 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
796 898
797 my $row = 0; 899 my $row = 0;
798 900
799 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 901 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
800 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 902 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
804 ); 906 );
805# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 907# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
806# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 908# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
807# $CFG->{effects_volume} = $_[1]; 909# $CFG->{effects_volume} = $_[1];
808# }); 910# });
911
912 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
913 $table->add_at (1, $row, new CFPlus::UI::CheckBox
914 expand => 1, state => $CFG->{effects_enable},
915 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
916 on_changed => sub {
917 $CFG->{effects_enable} = $_[1];
918 $CONN->update_fx_want if $CONN;
919 0
920 }
921 );
922 $table->add_at (2, $row++, new CFPlus::UI::Slider
923 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
924 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
925 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
926 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
927 );
928
809 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 929 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
810 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox); 930 $table->add_at (1, $row, new CFPlus::UI::CheckBox
811 $hbox->add (new CFPlus::UI::CheckBox
812 expand => 1, state => $CFG->{bgm_enable}, 931 expand => 1, state => $CFG->{bgm_enable},
813 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 932 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
814 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 933 on_changed => sub {
934 $CFG->{bgm_enable} = $_[1];
935 $CONN->update_fx_want if $CONN;
936 audio_music_push;
937 0
938 }
815 ); 939 );
816 $hbox->add (new CFPlus::UI::Slider 940 $table->add_at (2, $row++, new CFPlus::UI::Slider
817 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 941 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
818 tooltip => "The volume of the background music. Changes are instant.", 942 tooltip => "The volume of the background music. Changes are instant.",
819 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 943 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
820 ); 944 );
821 945
822 $table->add_at (1, $row++, new CFPlus::UI::Button 946 $table->add_at (1, $row++, new CFPlus::UI::Button
823 expand => 1, align => 0, text => "Apply", 947 c_colspan => 2, expand => 1, align => 0, text => "Apply",
824 tooltip => "Apply the audio settings", 948 tooltip => "Apply the audio settings",
825 on_activate => sub { 949 on_activate => sub {
826 audio_shutdown (); 950 audio_shutdown ();
827 audio_init (); 951 audio_init ();
828 0 952 0
… …
870 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 994 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
871 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 995 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
872 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 996 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
873 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food"); 997 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
874 998
875 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 999 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1000 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
1001 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
876 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1002 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
877 1003
878 $GAUGES = { 1004 $GAUGES = {
1005 exp => $exp, prg => $prg, sklprg => $sklprg,
879 exp => $exp, win => $win, range => $rng, 1006 win => $win, range => $rng,
880 food => $fg, mana => $mg, hp => $hg, grace => $gg 1007 hp => $hg, mana => $mg, grace => $gg, food => $fg,
881 }; 1008 };
882 1009
883 &set_gauge_window_fontsize; 1010 &set_gauge_window_fontsize;
884 1011
885 $win 1012 $win
… …
899 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 1026 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
900 1027
901 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1028 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
902 1029
903 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0); 1030 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
904 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2); 1031 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
905 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1); 1032 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
906 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2); 1033 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
907 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1); 1034 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
908 $t->add_at (1,1, new CFPlus::UI::Label text => "e"); 1035 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
909 1036
910 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); 1037 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
911 1038
912 $c->add_items ({ 1039 $c->add_items ({
… …
1086 $r 1213 $r
1087} 1214}
1088 1215
1089sub skill_window { 1216sub skill_window {
1090 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1217 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1218
1091 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1219 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1220
1092 $sw 1221 $sw
1093} 1222}
1094 1223
1095sub formsep($) { 1224sub formsep($) {
1096 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1225 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
1508 $sw1->add ($INV = new CFPlus::UI::Inventory); 1637 $sw1->add ($INV = new CFPlus::UI::Inventory);
1509 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1638 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1510 1639
1511 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1640 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1512 1641
1513 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1642 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1514 1643
1515 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1644 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1516 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1645 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1517 1646
1518 # XXX: Call after $INVR = ... because set_opencont sets the items 1647 # XXX: Call after $INVR = ... because set_opencont sets the items
1519 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1648 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1520 1649
1521 $hb 1650 $hb
1651}
1652
1653sub media_window {
1654 my $vb = new CFPlus::UI::VBox;
1655
1656 $vb->add (new CFPlus::UI::FancyFrame
1657 label => "Currently playing music",
1658 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1659 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1660 );
1661
1662 $vb->add (new CFPlus::UI::FancyFrame
1663 label => "Other media used in this session",
1664 expand => 1,
1665 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1666 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1667 );
1668
1669 $vb
1670}
1671
1672sub add_license {
1673 my ($meta) = @_;
1674
1675 $meta = $meta->{data}
1676 or return;
1677
1678 $meta->{license} || $meta->{author} || $meta->{source}
1679 or return;
1680
1681 $LICENSE_WIDGET->add_paragraph ({
1682 fg => [1, 1, 1, 1],
1683 markup => "<small>"
1684 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1685 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1686 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1687 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1688 . "</small>",
1689 });
1690 $LICENSE_WIDGET->scroll_to_bottom;
1522} 1691}
1523 1692
1524sub toggle_player_page { 1693sub toggle_player_page {
1525 my ($widget) = @_; 1694 my ($widget) = @_;
1526 1695
… …
1565 $ntb->add_tab ( 1734 $ntb->add_tab (
1566 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1735 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1567 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1736 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1568 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1737 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1569 ); 1738 );
1570 $ntb->add_tab (Pickup => autopickup_setup, 1739 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1571 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1740 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1741
1742 $ntb->add_tab (Media => media_window,
1743 "License, Author and Source info for media sent by the server.");
1572 1744
1573 $ntb->set_current_page ($INVENTORY_PAGE); 1745 $ntb->set_current_page ($INVENTORY_PAGE);
1574 1746
1575 $plwin->add ($ntb); 1747 $plwin->add ($ntb);
1576 $plwin 1748 $plwin
… …
1730 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1902 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1731 ); 1903 );
1732 $hb->add (new CFPlus::UI::Button 1904 $hb->add (new CFPlus::UI::Button
1733 text => "Quit anyway", 1905 text => "Quit anyway",
1734 expand => 1, 1906 expand => 1,
1735 on_activate => sub { exit }, 1907 on_activate => sub { Event::unloop_all },
1736 ); 1908 );
1737 } 1909 }
1738 1910
1739 $QUIT_DIALOG->show; 1911 $QUIT_DIALOG->show;
1740 $QUIT_DIALOG->grab_focus; 1912 $QUIT_DIALOG->grab_focus;
… …
1813 1985
1814 $SDL_ACTIVE = 1; 1986 $SDL_ACTIVE = 1;
1815 $LAST_REFRESH = time - 0.01; 1987 $LAST_REFRESH = time - 0.01;
1816 1988
1817 CFPlus::OpenGL::init; 1989 CFPlus::OpenGL::init;
1990 CFPlus::Macro::init;
1818 1991
1819 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1992 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1820 1993
1821 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1994 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1822 1995
1823 ############################################################################# 1996 #############################################################################
1824 1997
1825 if ($DEBUG_STATUS) { 1998 if ($DEBUG_STATUS) {
1826 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1999 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1827 } else { 2000 } else {
1828 # create the widgets 2001 # create/configure the widgets
2002
2003 $CFPlus::UI::ROOT->connect (key_down => sub {
2004 my (undef, $ev) = @_;
2005
2006 if (my @macros = CFPlus::Macro::find $ev) {
2007 CFPlus::Macro::execute $_ for @macros;
2008
2009 return 1;
2010 }
2011
2012 0
2013 });
1829 2014
1830 $DEBUG_STATUS = new CFPlus::UI::Label 2015 $DEBUG_STATUS = new CFPlus::UI::Label
1831 padding => 0, 2016 padding => 0,
1832 z => 100, 2017 z => 100,
1833 force_x => "max", 2018 force_x => "max",
… …
1863 $MESSAGE_WINDOW->activate_console ($preset) 2048 $MESSAGE_WINDOW->activate_console ($preset)
1864 if $MESSAGE_WINDOW; 2049 if $MESSAGE_WINDOW;
1865 }); 2050 });
1866 $MAPWIDGET->show; 2051 $MAPWIDGET->show;
1867 $MAPWIDGET->grab_focus; 2052 $MAPWIDGET->grab_focus;
2053
2054 $COMPLETER = new CFPlus::MapWidget::Command::
2055 command => { },
2056 tooltip => "#completer_help",
2057 ;
1868 2058
1869 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2059 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1870 title => "Setup", 2060 title => "Setup",
1871 name => "setup_dialog", 2061 name => "setup_dialog",
1872 x => 'center', 2062 x => 'center',
… …
1934 tooltip => "Terminates the program", 2124 tooltip => "Terminates the program",
1935 on_activate => sub { 2125 on_activate => sub {
1936 if ($CONN) { 2126 if ($CONN) {
1937 open_quit_dialog; 2127 open_quit_dialog;
1938 } else { 2128 } else {
1939 exit; 2129 Event::unloop_all;
1940 } 2130 }
1941 0 2131 0
1942 }, 2132 },
1943 ); 2133 );
1944 2134
1945 $BUTTONBAR->show; 2135 $BUTTONBAR->show;
1946 $SETUP_DIALOG->show; 2136 $SETUP_DIALOG->show;
2137 $MESSAGE_WINDOW->show;
1947 } 2138 }
1948 2139
1949 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2140 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1950} 2141}
1951 2142
… …
1953 CFPlus::OpenGL::shutdown; 2144 CFPlus::OpenGL::shutdown;
1954 2145
1955 undef $SDL_ACTIVE; 2146 undef $SDL_ACTIVE;
1956} 2147}
1957 2148
1958sub audio_init {
1959 if ($CFG->{audio_enable}) {
1960 $ENV{MIX_EFFECTSMAXSPEED} = 1;
1961 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1962
1963 unless ($SDL_MIXER) {
1964 status "Unable to open sound device: there will be no sound";
1965 return;
1966 }
1967
1968 CFPlus::Mix_AllocateChannels 16;
1969
1970 audio_music_finished;
1971 } else {
1972 undef $SDL_MIXER;
1973 }
1974}
1975
1976sub audio_shutdown {
1977 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1978 undef $SDL_MIXER;
1979 @SOUNDS = ();
1980 %AUDIO_CHUNK = ();
1981}
1982
1983my %animate_object; 2149my %animate_object;
1984my $animate_timer; 2150my $animate_timer;
1985 2151
1986my $fps = 9; 2152my $fps = 9;
1987 2153
1988sub force_refresh { 2154sub force_refresh {
2155 if ($ENV{CFPLUS_DEBUG} & 4) {
1989 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2156 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
1990 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2157 debug sprintf "%3.2f", $fps;
2158 }
1991 2159
1992 $CFPlus::UI::ROOT->draw; 2160 $CFPlus::UI::ROOT->draw;
1993 2161 CFPlus::SDL_GL_SwapBuffers;
1994 $WANT_REFRESH = 0;
1995 $CAN_REFRESH = 0;
1996 $LAST_REFRESH = $NOW; 2162 $LAST_REFRESH = $NOW;
1997 2163 $WANT_REFRESH->stop;
1998 CFPlus::SDL_GL_SwapBuffers;
1999} 2164}
2000 2165
2166$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2167
2001my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2168my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2002 $NOW = time; 2169 $NOW = time;
2003 2170
2004 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2171 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2005 for CFPlus::poll_events; 2172 for CFPlus::poll_events;
2006 2173
2007 if (%animate_object) { 2174 if (%animate_object) {
2008 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2175 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2009 ++$WANT_REFRESH; 2176 $WANT_REFRESH->start;
2010 }
2011
2012 if ($WANT_REFRESH) {
2013 force_refresh;
2014 } else {
2015 $CAN_REFRESH = 1;
2016 } 2177 }
2017}); 2178});
2018 2179
2019sub animation_start { 2180sub animation_start {
2020 my ($widget) = @_; 2181 my ($widget) = @_;
… …
2026 delete $animate_object{$widget}; 2187 delete $animate_object{$widget};
2027} 2188}
2028 2189
2029%SDL_CB = ( 2190%SDL_CB = (
2030 CFPlus::SDL_QUIT => sub { 2191 CFPlus::SDL_QUIT => sub {
2031 exit; 2192 Event::unloop_all;
2032 }, 2193 },
2033 CFPlus::SDL_VIDEORESIZE => sub { 2194 CFPlus::SDL_VIDEORESIZE => sub {
2034 }, 2195 },
2035 CFPlus::SDL_VIDEOEXPOSE => sub { 2196 CFPlus::SDL_VIDEOEXPOSE => sub {
2036 CFPlus::UI::full_refresh; 2197 CFPlus::UI::full_refresh;
… …
2075 CFPlus::DB::Server::run; 2236 CFPlus::DB::Server::run;
2076 2237
2077 CFPlus::UI::set_layout ($::CFG->{layout}); 2238 CFPlus::UI::set_layout ($::CFG->{layout});
2078 2239
2079 my %DEF_CFG = ( 2240 my %DEF_CFG = (
2080 sdl_mode => 0, 2241 sdl_mode => 0,
2081 fullscreen => 0, 2242 fullscreen => 0,
2082 fast => 0, 2243 fast => 0,
2244 force_opengl11 => undef,
2245 texture_compression => 1,
2083 map_scale => 1, 2246 map_scale => 1,
2084 fow_enable => 1, 2247 fow_enable => 1,
2085 fow_intensity => 0, 2248 fow_intensity => 0,
2086 map_smoothing => 1, 2249 map_smoothing => 1,
2087 gui_fontsize => 1, 2250 gui_fontsize => 1,
2088 log_fontsize => 0.7, 2251 log_fontsize => 0.7,
2089 gauge_fontsize => 1, 2252 gauge_fontsize => 1,
2090 gauge_size => 0.35, 2253 gauge_size => 0.35,
2091 stat_fontsize => 0.7, 2254 stat_fontsize => 0.7,
2092 mapsize => 100, 2255 mapsize => 100,
2093 audio_enable => 1, 2256 audio_enable => 1,
2257 effects_enable => 1,
2258 effects_volume => 1,
2094 bgm_enable => 1, 2259 bgm_enable => 1,
2095 bgm_volume => 0.25, 2260 bgm_volume => 0.5,
2096 output_sync => 1, 2261 output_sync => 1,
2097 output_count => 1, 2262 output_count => 1,
2098 output_rate => "", 2263 output_rate => "",
2099 pickup => 0, 2264 pickup => 0,
2100 inv_sort => "mtime", 2265 inv_sort => "mtime",
2101 default => "profile", # default profile 2266 default => "profile", # default profile
2102 show_tips => 1, 2267 show_tips => 1,
2103 logview_max_par => 1000, 2268 logview_max_par => 1000,
2104 ); 2269 );
2105 2270
2106 while (my ($k, $v) = each %DEF_CFG) { 2271 while (my ($k, $v) = each %DEF_CFG) {
2107 $CFG->{$k} = $v unless exists $CFG->{$k}; 2272 $CFG->{$k} = $v unless exists $CFG->{$k};
2108 } 2273 }
… …
2165# } 2330# }
2166# my $t2 = Time::HiRes::time; 2331# my $t2 = Time::HiRes::time;
2167# warn $t2-$t1; 2332# warn $t2-$t1;
2168# } 2333# }
2169 2334
2170 $startup_done->();
2171
2172 video_init; 2335 video_init;
2173 audio_init; 2336 audio_init;
2174} 2337}
2175 2338
2176show_tip_of_the_day if $CFG->{show_tips}; 2339show_tip_of_the_day if $CFG->{show_tips};
2177 2340
2341Event->idle (cb => sub {
2342 $_[0]->w->cancel;
2343 $startup_done->();
2344});
2345
2178Event::loop; 2346Event::loop;
2347
2348#video_shutdown;
2349#audio_shutdown;
2179#CFPlus::SDL_Quit; 2350CFPlus::SDL_Quit;
2180#CFPlus::_exit 0;
2181
2182END {
2183 CFPlus::SDL_Quit;
2184 CFPlus::DB::Server::stop; 2351CFPlus::DB::Server::stop;
2185}
2186 2352
2187=head1 NAME 2353=head1 NAME
2188 2354
2189cfplus - A Crossfire+ and Crossfire game client 2355cfplus - A Crossfire TRT and Crossfire game client
2190 2356
2191=head1 SYNOPSIS 2357=head1 SYNOPSIS
2192 2358
2193Just run it - no commandline arguments are supported. 2359Just run it - no commandline arguments are supported.
2194 2360
2195=head1 USAGE 2361=head1 USAGE
2196 2362
2197cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2363cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2198fullscreen and interactively. 2364be used in fullscreen mode and interactively.
2199 2365
2200=head1 DEBUGGING 2366=head1 DEBUGGING
2201 2367
2202 2368
2203CFPLUS_DEBUG - environment variable 2369CFPLUS_DEBUG - environment variable

Diff Legend

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