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.152 by root, Tue Apr 24 01:13:15 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) {
… …
29# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
30BEGIN { 31BEGIN {
31 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
32 @INC = grep ref, @INC; # weed out all paths except pars loader refs 33 @INC = grep ref, @INC; # weed out all paths except pars loader refs
33 34
35 my $tmp = $ENV{PAR_TEMP};
36
34 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
35 for ($zip->memberNames) { 38 for ($zip->memberNames) {
36 next unless /^root\/(.*)/; 39 next unless /^root\/(.*)/;
37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
38 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
39 } 42 }
40 } 43 }
41 44
42 # TODO: pango-rc file, anybody? 45 if ($^O eq "MSWin32") {
46 # relocatable
47 } else {
48 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/;
52 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
43 54
44 unshift @INC, $ENV{PAR_TEMP}; 55 mkdir "$tmp/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!";
58 print $fh $rc;
59
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
64 }
65
66 unshift @INC, $tmp;
45 } 67 }
46} 68}
47 69
48# need to do it again because that pile of garbage called PAR nukes it before main 70# need to do it again because that pile of garbage called PAR nukes it before main
49unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
… …
137 159
138our $SDL_ACTIVE; 160our $SDL_ACTIVE;
139our %SDL_CB; 161our %SDL_CB;
140 162
141our $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
142our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
143our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
144 172
145our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
146our $STATUSBOX; 174our $STATUSBOX;
… …
269 ellipsise => 0, 297 ellipsise => 0,
270 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>", 298 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
271 ; 299 ;
272 } 300 }
273 301
274 if ($conn->{chargen_race_title}) {
275 unshift @dialog, new CFPlus::UI::Face 302 unshift @dialog, new CFPlus::UI::Face
276 face => $conn->{player}{face}, 303 face => $conn->{player}{face},
277 bg => [.2, .2, .2, 1], 304 bg => [.2, .2, .2, 1],
278 min_w => 64, 305 min_w => 64,
279 min_h => 64, 306 min_h => 64,
280 ;
281 } 307 ;
282 308
283 if ($conn->{chargen_race_title}) { 309 if ($conn->{chargen_race_title}) {
284 unshift @dialog, new CFPlus::UI::Label 310 unshift @dialog, new CFPlus::UI::Label
285 allign => 1, 311 allign => 1,
286 ellipsise => 0, 312 ellipsise => 0,
… …
476 $LOGIN_BUTTON->set_text ("Login"); 502 $LOGIN_BUTTON->set_text ("Login");
477 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 503 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
478 $SETUP_DIALOG->show; 504 $SETUP_DIALOG->show;
479 $PL_WINDOW->hide; 505 $PL_WINDOW->hide;
480 $SPELL_LIST->clear_spells; 506 $SPELL_LIST->clear_spells;
507 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
508
509 &audio_music_set ([]);
481 510
482 return unless $CONN; 511 return unless $CONN;
483 512
484 status "connection closed"; 513 status "connection closed";
485 514
… …
726 $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 });
727 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 756 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
728 $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 });
729 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 758 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
730 $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 });
731 $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() } );
732 761
733 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);
734 763
735 for my $x (0..2) { 764 for my $x (0..2) {
736 for my $y (0 .. 2) { 765 for my $y (0 .. 2) {
… …
1251 1280
1252 $window 1281 $window
1253} 1282}
1254 1283
1255sub autopickup_setup { 1284sub autopickup_setup {
1285 my $r = new CFPlus::UI::ScrolledWindow (
1286 expand => 1,
1287 scroll_y => 1
1288 );
1256 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 );
1257 1293
1258 for ( 1294 for (
1259 ["General", 0, 0, 1295 ["General", 0, 0,
1260 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1296 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1261 ["Inhibit autopickup" => PICKUP_INHIBIT], 1297 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1345 $::CONN->send_command ("pickup $::CFG->{pickup}") 1381 $::CONN->send_command ("pickup $::CFG->{pickup}")
1346 if defined $::CONN; 1382 if defined $::CONN;
1347 0 1383 0
1348 }); 1384 });
1349 1385
1350 $table 1386 $r
1351} 1387}
1352 1388
1353my %SORT_ORDER = ( 1389my %SORT_ORDER = (
1354 type => undef, 1390 type => undef,
1355 mtime => sub { 1391 mtime => sub {
… …
1434 has_close_button => 1 1470 has_close_button => 1
1435 ; 1471 ;
1436 1472
1437 my $ntb = 1473 my $ntb =
1438 $PL_NOTEBOOK = 1474 $PL_NOTEBOOK =
1439 new CFPlus::UI::Notebook expand => 1, debug => 1; 1475 new CFPlus::UI::Notebook expand => 1;
1440 1476
1441 $ntb->add ( 1477 $ntb->add (
1442 "Statistics (F2)" => $STATS_PAGE = stats_window, 1478 "Statistics (F2)" => $STATS_PAGE = stats_window,
1443 "Shows statistics, where all your Stats and Resistances are shown." 1479 "Shows statistics, where all your Stats and Resistances are shown."
1444 ); 1480 );
… …
1456 $ntb->add ( 1492 $ntb->add (
1457 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1493 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1458 "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 :). "
1459 . "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."
1460 ); 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.");
1461 1499
1462 $ntb->set_current_page ($INVENTORY_PAGE); 1500 $ntb->set_current_page ($INVENTORY_PAGE);
1463 1501
1464 $plwin->add ($ntb); 1502 $plwin->add ($ntb);
1465 $plwin 1503 $plwin
… …
1792 1830
1793 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1831 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1794 "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.");
1795 $SETUP_NOTEBOOK->add (Client => client_setup, 1833 $SETUP_NOTEBOOK->add (Client => client_setup,
1796 "Configure various client-specific settings."); 1834 "Configure various client-specific settings.");
1797 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1798 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1799 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1835 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1800 "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.");
1801 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1837 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1802 "Configure the use of audio, sound effects and background music."); 1838 "Configure the use of audio, sound effects and background music.");
1803 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1839 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1981 CFPlus::OpenGL::shutdown; 2017 CFPlus::OpenGL::shutdown;
1982 2018
1983 undef $SDL_ACTIVE; 2019 undef $SDL_ACTIVE;
1984} 2020}
1985 2021
1986my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1987my $bgmusic;#TODO#hack#d#
1988
1989sub audio_channel_finished { 2022sub audio_channel_finished {
1990 my ($channel) = @_; 2023 my ($channel) = @_;
1991 2024
1992 #warn "channel $channel finished\n";#d# 2025 #warn "channel $channel finished\n";#d#
1993} 2026}
1994 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
1995sub audio_music_finished { 2100sub audio_music_finished {
1996 return unless $CFG->{bgm_enable}; 2101 $MUSIC_PLAYING = undef;
2102 undef $MUSIC_PLAYER;
1997 2103
1998 # TODO: hack, do play loop and mood music 2104 audio_music_changed;
1999 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
2000 $bgmusic->play (0);
2001
2002 push @bgmusic, shift @bgmusic;
2003} 2105}
2004 2106
2005sub audio_init { 2107sub audio_init {
2006 if ($CFG->{audio_enable}) { 2108 if ($CFG->{audio_enable}) {
2007 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2109 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
2067 2169
2068my $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 {
2069 $NOW = time; 2171 $NOW = time;
2070 2172
2071 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2173 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2072 for CFPlus::SDL_PollEvent; 2174 for CFPlus::poll_events;
2073 2175
2074 if (%animate_object) { 2176 if (%animate_object) {
2075 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2177 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2076 $WANT_REFRESH++; 2178 $WANT_REFRESH++;
2077 } 2179 }

Diff Legend

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