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.210 by root, Sun Aug 12 01:49:09 2007 UTC vs.
Revision 1.222 by root, Sun Aug 26 03:12:34 2007 UTC

… …
167our $STATUSBOX; 167our $STATUSBOX;
168our $DEBUG_STATUS; 168our $DEBUG_STATUS;
169 169
170our $INV; 170our $INV;
171our $INVR; 171our $INVR;
172our $INV_RIGHT_HB; 172our $INVR_HB;
173
174our $PICKUP_CFG;
175 173
176############################################################################# 174#############################################################################
177 175
178sub status { 176sub status {
179 $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]);
… …
230 $channel->set_position_r ($dx, $dy, 20); 228 $channel->set_position_r ($dx, $dy, 20);
231 $chunk->play ($channel); 229 $chunk->play ($channel);
232 } 230 }
233 } else { 231 } else {
234 # sound_meta not set means data is in flight either way 232 # sound_meta not set means data is in flight either way
235 my $meta = $CONN->{sound_meta}{$face} 233 my $meta = $CONN->{face}[$face]
236 or return; 234 or return;
237 235
236 $meta->{data}
237 or return;
238
238 # if its a jingle, play it as ambient music 239 # if its a jingle, play it as ambient music
239 if ($meta->{meta}{jingle}) { 240 if ($meta->{data}{jingle}) {
240 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 241 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
241 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 242 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
242 &audio_music_push ($face); 243 &audio_music_push ($face);
243 } 244 }
244 } else { 245 } else {
245 # fetch from database 246 # fetch from database
246 CFPlus::DB::get res_data => $meta->{name}, sub { 247 CFPlus::DB::get res_data => $meta->{name}, sub {
247 my $rwops = new CFPlus::RW $_[0]; 248 my $rwops = new CFPlus::RW $_[0];
248 my $chunk = new CFPlus::MixChunk $rwops 249 my $chunk = new CFPlus::MixChunk $rwops
249 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError; 250 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
250 $chunk->volume (($meta->{meta}{volume} || 1) * 128); 251 $chunk->volume (($meta->{data}{volume} || 1) * 128);
251 $AUDIO_CHUNK{$face} = $chunk; 252 $AUDIO_CHUNK{$face} = $chunk;
252 253
253 audio_sound_push ($face); 254 audio_sound_push ($face);
254 }; 255 };
255 } 256 }
… …
263 or return; 264 or return;
264 $CFG->{effects_enable} 265 $CFG->{effects_enable}
265 or return; 266 or return;
266 267
267 my $queue = $AUDIO_PLAY{$face} ||= []; 268 my $queue = $AUDIO_PLAY{$face} ||= [];
268 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s 269 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
269 audio_sound_push $face 270 audio_sound_push $face
270 unless @$queue > 1; 271 unless @$queue > 1;
271} 272}
272 273
273sub audio_music_set_meta { 274sub audio_music_set_meta {
274 my ($meta) = @_; 275 my ($meta) = @_;
275 276
276 $MUSIC_PLAYING_META = $meta; 277 $MUSIC_PLAYING_META = $meta;
277 $MUSIC_PLAYING_WIDGET->set_markup ( 278 $MUSIC_PLAYING_WIDGET->set_markup (
278 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n" 279 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
279 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n" 280 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
280 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n" 281 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
281 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license}) 282 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
282 ); 283 );
283} 284}
284 285
285sub audio_music_update_volume { 286sub audio_music_update_volume {
286 return unless $MUSIC_PLAYING_META; 287 return unless $MUSIC_PLAYING_META;
287 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1; 288 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
288 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume}; 289 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
289 CFPlus::MixMusic::volume $base * $volume * 128; 290 CFPlus::MixMusic::volume $base * $volume * 128;
290} 291}
291 292
292sub audio_music_start { 293sub audio_music_start {
293 my $meta = $MUSIC_PLAYING_META; 294 my $meta = $MUSIC_PLAYING_META;
… …
336 $fade_out = 333; 337 $fade_out = 333;
337 } else { 338 } else {
338 return unless $CFG->{bgm_enable}; 339 return unless $CFG->{bgm_enable};
339 340
340 my @have = 341 my @have =
341 grep $_, 342 grep $_ && $_->{data},
342 map $CONN->{music_meta}{$_}, 343 map $CONN->{face}[$_],
343 @$MUSIC_WANT; 344 @$MUSIC_WANT;
344 345
345 @MUSIC_HAVE = @have 346 @MUSIC_HAVE = @have
346 if @have; 347 if @have;
347 348
… …
771 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 772 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
772 ); 773 );
773 774
774 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 775 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
775 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 776 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
776 state => $CFG->{opengl11}, 777 state => $CFG->{force_opengl11},
777 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 778 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
778 . "higher memory usage and slower performance. It will, however, help tremendously on " 779 . "higher memory usage and slower performance. It will, however, help tremendously on "
779 . "cards that claim to support a feature but fall back to software rendering. " 780 . "cards that claim to support a feature but fall back to software rendering. "
780 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 781 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
781 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 782 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
782 . "experience extremely low framerates and your card should do better, try this option.</b>", 783 . "experience extremely low framerates and your card should do better, try this option.</b>",
783 on_changed => sub { my ($self, $value) = @_; $CFG->{opengl11} = $value; 0 } 784 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
785 );
786
787 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
788 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
789 state => $CFG->{texture_compression},
790 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
791 . "will save a lot of memory and increase performance. The compression algorithm "
792 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
793 . "forced OpenGL 1.1 mode.",
794 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
784 ); 795 );
785 796
786 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 797 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
787 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 798 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
788 state => $CFG->{fast}, 799 state => $CFG->{fast},
… …
910 expand => 1, state => $CFG->{bgm_enable}, 921 expand => 1, state => $CFG->{bgm_enable},
911 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 922 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
912 on_changed => sub { 923 on_changed => sub {
913 $CFG->{bgm_enable} = $_[1]; 924 $CFG->{bgm_enable} = $_[1];
914 $CONN->update_fx_want if $CONN; 925 $CONN->update_fx_want if $CONN;
926 audio_music_push;
915 0 927 0
916 } 928 }
917 ); 929 );
918 $table->add_at (2, $row++, new CFPlus::UI::Slider 930 $table->add_at (2, $row++, new CFPlus::UI::Slider
919 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 931 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
… …
972 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 984 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
973 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 985 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
974 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 986 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
975 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food"); 987 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
976 988
977 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 989 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
990 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
991 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
978 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 992 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
979 993
980 $GAUGES = { 994 $GAUGES = {
995 exp => $exp, prg => $prg, sklprg => $sklprg,
981 exp => $exp, win => $win, range => $rng, 996 win => $win, range => $rng,
982 food => $fg, mana => $mg, hp => $hg, grace => $gg 997 hp => $hg, mana => $mg, grace => $gg, food => $fg,
983 }; 998 };
984 999
985 &set_gauge_window_fontsize; 1000 &set_gauge_window_fontsize;
986 1001
987 $win 1002 $win
… …
1188 $r 1203 $r
1189} 1204}
1190 1205
1191sub skill_window { 1206sub skill_window {
1192 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1207 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1208
1193 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1209 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1210
1194 $sw 1211 $sw
1195} 1212}
1196 1213
1197sub formsep($) { 1214sub formsep($) {
1198 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1215 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
1610 $sw1->add ($INV = new CFPlus::UI::Inventory); 1627 $sw1->add ($INV = new CFPlus::UI::Inventory);
1611 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1628 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1612 1629
1613 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1630 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1614 1631
1615 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1632 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1616 1633
1617 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1634 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1618 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1635 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1619 1636
1620 # XXX: Call after $INVR = ... because set_opencont sets the items 1637 # XXX: Call after $INVR = ... because set_opencont sets the items
… …
1643} 1660}
1644 1661
1645sub add_license { 1662sub add_license {
1646 my ($meta) = @_; 1663 my ($meta) = @_;
1647 1664
1648 $meta = $meta->{meta} 1665 $meta = $meta->{data}
1649 or return; 1666 or return;
1650 1667
1651 $meta->{license} || $meta->{author} || $meta->{source} 1668 $meta->{license} || $meta->{author} || $meta->{source}
1652 or return; 1669 or return;
1653 1670
… …
1875 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1892 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1876 ); 1893 );
1877 $hb->add (new CFPlus::UI::Button 1894 $hb->add (new CFPlus::UI::Button
1878 text => "Quit anyway", 1895 text => "Quit anyway",
1879 expand => 1, 1896 expand => 1,
1880 on_activate => sub { exit }, 1897 on_activate => sub { Event::unloop_all },
1881 ); 1898 );
1882 } 1899 }
1883 1900
1884 $QUIT_DIALOG->show; 1901 $QUIT_DIALOG->show;
1885 $QUIT_DIALOG->grab_focus; 1902 $QUIT_DIALOG->grab_focus;
… …
2079 tooltip => "Terminates the program", 2096 tooltip => "Terminates the program",
2080 on_activate => sub { 2097 on_activate => sub {
2081 if ($CONN) { 2098 if ($CONN) {
2082 open_quit_dialog; 2099 open_quit_dialog;
2083 } else { 2100 } else {
2084 exit; 2101 Event::unloop_all;
2085 } 2102 }
2086 0 2103 0
2087 }, 2104 },
2088 ); 2105 );
2089 2106
2090 $BUTTONBAR->show; 2107 $BUTTONBAR->show;
2091 $SETUP_DIALOG->show; 2108 $SETUP_DIALOG->show;
2109 $MESSAGE_WINDOW->show;
2092 } 2110 }
2093 2111
2094 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2112 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2095} 2113}
2096 2114
… …
2141 delete $animate_object{$widget}; 2159 delete $animate_object{$widget};
2142} 2160}
2143 2161
2144%SDL_CB = ( 2162%SDL_CB = (
2145 CFPlus::SDL_QUIT => sub { 2163 CFPlus::SDL_QUIT => sub {
2146 exit; 2164 Event::unloop_all;
2147 }, 2165 },
2148 CFPlus::SDL_VIDEORESIZE => sub { 2166 CFPlus::SDL_VIDEORESIZE => sub {
2149 }, 2167 },
2150 CFPlus::SDL_VIDEOEXPOSE => sub { 2168 CFPlus::SDL_VIDEOEXPOSE => sub {
2151 CFPlus::UI::full_refresh; 2169 CFPlus::UI::full_refresh;
… …
2190 CFPlus::DB::Server::run; 2208 CFPlus::DB::Server::run;
2191 2209
2192 CFPlus::UI::set_layout ($::CFG->{layout}); 2210 CFPlus::UI::set_layout ($::CFG->{layout});
2193 2211
2194 my %DEF_CFG = ( 2212 my %DEF_CFG = (
2195 sdl_mode => 0, 2213 sdl_mode => 0,
2196 fullscreen => 0, 2214 fullscreen => 0,
2197 fast => 0, 2215 fast => 0,
2216 force_opengl11 => undef,
2217 texture_compression => 1,
2198 map_scale => 1, 2218 map_scale => 1,
2199 fow_enable => 1, 2219 fow_enable => 1,
2200 fow_intensity => 0, 2220 fow_intensity => 0,
2201 map_smoothing => 1, 2221 map_smoothing => 1,
2202 gui_fontsize => 1, 2222 gui_fontsize => 1,
2203 log_fontsize => 0.7, 2223 log_fontsize => 0.7,
2204 gauge_fontsize => 1, 2224 gauge_fontsize => 1,
2205 gauge_size => 0.35, 2225 gauge_size => 0.35,
2206 stat_fontsize => 0.7, 2226 stat_fontsize => 0.7,
2207 mapsize => 100, 2227 mapsize => 100,
2208 audio_enable => 1, 2228 audio_enable => 1,
2209 effects_enable => 1, 2229 effects_enable => 1,
2210 effects_volume => 1, 2230 effects_volume => 1,
2211 bgm_enable => 1, 2231 bgm_enable => 1,
2212 bgm_volume => 0.5, 2232 bgm_volume => 0.5,
2213 output_sync => 1, 2233 output_sync => 1,
2214 output_count => 1, 2234 output_count => 1,
2215 output_rate => "", 2235 output_rate => "",
2216 pickup => 0, 2236 pickup => 0,
2217 inv_sort => "mtime", 2237 inv_sort => "mtime",
2218 default => "profile", # default profile 2238 default => "profile", # default profile
2219 show_tips => 1, 2239 show_tips => 1,
2220 logview_max_par => 1000, 2240 logview_max_par => 1000,
2221 ); 2241 );
2222 2242
2223 while (my ($k, $v) = each %DEF_CFG) { 2243 while (my ($k, $v) = each %DEF_CFG) {
2224 $CFG->{$k} = $v unless exists $CFG->{$k}; 2244 $CFG->{$k} = $v unless exists $CFG->{$k};
2225 } 2245 }
… …
2282# } 2302# }
2283# my $t2 = Time::HiRes::time; 2303# my $t2 = Time::HiRes::time;
2284# warn $t2-$t1; 2304# warn $t2-$t1;
2285# } 2305# }
2286 2306
2287 $startup_done->();
2288
2289 video_init; 2307 video_init;
2290 audio_init; 2308 audio_init;
2291} 2309}
2292 2310
2293show_tip_of_the_day if $CFG->{show_tips}; 2311show_tip_of_the_day if $CFG->{show_tips};
2294 2312
2313Event->idle (cb => sub {
2314 $_[0]->w->cancel;
2315 $startup_done->();
2316});
2317
2295Event::loop; 2318Event::loop;
2319
2320#video_shutdown;
2321#audio_shutdown;
2296#CFPlus::SDL_Quit; 2322CFPlus::SDL_Quit;
2297#CFPlus::_exit 0;
2298
2299END {
2300 video_shutdown;
2301 audio_shutdown;
2302 CFPlus::SDL_Quit;
2303 CFPlus::DB::Server::stop; 2323CFPlus::DB::Server::stop;
2304}
2305 2324
2306=head1 NAME 2325=head1 NAME
2307 2326
2308cfplus - A Crossfire TRT and Crossfire game client 2327cfplus - A Crossfire TRT and Crossfire game client
2309 2328

Diff Legend

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