ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Main.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Main.pm (file contents):
Revision 1.11 by root, Sat Jan 7 15:24:41 2012 UTC vs.
Revision 1.17 by root, Wed Jan 18 13:42:19 2012 UTC

… …
57 DC::fatal Carp::longmess "$_[0]"; 57 DC::fatal Carp::longmess "$_[0]";
58 } 58 }
59} 59}
60 60
61use DC::OpenGL (); 61use DC::OpenGL ();
62use DC::Audio ();
62use DC::Protocol; 63use DC::Protocol;
63use DC::DB; 64use DC::DB;
64use DC::UI; 65use DC::UI;
65use DC::UI::Canvas; 66use DC::UI::Canvas;
66use DC::UI::Inventory; 67use DC::UI::Inventory;
… …
473 audio_music_push; 474 audio_music_push;
474} 475}
475 476
476sub audio_init { 477sub audio_init {
477 if ($CFG->{audio_enable}) { 478 if ($CFG->{audio_enable}) {
478 if (length $CFG->{audio_driver}) { 479 DC::Audio::init $CFG->{audio_driver};
479 local $ENV{SDL_AUDIODRIVER} = $CFG->{audio_driver};
480 DC::SDL_Init DC::SDL_INIT_AUDIO
481 and die "SDL::Init failed!\n";
482 } else {
483 DC::SDL_Init DC::SDL_INIT_AUDIO
484 and die "SDL::Init failed!\n";
485 }
486
487 $ENV{MIX_EFFECTSMAXSPEED} = 1;
488 $SDL_MIXER = !DC::Mix_OpenAudio
489 $CFG->{audio_hw_frequency},
490 DC::MIX_DEFAULT_FORMAT,
491 $CFG->{audio_hw_channels},
492 $CFG->{audio_hw_chunksize};
493 480
494 if ($SDL_MIXER) { 481 if ($SDL_MIXER) {
495 DC::Mix_AllocateChannels $CFG->{audio_mix_channels};
496
497 audio_music_finished; 482 audio_music_finished;
498 } else { 483 } else {
499 status "Unable to open sound device: there will be no sound"; 484 status "Unable to open sound device: there will be no sound";
500 } 485 }
501 } else { 486 } else {
… …
597 my $fh = Coro::AIO::aio_open "$override.tmp", IO::AIO::O_RDONLY, 0; 582 my $fh = Coro::AIO::aio_open "$override.tmp", IO::AIO::O_RDONLY, 0;
598 583
599 if ($fh) { 584 if ($fh) {
600 $error ||= Coro::AIO::aio_stat "$override.tmp"; 585 $error ||= Coro::AIO::aio_stat "$override.tmp";
601 $error ||= -s _ != $size; 586 $error ||= -s _ != $size;
602 $error ||= Coro::AIO::aio_readahead $fh, 0, $size; 587 Coro::AIO::aio_readahead $fh, 0, $size;
603 588
604 my $f_md5 = new Digest::MD5; 589 my $f_md5 = new Digest::MD5;
590 binmode $fh; # ugh :(
605 $f_md5->addfile ($fh); 591 $f_md5->addfile ($fh);
606 $f_md5 = $f_md5->hexdigest; 592 $f_md5 = $f_md5->hexdigest;
607 $error ||= $md5 ne $f_md5; 593 $error ||= $md5 ne $f_md5;
608 } 594 }
609 } 595 }
… …
2028 $table->add_at (2, $row++, new DC::UI::Button 2014 $table->add_at (2, $row++, new DC::UI::Button
2029 text => "Save Now", 2015 text => "Save Now",
2030 tooltip => "Use this to manually save configuration and UI layout when " 2016 tooltip => "Use this to manually save configuration and UI layout when "
2031 . "autosave is disabled.", 2017 . "autosave is disabled.",
2032 on_activate => sub { 2018 on_activate => sub {
2033 DC::write_cfg; 2019 DC::save_cfg;
2034 0 2020 0
2035 } 2021 }
2036 ); 2022 );
2037 } 2023 }
2038 2024
… …
2970# due to mac os x + sdl combined braindamage, we need this contortion 2956# due to mac os x + sdl combined braindamage, we need this contortion
2971sub DC::Main::main { 2957sub DC::Main::main {
2972 { 2958 {
2973 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2959 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2974 2960
2975 if (-e "$Deliantra::VARDIR/client.cf") { 2961 DC::load_cfg;
2976 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2977 } else {
2978 #TODO: compatibility cruft
2979 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2980 print STDERR "INFO: used old configuration file\n";
2981 }
2982 2962
2983 DC::DB::Server::run; 2963 DC::DB::Server::run;
2984 2964
2985 if ($CFG->{db_schema} < 1) { 2965 if ($CFG->{db_schema} < 1) {
2986 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2966 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2987 DC::DB::nuke_db; 2967 DC::DB::nuke_db;
2988 $CFG->{db_schema} = 1; 2968 $CFG->{db_schema} = 1;
2989 DC::write_cfg; 2969 DC::save_cfg;
2990 } 2970 }
2971
2972 DC::upgrade_cfg;
2991 2973
2992 DC::DB::open_db; 2974 DC::DB::open_db;
2993 2975
2994 DC::UI::set_layout ($::CFG->{layout}); 2976 DC::UI::set_layout ($::CFG->{layout});
2995
2996 my %DEF_CFG = (
2997 config_autosave => 1,
2998 sdl_mode => undef,
2999 fullscreen => 1,
3000 fast => 0,
3001 force_opengl11 => undef,
3002 disable_alpha => 0,
3003 smooth_movement => 1,
3004 smooth_transitions => 1,
3005 texture_compression => 1,
3006 map_scale => 1,
3007 fow_enable => 1,
3008 fow_intensity => 0,
3009 fow_texture => 0,
3010 map_smoothing => 1,
3011 gui_fontsize => 1,
3012 log_fontsize => 0.7,
3013 gauge_fontsize => 1,
3014 gauge_size => 0.35,
3015 stat_fontsize => 0.7,
3016 mapsize => 100,
3017 audio_enable => 1,
3018 audio_hw_channels => 0,
3019 audio_hw_frequency => 0,
3020 audio_hw_chunksize => 0,
3021 audio_mix_channels => 8,
3022 effects_enable => 1,
3023 effects_volume => 1,
3024 bgm_enable => 1,
3025 bgm_volume => 0.5,
3026 output_rate => "",
3027 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
3028 inv_sort => "mtime",
3029 default => "profile", # default profile
3030 show_tips => 1,
3031 logview_max_par => 1000,
3032 shift_fire_stop => 0,
3033 uitheme => "wood",
3034 map_shift_x => -24, # arbitrary
3035 map_shift_y => +24, # arbitrary
3036 );
3037
3038 while (my ($k, $v) = each %DEF_CFG) {
3039 $CFG->{$k} = $v unless exists $CFG->{$k};
3040 }
3041 2977
3042 my @args = @ARGV; 2978 my @args = @ARGV;
3043 2979
3044 # OS X passes some process serial number of other shit. they 2980 # OS X passes some process serial number of other shit. they
3045 # could have used an env var or any other sane mechanism. but 2981 # could have used an env var or any other sane mechanism. but
… …
3136 debug_toggle 0; 3072 debug_toggle 0;
3137 3073
3138 delete $SIG{__DIE__}; 3074 delete $SIG{__DIE__};
3139 EV::loop; 3075 EV::loop;
3140 3076
3141 DC::write_cfg if $CFG->{config_autosave}; 3077 DC::save_cfg if $CFG->{config_autosave};
3142 3078
3143 #video_shutdown; 3079 #video_shutdown;
3144 #audio_shutdown; 3080 #audio_shutdown;
3145 3081
3146 DC::OpenGL::quit; 3082 DC::OpenGL::quit;

Diff Legend

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