--- deliantra/Deliantra-Client/bin/pclient 2006/04/17 19:36:27 1.123 +++ deliantra/Deliantra-Client/bin/pclient 2006/04/20 07:12:58 1.150 @@ -6,12 +6,6 @@ use Time::HiRes 'time'; use Event; -use SDL; -use SDL::App; -use SDL::Event; -use SDL::Surface; -use SDL::OpenGL; - use Crossfire; use Crossfire::Protocol; @@ -19,6 +13,7 @@ use CFClient; use CFClient::UI; +use CFClient::MapWidget; our $VERSION = '0.1'; @@ -51,24 +46,27 @@ our $CONSOLE; our $METASERVER; +our $GAUGES; + our $SDL_ACTIVE; -our $SDL_EV; our %SDL_CB; +our $SDL_MIXER; +our @SOUNDS; # event => file mapping +our %AUDIO_CHUNKS; # audio files + our $ALT_ENTER_MESSAGE; our $STATUS_LINE; our $DEBUG_STATUS; sub status { $STATUS_LINE->set_text ($_[0]); - my ($w, $h) = $STATUS_LINE->size_request; - $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h); + $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h}); } sub debug { $DEBUG_STATUS->set_text ($_[0]); - my ($w, $h) = $DEBUG_STATUS->size_request; - $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h); + $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h}); } sub start_game { @@ -102,15 +100,15 @@ sub client_setup { my $dialog = new CFClient::UI::FancyFrame + title => "Client Setup", child => (my $vbox = new CFClient::UI::VBox); - $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup"); $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); - $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode"); + $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); $table->add (1, 0, my $hbox = new CFClient::UI::HBox); $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); - $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8); + $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); $mode_slider->connect (changed => sub { my ($self, $value) = @_; @@ -120,45 +118,74 @@ }); $mode_slider->emit (changed => $mode_slider->{range}[0]); - $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen"); + $table->add (0, 1, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; }); - $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly"); + $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; }); - $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War"); + $table->add (0, 3, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; }); - $table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity"); + $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; }); - $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth"); + $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { my ($self, $value) = @_; $CFG->{fow_smooth} = $value; + status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; }); - $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize"); - $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub { - my ($self, $value) = @_; - $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value); + $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); + $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub { + $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10; +# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; }); - $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { - destroy_screen (); - init_screen (); + $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); + $table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub { + $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10); + }); + + $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { + video_shutdown (); + video_init (); + }); + + $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); + $table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub { + $CFG->{audio_enable} = $_[1]; + }); +# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); +# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub { +# $CFG->{effects_volume} = $_[1]; +# }); + $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); + $table->add (1, 10, my $hbox = new CFClient::UI::HBox); + $hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub { + $CFG->{bgm_enable} = $_[1]; + }); + $hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub { + $CFG->{bgm_volume} = $_[1]; + CFClient::MixMusic::volume $_[1] * 128; + }); + + $table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { + audio_shutdown (); + audio_init (); }); $dialog @@ -166,6 +193,7 @@ sub metaserver_dialog { my $dialog = new CFClient::UI::FancyFrame + title => "Metaserver", child => (my $vbox = new CFClient::UI::VBox); $vbox->add ($dialog->{table} = new CFClient::UI::Table); @@ -232,7 +260,7 @@ (new CFClient::UI::Empty expand => 1), ]); - $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8) + $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8) for 0 .. $#$m; } } @@ -241,46 +269,46 @@ sub server_setup { my $dialog = new CFClient::UI::FancyFrame + title => "Server Setup", child => (my $vbox = new CFClient::UI::VBox); - $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup"); $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); - $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port"); + $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); { $table->add (1, 2, my $vbox = new CFClient::UI::VBox); - $vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub { + $vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub { my ($self, $value) = @_; $CFG->{host} = $value; }); $METASERVER = metaserver_dialog; - $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub { + $vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub { update_metaserver $HOST; }); } - $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); + $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub { my ($self, $value) = @_; $CFG->{user} = $value; }); - $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password"); + $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub { my ($self, $value) = @_; $CFG->{password} = $value; }); - $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd"); + $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd"); $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub { my ($self, $value) = @_; $CFG->{say_command} = $value; }); - $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size"); + $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); $table->add (1, 7, new CFClient::UI::Slider req_w => 100, range => [$CFG->{mapsize}, 10, 100 + 1, 1], @@ -300,10 +328,11 @@ sub message_window { my $window = new CFClient::UI::FancyFrame + title => "Messages", border_bg => [1, 1, 1, 0.5], bg => [0.3, 0.3, 0.3, 0.8], - user_w => $::WIDTH/4, - user_h => $::HEIGHT, + user_w => int $::WIDTH / 3, + user_h => int $::HEIGHT / 5, child => (my $vbox = new CFClient::UI::VBox); $vbox->add ($LOGVIEW = new CFClient::UI::TextView @@ -351,41 +380,19 @@ } sub sdl_init { - #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE - SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO + CFClient::SDL_Init and die "SDL::Init failed!\n"; } -sub init_screen { +sub video_init { sdl_init; ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; $FULLSCREEN = $CFG->{fullscreen}; $FAST = $CFG->{fast}; - SDL::GLSetAttribute SDL_GL_RED_SIZE, 5; - SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5; - SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5; - SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1; - - SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0; - SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0; - SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0; - SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0; - - SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1; - SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15; - SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0; - - SDL::SetVideoMode $WIDTH, $HEIGHT, 0, - SDL_HWSURFACE | SDL_ANYFORMAT | SDL_OPENGL | SDL_DOUBLEBUF - | ($FULLSCREEN ? SDL_FULLSCREEN : 0) - or die "SDL::SetVideoMode failed!\n"; - - SDL::WMSetCaption "Crossfire+ Client", "Crossfire+"; - - $SDL_EV = new SDL::Event; - $SDL_EV->set_unicode (1); + CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN + or die "SDL_SetVideoMode failed!\n"; $SDL_ACTIVE = 1; @@ -393,26 +400,26 @@ CFClient::gl_init; - $FONTSIZE = int $HEIGHT / 40; + $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; ############################################################################# $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; - $CFClient::UI::ROOT->add ($DEBUG_STATUS); + $DEBUG_STATUS->show; $STATUS_LINE = new CFClient::UI::Label padding => 0, - y => $HEIGHT * 44 / 45 - $FONTSIZE; - $CFClient::UI::ROOT->add ($STATUS_LINE); + y => $HEIGHT - $FONTSIZE * 1.8; + $STATUS_LINE->show; $ALT_ENTER_MESSAGE = new CFClient::UI::Label padding => 0, - y => $HEIGHT * 44 / 45, - fontsize => $HEIGHT / 45, + fontsize => 0.8, markup => "Use Alt-Enter to toggle fullscreen mode"; - $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE); + $ALT_ENTER_MESSAGE->show; + $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h}); - $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget); + $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget); $MAPWIDGET->focus_in; $MAPWIDGET->connect (activate_console => sub { my ($mapwidget, $preset) = @_; @@ -439,13 +446,65 @@ }); $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup + + my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0, title => "Stats"); + $tgw->add (my $hbox = new CFClient::UI::HBox ()); + + $hbox->add (my $hg = new CFClient::UI::Gauge (type => 'hp')); + $hbox->add (my $mg = new CFClient::UI::Gauge (type => 'mana')); + $hbox->add (my $gg = new CFClient::UI::Gauge (type => 'grace')); + $hbox->add (my $fg = new CFClient::UI::Gauge (type => 'food')); + + $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg }; + $CFClient::UI::ROOT->add ($tgw); } -sub destroy_screen { +sub video_shutdown { $CFClient::UI::ROOT->{children} = []; undef $SDL_ACTIVE; - undef $SDL_EV; - SDL::Quit; +} + +my $bgmusic;#TODO#hack#d# + +sub audio_init { + if ($CFG->{audio_enable}) { + if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { + + $SDL_MIXER = !CFClient::Mix_OpenAudio; + CFClient::Mix_AllocateChannels 8; + CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; + + # TODO: hack, do play loop and mood music + if ($CFG->{bgm_enable}) { + $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/game3.ogg"; + $bgmusic->play; + } + + while (<$fh>) { + next if /^\s*#/; + next if /^\s*$/; + + my ($file, $volume, $event) = split /\s+/, $_, 3; + + push @SOUNDS, "$volume,$file"; + + $AUDIO_CHUNKS{"$volume,$file"} ||= do { + my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; + $chunk->volume ($volume * 128 / 100); + $chunk + }; + } + } else { + status "unable to open sound config: $!"; + } + } +} + +sub audio_shutdown { + CFClient::Mix_CloseAudio if $SDL_MIXER; + undef $SDL_MIXER; + @SOUNDS = (); + %AUDIO_CHUNKS = (); } my %animate_object; @@ -465,7 +524,7 @@ $CFClient::UI::ROOT->draw; - SDL::GLSwapBuffers; + CFClient::SDL_GL_SwapBuffers; $LAST_REFRESH = $NOW; } @@ -473,8 +532,8 @@ my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { $NOW = time; - ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() - while $SDL_EV->poll; + ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) + for CFClient::SDL_PollEvent; if (%animate_object) { $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; @@ -504,6 +563,27 @@ @conn::ISA = Crossfire::Protocol::; +sub conn::stats_update { + my ($self, $stats) = @_; + + # i love text protocols!!! + # FIXME: the stats are somehow weird + my $hp = $stats->{1}; + my $hp_m = $stats->{2}; + my $sp = $stats->{3}; + my $sp_m = $stats->{4}; + my $fo = $stats->{18}; + my $fo_m = 999; + my $gr = $stats->{23}; + my $gr_m = $stats->{24}; + + #d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n"; + $GAUGES->{hp} ->set_value ($hp, $hp_m); + $GAUGES->{mana} ->set_value ($sp, $sp_m); + $GAUGES->{food} ->set_value ($fo, $fo_m); + $GAUGES->{grace}->set_value ($gr, $gr_m); +} + sub conn::user_send { my ($self, $command) = @_; @@ -545,7 +625,7 @@ my ($self) = @_; $self->flush_map; - delete $self->{neigh}; + delete $self->{neigh_map}; $MAP->clear; } @@ -567,33 +647,53 @@ } sub conn::flood_fill { - my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_; + my ($self, $gx, $gy, $path, $hash, $flags) = @_; # the server does not allow map paths > 6 return if 6 <= length $path; - for my $tile (1..4) { - next if $self->{neigh}{$hash}[$tile]; + my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; + + for ( + [1, 0, -1], + [2, 1, 0], + [3, 0, 1], + [4, -1, 0], + ) { + my ($tile, $dx, $dy) = @$_; + + my $gx = $gx + $dx; + my $gy = $gy + $dy; + next unless $flags & (1 << ($tile - 1)); + next if $self->{neigh_grid}{$gx, $gy}++; - my $neigh = $self->{neigh}{$hash} ||= []; + my $neigh = $self->{neigh_map}{$hash} ||= []; + if (my $info = $neigh->[$tile]) { + my ($flags, $x, $y, $w, $h, $hash) = @$info; - $self->send_mapinfo ("spatial $path$tile", sub { - my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; + $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) + if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; - #warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d# - return if $mode ne "spatial"; + } else { + $self->send_mapinfo ("spatial $path$tile", sub { + my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; - $x += $MAP->ox; - $y += $MAP->oy; - - $self->load_map ($hash, $x, $y); + #warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d# + return if $mode ne "spatial"; - $neigh->[$tile] = [$x, $y, $w, $h]; + $x += $MAP->ox; + $y += $MAP->oy; + + $self->load_map ($hash, $x, $y) + unless $self->{neigh_map}{$hash}[5]++;#d# - $self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1) - if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; - }); + $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; + + $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) + if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; + }); + } } } @@ -604,14 +704,16 @@ my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); - warn "$ox $oy map_info<$flags, $x, $y, $w, $h, $hash>\n";#d# - my $mapmapw = 250; my $mapmaph = 250; + + $self->{neigh_rect} = [ + $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, + $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5, + ]; - $self->flood_fill ("", $hash, $flags, - $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, - $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5); + delete $self->{neigh_grid}; + $self->flood_fill (0, 0, "", $hash, $flags); $x += $ox; $y += $oy; @@ -678,10 +780,23 @@ }; } +sub conn::sound_play { + my ($self, $x, $y, $soundnum, $type) = @_; + + $SDL_MIXER + or return; + + my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]} + or return; + + $chunk->play; +# warn "sound $x,$y,$soundnum,$type\n";#d# +} + sub conn::query { my ($self, $flags, $prompt) = @_; - #TODO + #TODO, display dialog with relevant information warn "<<<>>\n";#d# } @@ -707,44 +822,70 @@ $LOGVIEW->add_paragraph ($color[$color], $text); } +sub conn::spell_add { + my ($self, $spell) = @_; + + $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub { + }); + $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub { + }); +} + +sub conn::spell_delete { + my ($self, $spell) = @_; +} + +sub conn::addme_success { + my ($self) = @_; + + for my $skill (values %{$self->{skill_info}}) { + $MAPWIDGET->add_command ("ready_skill $skill", "", sub { + }); + $MAPWIDGET->add_command ("use_skill $skill", "", sub { + }); + } +} + %SDL_CB = ( - SDL_QUIT() => sub { + CFClient::SDL_QUIT => sub { Event::unloop -1; }, - SDL_VIDEORESIZE() => sub { + CFClient::SDL_VIDEORESIZE => sub { }, - SDL_VIDEOEXPOSE() => sub { + CFClient::SDL_VIDEOEXPOSE => sub { refresh; }, - SDL_KEYDOWN() => sub { - if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { + CFClient::SDL_KEYDOWN => sub { + if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { # alt-enter - destroy_screen; + video_shutdown; $CFG->{fullscreen} = !$CFG->{fullscreen}; - init_screen; + video_init; } else { - CFClient::UI::feed_sdl_key_down_event ($SDL_EV); + CFClient::UI::feed_sdl_key_down_event ($_[0]); } }, - SDL_KEYUP() => sub { - CFClient::UI::feed_sdl_key_up_event ($SDL_EV); + CFClient::SDL_KEYUP => sub { + CFClient::UI::feed_sdl_key_up_event ($_[0]); }, - SDL_MOUSEMOTION() => sub { - CFClient::UI::feed_sdl_motion_event ($SDL_EV); + CFClient::SDL_MOUSEMOTION => sub { + CFClient::UI::feed_sdl_motion_event ($_[0]); }, - SDL_MOUSEBUTTONDOWN() => sub { - CFClient::UI::feed_sdl_button_down_event ($SDL_EV); + CFClient::SDL_MOUSEBUTTONDOWN => sub { + CFClient::UI::feed_sdl_button_down_event ($_[0]); }, - SDL_MOUSEBUTTONUP() => sub { - CFClient::UI::feed_sdl_button_up_event ($SDL_EV); + CFClient::SDL_MOUSEBUTTONUP => sub { + CFClient::UI::feed_sdl_button_up_event ($_[0]); }, - SDL_ACTIVEEVENT() => sub { + CFClient::SDL_ACTIVEEVENT => sub { # printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# }, ); ############################################################################# +$SIG{INT} = $SIG{TERM} = sub { exit }; + $TILECACHE = CFClient::db_table "tilecache"; $FACEMAP = CFClient::db_table "facemap"; @@ -759,10 +900,14 @@ fow_enable => 1, fow_intensity => 0.45, fow_smooth => 0, + gui_fontsize => 1, log_fontsize => 14, mapsize => 100, host => "crossfire.schmorp.de", say_command => 'say', + audio_enable => 1, + bgm_enable => 1, + bgm_volume => 0.25, ); while (my ($k, $v) = each %DEF_CFG) { @@ -773,8 +918,7 @@ @SDL_MODES = reverse grep $_->[0] >= 640 && $_->[1] >= 480, - map [SDL::RectW ($_), SDL::RectH ($_)], - @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL }; + CFClient::SDL_ListModes; @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; @@ -787,8 +931,11 @@ CFClient::set_font $fonts[0]; } -init_screen; +video_init; +audio_init; Event::loop; +END { CFClient::SDL_Quit } +