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.146 by root, Wed Apr 19 21:17:16 2006 UTC vs.
Revision 1.177 by root, Mon Apr 24 11:45:17 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6BEGIN {
7 if (%PAR::LibCache) {
8 @INC = grep ref, @INC; # weed out all paths except pars loader refs
9
10 while (my ($filename, $zip) = each %PAR::LibCache) {
11 for ($zip->memberNames) {
12 next unless /^\/root\/(.*)/;
13 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
14 unless -e "$ENV{PAR_TEMP}/$1";
15 }
16 }
17
18 unshift @INC, $ENV{PAR_TEMP};
19
20 if ($^O eq "MSWin32") {
21 $ENV{GTK_RC_FILES} = "$ENV{PAR_TEMP}/share/themes/MS-Windows/gtk-2.0/gtkrc";
22 }
23 }
24}
25
26# need to do it again because that pile of garbage called PAR nukes it before main
27unshift @INC, $ENV{PAR_TEMP};
28
6use Time::HiRes 'time'; 29use Time::HiRes 'time';
7use Event; 30use Event;
8
9use SDL::Event;
10
11use SDL::OpenGL;
12 31
13use Crossfire; 32use Crossfire;
14use Crossfire::Protocol; 33use Crossfire::Protocol;
15 34
16use Compress::LZF; 35use Compress::LZF;
17 36
18use CFClient; 37use CFClient;
19use CFClient::UI; 38use CFClient::UI;
20use CFClient::MapWidget; 39use CFClient::MapWidget;
40
41$Event::DIED = sub {
42 CFClient::error $_[1];
43};
21 44
22our $VERSION = '0.1'; 45our $VERSION = '0.1';
23 46
24my $MAX_FPS = 60; 47my $MAX_FPS = 60;
25my $MIN_FPS = 5; # unused as of yet 48my $MIN_FPS = 5; # unused as of yet
… …
40our @SDL_MODES; 63our @SDL_MODES;
41our $WIDTH; 64our $WIDTH;
42our $HEIGHT; 65our $HEIGHT;
43our $FULLSCREEN; 66our $FULLSCREEN;
44our $FONTSIZE; 67our $FONTSIZE;
68
69our $FONT_PROP;
70our $FONT_FIXED;
45 71
46our $MAP; 72our $MAP;
47our $MAPWIDGET; 73our $MAPWIDGET;
48our $BUTTONBAR; 74our $BUTTONBAR;
49our $LOGVIEW; 75our $LOGVIEW;
50our $CONSOLE; 76our $CONSOLE;
51our $METASERVER; 77our $METASERVER;
52 78
79our $FLOORBOX;
53our $GAUGES; 80our $GAUGES;
81our $STATWIDS;
54 82
55our $SDL_ACTIVE; 83our $SDL_ACTIVE;
56our $SDL_EV;
57our %SDL_CB; 84our %SDL_CB;
58 85
59our $SDL_MIXER; 86our $SDL_MIXER;
60our @SOUNDS; # event => file mapping 87our @SOUNDS; # event => file mapping
61our %AUDIO_CHUNKS; # audio files 88our %AUDIO_CHUNKS; # audio files
… …
103 undef $CONN; 130 undef $CONN;
104} 131}
105 132
106sub client_setup { 133sub client_setup {
107 my $dialog = new CFClient::UI::FancyFrame 134 my $dialog = new CFClient::UI::FancyFrame
135 title => "Client Setup",
108 child => (my $vbox = new CFClient::UI::VBox); 136 child => (my $vbox = new CFClient::UI::VBox);
109 $vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Client Setup");
110 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 137 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
111 138
112 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 139 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
113 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 140 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
114 141
115 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 142 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
116 $hbox->add (my $mode_label = new CFClient::UI::Label valign => 0, height => 0.8); 143 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
117 144
118 $mode_slider->connect (changed => sub { 145 $mode_slider->connect (changed => sub {
119 my ($self, $value) = @_; 146 my ($self, $value) = @_;
120 147
121 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 148 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
122 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 149 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
123 }); 150 });
124 $mode_slider->emit (changed => $mode_slider->{range}[0]); 151 $mode_slider->emit (changed => $mode_slider->{range}[0]);
125 152
153 my $row = 1;
154
126 $table->add (0, 1, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 155 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
127 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub { 156 $table->add (1, $row++, new CFClient::UI::CheckBox
157 state => $CFG->{fullscreen},
158 tooltip => "Bring the client into fullscreen mode",
159 connect_changed => sub {
128 my ($self, $value) = @_; 160 my ($self, $value) = @_;
129 $CFG->{fullscreen} = $value; 161 $CFG->{fullscreen} = $value;
162 }
130 }); 163 );
131 164
132 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 165 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
133 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub { 166 $table->add (1, $row++, new CFClient::UI::CheckBox
167 state => $CFG->{fast},
168 tooltip => "Lower the visual quality considerably to speed up rendering.",
169 connect_changed => sub {
134 my ($self, $value) = @_; 170 my ($self, $value) = @_;
135 $CFG->{fast} = $value; 171 $CFG->{fast} = $value;
172 }
136 }); 173 );
137 174
175 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
176 $table->add (1, $row++, new CFClient::UI::Slider
177 range => [$CFG->{map_scale}, 0.25, 2, 0.05],
178 tooltip => "Enlarge or shrink the displayed map",
179 connect_changed => sub {
180 my ($self, $value) = @_;
181 $CFG->{map_scale} = 0.05 * int $value / 0.05;
182 }
183 );
184
138 $table->add (0, 3, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 185 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
139 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub { 186 $table->add (1, $row++, new CFClient::UI::CheckBox
187 state => $CFG->{fow_enable},
188 tooltip => "Fog-of-War marks areas that cannot be seen by the player",
189 connect_changed => sub {
140 my ($self, $value) = @_; 190 my ($self, $value) = @_;
141 $CFG->{fow_enable} = $value; 191 $CFG->{fow_enable} = $value;
192 }
142 }); 193 );
143 194
144 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 195 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
145 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub { 196 $table->add (1, $row++, new CFClient::UI::Slider
197 range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001],
198 tooltip => "The higher the intensity, the lighter the Fog-of-War color",
199 connect_changed => sub {
146 my ($self, $value) = @_; 200 my ($self, $value) = @_;
147 $CFG->{fow_intensity} = $value; 201 $CFG->{fow_intensity} = $value;
202 }
148 }); 203 );
149 204
150 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 205 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
151 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { 206 $table->add (1, $row++, new CFClient::UI::CheckBox
207 state => $CFG->{fow_smooth},
208 tooltip => "Smooth the Fog-of-War a bit to make it more realistic",
209 connect_changed => sub {
152 my ($self, $value) = @_; 210 my ($self, $value) = @_;
153 $CFG->{fow_smooth} = $value; 211 $CFG->{fow_smooth} = $value;
154 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 212 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
213 }
155 }); 214 );
156 215
157 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 216 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
158 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub { 217 $table->add (1, $row++, new CFClient::UI::Slider
218 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1],
219 tooltip => "The font size used by most GUI elements",
220 connect_changed => sub {
159 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10; 221 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
160# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 222# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
223 }
161 }); 224 );
162 225
163 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); 226 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
164 $table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub { 227 $table->add (1, $row++, new CFClient::UI::Slider
228 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1],
229 tooltip => "The font size used by the server log window only",
230 connect_changed => sub {
165 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10); 231 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
232 }
166 }); 233 );
167 234
168 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 235 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
236
237 $table->add (1, $row++, new CFClient::UI::Slider
238 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1],
239 tooltip => "The font size used by the statistics window only",
240 connect_changed => sub {
241 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
242 &set_stats_window_fontsize;
243 }
244 );
245
246 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
247 $table->add (1, $row++, new CFClient::UI::Slider
248 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
249 tooltip => "Adjust the size of the stats gauges at the bottom right",
250 connect_changed => sub {
251 $CFG->{gauge_size} = $_[1];
252 my $h = int $HEIGHT * $CFG->{gauge_size};
253 $GAUGES->{win}->set_size ($WIDTH, $h);
254 $GAUGES->{win}->move (0, $HEIGHT - $h);
255 }
256 );
257
258 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
259 $table->add (1, $row++, new CFClient::UI::Slider
260 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
261 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
262 connect_changed => sub {
263 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
264 &set_gauge_window_fontsize;
265 }
266 );
267
268 $table->add (1, $row++, new CFClient::UI::Button
269 expand => 1, align => 0, text => "Apply",
270 tooltip => "Apply the video settings",
271 connect_activate => sub {
169 video_shutdown (); 272 video_shutdown ();
170 video_init (); 273 video_init ();
274 }
171 }); 275 );
172 276
173 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 277 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
174 $table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub { 278 $table->add (1, $row++, new CFClient::UI::CheckBox
279 state => $CFG->{audio_enable},
280 tooltip => "If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
281 connect_changed => sub {
175 $CFG->{audio_enable} = $_[1]; 282 $CFG->{audio_enable} = $_[1];
283 }
176 }); 284 );
177# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 285# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
178# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub { 286# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
179# $CFG->{effects_volume} = $_[1]; 287# $CFG->{effects_volume} = $_[1];
180# }); 288# });
181 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 289 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
182 $table->add (1, 10, my $hbox = new CFClient::UI::HBox); 290 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
183 $hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub { 291 $hbox->add (new CFClient::UI::CheckBox
292 expand => 1, state => $CFG->{bgm_enable},
293 tooltip => "Enable background music playing",
294 connect_changed => sub {
184 $CFG->{bgm_enable} = $_[1]; 295 $CFG->{bgm_enable} = $_[1];
296 }
185 }); 297 );
186 $hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub { 298 $hbox->add (new CFClient::UI::Slider
299 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1],
300 tooltip => "The volume of the background music",
301 connect_changed => sub {
187 $CFG->{bgm_volume} = $_[1]; 302 $CFG->{bgm_volume} = $_[1];
188 CFClient::Mix_VolumeMusic ($_[1]); 303 CFClient::MixMusic::volume $_[1] * 128;
304 }
189 }); 305 );
190 306
191 $table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 307 $table->add (1, $row++, new CFClient::UI::Button
308 expand => 1, align => 0, text => "Apply",
309 tooltip => "Apply the audio settings",
310 connect_activate => sub {
192 audio_shutdown (); 311 audio_shutdown ();
193 audio_init (); 312 audio_init ();
313 }
194 }); 314 );
195 315
196 $dialog 316 $dialog
317}
318
319sub set_stats_window_fontsize {
320 for (values %{$STATWIDS}) {
321 $_->set_fontsize ($::CFG->{stat_fontsize});
322 }
323}
324
325sub set_gauge_window_fontsize {
326 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
327 $_->set_fontsize ($::CFG->{gauge_fontsize});
328 }
329
330# local $GAUGES->{win}{parent};#d#
331# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
332}
333
334sub make_gauge_window {
335 my $gh = int ($HEIGHT * $CFG->{gauge_size});
336# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
337
338 my $win = new CFClient::UI::Frame (
339 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh
340 );
341 $win->add (my $hbox = new CFClient::UI::HBox
342 children => [
343 (new CFClient::UI::HBox expand => 1),
344 ($FLOORBOX = new CFClient::UI::VBox),
345 (my $vbox = new CFClient::UI::VBox),
346 ],
347 );
348
349 $vbox->add (new CFClient::UI::HBox
350 expand => 1,
351 children => [
352 (new CFClient::UI::Empty expand => 1),
353 (my $hb = new CFClient::UI::HBox),
354 ],
355 );
356
357 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
358 tooltip => "Health points - depletes when you get wounded, refills when you heal or idle");
359 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
360 tooltip => "Spell points - deplete when you cast wizard spells, refills when you idle");
361 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
362 tooltip => "Grace points - deplete when you cast priest spells, refills when you pray");
363 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
364 tooltip => "Food - depletes with time, faster when you heal or build mana, refills when you eat healthy food");
365
366 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
367 tooltip => "Experience points and level - increases when you kill monsters or successfully use skills");
368 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
369 tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
370
371 $GAUGES = {
372 exp => $exp, win => $win, range => $rng,
373 food => $fg, mana => $mg, hp => $hg, grace => $gg
374 };
375
376 &set_gauge_window_fontsize;
377
378 $win
379}
380
381sub make_stats_window {
382 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
383
384 $tgw->add (my $vb = new CFClient::UI::VBox);
385 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
386 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
387
388 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
389
390 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
391
392 my $black = [0, 0, 0];
393
394 $tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
395 $tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
396 $tbl->add (0, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
397 $tbl->add (0, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
398 $tbl->add (0, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
399 $tbl->add (0, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
400 $tbl->add (0, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
401
402 $tbl->add (1, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Str");
403 $tbl->add (1, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Dex");
404 $tbl->add (1, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Con");
405 $tbl->add (1, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Int");
406 $tbl->add (1, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Wis");
407 $tbl->add (1, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Pow");
408 $tbl->add (1, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Cha");
409
410 $tbl->add (2, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, template => "-120");
411 $tbl->add (2, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, template => "-120");
412 $tbl->add (2, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, template => "120");
413 $tbl->add (2, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, template => "120");
414 $tbl->add (2, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, template => "10.54");
415 $tbl->add (2, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, template => "9");
416
417 $tbl->add (3, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Wc");
418 $tbl->add (3, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Ac");
419 $tbl->add (3, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Dam");
420 $tbl->add (3, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Arm");
421 $tbl->add (3, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Sp");
422 $tbl->add (3, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "WSp");
423
424 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
425
426 my $row = 0;
427 my $col = 0;
428
429 my %resist_names = (
430 slow => "Slow",
431 holyw => "Holy Word",
432 conf => "Confusion",
433 fire => "Fire",
434 depl => "Depletion",
435 magic => "Magic",
436 drain => "Draining",
437 acid => "Acid",
438 pois => "Poison",
439 para => "Paralysation",
440 deat => "Death",
441 phys => "Physical",
442 blind => "Blind",
443 fear => "Fear",
444 tund => "Turn undead",
445 elec => "Electricity",
446 cold => "Cold",
447 ghit => "Ghost hit",
448 );
449 for (qw/slow holyw conf fire depl magic
450 drain acid pois para deat phys
451 blind fear tund elec cold ghit/)
452 {
453 $tbl2->add ($col, $row,
454 $STATWIDS->{"res_$_"} =
455 new CFClient::UI::Label
456 template => "-100%",
457 align => +1,
458 valign => 0,
459 tooltip => $resist_names{$_}
460 );
461 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
462 can_hover => 1,
463 can_events => 1,
464 image => "ui/resist/resist_$_.png",
465 tooltip => $resist_names{$_}
466 );
467
468 $row++;
469 if ($row % 6 == 0) {
470 $col += 2;
471 $row = 0;
472 }
473 }
474
475 &set_stats_window_fontsize;
476 update_stats_window ({});
477
478 $tgw
479}
480
481sub formsep {
482 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1
483}
484
485sub update_stats_window {
486 my ($stats) = @_;
487
488 # i love text protocols!!!
489 my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1;
490 my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1;
491 my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1;
492 my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1;
493 my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1;
494 my $fo_m = 999;
495 my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1;
496 my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1;
497
498 $GAUGES->{hp} ->set_value ($hp, $hp_m);
499 $GAUGES->{mana} ->set_value ($sp, $sp_m);
500 $GAUGES->{food} ->set_value ($fo, $fo_m);
501 $GAUGES->{grace} ->set_value ($gr, $gr_m);
502 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64})
503 . " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")");
504 my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE};
505 $rng =~ s/^Range: //; # thank you so much dear server
506 $GAUGES->{range} ->set_text ("Rng: " . $rng);
507 my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE};
508 $title =~ s/^Player: //;
509 $STATWIDS->{title} ->set_text ("Title: " . $title);
510
511 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
512 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
513 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
514 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
515 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
516 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
517 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
518 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
519 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
520 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
521 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
522 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_SPEED});
523 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_WEAP_SP});
524
525 my %tbl = (
526 phys => 100,
527 magic => 101,
528 fire => 102,
529 elec => 103,
530 cold => 104,
531 conf => 105,
532 acid => 106,
533 drain => 107,
534 ghit => 108,
535 pois => 109,
536 slow => 110,
537 para => 111,
538 tund => 112,
539 fear => 113,
540 depl => 113,
541 deat => 115,
542 holyw => 116,
543 blind => 117
544 );
545
546 for (keys %tbl) {
547 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
548 }
549
197} 550}
198 551
199sub metaserver_dialog { 552sub metaserver_dialog {
200 my $dialog = new CFClient::UI::FancyFrame 553 my $dialog = new CFClient::UI::FancyFrame
554 title => "Metaserver",
201 child => (my $vbox = new CFClient::UI::VBox); 555 child => (my $vbox = new CFClient::UI::VBox);
202 556
203 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 557 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
204 558
205 $dialog 559 $dialog
… …
271 }); 625 });
272} 626}
273 627
274sub server_setup { 628sub server_setup {
275 my $dialog = new CFClient::UI::FancyFrame 629 my $dialog = new CFClient::UI::FancyFrame
630 title => "Server Setup",
276 child => (my $vbox = new CFClient::UI::VBox); 631 child => (my $vbox = new CFClient::UI::VBox);
277 632
278 $vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Server Setup");
279 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 633 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
280 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 634 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
281 635
282 { 636 {
283 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 637 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
284 638
285 $vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub { 639 $vbox->add (
640 my $HOST = new CFClient::UI::Entry
641 expand => 1,
642 text => $CFG->{host},
643 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
644 connect_changed => sub {
645 my ($self, $value) = @_;
646 $CFG->{host} = $value;
647 }
648 );
649
650 $METASERVER = metaserver_dialog;
651
652 $vbox->add (new CFClient::UI::Flopper
653 expand => 1,
654 text => "Metaserver",
655 other => $METASERVER,
656 tooltip => "Show a list of avaible crossfire servers",
657 connect_open => sub {
658 update_metaserver $HOST;
659 }
660 );
661 }
662
663 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
664 $table->add (1, 4, new CFClient::UI::Entry
665 text => $CFG->{user},
666 tooltip => "The name of your character on the server",
667 connect_changed => sub {
286 my ($self, $value) = @_; 668 my ($self, $value) = @_;
287 $CFG->{host} = $value;
288 });
289
290 $METASERVER = metaserver_dialog;
291
292 $vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
293 update_metaserver $HOST;
294 });
295 }
296
297 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
298 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
299 my ($self, $value) = @_;
300 $CFG->{user} = $value; 669 $CFG->{user} = $value;
670 }
301 }); 671 );
302 672
303 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 673 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
304 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub { 674 $table->add (1, 5, new CFClient::UI::Entry
675 text => $CFG->{password},
676 hidden => 1,
677 tooltip => "The password for your character",
678 connect_changed => sub {
305 my ($self, $value) = @_; 679 my ($self, $value) = @_;
306 $CFG->{password} = $value; 680 $CFG->{password} = $value;
681 }
307 }); 682 );
308 683
309 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd"); 684 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
310 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub { 685 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
686 text => $CFG->{say_command},
687 tooltip => "This is the command that will be used if you write a line in the message window entry. "
688 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
689 ."But you could also set it to 'tell &lt;playername&gt;' to only chat with that user.",
690 connect_changed => sub {
311 my ($self, $value) = @_; 691 my ($self, $value) = @_;
312 $CFG->{say_command} = $value; 692 $CFG->{say_command} = $value;
693 }
313 }); 694 );
314 695
315 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 696 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
316 $table->add (1, 7, new CFClient::UI::Slider 697 $table->add (1, 7, new CFClient::UI::Slider
317 req_w => 100, 698 req_w => 100,
318 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 699 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
700 tooltip => "This is the size of the portion of the map update the server sends you. "
701 ."If you set this to a high value you will be able to see further for example.",
319 connect_changed => sub { 702 connect_changed => sub {
320 my ($self, $value) = @_; 703 my ($self, $value) = @_;
321 704
322 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 705 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
323 }, 706 },
… …
330 $dialog 713 $dialog
331} 714}
332 715
333sub message_window { 716sub message_window {
334 my $window = new CFClient::UI::FancyFrame 717 my $window = new CFClient::UI::FancyFrame
718 title => "Messages",
335 border_bg => [1, 1, 1, 0.5], 719 border_bg => [1, 1, 1, 0.5],
336 bg => [0.3, 0.3, 0.3, 0.8], 720 bg => [0.3, 0.3, 0.3, 0.8],
337 user_w => int $::WIDTH / 3, 721 user_w => int $::WIDTH / 3,
338 user_h => int $::HEIGHT / 5, 722 user_h => int $::HEIGHT / 5,
339 child => (my $vbox = new CFClient::UI::VBox); 723 child => (my $vbox = new CFClient::UI::VBox);
340 724
341 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 725 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
342 expand => 1, 726 expand => 1,
727 font => $FONT_FIXED,
343 fontsize => $::CFG->{log_fontsize}, 728 fontsize => $::CFG->{log_fontsize},
344 ); 729 );
345 730
346 $vbox->add (my $input = new CFClient::UI::Entry 731 $vbox->add (my $input = new CFClient::UI::Entry
347 connect_focus_in => sub { 732 connect_focus_in => sub {
… …
395 $FAST = $CFG->{fast}; 780 $FAST = $CFG->{fast};
396 781
397 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 782 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
398 or die "SDL_SetVideoMode failed!\n"; 783 or die "SDL_SetVideoMode failed!\n";
399 784
400 $SDL_EV = new SDL::Event;
401 $SDL_EV->set_unicode (1);
402
403 $SDL_ACTIVE = 1; 785 $SDL_ACTIVE = 1;
404 786
405 $LAST_REFRESH = time - 0.01; 787 $LAST_REFRESH = time - 0.01;
406 788
407 CFClient::gl_init; 789 CFClient::gl_init;
… …
444 826
445 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 827 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
446 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 828 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
447 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 829 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
448 830
831 $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
832 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
833
449 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 834 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
450 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 835 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
451 status "Configuration Saved"; 836 status "Configuration Saved";
452 }); 837 });
453 838
454 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 839 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
455
456 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
457 $tgw->add (my $hbox = new CFClient::UI::HBox ());
458
459 $hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
460 $hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
461 $hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
462 $hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
463
464 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
465 $CFClient::UI::ROOT->add ($tgw);
466} 840}
467 841
468sub video_shutdown { 842sub video_shutdown {
469 $CFClient::UI::ROOT->{children} = []; 843 $CFClient::UI::ROOT->{children} = [];
844 undef $CFClient::UI::GRAB;
845 undef $CFClient::UI::HOVER;
470 undef $SDL_ACTIVE; 846 undef $SDL_ACTIVE;
471 undef $SDL_EV;
472} 847}
473 848
849my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
474my $bgmusic;#TODO#hack#d# 850my $bgmusic;#TODO#hack#d#
851
852sub audio_music_finished {
853 return unless $CFG->{bgm_enable};
854
855 # TODO: hack, do play loop and mood music
856 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
857 $bgmusic->play (0);
858
859 push @bgmusic, shift @bgmusic;
860}
475 861
476sub audio_init { 862sub audio_init {
477 if ($CFG->{audio_enable}) { 863 if ($CFG->{audio_enable}) {
478 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 864 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
479
480 $SDL_MIXER = !CFClient::Mix_OpenAudio; 865 $SDL_MIXER = !CFClient::Mix_OpenAudio;
481 CFClient::Mix_AllocateChannels 8; 866 CFClient::Mix_AllocateChannels 8;
482 CFClient::MixMusic::volume $CFG->{bgm_volume}; 867 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
483 868
484 # TODO: hack, do play loop and mood music 869 audio_music_finished;
485 if ($CFG->{bgm_enable}) {
486 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/game3.ogg";
487 $bgmusic->play;
488 }
489 870
490 while (<$fh>) { 871 while (<$fh>) {
491 next if /^\s*#/; 872 next if /^\s*#/;
492 next if /^\s*$/; 873 next if /^\s*$/;
493 874
… …
529 $want_refresh = 0; 910 $want_refresh = 0;
530 $can_refresh = 0; 911 $can_refresh = 0;
531 912
532 $CFClient::UI::ROOT->draw; 913 $CFClient::UI::ROOT->draw;
533 914
534 SDL::GLSwapBuffers; 915 CFClient::SDL_GL_SwapBuffers;
535 916
536 $LAST_REFRESH = $NOW; 917 $LAST_REFRESH = $NOW;
537} 918}
538 919
539my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 920my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
540 $NOW = time; 921 $NOW = time;
541 922
542 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 923 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
543 while $SDL_EV->poll; 924 for CFClient::SDL_PollEvent;
544 925
545 if (%animate_object) { 926 if (%animate_object) {
546 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 927 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
547 $want_refresh++; 928 $want_refresh++;
548 } 929 }
… …
571@conn::ISA = Crossfire::Protocol::; 952@conn::ISA = Crossfire::Protocol::;
572 953
573sub conn::stats_update { 954sub conn::stats_update {
574 my ($self, $stats) = @_; 955 my ($self, $stats) = @_;
575 956
576 # i love text protocols!!! 957 update_stats_window ($stats);
577 # FIXME: the stats are somehow weird
578 my $hp = $stats->{1};
579 my $hp_m = $stats->{2};
580 my $sp = $stats->{3};
581 my $sp_m = $stats->{4};
582 my $fo = $stats->{18};
583 my $fo_m = 1000;
584 my $gr = $stats->{23};
585 my $gr_m = $stats->{24};
586
587 #d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
588 $GAUGES->{hp}->set_value ($hp, $hp_m);
589 $GAUGES->{mana}->set_value ($sp, $sp_m);
590 $GAUGES->{food}->set_value ($fo, $fo_m);
591 $GAUGES->{grace}->set_value ($gr, $gr_m);
592} 958}
593 959
594sub conn::user_send { 960sub conn::user_send {
595 my ($self, $command) = @_; 961 my ($self, $command) = @_;
596 962
… …
621 987
622 my ($hash, $x, $y, $w, $h) = @$map_info; 988 my ($hash, $x, $y, $w, $h) = @$map_info;
623 989
624 my $data = $MAP->get_rect ($x, $y, $w, $h); 990 my $data = $MAP->get_rect ($x, $y, $w, $h);
625 $MAPCACHE->put ($hash => Compress::LZF::compress $data); 991 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
626
627 warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 992 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
628
629} 993}
630 994
631sub conn::map_clear { 995sub conn::map_clear {
632 my ($self) = @_; 996 my ($self) = @_;
633 997
634 $self->flush_map; 998 $self->flush_map;
635 delete $self->{neigh}; 999 delete $self->{neigh_map};
636 1000
637 $MAP->clear; 1001 $MAP->clear;
638} 1002}
639 1003
640 1004
641sub conn::load_map($$$) { 1005sub conn::load_map($$$) {
642 my ($self, $hash, $x, $y) = @_; 1006 my ($self, $hash, $x, $y) = @_;
643 1007
644 if (defined (my $data = $MAPCACHE->get ($hash))) { 1008 if (defined (my $data = $MAPCACHE->get ($hash))) {
645 $data = Compress::LZF::decompress $data; 1009 $data = Compress::LZF::decompress $data;
646 warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 1010 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
647 for my $id ($MAP->set_rect ($x, $y, $data)) { 1011 for my $id ($MAP->set_rect ($x, $y, $data)) {
648 my $data = $TILECACHE->get ($id) 1012 my $data = $TILECACHE->get ($id)
649 or next; 1013 or next;
650 1014
651 $self->set_texture ($id => $data); 1015 $self->set_texture ($id => $data);
652 } 1016 }
653 } 1017 }
654} 1018}
655 1019
1020# this method does a "flood fill" into every tile direction
1021# it assumes that tiles are arranged in a rectangular grid,
1022# i.e. a map is the same as the left of the right map etc.
1023# failure to comply are harmless and result in display errors
1024# at worst.
656sub conn::flood_fill { 1025sub conn::flood_fill {
657 my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_; 1026 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
658 1027
659 # the server does not allow map paths > 6 1028 # the server does not allow map paths > 6
660 return if 6 <= length $path; 1029 return if 6 <= length $path;
661 1030
662 for my $tile (1..4) { 1031 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
663 next if $self->{neigh}{$hash}[$tile]; 1032
1033 for (
1034 [1, 0, -1],
1035 [2, 1, 0],
1036 [3, 0, 1],
1037 [4, -1, 0],
1038 ) {
1039 my ($tile, $dx, $dy) = @$_;
1040
1041 my $gx = $gx + $dx;
1042 my $gy = $gy + $dy;
1043
664 next unless $flags & (1 << ($tile - 1)); 1044 next unless $flags & (1 << ($tile - 1));
1045 next if $self->{neigh_grid}{$gx, $gy}++;
665 1046
666 my $neigh = $self->{neigh}{$hash} ||= []; 1047 my $neigh = $self->{neigh_map}{$hash} ||= [];
667 1048 if (my $info = $neigh->[$tile]) {
668 $self->send_mapinfo ("spatial $path$tile", sub {
669 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1049 my ($flags, $x, $y, $w, $h, $hash) = @$info;
670 1050
671 #warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
672 return if $mode ne "spatial";
673
674 $x += $MAP->ox;
675 $y += $MAP->oy;
676
677 $self->load_map ($hash, $x, $y)
678 unless $self->{neigh}{$hash}[5]++;#d#
679
680 $neigh->[$tile] = [$x, $y, $w, $h];
681
682 $self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1) 1051 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
683 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1052 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1053
1054 } else {
1055 $self->send_mapinfo ("spatial $path$tile", sub {
1056 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1057
1058 return if $mode ne "spatial";
1059
1060 $x += $MAP->ox;
1061 $y += $MAP->oy;
1062
1063 $self->load_map ($hash, $x, $y)
1064 unless $self->{neigh_map}{$hash}[5]++;#d#
1065
1066 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1067
1068 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
1069 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1070 });
684 }); 1071 }
685 } 1072 }
686} 1073}
687 1074
688sub conn::map_change { 1075sub conn::map_change {
689 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 1076 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
… …
692 1079
693 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1080 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
694 1081
695 my $mapmapw = 250; 1082 my $mapmapw = 250;
696 my $mapmaph = 250; 1083 my $mapmaph = 250;
1084
1085 $self->{neigh_rect} = [
1086 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1087 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1088 ];
697 1089
1090 delete $self->{neigh_grid};
698 $self->flood_fill ("", $hash, $flags, 1091 $self->flood_fill (0, 0, "", $hash, $flags);
699 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
700 $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
701 1092
702 $x += $ox; 1093 $x += $ox;
703 $y += $oy; 1094 $y += $oy;
704 1095
705 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1096 $self->{map_info} = [$hash, $x, $y, $w, $h];
1097
1098 my $map = $self->{map_info}[0];
1099 $map =~ s/^.*?\/([^\/]+)$/\1/;
1100 $STATWIDS->{map}->set_text ("Map: " . $map);
706 1101
707 $self->load_map ($hash, $x, $y); 1102 $self->load_map ($hash, $x, $y);
708} 1103}
709 1104
710sub conn::face_find { 1105sub conn::face_find {
… …
736 } 1131 }
737 1132
738gotid: 1133gotid:
739 $face->{id} = $id; 1134 $face->{id} = $id;
740 $MAP->set_face ($facenum => $id); 1135 $MAP->set_face ($facenum => $id);
1136 $self->{faceid}[$facenum] = $id;#d#
741 $TILECACHE->get ($id) 1137 $TILECACHE->get ($id)
742} 1138}
743 1139
744sub conn::face_update { 1140sub conn::face_update {
745 my ($self, $facenum, $face) = @_; 1141 my ($self, $facenum, $face) = @_;
… …
753 my ($self, $id, $data) = @_; 1149 my ($self, $id, $data) = @_;
754 1150
755 $self->{texture}[$id] ||= do { 1151 $self->{texture}[$id] ||= do {
756 my $tex = 1152 my $tex =
757 new_from_image CFClient::Texture 1153 new_from_image CFClient::Texture
758 $data, minify => 1; 1154 $data, minify => 1, mipmap => 1;
759 1155
760 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 1156 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
761 $MAPWIDGET->update; 1157 $MAPWIDGET->update;
762 1158
763 $tex 1159 $tex
… …
775 1171
776 $chunk->play; 1172 $chunk->play;
777# warn "sound $x,$y,$soundnum,$type\n";#d# 1173# warn "sound $x,$y,$soundnum,$type\n";#d#
778} 1174}
779 1175
1176my $LAST_QUERY; # server is stupid, stupid, stupid
1177
780sub conn::query { 1178sub conn::query {
781 my ($self, $flags, $prompt) = @_; 1179 my ($self, $flags, $prompt) = @_;
782 1180
783 #TODO, display dialog with relevant information 1181 $prompt = $LAST_QUERY unless length $prompt;
784 warn "<<<<QUERY:$flags:$prompt>>>\n";#d# 1182 $LAST_QUERY = $prompt;
1183
1184 my $dialog = new CFClient::UI::FancyFrame
1185 title => "Query",
1186 child => my $vbox = new CFClient::UI::VBox;
1187
1188 $vbox->add (new CFClient::UI::Label
1189 max_w => $::WIDTH * 0.4,
1190 text => $prompt);
1191
1192 if ($flags & Crossfire::Protocol::CS_QUERY_YESNO) {
1193 $vbox->add (my $hbox = new CFClient::HBox);
1194 $hbox->add (new CFClient::Button
1195 text => "No",
1196 connect_activate => sub {
1197 $self->send ("reply n");
1198 $dialog->destroy;
1199 $MAPWIDGET->focus_in;
1200 }
1201 );
1202 $hbox->add (new CFClient::Button
1203 text => "Yes",
1204 connect_activate => sub {
1205 $self->send ("reply y");
1206 $dialog->destroy;
1207 $MAPWIDGET->focus_in;
1208 },
1209 );
1210
1211 $dialog->focus_in;
1212
1213 } elsif ($flags & Crossfire::Protocol::CS_QUERY_SINGLECHAR) {
1214 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
1215 $vbox->add (my $entry = new CFClient::UI::Entry
1216 connect_changed => sub {
1217 $self->send ("reply $_[1]");
1218 $dialog->destroy;
1219 $MAPWIDGET->focus_in;
1220 },
1221 );
1222
1223 $entry->focus_in;
1224
1225 } else {
1226 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
1227
1228 $vbox->add (my $entry = new CFClient::UI::Entry
1229 $flags & Crossfire::Protocol::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
1230 connect_activate => sub {
1231 $self->send ("reply $_[1]");
1232 $dialog->destroy;
1233 $MAPWIDGET->focus_in;
1234 },
1235 );
1236
1237 $entry->focus_in;
1238 }
1239
1240 $dialog->show;
785} 1241}
786 1242
787sub conn::drawinfo { 1243sub conn::drawinfo {
788 my ($self, $color, $text) = @_; 1244 my ($self, $color, $text) = @_;
789 1245
… …
807} 1263}
808 1264
809sub conn::spell_add { 1265sub conn::spell_add {
810 my ($self, $spell) = @_; 1266 my ($self, $spell) = @_;
811 1267
1268 # TODO
1269 # create a widget dynamically, using spell face (CF::Protocol downloads them)
812 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub { 1270 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message});
813 });
814 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub { 1271 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message});
815 });
816} 1272}
817 1273
818sub conn::spell_delete { 1274sub conn::spell_delete {
819 my ($self, $spell) = @_; 1275 my ($self, $spell) = @_;
820} 1276}
821 1277
822sub conn::addme_success { 1278sub conn::addme_success {
823 my ($self) = @_; 1279 my ($self) = @_;
824 1280
825 for my $skill (values %{$self->{skill_info}}) { 1281 for my $skill (values %{$self->{skill_info}}) {
826 $MAPWIDGET->add_command ("ready_skill $skill", "", sub { 1282 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
827 }); 1283 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
828 $MAPWIDGET->add_command ("use_skill $skill", "", sub {
829 });
830 } 1284 }
1285}
1286
1287sub update_floorbox {
1288 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1289 $FLOORBOX->clear;
1290 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1291
1292 my @items = values %{ $CONN->{container}{0} };
1293
1294 # we basically have to use the same sorting as everybody else
1295 @items = sort { $a->{type} <=> $b->{type} } @items;
1296
1297 for my $item (reverse @items) {
1298 my $desc = $item->{nrof} < 2
1299 ? $item->{name}
1300 : "$item->{nrof} $item->{name_pl}";
1301 # todo: animation widget, face widget, weight(?) etc.
1302 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1303 tooltip => (CFClient::UI::Label->escape ($desc)
1304 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1305 can_hover => 1,
1306 can_events => 1,
1307 connect_button_down => sub {
1308 my ($self, $ev, $x, $y) = @_;
1309
1310 # todo: maybe put examine on 1? but should just be a tooltip :(
1311 if ($ev->{button} == 1) {
1312 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1313 } elsif ($ev->{button} == 2) {
1314 $CONN->send ("apply $item->{tag}");
1315 } elsif ($ev->{button} == 3) {
1316 # examine, lock, mark, maybe other things
1317 warn "MENU not implemented yet\n";
1318 }
1319
1320 1
1321 },
1322 );
1323
1324 $hbox->add (new CFClient::UI::Face
1325 can_events => 0,
1326 face => $item->{face},
1327 anim => $item->{anim},
1328 animspeed => $item->{animspeed},
1329 );
1330
1331 $hbox->add (new CFClient::UI::Label
1332 can_events => 0,
1333 text => $desc,
1334 );
1335 }
1336 });
1337 refresh;
1338}
1339
1340sub conn::container_add {
1341 my ($self, $id, $items) = @_;
1342
1343 update_floorbox if $id == 0;
1344 # $self-<{player}{tag} => player inv
1345 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1346}
1347
1348sub conn::container_clear {
1349 my ($self, $id) = @_;
1350
1351 update_floorbox if $id == 0;
1352# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1353}
1354
1355sub conn::item_delete {
1356 my ($self, @items) = @_;
1357
1358 for (@items) {
1359 update_floorbox if $_->{container} == 0;
1360 }
1361}
1362
1363sub conn::item_update {
1364 my ($self, $item) = @_;
1365
1366 update_floorbox if $item->{container} == 0;
831} 1367}
832 1368
833%SDL_CB = ( 1369%SDL_CB = (
834 CFClient::SDL_QUIT => sub { 1370 CFClient::SDL_QUIT => sub {
835 Event::unloop -1; 1371 Event::unloop -1;
836 }, 1372 },
837 CFClient::SDL_VIDEORESIZE => sub { 1373 CFClient::SDL_VIDEORESIZE => sub {
838 }, 1374 },
839 CFClient::SDL_VIDEOEXPOSE => sub { 1375 CFClient::SDL_VIDEOEXPOSE => \&refresh,
840 refresh; 1376 CFClient::SDL_ACTIVEEVENT => sub {
1377# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
841 }, 1378 },
842 CFClient::SDL_KEYDOWN => sub { 1379 CFClient::SDL_KEYDOWN => sub {
843 if ($SDL_EV->key_mod & CFClient::KMOD_ALT && $SDL_EV->key_sym == 13) { 1380 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
844 # alt-enter 1381 # alt-enter
845 video_shutdown; 1382 video_shutdown;
846 $CFG->{fullscreen} = !$CFG->{fullscreen}; 1383 $CFG->{fullscreen} = !$CFG->{fullscreen};
847 video_init; 1384 video_init;
848 } else { 1385 } else {
849 CFClient::UI::feed_sdl_key_down_event ($SDL_EV); 1386 CFClient::UI::feed_sdl_key_down_event ($_[0]);
850 } 1387 }
851 }, 1388 },
852 CFClient::SDL_KEYUP => sub { 1389 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
853 CFClient::UI::feed_sdl_key_up_event ($SDL_EV); 1390 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
854 }, 1391 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
855 CFClient::SDL_MOUSEMOTION => sub { 1392 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
856 CFClient::UI::feed_sdl_motion_event ($SDL_EV); 1393 CFClient::SDL_USEREVENT => \&audio_music_finished,
857 },
858 CFClient::SDL_MOUSEBUTTONDOWN => sub {
859 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
860 },
861 CFClient::SDL_MOUSEBUTTONUP => sub {
862 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
863 },
864 CFClient::SDL_ACTIVEEVENT => sub {
865# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
866 },
867); 1394);
868 1395
869############################################################################# 1396#############################################################################
870 1397
871$SIG{INT} = $SIG{TERM} = sub { exit }; 1398$SIG{INT} = $SIG{TERM} = sub { exit };
… …
879 sdl_mode => 0, 1406 sdl_mode => 0,
880 width => 640, 1407 width => 640,
881 height => 480, 1408 height => 480,
882 fullscreen => 0, 1409 fullscreen => 0,
883 fast => 0, 1410 fast => 0,
1411 map_scale => 0.5,
884 fow_enable => 1, 1412 fow_enable => 1,
885 fow_intensity => 0.45, 1413 fow_intensity => 0.45,
886 fow_smooth => 0, 1414 fow_smooth => 0,
887 gui_fontsize => 1, 1415 gui_fontsize => 1,
888 log_fontsize => 14, 1416 log_fontsize => 1,
1417 gauge_fontsize => 1,
1418 gauge_size => 0.35,
1419 stat_fontsize => 1,
889 mapsize => 100, 1420 mapsize => 100,
890 host => "crossfire.schmorp.de", 1421 host => "crossfire.schmorp.de",
891 say_command => 'say', 1422 say_command => 'say',
892 audio_enable => 1, 1423 audio_enable => 1,
893 bgm_enable => 1, 1424 bgm_enable => 1,
894 bgm_volume => 64, 1425 bgm_volume => 0.25,
895); 1426);
896 1427
897while (my ($k, $v) = each %DEF_CFG) { 1428while (my ($k, $v) = each %DEF_CFG) {
898 $CFG->{$k} = $v unless exists $CFG->{$k}; 1429 $CFG->{$k} = $v unless exists $CFG->{$k};
899} 1430}
… …
907@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 1438@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
908 1439
909$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1440$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
910 1441
911{ 1442{
912 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf); 1443 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1444 DejaVuSans.ttf
1445 DejaVuSansMono.ttf
1446 DejaVuSans-Bold.ttf
1447 DejaVuSansMono-Bold.ttf
1448 DejaVuSans-Oblique.ttf
1449 DejaVuSansMono-Oblique.ttf
1450 DejaVuSans-BoldOblique.ttf
1451 DejaVuSansMono-BoldOblique.ttf
1452 );
913 1453
914 CFClient::add_font $_ for @fonts; 1454 CFClient::add_font $_ for @fonts;
915 CFClient::set_font $fonts[0]; 1455
1456 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1457 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1458
1459 $FONT_PROP->make_default;
916} 1460}
917 1461
918video_init; 1462video_init;
919audio_init; 1463audio_init;
920 1464
921Event::loop; 1465Event::loop;
922 1466
923END { SDL::Quit } 1467END { CFClient::SDL_Quit }
924 1468
925 1469

Diff Legend

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