--- deliantra/Deliantra-Client/bin/pclient 2006/04/19 06:21:07 1.141 +++ deliantra/Deliantra-Client/bin/pclient 2006/04/23 05:33:24 1.167 @@ -6,17 +6,6 @@ use Time::HiRes 'time'; use Event; -use SDL; -use SDL::App; -use SDL::Event; -use SDL::Surface; - -use SDL::Mixer; -use SDL::Sound; -use SDL::Music; - -use SDL::OpenGL; - use Crossfire; use Crossfire::Protocol; @@ -58,9 +47,9 @@ our $METASERVER; our $GAUGES; +our $STATWIDS; our $SDL_ACTIVE; -our $SDL_EV; our %SDL_CB; our $SDL_MIXER; @@ -112,15 +101,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 valign => 0, 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 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 valign => 0, height => 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) = @_; @@ -130,81 +119,365 @@ }); $mode_slider->emit (changed => $mode_slider->{range}[0]); - $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; - }); + my $row = 1; - $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, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); + $table->add (1, $row++, new CFClient::UI::CheckBox + state => $CFG->{fullscreen}, + tooltip => "Bring the client into fullscreen mode", + connect_changed => sub { + my ($self, $value) = @_; + $CFG->{fullscreen} = $value; + } + ); - $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, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); + $table->add (1, $row++, new CFClient::UI::CheckBox + state => $CFG->{fast}, + tooltip => "Lower the visual quality considerably to speed up rendering.", + connect_changed => sub { + my ($self, $value) = @_; + $CFG->{fast} = $value; + } + ); - $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, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); + $table->add (1, $row++, new CFClient::UI::CheckBox + state => $CFG->{fow_enable}, + tooltip => "Fog-of-War marks areas that cannot be seen by the player", + connect_changed => sub { + my ($self, $value) = @_; + $CFG->{fow_enable} = $value; + } + ); - $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, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); + $table->add (1, $row++, new CFClient::UI::Slider + range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], + tooltip => "The higher the intensity, the lighter the Fog-of-War color", + connect_changed => sub { + my ($self, $value) = @_; + $CFG->{fow_intensity} = $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; + $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); + $table->add (1, $row++, new CFClient::UI::CheckBox + state => $CFG->{fow_smooth}, + tooltip => "Smooth the Fog-of-War a bit to make it more realistic", + 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, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); + $table->add (1, $row++, new CFClient::UI::Slider + range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], + tooltip => "The font size used by most GUI elements", + connect_changed => sub { + $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10; # $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; - }); + } + ); - $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 (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); + $table->add (1, $row++, new CFClient::UI::Slider + range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], + tooltip => "The font size used by the server log window only", + 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, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); - $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 (1, $row++, new CFClient::UI::Slider + range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], + tooltip => "The font size used by the statistics window only", + connect_changed => sub { + $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; + &set_stats_window_fontsize; + } + ); + + $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); + $table->add (1, $row++, new CFClient::UI::Slider + range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], + tooltip => "Adjust the size of the stats gauges at the bottom right", + connect_changed => sub { + $CFG->{gauge_size} = $_[1]; + my $h = int $HEIGHT * $CFG->{gauge_size}; + $GAUGES->{win}->set_size ($WIDTH, $h); + $GAUGES->{win}->move (0, $HEIGHT - $h); + } + ); + + $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); + $table->add (1, $row++, new CFClient::UI::Slider + range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], + tooltip => "Adjusts the fontsize of the gauges at the bottom right", + connect_changed => sub { + $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; + &set_gauge_window_fontsize; + #$GAUGES->{win}->check_size; + #$GAUGES->{win}->update; + } + ); + + $table->add (1, $row++, new CFClient::UI::Button + expand => 1, align => 0, text => "Apply", + tooltip => "Apply the video settings (unless they are auto-apply)", + connect_activate => sub { + video_shutdown (); + video_init (); + } + ); + + $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); + $table->add (1, $row++, new CFClient::UI::CheckBox + state => $CFG->{audio_enable}, + tooltip => "If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", + 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, 128, 1], connect_changed => sub { - $CFG->{bgm_volume} = $_[1]; - $SDL_MIXER->music_volume ($_[1]); - }); + $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); + $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); + $hbox->add (new CFClient::UI::CheckBox + expand => 1, state => $CFG->{bgm_enable}, + tooltip => "Enable background music playing", + connect_changed => sub { + $CFG->{bgm_enable} = $_[1]; + } + ); + $hbox->add (new CFClient::UI::Slider + expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], + tooltip => "The volume of the background music", + 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 (); - }); + $table->add (1, $row++, new CFClient::UI::Button + expand => 1, align => 0, text => "Apply", + tooltip => "Apply the audio settings that are not auto-apply", + connect_activate => sub { + audio_shutdown (); + audio_init (); + } + ); $dialog } +sub set_stats_window_fontsize { + for (values %{$STATWIDS}) { + $_->set_fontsize ($::CFG->{stat_fontsize}); + } +} + +sub set_gauge_window_fontsize { + for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { + $_->set_fontsize ($::CFG->{gauge_fontsize}); + } +} + +sub make_gauge_window { + my $gh = int ($HEIGHT * $CFG->{gauge_size}); +# my $gw = int ($WIDTH * $CFG->{gauge_w_size}); + + my $win = new CFClient::UI::Frame ( + y => $HEIGHT - $gh, x => 0, req_w => $WIDTH, req_h => $gh + ); + $win->add (my $vb = new CFClient::UI::VBox); + + $vb->add (my $hbg = new CFClient::UI::HBox expand => 1); + + + $hbg->add (new CFClient::UI::Empty expand => 1); + $hbg->add (my $hb = new CFClient::UI::HBox); + $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', tooltip => "Health points"); + $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', tooltip => "Spellpoints"); + $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', tooltip => "Grace"); + $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', tooltip => "Food"); + + $vb->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, text => "XP: 0 LVL: 0"); + $vb->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, text => "Rng:"); + + $GAUGES = { + exp => $exp, win => $win, range => $rng, + food => $fg, mana => $mg, hp => $hg, grace => $gg + }; + $win +} + +sub make_stats_window { + my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats"); + + $tgw->add (my $vb = new CFClient::UI::VBox); + $vb->add (my $uhb = new CFClient::UI::HBox); + $uhb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1); + $uhb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1); + + $vb->add (my $hb = new CFClient::UI::HBox expand => 1); + + $hb->add (my $tbl = new CFClient::UI::Table expand => 1); + + $tbl->add (0, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Str"); + $tbl->add (0, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dex"); + $tbl->add (0, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Con"); + $tbl->add (0, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Int"); + $tbl->add (0, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wis"); + $tbl->add (0, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Pow"); + $tbl->add (0, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Cha"); + + $tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, text => ""); + $tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, text => ""); + $tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, text => ""); + $tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, text => ""); + $tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, text => ""); + $tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, text => ""); + $tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, text => ""); + + $tbl->add (2, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wc"); + $tbl->add (2, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ac"); + $tbl->add (2, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dam"); + $tbl->add (2, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Arm"); + $tbl->add (2, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Sp"); + $tbl->add (2, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "WSp"); + + $tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, text => ""); + $tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, text => ""); + $tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, text => ""); + $tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, text => ""); + $tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, text => ""); + $tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, text => ""); + + $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); + + my $row = 0; + my $col = 0; + + my %resist_names = ( + slow => "Slow", + holyw => "Holy Word", + conf => "Confusion", + fire => "Fire", + depl => "Depletion", + magic => "Magic", + drain => "Draining", + acid => "Acid", + pois => "Poison", + para => "Paralysation", + deat => "Death", + phys => "Physical", + blind => "Blind", + fear => "Fear", + tund => "Turn undead", + elec => "Electricity", + cold => "Cold", + ghit => "Ghost hit", + ); + for (qw/slow holyw conf fire depl magic + drain acid pois para deat phys + blind fear tund elec cold ghit/) + { + $tbl2->add ($col, $row, + $STATWIDS->{"res_$_"} = + new CFClient::UI::Label text => "0", align => +1, valign => 0 + ); + $tbl2->add ($col + 1, $row, new CFClient::UI::Image can_hover => 1, can_events => 1, image => "ui/resist/resist_$_.png", tooltip => $resist_names{$_}); + + $row++; + if ($row % 6 == 0) { + $col += 2; + $row = 0; + } + } + + &set_stats_window_fontsize; + update_stats_window ({}); + + $tgw +} + +sub update_stats_window { + my ($stats) = @_; + + # i love text protocols!!! + my $hp = $stats->{1} * 1; + my $hp_m = $stats->{2} * 1; + my $sp = $stats->{3} * 1; + my $sp_m = $stats->{4} * 1; + my $fo = $stats->{18} * 1; + my $fo_m = 999; + my $gr = $stats->{23} * 1; + my $gr_m = $stats->{24} * 1; + + $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); + $GAUGES->{exp} ->set_text ("XP: " . ($stats->{11} || $stats->{28}) * 1 + ." LVL: " . $stats->{12} * 1); + my $rng = $stats->{20}; + $rng =~ s/^Range: //; # thank you so much dear server + $GAUGES->{range} ->set_text ("Rng: " . $rng); + my $title = $stats->{21}; + $title =~ s/^Player: //; + $STATWIDS->{title} ->set_text ("Title: " . $title); + + $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5}); + $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8}); + $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9}); + $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6}); + $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7}); + $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22}); + $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10}); + $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13}); + $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14}); + $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15}); + $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16}); + $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17}); + $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19}); + + my %tbl = ( + phys => 100, + magic => 101, + fire => 102, + elec => 103, + cold => 104, + conf => 105, + acid => 106, + drain => 107, + ghit => 108, + pois => 109, + slow => 110, + para => 111, + tund => 112, + fear => 113, + depl => 113, + deat => 115, + holyw => 116, + blind => 117 + ); + + for (keys %tbl) { + $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}); + } + +} + 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); @@ -280,49 +553,78 @@ 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 valign => 0, 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 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 expand => 1, text => $CFG->{host}, connect_changed => sub { - my ($self, $value) = @_; - $CFG->{host} = $value; - }); + $vbox->add ( + my $HOST = new CFClient::UI::Entry + expand => 1, + text => $CFG->{host}, + tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", + connect_changed => sub { + my ($self, $value) = @_; + $CFG->{host} = $value; + } + ); $METASERVER = metaserver_dialog; - $vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub { - update_metaserver $HOST; - }); + $vbox->add (new CFClient::UI::Flopper + expand => 1, + text => "Metaserver", + other => $METASERVER, + tooltip => "Show a list of avaible crossfire servers", + connect_open => sub { + update_metaserver $HOST; + } + ); } $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 (1, 4, new CFClient::UI::Entry + text => $CFG->{user}, + tooltip => "The name of your character on the server", + connect_changed => sub { + my ($self, $value) = @_; + $CFG->{user} = $value; + } + ); $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 (1, 5, new CFClient::UI::Entry + text => $CFG->{password}, + hidden => 1, + tooltip => "The password for your character", + connect_changed => sub { + my ($self, $value) = @_; + $CFG->{password} = $value; + } + ); $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 (1, 6, my $saycmd = new CFClient::UI::Entry + text => $CFG->{say_command}, + tooltip => "This is the command that will be used if you write a line in the message window entry. " + ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " + ."But you could also set it to 'tell ' to only chat with that user.", + connect_changed => sub { + my ($self, $value) = @_; + $CFG->{say_command} = $value; + } + ); $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], + tooltip => "This is the size of the portion of the map update the server sends you. " + ."If you set this to a high value you will be able to see further for example.", connect_changed => sub { my ($self, $value) = @_; @@ -339,6 +641,7 @@ 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 => int $::WIDTH / 3, @@ -390,8 +693,7 @@ } 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"; } @@ -402,29 +704,8 @@ $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; @@ -472,45 +753,43 @@ $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); + $CFClient::UI::ROOT->add (make_gauge_window); # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D + $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); + $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; status "Configuration Saved"; }); $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup - - my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0); - $tgw->add (my $hbox = new CFClient::UI::HBox ()); - - $hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp')); - $hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana')); - $hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace')); - $hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food')); - - $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg }; - $CFClient::UI::ROOT->add ($tgw); } sub video_shutdown { $CFClient::UI::ROOT->{children} = []; undef $SDL_ACTIVE; - undef $SDL_EV; } +my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# my $bgmusic;#TODO#hack#d# +sub audio_music_finished { + return unless $CFG->{bgm_enable}; + + # TODO: hack, do play loop and mood music + $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]"; + $bgmusic->play (0); + + push @bgmusic, shift @bgmusic; +} + sub audio_init { if ($CFG->{audio_enable}) { if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { - $SDL_MIXER = new SDL::Mixer; - $SDL_MIXER->allocate_channels (8); + $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 SDL::Music CFClient::find_rcfile "music/game3.ogg"; - $SDL_MIXER->play_music ($bgmusic, -1); - $SDL_MIXER->music_volume ($CFG->{bgm_volume}); - } + audio_music_finished; while (<$fh>) { next if /^\s*#/; @@ -521,7 +800,7 @@ push @SOUNDS, "$volume,$file"; $AUDIO_CHUNKS{"$volume,$file"} ||= do { - my $chunk = new SDL::Sound CFClient::find_rcfile "sounds/$file"; + my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; $chunk->volume ($volume * 128 / 100); $chunk }; @@ -533,6 +812,7 @@ } sub audio_shutdown { + CFClient::Mix_CloseAudio if $SDL_MIXER; undef $SDL_MIXER; @SOUNDS = (); %AUDIO_CHUNKS = (); @@ -555,7 +835,7 @@ $CFClient::UI::ROOT->draw; - SDL::GLSwapBuffers; + CFClient::SDL_GL_SwapBuffers; $LAST_REFRESH = $NOW; } @@ -563,8 +843,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; @@ -597,22 +877,7 @@ 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 = 1000; - 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); + update_stats_window ($stats); } sub conn::user_send { @@ -647,16 +912,14 @@ my $data = $MAP->get_rect ($x, $y, $w, $h); $MAPCACHE->put ($hash => Compress::LZF::compress $data); - - warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# - + #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# } sub conn::map_clear { my ($self) = @_; $self->flush_map; - delete $self->{neigh}; + delete $self->{neigh_map}; $MAP->clear; } @@ -667,7 +930,7 @@ if (defined (my $data = $MAPCACHE->get ($hash))) { $data = Compress::LZF::decompress $data; - warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# + #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# for my $id ($MAP->set_rect ($x, $y, $data)) { my $data = $TILECACHE->get ($id) or next; @@ -677,35 +940,58 @@ } } +# this method does a "flood fill" into every tile direction +# it assumes that tiles are arranged in a rectangular grid, +# i.e. a map is the same as the left of the right map etc. +# failure to comply are harmless and result in display errors +# at worst. 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) - unless $self->{neigh}{$hash}[5]++;#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; + }); + } } } @@ -718,16 +1004,24 @@ my $mapmapw = 250; my $mapmaph = 250; + + $self->{neigh_rect} = [ + $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, + $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, + ]; - $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; $self->{map_info} = [$hash, $x, $y, $w, $h]; + my $map = $self->{map_info}[0]; + $map =~ s/^.*?\/([^\/]+)$/\1/; + $STATWIDS->{map}->set_text ("Map: " . $map); + $self->load_map ($hash, $x, $y); } @@ -797,14 +1091,14 @@ my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]} or return; - $SDL_MIXER->play_channel (-1, $chunk); - warn "sound $x,$y,$soundnum,$type\n";#d# + $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# } @@ -830,40 +1124,55 @@ $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 { - refresh; + CFClient::SDL_VIDEOEXPOSE => \&refresh, + CFClient::SDL_ACTIVEEVENT => sub { +# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# }, - 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 video_shutdown; $CFG->{fullscreen} = !$CFG->{fullscreen}; 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); - }, - SDL_MOUSEMOTION() => sub { - CFClient::UI::feed_sdl_motion_event ($SDL_EV); - }, - SDL_MOUSEBUTTONDOWN() => sub { - CFClient::UI::feed_sdl_button_down_event ($SDL_EV); - }, - SDL_MOUSEBUTTONUP() => sub { - CFClient::UI::feed_sdl_button_up_event ($SDL_EV); - }, - SDL_ACTIVEEVENT() => sub { -# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# - }, + CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, + CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, + CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, + CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, + CFClient::SDL_USEREVENT => \&audio_music_finished, ); ############################################################################# @@ -885,13 +1194,16 @@ fow_intensity => 0.45, fow_smooth => 0, gui_fontsize => 1, - log_fontsize => 14, + log_fontsize => 1, + gauge_fontsize => 1, + gauge_size => 0.35, + stat_fontsize => 1, mapsize => 100, host => "crossfire.schmorp.de", say_command => 'say', audio_enable => 1, bgm_enable => 1, - bgm_volume => 64, + bgm_volume => 0.25, ); while (my ($k, $v) = each %DEF_CFG) { @@ -902,8 +1214,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)"; @@ -921,6 +1232,6 @@ Event::loop; -END { SDL::Quit } +END { CFClient::SDL_Quit }