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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.7 by root, Mon Dec 3 22:48:25 2007 UTC vs.
Revision 1.15 by root, Wed Dec 26 18:20:46 2007 UTC

… …
83 83
84use Time::HiRes 'time'; 84use Time::HiRes 'time';
85use EV; 85use EV;
86use List::Util qw(max min); 86use List::Util qw(max min);
87 87
88use Crossfire; 88use Deliantra;
89use Crossfire::Protocol::Constants; 89use Deliantra::Protocol::Constants;
90 90
91use Compress::LZF; 91use Compress::LZF;
92 92
93use CFPlus; 93use CFPlus;
94use CFPlus::OpenGL (); 94use CFPlus::OpenGL ();
… …
258 } else { 258 } else {
259 # fetch from database 259 # fetch from database
260 CFPlus::DB::get res_data => $meta->{name}, sub { 260 CFPlus::DB::get res_data => $meta->{name}, sub {
261 my $rwops = new CFPlus::RW $_[0]; 261 my $rwops = new CFPlus::RW $_[0];
262 my $chunk = new CFPlus::MixChunk $rwops 262 my $chunk = new CFPlus::MixChunk $rwops
263 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError; 263 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
264 $chunk->volume (($meta->{data}{volume} || 1) * 128); 264 $chunk->volume (($meta->{data}{volume} || 1) * 128);
265 $AUDIO_CHUNK{$face} = $chunk; 265 $AUDIO_CHUNK{$face} = $chunk;
266 266
267 audio_sound_push ($face); 267 audio_sound_push ($face);
268 }; 268 };
… …
344 return unless $SDL_MIXER; 344 return unless $SDL_MIXER;
345 345
346 my $fade_out; 346 my $fade_out;
347 347
348 if (@MUSIC_JINGLE) { 348 if (@MUSIC_JINGLE) {
349 $fade_out = 333;
349 @MUSIC_HAVE = $MUSIC_JINGLE[0]; 350 @MUSIC_HAVE = $MUSIC_JINGLE[0];
350 $fade_out = 333; 351
351 } else { 352 } else {
352 return unless $CFG->{bgm_enable}; 353 return unless $CFG->{bgm_enable};
353 354
354 my @have = 355 $fade_out = 700;
356
357 @MUSIC_HAVE =
355 grep $_ && $_->{data}, 358 grep $_ && $_->{data},
356 map $CONN->{face}[$_], 359 map $CONN->{face}[$_],
357 @$MUSIC_WANT; 360 @$MUSIC_WANT;
358 361
359 # randomize music a bit so that the order is not always the same 362 # randomize music a bit so that the order is not always the same
360 $_->{stop_time} ||= rand for @have; 363 $_->{stop_time} ||= rand for @MUSIC_HAVE;
361
362 @MUSIC_HAVE = @have
363 if @have;
364 364
365 # default MUSIC_HAVE == MUSIC_DEFAULT 365 # default MUSIC_HAVE == MUSIC_DEFAULT
366 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE; 366 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" }
367 $fade_out = 700; 367 unless @MUSIC_HAVE;
368 } 368 }
369 369
370 # if the currently playing song is acceptable, let it continue 370 # if the currently playing song is acceptable, let it continue
371 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; 371 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
372 372
… …
469 my ($conn, $flags, $prompt) = @_; 469 my ($conn, $flags, $prompt) = @_;
470 470
471 # FIXME: a very ugly hack to wait for stat update #d# 471 # FIXME: a very ugly hack to wait for stat update #d#
472 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) { 472 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
473 unless ($QUERY_TIMER) { 473 unless ($QUERY_TIMER) {
474 $QUERY_TIMER =
475 EV::timer 1, 0, sub { 474 $QUERY_TIMER = EV::timer 1, 0, sub {
476 server_query ($conn, $flags, $prompt, 1); 475 server_query ($conn, $flags, $prompt, 1);
477 $QUERY_TIMER = undef 476 $QUERY_TIMER = undef
478 }; 477 };
478
479 return; 479 return;
480 } 480 }
481 } 481 }
482 482
483 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 483 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
… …
1350 my $ok = 0; 1350 my $ok = 0;
1351 1351
1352 CFPlus::background { 1352 CFPlus::background {
1353 my $ua = CFPlus::lwp_useragent; 1353 my $ua = CFPlus::lwp_useragent;
1354 1354
1355 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content; 1355 CFPlus::background_msg CFPlus::decode_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
1356 } sub { 1356 } sub {
1357 my ($msg) = @_; 1357 my ($msg) = @_;
1358 if ($msg) { 1358 if ($msg) {
1359 $table->clear; 1359 $table->clear;
1360 1360
… …
2227 $BUTTONBAR->add (new CFPlus::UI::Button 2227 $BUTTONBAR->add (new CFPlus::UI::Button
2228 text => "Save Config", 2228 text => "Save Config",
2229 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2229 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2230 on_activate => sub { 2230 on_activate => sub {
2231 $::CFG->{layout} = CFPlus::UI::get_layout; 2231 $::CFG->{layout} = CFPlus::UI::get_layout;
2232 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc"; 2232 CFPlus::write_cfg "$Deliantra::VARDIR/client.cf";
2233 status "Configuration Saved"; 2233 status "Configuration Saved";
2234 0 2234 0
2235 }, 2235 },
2236 ); 2236 );
2237 2237
… …
2270my $animate_timer; 2270my $animate_timer;
2271 2271
2272my $fps = 9; 2272my $fps = 9;
2273 2273
2274sub force_refresh { 2274sub force_refresh {
2275 $WANT_REFRESH->stop;
2276
2277 if ($ENV{CFPLUS_DEBUG} & 4) { 2275 if ($ENV{CFPLUS_DEBUG} & 4) {
2278 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02; 2276 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2279 debug sprintf "%3.2f", $fps; 2277 debug sprintf "%3.2f", $fps;
2280 } 2278 }
2281 2279
2280 $WANT_REFRESH->stop;
2281
2282 $CFPlus::UI::ROOT->draw; 2282 $CFPlus::UI::ROOT->draw;
2283 CFPlus::SDL_GL_SwapBuffers; 2283 CFPlus::SDL_GL_SwapBuffers;
2284 $LAST_REFRESH = $NOW; 2284 $LAST_REFRESH = $NOW;
2285} 2285}
2286 2286
2287$WANT_REFRESH = EV::idle_ns \&force_refresh; 2287$WANT_REFRESH = EV::idle_ns \&force_refresh;
2288 2288
2289my $input = EV::timer 0, 1/60, sub { 2289# 0.015 is server tick time / 8 ~~ 66.6...hz
2290my $input = EV::periodic 0, 0.015, undef, sub {
2290 $NOW = time; 2291 $NOW = time;
2291 2292
2292 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2293 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2293 for CFPlus::poll_events; 2294 for CFPlus::poll_events;
2294 2295
… …
2316 }, 2317 },
2317 CFPlus::SDL_VIDEOEXPOSE => sub { 2318 CFPlus::SDL_VIDEOEXPOSE => sub {
2318 CFPlus::UI::full_refresh; 2319 CFPlus::UI::full_refresh;
2319 }, 2320 },
2320 CFPlus::SDL_ACTIVEEVENT => sub { 2321 CFPlus::SDL_ACTIVEEVENT => sub {
2321# not useful, as APPACTIVE include sonly iconified state, not unmapped 2322# not useful, as APPACTIVE includes only iconified state, not unmapped
2322# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d# 2323# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2323# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d# 2324# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2324# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2325# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2325# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2326# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2326# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2327# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
… …
2348 }, 2349 },
2349); 2350);
2350 2351
2351############################################################################# 2352#############################################################################
2352 2353
2353$SIG{INT} = $SIG{TERM} = sub { exit }; 2354$SIG{INT} = $SIG{TERM} = sub {
2355 EV::unloop;
2356 #d# TODO calling exit here hangs the process in some futex
2357};
2354 2358
2355{ 2359{
2360 if (-e "$Deliantra::VARDIR/client.cf") {
2361 CFPlus::read_cfg "$Deliantra::VARDIR/client.cf";
2362 } else {
2363 #TODO: compatibility cruft
2356 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2364 CFPlus::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2365 print STDERR "INFO: used old configuratrion file\n";
2366 }
2367
2357 CFPlus::DB::Server::run; 2368 CFPlus::DB::Server::run;
2358 2369
2359 CFPlus::UI::set_layout ($::CFG->{layout}); 2370 CFPlus::UI::set_layout ($::CFG->{layout});
2360 2371
2361 my %DEF_CFG = ( 2372 my %DEF_CFG = (

Diff Legend

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