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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.130 by root, Tue Apr 18 01:36:13 2006 UTC vs.
Revision 1.138 by elmex, Tue Apr 18 21:37:48 2006 UTC

… …
8 8
9use SDL; 9use SDL;
10use SDL::App; 10use SDL::App;
11use SDL::Event; 11use SDL::Event;
12use SDL::Surface; 12use SDL::Surface;
13
14use SDL::Mixer;
15use SDL::Sound;
16use SDL::Music;
17
13use SDL::OpenGL; 18use SDL::OpenGL;
14 19
15use Crossfire; 20use Crossfire;
16use Crossfire::Protocol; 21use Crossfire::Protocol;
17 22
… …
54our $GAUGES; 59our $GAUGES;
55 60
56our $SDL_ACTIVE; 61our $SDL_ACTIVE;
57our $SDL_EV; 62our $SDL_EV;
58our %SDL_CB; 63our %SDL_CB;
64
65our $SDL_MIXER;
66our @SOUNDS; # event => file mapping
67our %AUDIO_CHUNKS; # audio files
59 68
60our $ALT_ENTER_MESSAGE; 69our $ALT_ENTER_MESSAGE;
61our $STATUS_LINE; 70our $STATUS_LINE;
62our $DEBUG_STATUS; 71our $DEBUG_STATUS;
63 72
… …
146 155
147 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth"); 156 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
148 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { 157 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
149 my ($self, $value) = @_; 158 my ($self, $value) = @_;
150 $CFG->{fow_smooth} = $value; 159 $CFG->{fow_smooth} = $value;
160 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
151 }); 161 });
152 162
153 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize"); 163 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
154 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub { 164 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
155 my ($self, $value) = @_; 165 my ($self, $value) = @_;
156 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value); 166 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
157 }); 167 });
158 168
159 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 169 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
160 destroy_screen (); 170 video_shutdown ();
161 init_screen (); 171 video_init ();
172 });
173
174 $table->add (0, 8, new CFClient::UI::Label align => 1, text => "Sound");
175 $table->add (1, 8, new CFClient::UI::CheckBox state => $CFG->{sound}, connect_changed => sub {
176 my ($self, $value) = @_;
177 $CFG->{sound} = $value;
178 });
179 $table->add (0, 9, new CFClient::UI::Label align => 1, text => "Bg. Music");
180 $table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{bg_music_enable}, connect_changed => sub {
181 my ($self, $value) = @_;
182 $CFG->{bg_music_enable} = $value;
183 });
184 $table->add (1, 10, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
185 audio_shutdown ();
186 audio_init ();
162 }); 187 });
163 188
164 $dialog 189 $dialog
165} 190}
166 191
… …
349 374
350 $window 375 $window
351} 376}
352 377
353sub sdl_init { 378sub sdl_init {
354 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE 379 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE
355 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO 380 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
356 and die "SDL::Init failed!\n"; 381 and die "SDL::Init failed!\n";
357} 382}
358 383
359sub init_screen { 384sub video_init {
360 sdl_init; 385 sdl_init;
361 386
362 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 387 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
363 $FULLSCREEN = $CFG->{fullscreen}; 388 $FULLSCREEN = $CFG->{fullscreen};
364 $FAST = $CFG->{fast}; 389 $FAST = $CFG->{fast};
… …
450 475
451 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg }; 476 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
452 $CFClient::UI::ROOT->add ($tgw); 477 $CFClient::UI::ROOT->add ($tgw);
453} 478}
454 479
455sub destroy_screen { 480sub video_shutdown {
456 $CFClient::UI::ROOT->{children} = []; 481 $CFClient::UI::ROOT->{children} = [];
457 undef $SDL_ACTIVE; 482 undef $SDL_ACTIVE;
458 undef $SDL_EV; 483 undef $SDL_EV;
459 SDL::Quit; 484}
485
486my $bgmusic;#TODO#hack#d#
487
488sub audio_init {
489 if ($CFG->{sound} || 1) {
490 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
491 $SDL_MIXER = new SDL::Mixer;
492 $SDL_MIXER->allocate_channels (8);
493
494 if ($CFG->{bg_music_enable}) {
495 $bgmusic = new SDL::Music CFClient::find_rcfile "music/game3.ogg";
496 $SDL_MIXER->play_music ($bgmusic, -1);
497 }
498
499 while (<$fh>) {
500 next if /^\s*#/;
501 next if /^\s*$/;
502
503 my ($file, $volume, $event) = split /\s+/, $_, 3;
504
505 push @SOUNDS, "$volume,$file";
506
507 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
508 my $chunk = new SDL::Sound CFClient::find_rcfile "sounds/$file";
509 $chunk->volume ($volume * 128 / 100);
510 $chunk
511 };
512 }
513 } else {
514 status "unable to open sound config: $!";
515 }
516 }
517}
518
519sub audio_shutdown {
520 undef $SDL_MIXER;
521 @SOUNDS = ();
522 %AUDIO_CHUNKS = ();
460} 523}
461 524
462my %animate_object; 525my %animate_object;
463my $animate_timer; 526my $animate_timer;
464 527
… …
634 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 697 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
635 698
636 $self->flush_map; 699 $self->flush_map;
637 700
638 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 701 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
639
640 warn "$ox $oy map_info<$flags, $x, $y, $w, $h, $hash>\n";#d#
641 702
642 my $mapmapw = 250; 703 my $mapmapw = 250;
643 my $mapmaph = 250; 704 my $mapmaph = 250;
644 705
645 $self->flood_fill ("", $hash, $flags, 706 $self->flood_fill ("", $hash, $flags,
… …
707 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 768 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
708 $MAPWIDGET->update; 769 $MAPWIDGET->update;
709 770
710 $tex 771 $tex
711 }; 772 };
773}
774
775sub conn::sound_play {
776 my ($self, $x, $y, $soundnum, $type) = @_;
777
778 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
779 or return;
780
781 $SDL_MIXER->play_channel (-1, $chunk);
782 warn "sound $x,$y,$soundnum,$type\n";#d#
712} 783}
713 784
714sub conn::query { 785sub conn::query {
715 my ($self, $flags, $prompt) = @_; 786 my ($self, $flags, $prompt) = @_;
716 787
… …
750 refresh; 821 refresh;
751 }, 822 },
752 SDL_KEYDOWN() => sub { 823 SDL_KEYDOWN() => sub {
753 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 824 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
754 # alt-enter 825 # alt-enter
755 destroy_screen; 826 video_shutdown;
756 $CFG->{fullscreen} = !$CFG->{fullscreen}; 827 $CFG->{fullscreen} = !$CFG->{fullscreen};
757 init_screen; 828 video_init;
758 } else { 829 } else {
759 CFClient::UI::feed_sdl_key_down_event ($SDL_EV); 830 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
760 } 831 }
761 }, 832 },
762 SDL_KEYUP() => sub { 833 SDL_KEYUP() => sub {
… …
776 }, 847 },
777); 848);
778 849
779############################################################################# 850#############################################################################
780 851
852$SIG{INT} = $SIG{TERM} = sub { exit };
853
781$TILECACHE = CFClient::db_table "tilecache"; 854$TILECACHE = CFClient::db_table "tilecache";
782$FACEMAP = CFClient::db_table "facemap"; 855$FACEMAP = CFClient::db_table "facemap";
783 856
784CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 857CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
785 858
… …
794 fow_smooth => 0, 867 fow_smooth => 0,
795 log_fontsize => 14, 868 log_fontsize => 14,
796 mapsize => 100, 869 mapsize => 100,
797 host => "crossfire.schmorp.de", 870 host => "crossfire.schmorp.de",
798 say_command => 'say', 871 say_command => 'say',
872 sound => 1,
873 bg_music_enable => 1,
799); 874);
800 875
801while (my ($k, $v) = each %DEF_CFG) { 876while (my ($k, $v) = each %DEF_CFG) {
802 $CFG->{$k} = $v unless exists $CFG->{$k}; 877 $CFG->{$k} = $v unless exists $CFG->{$k};
803} 878}
… …
818 893
819 CFClient::add_font $_ for @fonts; 894 CFClient::add_font $_ for @fonts;
820 CFClient::set_font $fonts[0]; 895 CFClient::set_font $fonts[0];
821} 896}
822 897
823init_screen; 898video_init;
899audio_init;
824 900
825Event::loop; 901Event::loop;
826 902
903END { SDL::Quit }
827 904
905

Diff Legend

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