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.209 by root, Thu May 11 23:54:31 2006 UTC vs.
Revision 1.243 by root, Wed May 24 03:29:20 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6# do things only needed for single-binary version (par)
6BEGIN { 7BEGIN {
7 if (%PAR::LibCache) { 8 if (%PAR::LibCache) {
8 @INC = grep ref, @INC; # weed out all paths except pars loader refs 9 @INC = grep ref, @INC; # weed out all paths except pars loader refs
9 10
10 while (my ($filename, $zip) = each %PAR::LibCache) { 11 while (my ($filename, $zip) = each %PAR::LibCache) {
… …
13 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
14 unless -e "$ENV{PAR_TEMP}/$1"; 15 unless -e "$ENV{PAR_TEMP}/$1";
15 } 16 }
16 } 17 }
17 18
19 # TODO: pango-rc file, anybody?
20
18 unshift @INC, $ENV{PAR_TEMP}; 21 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 } 22 }
24} 23}
25 24
26# need to do it again because that pile of garbage called PAR nukes it before main 25# need to do it again because that pile of garbage called PAR nukes it before main
27unshift @INC, $ENV{PAR_TEMP}; 26unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache;
28 28
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM;
30use Event; 31use Event;
31 32
32use Crossfire; 33use Crossfire;
33use Crossfire::Protocol; 34use Crossfire::Protocol;
34 35
… …
81our $BUTTONBAR; 82our $BUTTONBAR;
82our $LOGVIEW; 83our $LOGVIEW;
83our $CONSOLE; 84our $CONSOLE;
84our $METASERVER; 85our $METASERVER;
85our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
87our $QUIT_DIALOG;
86 88
87our $FLOORBOX; 89our $FLOORBOX;
88our $GAUGES; 90our $GAUGES;
89our $STATWIDS; 91our $STATWIDS;
90 92
… …
94our $SDL_MIXER; 96our $SDL_MIXER;
95our @SOUNDS; # event => file mapping 97our @SOUNDS; # event => file mapping
96our %AUDIO_CHUNKS; # audio files 98our %AUDIO_CHUNKS; # audio files
97 99
98our $ALT_ENTER_MESSAGE; 100our $ALT_ENTER_MESSAGE;
99our $STATUS_LINE; 101our $STATUSBOX;
100our $DEBUG_STATUS; 102our $DEBUG_STATUS;
101 103
102our $INVWIN; 104our $INVWIN;
103our $INV; 105our $INV;
106our $INVR;
107our $INVR_LBL;
108our $OPENCONT;
104 109
105sub status { 110sub status {
106 $STATUS_LINE->add ($_[0], group => "status", timeout => 60); 111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
107 $CFClient::UI::ROOT->on_refresh ($STATUS_LINE => sub {
108 $STATUS_LINE->move (0, $HEIGHT - $STATUS_LINE->{h});#d# to in toplevel
109 });
110} 112}
111 113
112sub debug { 114sub debug {
113 $DEBUG_STATUS->set_text ($_[0]); 115 $DEBUG_STATUS->set_text ($_[0]);
114 my ($w, $h) = $DEBUG_STATUS->size_request; 116 my ($w, $h) = $DEBUG_STATUS->size_request;
… …
135 maph => $mapsize, 137 maph => $mapsize,
136 ; 138 ;
137 }; 139 };
138 140
139 if ($CONN) { 141 if ($CONN) {
142 CFClient::lowdelay fileno $CONN->{fh};
143
140 $LOGIN_BUTTON->set_text ("Logout"); 144 $LOGIN_BUTTON->set_text ("Logout");
141
142 status "login successful"; 145 status "login successful";
143 146
144 CFClient::lowdelay fileno $CONN->{fh}; 147 $BUTTONBAR->{children}[1]->emit ("activate")
148 if $BUTTONBAR->{children}[1]->{state};
149
145 } else { 150 } else {
146 status "unable to connect"; 151 status "unable to connect";
147 stop_game(); 152 stop_game();
148 } 153 }
149} 154}
… …
153 158
154 status "connection closed"; 159 status "connection closed";
155 $LOGIN_BUTTON->set_text ("Login"); 160 $LOGIN_BUTTON->set_text ("Login");
156 $CONN->destroy; 161 $CONN->destroy;
157 $CONN = 0; # false, does not autovivify 162 $CONN = 0; # false, does not autovivify
163
164 $BUTTONBAR->{children}[1]->emit ("activate")
165 unless $BUTTONBAR->{children}[1]->{state};
158 166
159 undef $MAPCACHE; 167 undef $MAPCACHE;
160 undef $MAP; 168 undef $MAP;
161} 169}
162 170
… …
167 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 175 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
168 176
169 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 177 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
170 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 178 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
171 179
172 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 180 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
173 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 181 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
174 182
175 $mode_slider->connect (changed => sub { 183 $mode_slider->connect (changed => sub {
176 my ($self, $value) = @_; 184 my ($self, $value) = @_;
177 185
… …
202 } 210 }
203 ); 211 );
204 212
205 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
206 $table->add (1, $row++, new CFClient::UI::Slider 214 $table->add (1, $row++, new CFClient::UI::Slider
207 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 215 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
208 tooltip => "Enlarge or shrink the displayed map", 216 tooltip => "Enlarge or shrink the displayed map",
209 connect_changed => sub { 217 connect_changed => sub {
210 my ($self, $value) = @_; 218 my ($self, $value) = @_;
211 $CFG->{map_scale} = 0.05 * int $value / 0.05; 219 $CFG->{map_scale} = 2 ** $value;
212 } 220 }
213 ); 221 );
214 222
215 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
216 $table->add (1, $row++, new CFClient::UI::CheckBox 224 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
222 } 230 }
223 ); 231 );
224 232
225 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
226 $table->add (1, $row++, new CFClient::UI::Slider 234 $table->add (1, $row++, new CFClient::UI::Slider
227 range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], 235 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
228 tooltip => "The higher the intensity, the lighter the Fog-of-War color", 236 tooltip => "The higher the intensity, the lighter the Fog-of-War color",
229 connect_changed => sub { 237 connect_changed => sub {
230 my ($self, $value) = @_; 238 my ($self, $value) = @_;
231 $CFG->{fow_intensity} = $value; 239 $CFG->{fow_intensity} = $value;
232 } 240 }
… …
243 } 251 }
244 ); 252 );
245 253
246 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 254 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
247 $table->add (1, $row++, new CFClient::UI::Slider 255 $table->add (1, $row++, new CFClient::UI::Slider
248 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 256 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
249 tooltip => "The font size used by most GUI elements", 257 tooltip => "The font size used by most GUI elements",
250 connect_changed => sub { 258 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
251 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
252# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
253 }
254 ); 259 );
255 260
256 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); 261 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
257 $table->add (1, $row++, new CFClient::UI::Slider 262 $table->add (1, $row++, new CFClient::UI::Slider
258 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 263 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
259 tooltip => "The font size used by the server log window only", 264 tooltip => "The font size used by the server log window only",
260 connect_changed => sub { 265 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
261 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
262 }
263 ); 266 );
264 267
265 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 268 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
266 269
267 $table->add (1, $row++, new CFClient::UI::Slider 270 $table->add (1, $row++, new CFClient::UI::Slider
268 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 271 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
269 tooltip => "The font size used by the statistics window only", 272 tooltip => "The font size used by the statistics window only",
270 connect_changed => sub { 273 connect_changed => sub {
271 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 274 $CFG->{stat_fontsize} = $_[1];
272 &set_stats_window_fontsize; 275 &set_stats_window_fontsize;
276 }
277 );
278
279 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
280 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
282 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
283 connect_changed => sub {
284 $CFG->{gauge_fontsize} = $_[1];
285 &set_gauge_window_fontsize;
273 } 286 }
274 ); 287 );
275 288
276 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 289 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
277 $table->add (1, $row++, new CFClient::UI::Slider 290 $table->add (1, $row++, new CFClient::UI::Slider
278 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 291 range => [$CFG->{gauge_size}, 0.2, 0.8],
279 tooltip => "Adjust the size of the stats gauges at the bottom right", 292 tooltip => "Adjust the size of the stats gauges at the bottom right",
280 connect_changed => sub { 293 connect_changed => sub {
281 $CFG->{gauge_size} = $_[1]; 294 $CFG->{gauge_size} = $_[1];
282 my $h = int $HEIGHT * $CFG->{gauge_size}; 295 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
283 $GAUGES->{win}->set_size ($WIDTH, $h);
284 $GAUGES->{win}->move (0, $HEIGHT - $h);
285 }
286 );
287
288 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
289 $table->add (1, $row++, new CFClient::UI::Slider
290 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
291 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
292 connect_changed => sub {
293 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
294 &set_gauge_window_fontsize;
295 } 296 }
296 ); 297 );
297 298
298 $table->add (1, $row++, new CFClient::UI::Button 299 $table->add (1, $row++, new CFClient::UI::Button
299 expand => 1, align => 0, text => "Apply", 300 expand => 1, align => 0, text => "Apply",
… …
324 connect_changed => sub { 325 connect_changed => sub {
325 $CFG->{bgm_enable} = $_[1]; 326 $CFG->{bgm_enable} = $_[1];
326 } 327 }
327 ); 328 );
328 $hbox->add (new CFClient::UI::Slider 329 $hbox->add (new CFClient::UI::Slider
329 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], 330 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
330 tooltip => "The volume of the background music", 331 tooltip => "The volume of the background music",
331 connect_changed => sub { 332 connect_changed => sub {
332 $CFG->{bgm_volume} = $_[1]; 333 $CFG->{bgm_volume} = $_[1];
333 CFClient::MixMusic::volume $_[1] * 128; 334 CFClient::MixMusic::volume $_[1] * 128;
334 } 335 }
… …
372# local $GAUGES->{win}{parent};#d# 373# local $GAUGES->{win}{parent};#d#
373# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D; 374# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
374} 375}
375 376
376sub make_gauge_window { 377sub make_gauge_window {
377 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 378 my $gh = int $HEIGHT * $CFG->{gauge_size};
378# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
379 379
380 my $win = new CFClient::UI::Frame ( 380 my $win = new CFClient::UI::Frame (
381 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 381 req_y => -1,
382 user_w => $WIDTH,
383 user_h => $gh,
382 ); 384 );
385
383 $win->add (my $hbox = new CFClient::UI::HBox 386 $win->add (my $hbox = new CFClient::UI::HBox
384 children => [ 387 children => [
385 (new CFClient::UI::HBox expand => 1), 388 (new CFClient::UI::HBox expand => 1),
386 ($FLOORBOX = new CFClient::UI::VBox), 389 (new CFClient::UI::VBox children => [
390 (new CFClient::UI::Empty expand => 1),
391 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)),
392 ]),
387 (my $vbox = new CFClient::UI::VBox), 393 (my $vbox = new CFClient::UI::VBox),
388 ], 394 ],
389 ); 395 );
390 396
391 $vbox->add (new CFClient::UI::HBox 397 $vbox->add (new CFClient::UI::HBox
… …
395 (my $hb = new CFClient::UI::HBox), 401 (my $hb = new CFClient::UI::HBox),
396 ], 402 ],
397 ); 403 );
398 404
399 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 405 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
400 tooltip => "Health points. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment."); 406 tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
401 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 407 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
402 tooltip => "Spell points. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana."); 408 tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
403 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 409 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
404 tooltip => "Grace points - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods."); 410 tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
405 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 411 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
406 tooltip => "Food. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too."); 412 tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
407 413
408 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 414 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
409 tooltip => "Experience points and overall level - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100."); 415 tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
410 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 416 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
411 tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)"); 417 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
412 418
413 $GAUGES = { 419 $GAUGES = {
414 exp => $exp, win => $win, range => $rng, 420 exp => $exp, win => $win, range => $rng,
415 food => $fg, mana => $mg, hp => $hg, grace => $gg 421 food => $fg, mana => $mg, hp => $hg, grace => $gg
416 }; 422 };
… …
419 425
420 $win 426 $win
421} 427}
422 428
423sub make_stats_window { 429sub make_stats_window {
424 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats"; 430 my $tgw = new CFClient::UI::FancyFrame title => "Stats";
425 431
426 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 432 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
427 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1); 433 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
434 can_hover => 1, can_events => 1,
435 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
428 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1); 436 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
437 can_hover => 1, can_events => 1,
438 tooltip => "The map you are currently on (if supported by the server).");
429 439
430 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 440 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
431
432 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 441 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
433 442
434 my $black = [0, 0, 0]; 443 my $color2 = [1, 1, 0];
435 444
436 for ( 445 for (
437 [0, 0, st_str => "Str", 30, "Physical Strength, determines damage dealt with weapons, how much you can carry, and how often you can attack"], 446 [0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"],
438 [0, 1, st_dex => "Dex", 30, "Dexterity, your physical agility. Determines chance of being hit and affects armor class and speed"], 447 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"],
439 [0, 2, st_con => "Con", 30, "Constitution, physical health and toughness. Determines how many healthpoints you can have"], 448 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"],
440 [0, 3, st_int => "Int", 30, "Intelligence, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"], 449 [0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"],
441 [0, 4, st_wis => "Wis", 30, "Wisdom, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"], 450 [0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"],
442 [0, 5, st_pow => "Pow", 30, "Power, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"], 451 [0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"],
443 [0, 6, st_cha => "Cha", 30, "Charisma, how well you are received by NPCs. Affects buying and selling prices in shops."], 452 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
444 453
445 [2, 0, st_wc => "Wc", -120, "Weapon Class, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 454 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],
446 [2, 1, st_ac => "Ac", -120, "Armour Class, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 455 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],
447 [2, 2, st_dam => "Dam", 120, "Damage, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 456 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],
448 [2, 3, st_arm => "Arm", 120, "Armour, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 457 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."],
449 [2, 4, st_spd => "Spd", 10.54, "Speed, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 458 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],
450 [2, 5, st_wspd => "WSp", 10.54, "Weapon Speed, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 459 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],
451 ) { 460 ) {
452 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 461 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
453 462
454 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 463 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
455 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 464 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
456 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 465 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
457 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $black, valign => 0, align => -1, text => $label, tooltip => $tooltip); 466 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);
458 } 467 }
459 468
460 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 469 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
461 470
462 my $row = 0; 471 my $row = 0;
463 my $col = 0; 472 my $col = 0;
464 473
465 my %resist_names = ( 474 my %resist_names = (
466 slow => "Slow (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)", 475 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)",
467 holyw => "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 476 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",
468 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)", 477 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)",
469 fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 478 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
470 depl => "Depletion (some monsters and other effects can cause stats depletion)", 479 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)",
471 magic => "Magic (resistance to magic spells like magic missile or similar)", 480 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)",
472 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)", 481 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
473 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 482 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
474 pois => "Poison (resistance to getting poisoned)", 483 pois => "<b>Poison</b> (resistance to getting poisoned)",
475 para => "Paralysation (this resistance affects the chance you get paralysed)", 484 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
476 deat => "Death (resistance against death spells)", 485 deat => "<b>Death</b> (resistance against death spells)",
477 phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 486 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
478 blind => "Blind (blind resistance affects the chance of a successful blinding attack)", 487 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
479 fear => "Fear (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 488 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
480 tund => "Turn undead", 489 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
481 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)", 490 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
482 cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)", 491 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
483 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)", 492 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)",
484 ); 493 );
485 for (qw/slow holyw conf fire depl magic 494 for (qw/slow holyw conf fire depl magic
486 drain acid pois para deat phys 495 drain acid pois para deat phys
487 blind fear tund elec cold ghit/) 496 blind fear tund elec cold ghit/)
488 { 497 {
… …
668 $HOST->set_text ($CFG->{host} = $host); 677 $HOST->set_text ($CFG->{host} = $host);
669 }), 678 }),
670 (new CFClient::UI::Empty expand => 1), 679 (new CFClient::UI::Empty expand => 1),
671 ]); 680 ]);
672 681
673 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8) 682 $table->add ($_ + 1, $y, new CFClient::UI::Label
683 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)
674 for 0 .. $#$m; 684 for 0 .. $#$m;
675 } 685 }
676 } 686 }
677 }); 687 });
678} 688}
… …
734 ); 744 );
735 745
736 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 746 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
737 $table->add (1, 7, new CFClient::UI::Slider 747 $table->add (1, 7, new CFClient::UI::Slider
738 req_w => 100, 748 req_w => 100,
739 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 749 range => [$CFG->{mapsize}, 10, 100, 0, 1],
740 tooltip => "This is the size of the portion of the map update the server sends you. " 750 tooltip => "This is the size of the portion of the map update the server sends you. "
741 ."If you set this to a high value you will be able to see further for example.", 751 . "If you set this to a high value you will be able to see further for example.",
742 connect_changed => sub { 752 connect_changed => sub {
743 my ($self, $value) = @_; 753 my ($self, $value) = @_;
744 754
745 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 755 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
746 }, 756 },
747 ); 757 );
748 758
759 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
760 $table->add (1, 8, new CFClient::UI::Entry
761 text => $CFG->{output_count},
762 tooltip => "Should be set to 1 unless you know what you are doing",
763 connect_changed => sub { $CFG->{output_count} = $_[1] },
764 );
765
766 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
767 $table->add (1, 9, new CFClient::UI::Entry
768 text => $CFG->{output_sync},
769 tooltip => "Should be set to 1 unless you know what you are doing",
770 connect_changed => sub { $CFG->{output_sync} = $_[1] },
771 );
772
749 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button 773 $table->add (1, 10, $LOGIN_BUTTON = new CFClient::UI::Button
750 expand => 1, 774 expand => 1,
751 align => 0, 775 align => 0,
752 text => "Login", 776 text => "Login",
753 connect_activate => sub { 777 connect_activate => sub {
754 $CONN ? stop_game 778 $CONN ? stop_game
… …
761 785
762sub message_window { 786sub message_window {
763 my $window = new CFClient::UI::FancyFrame 787 my $window = new CFClient::UI::FancyFrame
764 title => "Messages", 788 title => "Messages",
765 border_bg => [1, 1, 1, 1], 789 border_bg => [1, 1, 1, 1],
766 bg => [0, 0, 0, 0.5], 790 bg => [0, 0, 0, 0.75],
767 user_w => int $::WIDTH / 3, 791 user_w => int $::WIDTH / 3,
768 user_h => int $::HEIGHT / 5, 792 user_h => int $::HEIGHT / 5,
769 child => (my $vbox = new CFClient::UI::VBox); 793 child => (my $vbox = new CFClient::UI::VBox);
770 794
771 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 795 $vbox->add ($LOGVIEW);
772 expand => 1,
773 font => $FONT_FIXED,
774 fontsize => $::CFG->{log_fontsize},
775 );
776 796
777 $vbox->add (my $input = new CFClient::UI::Entry 797 $vbox->add (my $input = new CFClient::UI::Entry
798 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
799 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
800 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
801 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
778 connect_focus_in => sub { 802 connect_focus_in => sub {
779 my ($input, $prev_focus) = @_; 803 my ($input, $prev_focus) = @_;
780 804
781 delete $input->{refocus_map}; 805 delete $input->{refocus_map};
782 806
… …
811 }; 835 };
812 836
813 $window 837 $window
814} 838}
815 839
840sub open_quit_dialog {
841 unless ($QUIT_DIALOG) {
842
843 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";
844
845 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
846
847 $vb->add (new CFClient::UI::Label
848 text => "You should find a savebed and apply it first!",
849 max_w => $WIDTH * 0.25
850 );
851 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
852 $hb->add (new CFClient::UI::Button
853 text => "Ok",
854 connect_activate => sub { $QUIT_DIALOG->hide },
855 expand => 1
856 );
857 $hb->add (new CFClient::UI::Button
858 text => "Quit anyway",
859 connect_activate => sub { exit 1 },
860 expand => 1
861 );
862 $hb->add (new CFClient::UI::Label "You should find a savebed and apply it first!");
863
864 $QUIT_DIALOG->show_centered;
865 } else {
866 $QUIT_DIALOG->show_centered;
867 }
868}
869
816sub make_inventory_window { 870sub make_inventory_window {
817 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory"; 871 my $invwin = new CFClient::UI::FancyFrame
872 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory";
873
874 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
875
876 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
877 $vb1->add (my $lbl = new CFClient::UI::Label);
878 $lbl->set_text ("Player");
818 $invwin->add ($INV = new CFClient::UI::Inventory expand => 1); 879 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
880
881 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
882 $vb2->add ($INVR_LBL = new CFClient::UI::Label);
883 $INVR_LBL->set_text ("Floor");
884 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
885
819 $invwin 886 $invwin
887}
888
889sub make_help_window {
890 my $win = new CFClient::UI::FancyFrame
891 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";
892
893 $win->add (my $vbox = new CFClient::UI::VBox);
894
895 $vbox->add (my $buttons = new CFClient::UI::HBox);
896 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
897
898 for (
899 [intro => "Introduction"],
900 [command_help => "Commands"],
901 [skill_help => "Skills"],
902 ) {
903 my ($pod, $label) = @$_;
904
905 $buttons->add (new CFClient::UI::Button
906 text => $label,
907 connect_activate => sub {
908 my $parser = new Pod::POM;
909 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
910
911 $viewer->clear;
912
913 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
914 for @{ CFClient::pod_to_pango_list $pom };
915
916 $viewer->set_offset (0);
917 },
918 );
919 }
920
921 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
922
923 $win
820} 924}
821 925
822sub sdl_init { 926sub sdl_init {
823 CFClient::SDL_Init 927 CFClient::SDL_Init
824 and die "SDL::Init failed!\n"; 928 and die "SDL::Init failed!\n";
… …
832 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 936 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
833 $FULLSCREEN = $CFG->{fullscreen}; 937 $FULLSCREEN = $CFG->{fullscreen};
834 $FAST = $CFG->{fast}; 938 $FAST = $CFG->{fast};
835 939
836 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 940 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
837 or die "SDL_SetVideoMode failed!\n"; 941 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
838 942
839 $SDL_ACTIVE = 1; 943 $SDL_ACTIVE = 1;
840 $LAST_REFRESH = time - 0.01; 944 $LAST_REFRESH = time - 0.01;
841 945
842 CFClient::gl_init; 946 CFClient::gl_init;
… …
845 949
846 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 950 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
847 951
848 ############################################################################# 952 #############################################################################
849 953
850 if ($DEBUG_STATUS) { 954 unless ($DEBUG_STATUS) {
851 # reconfigure all widgets
852 $CFClient::UI::ROOT->reconfigure;
853
854 } else {
855 # create the widgets 955 # create the widgets
856 956
857 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, text => "hulla", x => 100;#d# 957 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
858 $DEBUG_STATUS->show; 958 $DEBUG_STATUS->show;
859 959
860 $STATUS_LINE = new CFClient::UI::Statusbox; 960 $STATUSBOX = new CFClient::UI::Statusbox;
861 $STATUS_LINE->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => 0, size => 0.8, color => [1, 1, 1]); 961 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
862 $STATUS_LINE->show; 962
963 (new CFClient::UI::Frame
964 bg => [0, 0, 0, 0.4],
965 req_y => -1,
966 child => $STATUSBOX,
967 )->show;
863 968
864 CFClient::UI::FancyFrame->new ( 969 CFClient::UI::FancyFrame->new (
865 border_bg => [1, 1, 1, 192/255], 970 border_bg => [1, 1, 1, 192/255],
866 bg => [1, 1, 1, 0], 971 bg => [1, 1, 1, 0],
867 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 972 child => ($MAPMAP = new CFClient::MapWidget::MapMap
973 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
974 ),
868 )->show; 975 )->show;
869 976
870 $MAPWIDGET = new CFClient::MapWidget; 977 $MAPWIDGET = new CFClient::MapWidget;
871 $MAPWIDGET->connect (activate_console => sub { 978 $MAPWIDGET->connect (activate_console => sub {
872 my ($mapwidget, $preset) = @_; 979 my ($mapwidget, $preset) = @_;
… …
881 } 988 }
882 }); 989 });
883 $MAPWIDGET->show; 990 $MAPWIDGET->show;
884 $MAPWIDGET->focus_in; 991 $MAPWIDGET->focus_in;
885 992
993 $LOGVIEW = new CFClient::UI::TextView
994 expand => 1,
995 font => $FONT_FIXED,
996 fontsize => $::CFG->{log_fontsize},
997 can_hover => 1,
998 can_events => 1,
999 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1000 ;
1001
886 $BUTTONBAR = new CFClient::UI::HBox; 1002 $BUTTONBAR = new CFClient::UI::HBox;
887 1003
888 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 1004 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1005 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
889 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 1006 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1007 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
890 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 1008 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1009 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
891 1010
892 make_gauge_window->show; # 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 1011 make_gauge_window->show; # 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
893 1012
894 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 1013 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1014 tooltip => "Toggles the statistics window, where all your Stats and Resistances are beign displaye at all times.");
895 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window); 1015 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1016 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");
896 1017
897 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 1018 $BUTTONBAR->add (new CFClient::UI::Button
1019 text => "Save Config",
1020 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1021 connect_activate => sub {
898 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1022 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
899 status "Configuration Saved"; 1023 status "Configuration Saved";
1024 },
900 }); 1025 );
1026
1027 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1028 tooltip => "View Documentation");
1029
1030 $BUTTONBAR->add (new CFClient::UI::Button
1031 text => "Quit",
1032 tooltip => "Terminates the program",
1033 connect_activate => sub {
1034 if ($CONN) {
1035 open_quit_dialog;
1036 } else {
1037 exit;
1038 }
1039 },
1040 );
901 1041
902 $BUTTONBAR->show; 1042 $BUTTONBAR->show;
903 1043
1044 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1045
904 # delay till geometry is constant 1046 # delay till geometry is constant
905 $CFClient::UI::ROOT->on_refresh (startup => sub { 1047 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
906 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 1048 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1049 my $widget = $GAUGES->{win};
1050 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
907 }); 1051 });
908 force_refresh (); 1052 force_refresh ();
909 } 1053 }
910} 1054}
911 1055
… …
917my $bgmusic;#TODO#hack#d# 1061my $bgmusic;#TODO#hack#d#
918 1062
919sub audio_channel_finished { 1063sub audio_channel_finished {
920 my ($channel) = @_; 1064 my ($channel) = @_;
921 1065
922 warn "channel $channel finished\n";#d# 1066 #warn "channel $channel finished\n";#d#
923} 1067}
924 1068
925sub audio_music_finished { 1069sub audio_music_finished {
926 return unless $CFG->{bgm_enable}; 1070 return unless $CFG->{bgm_enable};
927 1071
… …
934 1078
935sub audio_init { 1079sub audio_init {
936 if ($CFG->{audio_enable}) { 1080 if ($CFG->{audio_enable}) {
937 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1081 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
938 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1082 $SDL_MIXER = !CFClient::Mix_OpenAudio;
1083
1084 unless ($SDL_MIXER) {
1085 status "Unable to open sound device: there will be no sound";
1086 return;
1087 }
1088
939 CFClient::Mix_AllocateChannels 8; 1089 CFClient::Mix_AllocateChannels 8;
940 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1090 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
941 1091
942 audio_music_finished; 1092 audio_music_finished;
943 1093
… …
971my %animate_object; 1121my %animate_object;
972my $animate_timer; 1122my $animate_timer;
973 1123
974my $fps = 9; 1124my $fps = 9;
975 1125
1126my %demo;#d#
1127
976sub force_refresh { 1128sub force_refresh {
977 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 1129 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
978 debug sprintf "%3.2f", $fps; 1130 debug sprintf "%3.2f", $fps;
979 1131
980 $CFClient::UI::ROOT->draw; 1132 $CFClient::UI::ROOT->draw;
981 CFClient::SDL_GL_SwapBuffers;
982 1133
983 $WANT_REFRESH = 0; 1134 $WANT_REFRESH = 0;
984 $CAN_REFRESH = 0; 1135 $CAN_REFRESH = 0;
985 $LAST_REFRESH = $NOW; 1136 $LAST_REFRESH = $NOW;
1137
11380 && do {
1139 # some weird model-drawing code, just a joke right now
1140 use CFClient::OpenGL;
1141
1142 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1143 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1144 $demo{r} ||= do {
1145 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1146 $mod->{v} = pack "f*", @{$mod->{v}};
1147 $_ = [scalar @$_, pack "S!*", @$_]
1148 for values %{$mod->{g}};
1149 $mod
1150 };
1151
1152 my $r = $demo{r} or die;
1153
1154 glDepthMask 1;
1155 glClear GL_DEPTH_BUFFER_BIT;
1156 glEnable GL_TEXTURE_2D;
1157 glEnable GL_DEPTH_TEST;
1158 glEnable GL_CULL_FACE;
1159 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1160
1161 glMatrixMode GL_PROJECTION;
1162 glLoadIdentity;
1163 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1164 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1165 glMatrixMode GL_MODELVIEW;
1166 glLoadIdentity;
1167
1168 glPushMatrix;
1169 glTranslate 0, 0, -800;
1170 glScale 1, -1, 1;
1171 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1172 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1173 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1174 glScale 50, 50, 50;
1175
1176 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1177 while (my ($k, $v) = each %{$r->{g}}) {
1178 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1179 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1180 }
1181
1182 glPopMatrix;
1183
1184 glShadeModel GL_FLAT;
1185 glDisable GL_DEPTH_TEST;
1186 glDisable GL_TEXTURE_2D;
1187 glDepthMask 0;
1188
1189 $WANT_REFRESH++;
1190};
1191
1192 CFClient::SDL_GL_SwapBuffers;
986} 1193}
987 1194
988my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1195my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
989 $NOW = time; 1196 $NOW = time;
990 1197
… …
1013 delete $animate_object{$widget}; 1220 delete $animate_object{$widget};
1014} 1221}
1015 1222
1016@conn::ISA = Crossfire::Protocol::; 1223@conn::ISA = Crossfire::Protocol::;
1017 1224
1225sub conn::new {
1226 my $class = shift;
1227
1228 my $self = $class->Crossfire::Protocol::new (@_);
1229
1230 $MAPWIDGET->clr_commands;
1231
1232 my $parser = new Pod::POM;
1233 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1234
1235 for my $head2 ($pod->head2) {
1236 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1237 or next;
1238
1239 my $cmd = $1;
1240 my @args = split /\|/, $2;
1241 @args = (".*") unless @args;
1242
1243 my $text = CFClient::pod_to_pango $head2->content;
1244
1245 for my $arg (@args) {
1246 $arg = $arg eq ".*" ? "" : " $arg";
1247
1248 $MAPWIDGET->add_command ("$cmd$arg", $text);
1249 }
1250 }
1251
1252 $self->{noface} = new_from_file CFClient::Texture
1253 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
1254
1255 $self
1256}
1257
1018sub conn::stats_update { 1258sub conn::stats_update {
1019 my ($self, $stats) = @_; 1259 my ($self, $stats) = @_;
1260
1261 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1262 my $diff = $exp - $self->{prev_exp};
1263 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1264 if exists $self->{prev_exp} && $diff;
1265 $self->{prev_exp} = $exp;
1266 }
1020 1267
1021 update_stats_window ($stats); 1268 update_stats_window ($stats);
1022} 1269}
1023 1270
1024sub conn::user_send { 1271sub conn::user_send {
… …
1079 $self->set_texture ($id => $data); 1326 $self->set_texture ($id => $data);
1080 } 1327 }
1081 } 1328 }
1082} 1329}
1083 1330
1331# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1332# (server resource,s latency, bandwidth), so this hack is warranted.
1333# the right fix is to make real tiled maps with an overview file
1334sub conn::send_mapinfo {
1335 my ($self, $data, $cb) = @_;
1336
1337 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1338 my ($wx, $wy) = ($1, $2);
1339
1340 if ($data =~ /^spatial ([1-4]+)$/) {
1341 my @dx = (0, 0, 1, 0, -1);
1342 my @dy = (0, -1, 0, 1, 0);
1343 my ($dx, $dy);
1344
1345 for (split //, $1) {
1346 $dx += $dx[$_];
1347 $dy += $dy[$_];
1348 }
1349
1350 $cb->(spatial => 15,
1351 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1352 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1353 50, 50,
1354 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1355 );
1356
1357 return;
1358 }
1359 }
1360
1361 $self->SUPER::send_mapinfo ($data, $cb);
1362}
1363
1084# this method does a "flood fill" into every tile direction 1364# this method does a "flood fill" into every tile direction
1085# it assumes that tiles are arranged in a rectangular grid, 1365# it assumes that tiles are arranged in a rectangular grid,
1086# i.e. a map is the same as the left of the right map etc. 1366# i.e. a map is the same as the left of the right map etc.
1087# failure to comply are harmless and result in display errors 1367# failure to comply are harmless and result in display errors
1088# at worst. 1368# at worst.
1089sub conn::flood_fill { 1369sub conn::flood_fill {
1090 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1370 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1091 1371
1092 # the server does not allow map paths > 6 1372 # the server does not allow map paths > 6
1093 return if 7 <= length $path; 1373 return if 7 <= length $path;
1094 1374
1095 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1375 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1096 1376
1097 for ( 1377 for (
1098 [1, 0, -1], 1378 [1, 3, 0, -1],
1099 [2, 1, 0], 1379 [2, 4, 1, 0],
1100 [3, 0, 1], 1380 [3, 1, 0, 1],
1101 [4, -1, 0], 1381 [4, 2, -1, 0],
1102 ) { 1382 ) {
1103 my ($tile, $dx, $dy) = @$_; 1383 my ($tile, $tile2, $dx, $dy) = @$_;
1384
1385 next if $block & (1 << $tile);
1386 my $block = $block | (1 << $tile2);
1104 1387
1105 my $gx = $gx + $dx; 1388 my $gx = $gx + $dx;
1106 my $gy = $gy + $dy; 1389 my $gy = $gy + $dy;
1107 1390
1108 next unless $flags & (1 << ($tile - 1)); 1391 next unless $flags & (1 << ($tile - 1));
… …
1110 1393
1111 my $neigh = $self->{neigh_map}{$hash} ||= []; 1394 my $neigh = $self->{neigh_map}{$hash} ||= [];
1112 if (my $info = $neigh->[$tile]) { 1395 if (my $info = $neigh->[$tile]) {
1113 my ($flags, $x, $y, $w, $h, $hash) = @$info; 1396 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1114 1397
1115 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1398 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1116 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1399 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1117 1400
1118 } else { 1401 } else {
1119 $self->send_mapinfo ("spatial $path$tile", sub { 1402 $self->send_mapinfo ("spatial $path$tile", sub {
1120 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1403 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1121 1404
1122 return if $mode ne "spatial"; 1405 return if $mode ne "spatial";
1123 1406
1124 $x += $MAP->ox; 1407 $x += $MAP->ox;
1125 $y += $MAP->oy; 1408 $y += $MAP->oy;
1126 1409
1127 $self->load_map ($hash, $x, $y) 1410 $self->load_map ($hash, $x, $y)
1128 unless $self->{neigh_map}{$hash}[5]++;#d# 1411 unless $self->{neigh_map}{$hash}[5]++;#d#
1129 1412
1130 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 1413 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1131 1414
1132 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1415 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1133 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1416 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1134 }); 1417 });
1135 } 1418 }
1136 } 1419 }
1137} 1420}
… …
1150 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1433 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1151 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1434 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1152 ]; 1435 ];
1153 1436
1154 delete $self->{neigh_grid}; 1437 delete $self->{neigh_grid};
1155 $self->flood_fill (0, 0, "", $hash, $flags);
1156 1438
1157 $x += $ox; 1439 $x += $ox;
1158 $y += $oy; 1440 $y += $oy;
1159 1441
1160 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1442 $self->{map_info} = [$hash, $x, $y, $w, $h];
1161 1443
1162 my $map = $self->{map_info}[0];
1163 $map =~ s/^.*?\/([^\/]+)$/\1/; 1444 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1164 $STATWIDS->{map}->set_text ("Map: " . $map); 1445 $STATWIDS->{map}->set_text ("Map: " . $map);
1165 1446
1166 $self->load_map ($hash, $x, $y); 1447 $self->load_map ($hash, $x, $y);
1448 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1167} 1449}
1168 1450
1169sub conn::face_find { 1451sub conn::face_find {
1170 my ($self, $facenum, $face) = @_; 1452 my ($self, $facenum, $face) = @_;
1171 1453
… …
1173 1455
1174 my $id = $FACEMAP->get ($hash); 1456 my $id = $FACEMAP->get ($hash);
1175 1457
1176 unless ($id) { 1458 unless ($id) {
1177 # create new id for face 1459 # create new id for face
1178 # i love transactions 1460 # I love transactions
1179 for (1..100) { 1461 for (1..100) {
1180 my $txn = $CFClient::DB_ENV->txn_begin; 1462 my $txn = $CFClient::DB_ENV->txn_begin;
1181 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW); 1463 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
1182 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 1464 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
1183 $id++; 1465 $id = ($id || 16) + 1;
1184 if ($FACEMAP->put (id => $id) == 0 1466 if ($FACEMAP->put (id => $id) == 0
1185 && $FACEMAP->put ($hash => $id) == 0) { 1467 && $FACEMAP->put ($hash => $id) == 0) {
1186 $txn->txn_commit; 1468 $txn->txn_commit;
1187 1469
1188 goto gotid; 1470 goto gotid;
… …
1196 1478
1197gotid: 1479gotid:
1198 $face->{id} = $id; 1480 $face->{id} = $id;
1199 $MAP->set_face ($facenum => $id); 1481 $MAP->set_face ($facenum => $id);
1200 $self->{faceid}[$facenum] = $id;#d# 1482 $self->{faceid}[$facenum] = $id;#d#
1483
1201 $TILECACHE->get ($id) 1484 $TILECACHE->get ($id) || do {
1485 my $tex = $self->{noface};
1486 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1487 undef
1488 };
1202} 1489}
1203 1490
1204sub conn::face_update { 1491sub conn::face_update {
1205 my ($self, $facenum, $face) = @_; 1492 my ($self, $facenum, $face) = @_;
1206 1493
… …
1299 ); 1586 );
1300 1587
1301 $entry->focus_in; 1588 $entry->focus_in;
1302 } 1589 }
1303 1590
1304 $dialog->show; 1591 $dialog->show_centered;
1305} 1592}
1306 1593
1307sub conn::drawinfo { 1594sub conn::drawinfo {
1308 my ($self, $color, $text) = @_; 1595 my ($self, $color, $text) = @_;
1309 1596
… …
1323 [0.74, 0.65, 0.41], 1610 [0.74, 0.65, 0.41],
1324 ); 1611 );
1325 1612
1326 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 1613 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1327 1614
1328 $text =~ s/&/&amp;/g; $text =~ s/</&lt;/g; 1615 $text = CFClient::UI::Label::escape $text;
1329 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1616 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1330 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1617 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1331 1618
1332 $LOGVIEW->add_paragraph ($color[$color], 1619 $LOGVIEW->add_paragraph ($color[$color],
1333 join "\n", map "$time $_", split /\n/, $text); 1620 join "\n", map "$time $_", split /\n/, $text);
1334 $STATUS_LINE->add ($text, color => $color[$color], timeout => 60); 1621
1622 $STATUSBOX->add ($text,
1623 group => $text,
1624 fg => $color[$color],
1625 timeout => 60,
1626 tooltip_font => $::FONT_FIXED,
1627 );
1335} 1628}
1336 1629
1337sub conn::drawextinfo { 1630sub conn::drawextinfo {
1338 my ($self, $color, $type, $subtype, $message) = @_; 1631 my ($self, $color, $type, $subtype, $message) = @_;
1339 1632
… …
1343sub conn::spell_add { 1636sub conn::spell_add {
1344 my ($self, $spell) = @_; 1637 my ($self, $spell) = @_;
1345 1638
1346 # TODO 1639 # TODO
1347 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1640 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1348 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1641 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1349 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1642 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1350} 1643}
1351 1644
1352sub conn::spell_delete { 1645sub conn::spell_delete {
1353 my ($self, $spell) = @_; 1646 my ($self, $spell) = @_;
1354} 1647}
1355 1648
1356sub conn::addme_success { 1649sub conn::addme_success {
1357 my ($self) = @_; 1650 my ($self) = @_;
1358 1651
1652 $self->send ("command output-sync $CFG->{output_sync}");
1653 $self->send ("command output-count $CFG->{output_count}");
1654
1655 my $parser = new Pod::POM;
1656 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1657
1658 my %skill_tooltip;
1659
1660 for my $head2 ($pod->head2) {
1661 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1662 }
1663
1359 for my $skill (values %{$self->{skill_info}}) { 1664 for my $skill (values %{$self->{skill_info}}) {
1360 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1665 $MAPWIDGET->add_command ("ready_skill $skill",
1361 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1666 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1667 . $skill_tooltip{$skill});
1668 $MAPWIDGET->add_command ("use_skill $skill",
1669 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1670 . $skill_tooltip{$skill});
1362 } 1671 }
1363
1364 $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you");
1365 $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players");
1366 $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1367 $MAPWIDGET->add_command ("kill\\_pets", "kill your pets");
1368} 1672}
1369 1673
1370sub conn::eof { 1674sub conn::eof {
1675 $MAPWIDGET->clr_commands;
1676
1371 stop_game; 1677 stop_game;
1372} 1678}
1373 1679
1374sub update_floorbox { 1680sub update_floorbox {
1375 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1681 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1376 return unless $CONN; 1682 return unless $CONN;
1377 1683
1378 $FLOORBOX->clear; 1684 $FLOORBOX->clear;
1379 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1685 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1380 1686
1381 my $count = 4; 1687 my $count = 7;
1382 for (@{ $CONN->{container}{0} }) { 1688 for (@{ $CONN->{container}{0} }) {
1383 if (--$count) { 1689 if (--$count) {
1384 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_); 1690 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1385 } else { 1691 } else {
1386 $FLOORBOX->add (new CFClient::UI::Label text => "More..."); 1692 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
… …
1393} 1699}
1394 1700
1395sub conn::container_add { 1701sub conn::container_add {
1396 my ($self, $tag, $items) = @_; 1702 my ($self, $tag, $items) = @_;
1397 1703
1398 update_floorbox if $tag == 0; 1704 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1399 1705
1706 if ($tag == 0) {
1707 update_floorbox;
1708 $OPENCONT = 0;
1709 $INVR_LBL->set_text ("Floor");
1710 $INVR->set_items ($self->{container}{0});
1711 } elsif ($tag == $self->{player}{tag}) {
1712 $INVR_LBL->set_text ("Player");
1400 $INV->set_items ($self->{container}{$self->{player}{tag}}) 1713 $INV->set_items ($self->{container}{$self->{player}{tag}})
1401 if $tag == $self->{player}{tag}; 1714 } else {
1715 $OPENCONT = $tag;
1716 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1717 $INVR->set_items ($self->{container}{$tag});
1718 }
1402 1719
1403 # $self-<{player}{tag} => player inv 1720 # $self-<{player}{tag} => player inv
1404 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1721 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1405} 1722}
1406 1723
1407sub conn::container_clear { 1724sub conn::container_clear {
1408 my ($self, $tag) = @_; 1725 my ($self, $tag) = @_;
1409 1726
1410 update_floorbox if $tag == 0; 1727 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1411 1728
1729 if ($tag == 0) {
1730 update_floorbox;
1731 $OPENCONT = 0;
1732 $INVR_LBL->set_text ("Floor");
1733 $INVR->set_items ($self->{container}{0});
1734 } elsif ($tag == $self->{player}{tag}) {
1735 $INVR_LBL->set_text ("Player");
1412 $INV->set_items ($self->{container}{$tag}) 1736 $INV->set_items ($self->{container}{$tag})
1413 if $tag == $self->{player}{tag}; 1737 } else {
1738 $OPENCONT = $tag;
1739 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1740 $INVR->set_items ($self->{container}{$tag});
1741 }
1414 1742
1415# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1743# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1416} 1744}
1417 1745
1418sub conn::item_delete { 1746sub conn::item_delete {
1419 my ($self, @items) = @_; 1747 my ($self, @items) = @_;
1420 1748
1421 for (@items) { 1749 for (@items) {
1422 update_floorbox if $_->{container} == 0; 1750 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1423 1751
1752 if ($_->{container} == 0) {
1753 update_floorbox;
1754 $OPENCONT = 0;
1755 $INVR_LBL->set_text ("Floor");
1756 $INVR->set_items ($self->{container}{0});
1757 } elsif ($_->{container} == $self->{player}{tag}) {
1758 $INVR_LBL->set_text ("Player");
1759 $INV->set_items ($self->{container}{$self->{player}{tag}})
1760 } else {
1761 $OPENCONT = $_->{container};
1762 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1424 $INV->set_items ($self->{container}{$_->{container}}) 1763 $INVR->set_items ($self->{container}{$_->{container}});
1425 if $_->{container} == $self->{player}{tag}; 1764 }
1426 } 1765 }
1427} 1766}
1428 1767
1429sub conn::item_update { 1768sub conn::item_update {
1430 my ($self, $item) = @_; 1769 my ($self, $item) = @_;
1431 1770
1432 update_floorbox if $item->{container} == 0; 1771 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1433 1772
1773 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1774 $OPENCONT = 0;
1775 $INVR_LBL->set_text ("Floor");
1776 $INVR->set_items ($self->{container}{0});
1777
1778 $item->{widget}->update_item
1779 if $item->{widget};
1780 } else {
1781 if ($item->{container} == 0) {
1782 update_floorbox;
1783 $OPENCONT = 0;
1784 $INVR_LBL->set_text ("Floor");
1785 $INVR->set_items ($self->{container}{0});
1786 } elsif ($item->{container} == $self->{player}{tag}) {
1434 $INV->set_items ($self->{container}{$item->{container}}) 1787 $INV->set_items ($self->{container}{$item->{container}})
1435 if $item->{container} == $self->{player}{tag}; 1788 }
1789 }
1436} 1790}
1437 1791
1438%SDL_CB = ( 1792%SDL_CB = (
1439 CFClient::SDL_QUIT => sub { 1793 CFClient::SDL_QUIT => sub {
1440 Event::unloop -1; 1794 Event::unloop -1;
1441 }, 1795 },
1442 CFClient::SDL_VIDEORESIZE => sub { 1796 CFClient::SDL_VIDEORESIZE => sub {
1443 }, 1797 },
1444 CFClient::SDL_VIDEOEXPOSE => sub { 1798 CFClient::SDL_VIDEOEXPOSE => sub {
1445 $WANT_REFRESH++; 1799 CFClient::UI::full_refresh;
1446 }, 1800 },
1447 CFClient::SDL_ACTIVEEVENT => sub { 1801 CFClient::SDL_ACTIVEEVENT => sub {
1448# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1802# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1449 }, 1803 },
1450 CFClient::SDL_KEYDOWN => sub { 1804 CFClient::SDL_KEYDOWN => sub {
… …
1486 sdl_mode => 0, 1840 sdl_mode => 0,
1487 width => 640, 1841 width => 640,
1488 height => 480, 1842 height => 480,
1489 fullscreen => 0, 1843 fullscreen => 0,
1490 fast => 0, 1844 fast => 0,
1491 map_scale => 0.5, 1845 map_scale => 1,
1492 fow_enable => 1, 1846 fow_enable => 1,
1493 fow_intensity => 0.45, 1847 fow_intensity => 0.45,
1494 fow_smooth => 0, 1848 fow_smooth => 0,
1495 gui_fontsize => 1, 1849 gui_fontsize => 1,
1496 log_fontsize => 1, 1850 log_fontsize => 1,
… …
1501 host => "crossfire.schmorp.de", 1855 host => "crossfire.schmorp.de",
1502 say_command => 'say', 1856 say_command => 'say',
1503 audio_enable => 1, 1857 audio_enable => 1,
1504 bgm_enable => 1, 1858 bgm_enable => 1,
1505 bgm_volume => 0.25, 1859 bgm_volume => 0.25,
1860 output_sync => 1,
1861 output_count => 1,
1506 ); 1862 );
1507 1863
1508 while (my ($k, $v) = each %DEF_CFG) { 1864 while (my ($k, $v) = each %DEF_CFG) {
1509 $CFG->{$k} = $v unless exists $CFG->{$k}; 1865 $CFG->{$k} = $v unless exists $CFG->{$k};
1510 } 1866 }
… …
1531 DejaVuSansMono-BoldOblique.ttf 1887 DejaVuSansMono-BoldOblique.ttf
1532 ); 1888 );
1533 1889
1534 CFClient::add_font $_ for @fonts; 1890 CFClient::add_font $_ for @fonts;
1535 1891
1892 CFClient::pango_init;
1893
1536 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1894 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1537 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1895 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1538 1896
1539 $FONT_PROP->make_default; 1897 $FONT_PROP->make_default;
1540 } 1898 }
1541 1899
1900# compare mono (ft) vs. rgba (cairo)
1901# ft - 1.8s, cairo 3s, even in alpha-only mode
1902# for my $rgba (0..1) {
1903# my $t1 = Time::HiRes::time;
1904# for (1..1000) {
1905# my $layout = CFClient::Layout->new ($rgba);
1906# $layout->set_text ("hallo" x 100);
1907# $layout->render;
1908# }
1909# my $t2 = Time::HiRes::time;
1910# warn $t2-$t1;
1911# }
1912
1542 video_init; 1913 video_init;
1543 audio_init; 1914 audio_init;
1544} 1915}
1545 1916
1546Event::loop; 1917Event::loop;
1547 1918
1548END { CFClient::SDL_Quit } 1919END { CFClient::SDL_Quit }
1549 1920
1921=head1 NAME
1922
1550=head1 pclient - Crossfire+ and Crossfire game client 1923pclient - A Crossfire+ and Crossfire game client
1551 1924
1552Pclient is a Crossfire+ and Crossfire game client. 1925=head1 SYNOPSIS
1553 1926
1554=head2 Features 1927Just run it - no commandline arguments are supported.
1555
1556=over 4
1557
1558=item Fullscreen Map
1559
1560PClient can uses a fullscreen map, which greatly enhances how much of the
1561game world you can see.
1562
1563=item Persistent Map Cache (Crossfire+ only)
1564
1565PClient can persistently cache all map data it received from the
1566server. This not only allows it to display an overview map, but also
1567ensures that once-explored areas will be available the next time you want
1568to explore more.
1569
1570=item Hardware acceleration
1571
1572Unlike most Crossfire clients, PClient take advantage of OpenGL hardware
1573acceleration. Most modern graphics cards have difficulties with 2D
1574acceleration, while 3D graphics is accelerated well.
1575
1576=item No arbitrary limits
1577
1578Unlike other Crossfire clients, pclient does not suffer from arbitrary
1579limits (like a fixed amount of face numbers). There are still limits, but
1580they are not arbitrarily low :)
1581
1582=back
1583 1928
1584=head1 USAGE 1929=head1 USAGE
1585 1930
1586=head2 The Map 1931Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used
1587 1932fullscreen and interactively.
1588The map is always displayed in the background, behind all other windows and UI elements.
1589
1590#TODO# middle-click scrolls
1591#
1592# keys:
1593#
1594# a apply
1595# keypad moves, kp_5 applies ranged attack to self
1596
1597Starting to type enters the I<completion mode>. In that mode, you can type
1598abbreviations or commands and have them executed as soon as they match a
1599valid command. This is best explained by a few examples:
1600
1601Typing B<climb> will display a list of commands with I<climb> in their
1602name, such as I<ready_skill climbing> and I<use_skill climbing>.
1603
1604You can abbreviate commands by typing only the first character of every
1605word. For example, typing I<iwor> will likely select I<invoke word of
1606recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli>
1607will likely select I<ready_skill climbing> and I<usl> will give you
1608I<use_skill levitation>.
1609
1610=head2 The map overview
1611
1612#TODO#
1613
1614=head2 The Status area in the lower right corner
1615
1616#TODO#
1617
1618=head2 The I<Statistics>/I>Stats> window
1619
1620#TODO#
1621
1622=head1 FAQ
1623
1624=over 4
1625
1626=item The client is very sluggish and slow, what can I do about this?
1627
1628Most likely, you don't have accelerated OpenGL support. Try to find a
1629newer driver, or a driver from your hardware vendor, that features OpenGL
1630support.
1631
1632If this is not an option, the following Setup options reduce the load and
1633will likely make the client playable with sofwtare rendering (it will
1634still be slow, though):
1635
1636=over 4
1637
1638=item B<Video Mode> should be set as low as possible (e.g. 640x480)
1639
1640=item Enable B<Fast & Ugly> mode
1641
1642=item Disable B<Fog of War>
1643
1644=item Increase B<Map Scale>
1645
1646=back
1647
1648=back
1649 1933
1650=head1 AUTHOR 1934=head1 AUTHOR
1651 1935
1652Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1936Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1653 1937

Diff Legend

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