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.154 by root, Wed May 9 11:46:49 2007 UTC vs.
Revision 1.170 by root, Sun Jul 15 21:15:14 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3my $startup_done = sub { }; 3my $startup_done = sub { };
4our $PANGO = "1.5.0";
4 5
5# do splash-screen thingy on win32 6# do splash-screen thingy on win32
6BEGIN { 7BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") { 8 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) { 9 while (my ($filename, $zip) = each %PAR::LibCache) {
… …
43 44
44 if ($^O eq "MSWin32") { 45 if ($^O eq "MSWin32") {
45 # relocatable 46 # relocatable
46 } else { 47 } else {
47 # unix, need to patch pango rc file 48 # unix, need to patch pango rc file
48 open my $fh, "<:perlio", "$tmp/usr/lib/pango/1.5.0/module-files.d/libpango1.0-0.modules" 49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
49 or die "$tmp/usr/lib/1.5.0/module-files.d/libpango1.0-0.modules: $!"; 50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
50 local $/; 51 local $/;
51 my $rc = <$fh>; 52 my $rc = <$fh>;
52 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones 53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
53 54
54 mkdir "$tmp/pango-modules"; 55 mkdir "$tmp/pango-modules";
… …
158 159
159our $SDL_ACTIVE; 160our $SDL_ACTIVE;
160our %SDL_CB; 161our %SDL_CB;
161 162
162our $SDL_MIXER; 163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT;
166our $MUSIC_START;
167our $MUSIC_PLAYING;
168our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
163our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
164our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
165 172
166our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
167our $STATUSBOX; 174our $STATUSBOX;
… …
495 $LOGIN_BUTTON->set_text ("Login"); 502 $LOGIN_BUTTON->set_text ("Login");
496 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 503 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
497 $SETUP_DIALOG->show; 504 $SETUP_DIALOG->show;
498 $PL_WINDOW->hide; 505 $PL_WINDOW->hide;
499 $SPELL_LIST->clear_spells; 506 $SPELL_LIST->clear_spells;
507 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
508
509 &audio_music_set ([]);
500 510
501 return unless $CONN; 511 return unless $CONN;
502 512
503 status "connection closed"; 513 status "connection closed";
504 514
… …
745 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 755 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
746 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 756 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
747 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 757 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
748 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 758 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
749 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 759 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
750 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 760 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
751 761
752 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 762 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
753 763
754 for my $x (0..2) { 764 for my $x (0..2) {
755 for my $y (0 .. 2) { 765 for my $y (0 .. 2) {
… …
1270 1280
1271 $window 1281 $window
1272} 1282}
1273 1283
1274sub autopickup_setup { 1284sub autopickup_setup {
1285 my $r = new CFPlus::UI::ScrolledWindow (
1286 expand => 1,
1287 scroll_y => 1
1288 );
1275 my $table = new CFPlus::UI::Table; 1289 $r->add (my $table = new CFPlus::UI::Table
1290 row_expand => [0],
1291 col_expand => [0, 1, 0, 1],
1292 );
1276 1293
1277 for ( 1294 for (
1278 ["General", 0, 0, 1295 ["General", 0, 0,
1279 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1296 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1280 ["Inhibit autopickup" => PICKUP_INHIBIT], 1297 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1364 $::CONN->send_command ("pickup $::CFG->{pickup}") 1381 $::CONN->send_command ("pickup $::CFG->{pickup}")
1365 if defined $::CONN; 1382 if defined $::CONN;
1366 0 1383 0
1367 }); 1384 });
1368 1385
1369 $table 1386 $r
1370} 1387}
1371 1388
1372my %SORT_ORDER = ( 1389my %SORT_ORDER = (
1373 type => undef, 1390 type => undef,
1374 mtime => sub { 1391 mtime => sub {
… …
1453 has_close_button => 1 1470 has_close_button => 1
1454 ; 1471 ;
1455 1472
1456 my $ntb = 1473 my $ntb =
1457 $PL_NOTEBOOK = 1474 $PL_NOTEBOOK =
1458 new CFPlus::UI::Notebook expand => 1, debug => 1; 1475 new CFPlus::UI::Notebook expand => 1;
1459 1476
1460 $ntb->add ( 1477 $ntb->add (
1461 "Statistics (F2)" => $STATS_PAGE = stats_window, 1478 "Statistics (F2)" => $STATS_PAGE = stats_window,
1462 "Shows statistics, where all your Stats and Resistances are shown." 1479 "Shows statistics, where all your Stats and Resistances are shown."
1463 ); 1480 );
… …
1475 $ntb->add ( 1492 $ntb->add (
1476 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1493 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1477 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1494 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1478 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1495 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1479 ); 1496 );
1497 $ntb->add (Pickup => autopickup_setup,
1498 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1480 1499
1481 $ntb->set_current_page ($INVENTORY_PAGE); 1500 $ntb->set_current_page ($INVENTORY_PAGE);
1482 1501
1483 $plwin->add ($ntb); 1502 $plwin->add ($ntb);
1484 $plwin 1503 $plwin
… …
1811 1830
1812 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1831 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1813 "Configure the server to play on, your username, password and other server-related options."); 1832 "Configure the server to play on, your username, password and other server-related options.");
1814 $SETUP_NOTEBOOK->add (Client => client_setup, 1833 $SETUP_NOTEBOOK->add (Client => client_setup,
1815 "Configure various client-specific settings."); 1834 "Configure various client-specific settings.");
1816 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1817 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1818 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1835 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1819 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1836 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1820 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1837 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1821 "Configure the use of audio, sound effects and background music."); 1838 "Configure the use of audio, sound effects and background music.");
1822 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1839 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
2000 CFPlus::OpenGL::shutdown; 2017 CFPlus::OpenGL::shutdown;
2001 2018
2002 undef $SDL_ACTIVE; 2019 undef $SDL_ACTIVE;
2003} 2020}
2004 2021
2005my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
2006my $bgmusic;#TODO#hack#d#
2007
2008sub audio_channel_finished { 2022sub audio_channel_finished {
2009 my ($channel) = @_; 2023 my ($channel) = @_;
2010 2024
2011 #warn "channel $channel finished\n";#d# 2025 #warn "channel $channel finished\n";#d#
2012} 2026}
2013 2027
2028sub audio_music_set {
2029 my ($songs) = @_;
2030
2031 my @want =
2032 grep $_,
2033 map $CONN->{music_meta}{$_},
2034 @$songs;
2035
2036 if (@want) {
2037 @MUSIC_WANT = @want;
2038 &audio_music_changed ();
2039 }
2040}
2041
2042sub audio_music_start {
2043 my $path = $MUSIC_PLAYING->{path}
2044 or return;
2045
2046 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2047 # music might have changed...
2048 $path eq $MUSIC_PLAYING->{path}
2049 or return &audio_music_start ();
2050
2051 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2052
2053 my $NOW = time;
2054
2055 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2056 my $pos = $MUSIC_PLAYING->{stop_pos};
2057 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2058 $MUSIC_START = time - $pos;
2059 } else {
2060 $MUSIC_PLAYER->play (0);
2061 $MUSIC_START = time;
2062 }
2063
2064 delete $MUSIC_PLAYING->{stop_time};
2065 delete $MUSIC_PLAYING->{stop_pos};
2066 }
2067}
2068
2069sub audio_music_changed {
2070 return unless $CFG->{bgm_enable};
2071
2072 # default MUSIC_WANT == MUSIC_DEFAULT
2073 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2074
2075 # if the currently playing song is acceptable, let it continue
2076 return if $MUSIC_PLAYING
2077 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2078
2079 my $NOW = time;
2080
2081 if ($MUSIC_PLAYING) {
2082 $MUSIC_PLAYING->{stop_time} = $NOW;
2083 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2084 CFPlus::MixMusic::fade_out 1000;
2085 } else {
2086 # sort by stop time, oldest first
2087 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2088
2089 # if the most recently-played piece played very recently,
2090 # resume it, else choose the oldest piece for rotation.
2091 $MUSIC_PLAYING =
2092 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2093 ? $MUSIC_WANT[-1]
2094 : $MUSIC_WANT[0];
2095
2096 audio_music_start;
2097 }
2098}
2099
2014sub audio_music_finished { 2100sub audio_music_finished {
2015 return unless $CFG->{bgm_enable}; 2101 $MUSIC_PLAYING = undef;
2102 undef $MUSIC_PLAYER;
2016 2103
2017 # TODO: hack, do play loop and mood music 2104 audio_music_changed;
2018 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
2019 $bgmusic->play (0);
2020
2021 push @bgmusic, shift @bgmusic;
2022} 2105}
2023 2106
2024sub audio_init { 2107sub audio_init {
2025 if ($CFG->{audio_enable}) { 2108 if ($CFG->{audio_enable}) {
2026 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2109 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
2086 2169
2087my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2170my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2088 $NOW = time; 2171 $NOW = time;
2089 2172
2090 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2173 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2091 for CFPlus::SDL_PollEvent; 2174 for CFPlus::poll_events;
2092 2175
2093 if (%animate_object) { 2176 if (%animate_object) {
2094 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2177 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2095 $WANT_REFRESH++; 2178 $WANT_REFRESH++;
2096 } 2179 }

Diff Legend

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