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.207 by root, Wed May 10 21:12:26 2006 UTC vs.
Revision 1.242 by root, Tue May 23 23:26:31 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
… …
37use CFClient; 38use CFClient;
38use CFClient::UI; 39use CFClient::UI;
39use CFClient::MapWidget; 40use CFClient::MapWidget;
40 41
41$Event::DIED = sub { 42$Event::DIED = sub {
43 # TODO: display dialog box or so
42 CFClient::error $_[1]; 44 CFClient::error $_[1];
43}; 45};
44 46
45#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 47#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
46 48
… …
80our $BUTTONBAR; 82our $BUTTONBAR;
81our $LOGVIEW; 83our $LOGVIEW;
82our $CONSOLE; 84our $CONSOLE;
83our $METASERVER; 85our $METASERVER;
84our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
87our $QUIT_DIALOG;
85 88
86our $FLOORBOX; 89our $FLOORBOX;
87our $GAUGES; 90our $GAUGES;
88our $STATWIDS; 91our $STATWIDS;
89 92
… …
93our $SDL_MIXER; 96our $SDL_MIXER;
94our @SOUNDS; # event => file mapping 97our @SOUNDS; # event => file mapping
95our %AUDIO_CHUNKS; # audio files 98our %AUDIO_CHUNKS; # audio files
96 99
97our $ALT_ENTER_MESSAGE; 100our $ALT_ENTER_MESSAGE;
98our $STATUS_LINE; 101our $STATUSBOX;
99our $DEBUG_STATUS; 102our $DEBUG_STATUS;
100 103
101our $INVWIN; 104our $INVWIN;
102our $INV; 105our $INV;
106our $INVR;
107our $INVR_LBL;
108our $OPENCONT;
103 109
104sub status { 110sub status {
105 $STATUS_LINE->set_text ($_[0]); 111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
106 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
107} 112}
108 113
109sub debug { 114sub debug {
110 $DEBUG_STATUS->set_text ($_[0]); 115 $DEBUG_STATUS->set_text ($_[0]);
111 my ($w, $h) = $DEBUG_STATUS->size_request; 116 my ($w, $h) = $DEBUG_STATUS->size_request;
… …
132 maph => $mapsize, 137 maph => $mapsize,
133 ; 138 ;
134 }; 139 };
135 140
136 if ($CONN) { 141 if ($CONN) {
142 CFClient::lowdelay fileno $CONN->{fh};
143
137 $LOGIN_BUTTON->set_text ("Logout"); 144 $LOGIN_BUTTON->set_text ("Logout");
138
139 status "login successful"; 145 status "login successful";
140 146
141 CFClient::lowdelay fileno $CONN->{fh}; 147 $BUTTONBAR->{children}[1]->emit ("activate")
148 if $BUTTONBAR->{children}[1]->{state};
149
142 } else { 150 } else {
143 status "unable to connect"; 151 status "unable to connect";
144 stop_game(); 152 stop_game();
145 } 153 }
146} 154}
… …
150 158
151 status "connection closed"; 159 status "connection closed";
152 $LOGIN_BUTTON->set_text ("Login"); 160 $LOGIN_BUTTON->set_text ("Login");
153 $CONN->destroy; 161 $CONN->destroy;
154 $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};
155 166
156 undef $MAPCACHE; 167 undef $MAPCACHE;
157 undef $MAP; 168 undef $MAP;
158} 169}
159 170
… …
164 $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]);
165 176
166 $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");
167 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 178 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
168 179
169 $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, 1, 1]);
170 $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");
171 182
172 $mode_slider->connect (changed => sub { 183 $mode_slider->connect (changed => sub {
173 my ($self, $value) = @_; 184 my ($self, $value) = @_;
174 185
… …
199 } 210 }
200 ); 211 );
201 212
202 $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");
203 $table->add (1, $row++, new CFClient::UI::Slider 214 $table->add (1, $row++, new CFClient::UI::Slider
204 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 215 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
205 tooltip => "Enlarge or shrink the displayed map", 216 tooltip => "Enlarge or shrink the displayed map",
206 connect_changed => sub { 217 connect_changed => sub {
207 my ($self, $value) = @_; 218 my ($self, $value) = @_;
208 $CFG->{map_scale} = 0.05 * int $value / 0.05; 219 $CFG->{map_scale} = 2 ** $value;
209 } 220 }
210 ); 221 );
211 222
212 $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");
213 $table->add (1, $row++, new CFClient::UI::CheckBox 224 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
240 } 251 }
241 ); 252 );
242 253
243 $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");
244 $table->add (1, $row++, new CFClient::UI::Slider 255 $table->add (1, $row++, new CFClient::UI::Slider
245 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 256 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
246 tooltip => "The font size used by most GUI elements", 257 tooltip => "The font size used by most GUI elements",
247 connect_changed => sub { 258 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
248 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
249# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
250 }
251 ); 259 );
252 260
253 $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");
254 $table->add (1, $row++, new CFClient::UI::Slider 262 $table->add (1, $row++, new CFClient::UI::Slider
255 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 263 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
256 tooltip => "The font size used by the server log window only", 264 tooltip => "The font size used by the server log window only",
257 connect_changed => sub { 265 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
258 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
259 }
260 ); 266 );
261 267
262 $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");
263 269
264 $table->add (1, $row++, new CFClient::UI::Slider 270 $table->add (1, $row++, new CFClient::UI::Slider
265 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 271 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
266 tooltip => "The font size used by the statistics window only", 272 tooltip => "The font size used by the statistics window only",
267 connect_changed => sub { 273 connect_changed => sub {
268 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 274 $CFG->{stat_fontsize} = $_[1];
269 &set_stats_window_fontsize; 275 &set_stats_window_fontsize;
270 } 276 }
271 ); 277 );
272 278
273 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 279 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
274 $table->add (1, $row++, new CFClient::UI::Slider 280 $table->add (1, $row++, new CFClient::UI::Slider
275 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 281 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
276 tooltip => "Adjust the size of the stats gauges at the bottom right", 282 tooltip => "Adjust the size of the stats gauges at the bottom right",
277 connect_changed => sub { 283 connect_changed => sub {
278 $CFG->{gauge_size} = $_[1]; 284 $CFG->{gauge_size} = $_[1];
279 my $h = int $HEIGHT * $CFG->{gauge_size}; 285 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
280 $GAUGES->{win}->set_size ($WIDTH, $h);
281 $GAUGES->{win}->move (0, $HEIGHT - $h);
282 } 286 }
283 ); 287 );
284 288
285 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 289 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
286 $table->add (1, $row++, new CFClient::UI::Slider 290 $table->add (1, $row++, new CFClient::UI::Slider
287 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 291 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
288 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 292 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
289 connect_changed => sub { 293 connect_changed => sub {
290 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 294 $CFG->{gauge_fontsize} = $_[1];
291 &set_gauge_window_fontsize; 295 &set_gauge_window_fontsize;
292 } 296 }
293 ); 297 );
294 298
295 $table->add (1, $row++, new CFClient::UI::Button 299 $table->add (1, $row++, new CFClient::UI::Button
… …
369# local $GAUGES->{win}{parent};#d# 373# local $GAUGES->{win}{parent};#d#
370# 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;
371} 375}
372 376
373sub make_gauge_window { 377sub make_gauge_window {
374 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 378 my $gh = int $HEIGHT * $CFG->{gauge_size};
375# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
376 379
377 my $win = new CFClient::UI::Frame ( 380 my $win = new CFClient::UI::Frame (
378 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 381 req_y => -1,
382 user_w => $WIDTH,
383 user_h => $gh,
379 ); 384 );
385
380 $win->add (my $hbox = new CFClient::UI::HBox 386 $win->add (my $hbox = new CFClient::UI::HBox
381 children => [ 387 children => [
382 (new CFClient::UI::HBox expand => 1), 388 (new CFClient::UI::HBox expand => 1),
383 ($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 ]),
384 (my $vbox = new CFClient::UI::VBox), 393 (my $vbox = new CFClient::UI::VBox),
385 ], 394 ],
386 ); 395 );
387 396
388 $vbox->add (new CFClient::UI::HBox 397 $vbox->add (new CFClient::UI::HBox
… …
392 (my $hb = new CFClient::UI::HBox), 401 (my $hb = new CFClient::UI::HBox),
393 ], 402 ],
394 ); 403 );
395 404
396 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 405 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
397 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.");
398 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 407 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
399 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.");
400 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 409 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
401 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.");
402 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 411 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
403 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.");
404 413
405 $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,
406 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.");
407 $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,
408 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.)");
409 418
410 $GAUGES = { 419 $GAUGES = {
411 exp => $exp, win => $win, range => $rng, 420 exp => $exp, win => $win, range => $rng,
412 food => $fg, mana => $mg, hp => $hg, grace => $gg 421 food => $fg, mana => $mg, hp => $hg, grace => $gg
413 }; 422 };
… …
416 425
417 $win 426 $win
418} 427}
419 428
420sub make_stats_window { 429sub make_stats_window {
421 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats"; 430 my $tgw = new CFClient::UI::FancyFrame title => "Stats";
422 431
423 $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);
424 $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.");
425 $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).");
426 439
427 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 440 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
428
429 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 441 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
430 442
431 my $black = [0, 0, 0]; 443 my $color2 = [1, 1, 0];
432 444
433 for ( 445 for (
434 [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"],
435 [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"],
436 [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"],
437 [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"],
438 [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"],
439 [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"],
440 [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."],
441 453
442 [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."],
443 [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."],
444 [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."],
445 [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."],
446 [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."],
447 [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."],
448 ) { 460 ) {
449 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 461 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
450 462
451 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 463 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
452 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);
453 $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
454 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);
455 } 467 }
456 468
457 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 469 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
458 470
459 my $row = 0; 471 my $row = 0;
460 my $col = 0; 472 my $col = 0;
461 473
462 my %resist_names = ( 474 my %resist_names = (
463 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.)",
464 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.)",
465 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.)",
466 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, ...)",
467 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)",
468 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)",
469 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)",
470 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)",
471 pois => "Poison (resistance to getting poisoned)", 483 pois => "<b>Poison</b> (resistance to getting poisoned)",
472 para => "Paralysation (this resistance affects the chance you get paralysed)", 484 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
473 deat => "Death (resistance against death spells)", 485 deat => "<b>Death</b> (resistance against death spells)",
474 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)",
475 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)",
476 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)",
477 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...",
478 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, ...)",
479 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, ...)",
480 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)",
481 ); 493 );
482 for (qw/slow holyw conf fire depl magic 494 for (qw/slow holyw conf fire depl magic
483 drain acid pois para deat phys 495 drain acid pois para deat phys
484 blind fear tund elec cold ghit/) 496 blind fear tund elec cold ghit/)
485 { 497 {
… …
665 $HOST->set_text ($CFG->{host} = $host); 677 $HOST->set_text ($CFG->{host} = $host);
666 }), 678 }),
667 (new CFClient::UI::Empty expand => 1), 679 (new CFClient::UI::Empty expand => 1),
668 ]); 680 ]);
669 681
670 $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)
671 for 0 .. $#$m; 684 for 0 .. $#$m;
672 } 685 }
673 } 686 }
674 }); 687 });
675} 688}
… …
731 ); 744 );
732 745
733 $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");
734 $table->add (1, 7, new CFClient::UI::Slider 747 $table->add (1, 7, new CFClient::UI::Slider
735 req_w => 100, 748 req_w => 100,
736 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 749 range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1],
737 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. "
738 ."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.",
739 connect_changed => sub { 752 connect_changed => sub {
740 my ($self, $value) = @_; 753 my ($self, $value) = @_;
741 754
742 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 755 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
743 }, 756 },
744 ); 757 );
745 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
746 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button 773 $table->add (1, 10, $LOGIN_BUTTON = new CFClient::UI::Button
747 expand => 1, 774 expand => 1,
748 align => 0, 775 align => 0,
749 text => "Login", 776 text => "Login",
750 connect_activate => sub { 777 connect_activate => sub {
751 $CONN ? stop_game 778 $CONN ? stop_game
… …
758 785
759sub message_window { 786sub message_window {
760 my $window = new CFClient::UI::FancyFrame 787 my $window = new CFClient::UI::FancyFrame
761 title => "Messages", 788 title => "Messages",
762 border_bg => [1, 1, 1, 1], 789 border_bg => [1, 1, 1, 1],
763 bg => [0, 0, 0, 0.5], 790 bg => [0, 0, 0, 0.75],
764 user_w => int $::WIDTH / 3, 791 user_w => int $::WIDTH / 3,
765 user_h => int $::HEIGHT / 5, 792 user_h => int $::HEIGHT / 5,
766 child => (my $vbox = new CFClient::UI::VBox); 793 child => (my $vbox = new CFClient::UI::VBox);
767 794
768 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 795 $vbox->add ($LOGVIEW);
769 expand => 1,
770 font => $FONT_FIXED,
771 fontsize => $::CFG->{log_fontsize},
772 );
773 796
774 $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.",
775 connect_focus_in => sub { 802 connect_focus_in => sub {
776 my ($input, $prev_focus) = @_; 803 my ($input, $prev_focus) = @_;
777 804
778 delete $input->{refocus_map}; 805 delete $input->{refocus_map};
779 806
… …
808 }; 835 };
809 836
810 $window 837 $window
811} 838}
812 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
813sub make_inventory_window { 870sub make_inventory_window {
814 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");
815 $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
816 $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 );
917 }
918
919 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
920
921 $win
817} 922}
818 923
819sub sdl_init { 924sub sdl_init {
820 CFClient::SDL_Init 925 CFClient::SDL_Init
821 and die "SDL::Init failed!\n"; 926 and die "SDL::Init failed!\n";
… …
829 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 934 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
830 $FULLSCREEN = $CFG->{fullscreen}; 935 $FULLSCREEN = $CFG->{fullscreen};
831 $FAST = $CFG->{fast}; 936 $FAST = $CFG->{fast};
832 937
833 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 938 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
834 or die "SDL_SetVideoMode failed!\n"; 939 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
835 940
836 $SDL_ACTIVE = 1; 941 $SDL_ACTIVE = 1;
837 $LAST_REFRESH = time - 0.01; 942 $LAST_REFRESH = time - 0.01;
838 943
839 CFClient::gl_init; 944 CFClient::gl_init;
… …
842 947
843 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 948 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
844 949
845 ############################################################################# 950 #############################################################################
846 951
847 if ($DEBUG_STATUS) { 952 unless ($DEBUG_STATUS) {
848 # reconfigure all widgets
849 $CFClient::UI::ROOT->reconfigure;
850
851 } else {
852 # create the widgets 953 # create the widgets
853 954
854 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, text => "hulla", x => 100;#d# 955 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
855 $DEBUG_STATUS->show; 956 $DEBUG_STATUS->show;
856 957
857 $STATUS_LINE = new CFClient::UI::Label 958 $STATUSBOX = new CFClient::UI::Statusbox;
858 padding => 0, 959 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
859 y => $HEIGHT - $FONTSIZE * 1.8;
860 $STATUS_LINE->show;
861 960
862 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 961 (new CFClient::UI::Frame
863 padding => 0, 962 bg => [0, 0, 0, 0.4],
864 fontsize => 0.8, 963 req_y => -1,
865 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 964 child => $STATUSBOX,
866 $ALT_ENTER_MESSAGE->show; 965 )->show;
867 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
868 966
869 CFClient::UI::FancyFrame->new ( 967 CFClient::UI::FancyFrame->new (
870 border_bg => [1, 1, 1, 192/255], 968 border_bg => [1, 1, 1, 192/255],
871 bg => [1, 1, 1, 0], 969 bg => [1, 1, 1, 0],
872 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 970 child => ($MAPMAP = new CFClient::MapWidget::MapMap
971 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
972 ),
873 )->show; 973 )->show;
874 974
875 $MAPWIDGET = new CFClient::MapWidget; 975 $MAPWIDGET = new CFClient::MapWidget;
876 $MAPWIDGET->connect (activate_console => sub { 976 $MAPWIDGET->connect (activate_console => sub {
877 my ($mapwidget, $preset) = @_; 977 my ($mapwidget, $preset) = @_;
… …
886 } 986 }
887 }); 987 });
888 $MAPWIDGET->show; 988 $MAPWIDGET->show;
889 $MAPWIDGET->focus_in; 989 $MAPWIDGET->focus_in;
890 990
991 $LOGVIEW = new CFClient::UI::TextView
992 expand => 1,
993 font => $FONT_FIXED,
994 fontsize => $::CFG->{log_fontsize},
995 can_hover => 1,
996 can_events => 1,
997 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
998 ;
999
891 $BUTTONBAR = new CFClient::UI::HBox; 1000 $BUTTONBAR = new CFClient::UI::HBox;
892 1001
893 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 1002 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1003 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
894 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 1004 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1005 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
895 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 1006 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1007 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
896 1008
897 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 1009 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
898 1010
899 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 1011 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1012 tooltip => "Toggles the statistics window, where all your Stats and Resistances are beign displaye at all times.");
900 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window); 1013 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1014 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");
901 1015
902 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 1016 $BUTTONBAR->add (new CFClient::UI::Button
1017 text => "Save Config",
1018 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1019 connect_activate => sub {
903 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1020 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
904 status "Configuration Saved"; 1021 status "Configuration Saved";
1022 },
905 }); 1023 );
1024
1025 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1026 tooltip => "View Documentation");
1027
1028 $BUTTONBAR->add (new CFClient::UI::Button
1029 text => "Quit",
1030 tooltip => "Terminates the program",
1031 connect_activate => sub {
1032 if ($CONN) {
1033 open_quit_dialog;
1034 } else {
1035 exit;
1036 }
1037 },
1038 );
906 1039
907 $BUTTONBAR->show; 1040 $BUTTONBAR->show;
908 1041
1042 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1043
909 # delay till geometry is constant 1044 # delay till geometry is constant
910 $CFClient::UI::ROOT->on_refresh (startup => sub { 1045 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
911 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 1046 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1047 my $widget = $GAUGES->{win};
1048 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
912 }); 1049 });
913 force_refresh (); 1050 force_refresh ();
914 } 1051 }
915} 1052}
916 1053
… …
922my $bgmusic;#TODO#hack#d# 1059my $bgmusic;#TODO#hack#d#
923 1060
924sub audio_channel_finished { 1061sub audio_channel_finished {
925 my ($channel) = @_; 1062 my ($channel) = @_;
926 1063
927 warn "channel $channel finished\n";#d# 1064 #warn "channel $channel finished\n";#d#
928} 1065}
929 1066
930sub audio_music_finished { 1067sub audio_music_finished {
931 return unless $CFG->{bgm_enable}; 1068 return unless $CFG->{bgm_enable};
932 1069
… …
939 1076
940sub audio_init { 1077sub audio_init {
941 if ($CFG->{audio_enable}) { 1078 if ($CFG->{audio_enable}) {
942 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1079 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
943 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1080 $SDL_MIXER = !CFClient::Mix_OpenAudio;
1081
1082 unless ($SDL_MIXER) {
1083 status "Unable to open sound device: there will be no sound";
1084 return;
1085 }
1086
944 CFClient::Mix_AllocateChannels 8; 1087 CFClient::Mix_AllocateChannels 8;
945 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1088 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
946 1089
947 audio_music_finished; 1090 audio_music_finished;
948 1091
… …
976my %animate_object; 1119my %animate_object;
977my $animate_timer; 1120my $animate_timer;
978 1121
979my $fps = 9; 1122my $fps = 9;
980 1123
1124my %demo;#d#
1125
981sub force_refresh { 1126sub force_refresh {
982 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 1127 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
983 debug sprintf "%3.2f", $fps; 1128 debug sprintf "%3.2f", $fps;
984 1129
985 $CFClient::UI::ROOT->draw; 1130 $CFClient::UI::ROOT->draw;
986 CFClient::SDL_GL_SwapBuffers;
987 1131
988 $WANT_REFRESH = 0; 1132 $WANT_REFRESH = 0;
989 $CAN_REFRESH = 0; 1133 $CAN_REFRESH = 0;
990 $LAST_REFRESH = $NOW; 1134 $LAST_REFRESH = $NOW;
1135
11360 && do {
1137 # some weird model-drawing code, just a joke right now
1138 use CFClient::OpenGL;
1139
1140 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1141 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1142 $demo{r} ||= do {
1143 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1144 $mod->{v} = pack "f*", @{$mod->{v}};
1145 $_ = [scalar @$_, pack "S!*", @$_]
1146 for values %{$mod->{g}};
1147 $mod
1148 };
1149
1150 my $r = $demo{r} or die;
1151
1152 glDepthMask 1;
1153 glClear GL_DEPTH_BUFFER_BIT;
1154 glEnable GL_TEXTURE_2D;
1155 glEnable GL_DEPTH_TEST;
1156 glEnable GL_CULL_FACE;
1157 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1158
1159 glMatrixMode GL_PROJECTION;
1160 glLoadIdentity;
1161 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1162 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1163 glMatrixMode GL_MODELVIEW;
1164 glLoadIdentity;
1165
1166 glPushMatrix;
1167 glTranslate 0, 0, -800;
1168 glScale 1, -1, 1;
1169 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1170 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1171 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1172 glScale 50, 50, 50;
1173
1174 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1175 while (my ($k, $v) = each %{$r->{g}}) {
1176 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1177 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1178 }
1179
1180 glPopMatrix;
1181
1182 glShadeModel GL_FLAT;
1183 glDisable GL_DEPTH_TEST;
1184 glDisable GL_TEXTURE_2D;
1185 glDepthMask 0;
1186
1187 $WANT_REFRESH++;
1188};
1189
1190 CFClient::SDL_GL_SwapBuffers;
991} 1191}
992 1192
993my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1193my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
994 $NOW = time; 1194 $NOW = time;
995 1195
… …
1018 delete $animate_object{$widget}; 1218 delete $animate_object{$widget};
1019} 1219}
1020 1220
1021@conn::ISA = Crossfire::Protocol::; 1221@conn::ISA = Crossfire::Protocol::;
1022 1222
1223sub conn::new {
1224 my $class = shift;
1225
1226 my $self = $class->Crossfire::Protocol::new (@_);
1227
1228 $MAPWIDGET->clr_commands;
1229
1230 my $parser = new Pod::POM;
1231 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1232
1233 for my $head2 ($pod->head2) {
1234 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1235 or next;
1236
1237 my $cmd = $1;
1238 my @args = split /\|/, $2;
1239 @args = (".*") unless @args;
1240
1241 my $text = CFClient::pod_to_pango $head2->content;
1242
1243 for my $arg (@args) {
1244 $arg = $arg eq ".*" ? "" : " $arg";
1245
1246 $MAPWIDGET->add_command ("$cmd$arg", $text);
1247 }
1248 }
1249
1250 $self->{noface} = new_from_file CFClient::Texture
1251 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
1252
1253 $self
1254}
1255
1023sub conn::stats_update { 1256sub conn::stats_update {
1024 my ($self, $stats) = @_; 1257 my ($self, $stats) = @_;
1258
1259 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1260 my $diff = $exp - $self->{prev_exp};
1261 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1262 if exists $self->{prev_exp} && $diff;
1263 $self->{prev_exp} = $exp;
1264 }
1025 1265
1026 update_stats_window ($stats); 1266 update_stats_window ($stats);
1027} 1267}
1028 1268
1029sub conn::user_send { 1269sub conn::user_send {
… …
1084 $self->set_texture ($id => $data); 1324 $self->set_texture ($id => $data);
1085 } 1325 }
1086 } 1326 }
1087} 1327}
1088 1328
1329# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1330# (server resource,s latency, bandwidth), so this hack is warranted.
1331# the right fix is to make real tiled maps with an overview file
1332sub conn::send_mapinfo {
1333 my ($self, $data, $cb) = @_;
1334
1335 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1336 my ($wx, $wy) = ($1, $2);
1337
1338 if ($data =~ /^spatial ([1-4]+)$/) {
1339 my @dx = (0, 0, 1, 0, -1);
1340 my @dy = (0, -1, 0, 1, 0);
1341 my ($dx, $dy);
1342
1343 for (split //, $1) {
1344 $dx += $dx[$_];
1345 $dy += $dy[$_];
1346 }
1347
1348 $cb->(spatial => 15,
1349 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1350 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1351 50, 50,
1352 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1353 );
1354
1355 return;
1356 }
1357 }
1358
1359 $self->SUPER::send_mapinfo ($data, $cb);
1360}
1361
1089# this method does a "flood fill" into every tile direction 1362# this method does a "flood fill" into every tile direction
1090# it assumes that tiles are arranged in a rectangular grid, 1363# it assumes that tiles are arranged in a rectangular grid,
1091# i.e. a map is the same as the left of the right map etc. 1364# i.e. a map is the same as the left of the right map etc.
1092# failure to comply are harmless and result in display errors 1365# failure to comply are harmless and result in display errors
1093# at worst. 1366# at worst.
1094sub conn::flood_fill { 1367sub conn::flood_fill {
1095 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1368 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1096 1369
1097 # the server does not allow map paths > 6 1370 # the server does not allow map paths > 6
1098 return if 7 <= length $path; 1371 return if 7 <= length $path;
1099 1372
1100 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1373 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1101 1374
1102 for ( 1375 for (
1103 [1, 0, -1], 1376 [1, 3, 0, -1],
1104 [2, 1, 0], 1377 [2, 4, 1, 0],
1105 [3, 0, 1], 1378 [3, 1, 0, 1],
1106 [4, -1, 0], 1379 [4, 2, -1, 0],
1107 ) { 1380 ) {
1108 my ($tile, $dx, $dy) = @$_; 1381 my ($tile, $tile2, $dx, $dy) = @$_;
1382
1383 next if $block & (1 << $tile);
1384 my $block = $block | (1 << $tile2);
1109 1385
1110 my $gx = $gx + $dx; 1386 my $gx = $gx + $dx;
1111 my $gy = $gy + $dy; 1387 my $gy = $gy + $dy;
1112 1388
1113 next unless $flags & (1 << ($tile - 1)); 1389 next unless $flags & (1 << ($tile - 1));
… …
1115 1391
1116 my $neigh = $self->{neigh_map}{$hash} ||= []; 1392 my $neigh = $self->{neigh_map}{$hash} ||= [];
1117 if (my $info = $neigh->[$tile]) { 1393 if (my $info = $neigh->[$tile]) {
1118 my ($flags, $x, $y, $w, $h, $hash) = @$info; 1394 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1119 1395
1120 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1396 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1121 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1397 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1122 1398
1123 } else { 1399 } else {
1124 $self->send_mapinfo ("spatial $path$tile", sub { 1400 $self->send_mapinfo ("spatial $path$tile", sub {
1125 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1401 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1126 1402
1127 return if $mode ne "spatial"; 1403 return if $mode ne "spatial";
1128 1404
1129 $x += $MAP->ox; 1405 $x += $MAP->ox;
1130 $y += $MAP->oy; 1406 $y += $MAP->oy;
1131 1407
1132 $self->load_map ($hash, $x, $y) 1408 $self->load_map ($hash, $x, $y)
1133 unless $self->{neigh_map}{$hash}[5]++;#d# 1409 unless $self->{neigh_map}{$hash}[5]++;#d#
1134 1410
1135 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 1411 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1136 1412
1137 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1413 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1138 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1414 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1139 }); 1415 });
1140 } 1416 }
1141 } 1417 }
1142} 1418}
… …
1155 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1431 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1156 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1432 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1157 ]; 1433 ];
1158 1434
1159 delete $self->{neigh_grid}; 1435 delete $self->{neigh_grid};
1160 $self->flood_fill (0, 0, "", $hash, $flags);
1161 1436
1162 $x += $ox; 1437 $x += $ox;
1163 $y += $oy; 1438 $y += $oy;
1164 1439
1165 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1440 $self->{map_info} = [$hash, $x, $y, $w, $h];
1166 1441
1167 my $map = $self->{map_info}[0];
1168 $map =~ s/^.*?\/([^\/]+)$/\1/; 1442 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1169 $STATWIDS->{map}->set_text ("Map: " . $map); 1443 $STATWIDS->{map}->set_text ("Map: " . $map);
1170 1444
1171 $self->load_map ($hash, $x, $y); 1445 $self->load_map ($hash, $x, $y);
1446 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1172} 1447}
1173 1448
1174sub conn::face_find { 1449sub conn::face_find {
1175 my ($self, $facenum, $face) = @_; 1450 my ($self, $facenum, $face) = @_;
1176 1451
… …
1178 1453
1179 my $id = $FACEMAP->get ($hash); 1454 my $id = $FACEMAP->get ($hash);
1180 1455
1181 unless ($id) { 1456 unless ($id) {
1182 # create new id for face 1457 # create new id for face
1183 # i love transactions 1458 # I love transactions
1184 for (1..100) { 1459 for (1..100) {
1185 my $txn = $CFClient::DB_ENV->txn_begin; 1460 my $txn = $CFClient::DB_ENV->txn_begin;
1186 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW); 1461 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
1187 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 1462 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
1188 $id++; 1463 $id = ($id || 16) + 1;
1189 if ($FACEMAP->put (id => $id) == 0 1464 if ($FACEMAP->put (id => $id) == 0
1190 && $FACEMAP->put ($hash => $id) == 0) { 1465 && $FACEMAP->put ($hash => $id) == 0) {
1191 $txn->txn_commit; 1466 $txn->txn_commit;
1192 1467
1193 goto gotid; 1468 goto gotid;
… …
1201 1476
1202gotid: 1477gotid:
1203 $face->{id} = $id; 1478 $face->{id} = $id;
1204 $MAP->set_face ($facenum => $id); 1479 $MAP->set_face ($facenum => $id);
1205 $self->{faceid}[$facenum] = $id;#d# 1480 $self->{faceid}[$facenum] = $id;#d#
1481
1206 $TILECACHE->get ($id) 1482 $TILECACHE->get ($id) || do {
1483 my $tex = $self->{noface};
1484 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1485 undef
1486 };
1207} 1487}
1208 1488
1209sub conn::face_update { 1489sub conn::face_update {
1210 my ($self, $facenum, $face) = @_; 1490 my ($self, $facenum, $face) = @_;
1211 1491
… …
1304 ); 1584 );
1305 1585
1306 $entry->focus_in; 1586 $entry->focus_in;
1307 } 1587 }
1308 1588
1309 $dialog->show; 1589 $dialog->show_centered;
1310} 1590}
1311 1591
1312sub conn::drawinfo { 1592sub conn::drawinfo {
1313 my ($self, $color, $text) = @_; 1593 my ($self, $color, $text) = @_;
1314 1594
… …
1326 [0.55, 0.41, 0.13], 1606 [0.55, 0.41, 0.13],
1327 [0.99, 0.77, 0.26], 1607 [0.99, 0.77, 0.26],
1328 [0.74, 0.65, 0.41], 1608 [0.74, 0.65, 0.41],
1329 ); 1609 );
1330 1610
1611 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1612
1613 $text = CFClient::UI::Label::escape $text;
1614 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1615 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1616
1331 $LOGVIEW->add_paragraph ($color[$color], $text); 1617 $LOGVIEW->add_paragraph ($color[$color],
1618 join "\n", map "$time $_", split /\n/, $text);
1619
1620 $STATUSBOX->add ($text,
1621 group => $text,
1622 fg => $color[$color],
1623 timeout => 60,
1624 tooltip_font => $::FONT_FIXED,
1625 );
1626}
1627
1628sub conn::drawextinfo {
1629 my ($self, $color, $type, $subtype, $message) = @_;
1630
1631 $self->drawinfo ($color, $message);
1332} 1632}
1333 1633
1334sub conn::spell_add { 1634sub conn::spell_add {
1335 my ($self, $spell) = @_; 1635 my ($self, $spell) = @_;
1336 1636
1337 # TODO 1637 # TODO
1338 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1638 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1339 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1639 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1340 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1640 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1341} 1641}
1342 1642
1343sub conn::spell_delete { 1643sub conn::spell_delete {
1344 my ($self, $spell) = @_; 1644 my ($self, $spell) = @_;
1345} 1645}
1346 1646
1347sub conn::addme_success { 1647sub conn::addme_success {
1348 my ($self) = @_; 1648 my ($self) = @_;
1349 1649
1650 $self->send ("command output-sync $CFG->{output_sync}");
1651 $self->send ("command output-count $CFG->{output_count}");
1652
1653 my $parser = new Pod::POM;
1654 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1655
1656 my %skill_tooltip;
1657
1658 for my $head2 ($pod->head2) {
1659 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1660 }
1661
1350 for my $skill (values %{$self->{skill_info}}) { 1662 for my $skill (values %{$self->{skill_info}}) {
1351 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1663 $MAPWIDGET->add_command ("ready_skill $skill",
1352 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1664 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1665 . $skill_tooltip{$skill});
1666 $MAPWIDGET->add_command ("use_skill $skill",
1667 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1668 . $skill_tooltip{$skill});
1353 } 1669 }
1354
1355 $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you");
1356 $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players");
1357 $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1358 $MAPWIDGET->add_command ("kill\\_pets", "kill your pets");
1359} 1670}
1360 1671
1361sub conn::eof { 1672sub conn::eof {
1673 $MAPWIDGET->clr_commands;
1674
1362 stop_game; 1675 stop_game;
1363} 1676}
1364 1677
1365sub update_floorbox { 1678sub update_floorbox {
1366 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1679 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1367 return unless $CONN; 1680 return unless $CONN;
1368 1681
1369 $FLOORBOX->clear; 1682 $FLOORBOX->clear;
1370 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1683 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1371 1684
1372 my $count = 4; 1685 my $count = 7;
1373 for (@{ $CONN->{container}{0} }) { 1686 for (@{ $CONN->{container}{0} }) {
1374 if (--$count) { 1687 if (--$count) {
1375 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_); 1688 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1376 } else { 1689 } else {
1377 $FLOORBOX->add (new CFClient::UI::Label text => "More..."); 1690 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
… …
1384} 1697}
1385 1698
1386sub conn::container_add { 1699sub conn::container_add {
1387 my ($self, $tag, $items) = @_; 1700 my ($self, $tag, $items) = @_;
1388 1701
1389 update_floorbox if $tag == 0; 1702 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1390 1703
1704 if ($tag == 0) {
1705 update_floorbox;
1706 $OPENCONT = 0;
1707 $INVR_LBL->set_text ("Floor");
1708 $INVR->set_items ($self->{container}{0});
1709 } elsif ($tag == $self->{player}{tag}) {
1710 $INVR_LBL->set_text ("Player");
1391 $INV->set_items ($self->{container}{$self->{player}{tag}}) 1711 $INV->set_items ($self->{container}{$self->{player}{tag}})
1392 if $tag == $self->{player}{tag}; 1712 } else {
1713 $OPENCONT = $tag;
1714 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1715 $INVR->set_items ($self->{container}{$tag});
1716 }
1393 1717
1394 # $self-<{player}{tag} => player inv 1718 # $self-<{player}{tag} => player inv
1395 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1719 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1396} 1720}
1397 1721
1398sub conn::container_clear { 1722sub conn::container_clear {
1399 my ($self, $tag) = @_; 1723 my ($self, $tag) = @_;
1400 1724
1401 update_floorbox if $tag == 0; 1725 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1402 1726
1727 if ($tag == 0) {
1728 update_floorbox;
1729 $OPENCONT = 0;
1730 $INVR_LBL->set_text ("Floor");
1731 $INVR->set_items ($self->{container}{0});
1732 } elsif ($tag == $self->{player}{tag}) {
1733 $INVR_LBL->set_text ("Player");
1403 $INV->set_items ($self->{container}{$tag}) 1734 $INV->set_items ($self->{container}{$tag})
1404 if $tag == $self->{player}{tag}; 1735 } else {
1736 $OPENCONT = $tag;
1737 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1738 $INVR->set_items ($self->{container}{$tag});
1739 }
1405 1740
1406# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1741# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1407} 1742}
1408 1743
1409sub conn::item_delete { 1744sub conn::item_delete {
1410 my ($self, @items) = @_; 1745 my ($self, @items) = @_;
1411 1746
1412 for (@items) { 1747 for (@items) {
1413 update_floorbox if $_->{container} == 0; 1748 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1414 1749
1750 if ($_->{container} == 0) {
1751 update_floorbox;
1752 $OPENCONT = 0;
1753 $INVR_LBL->set_text ("Floor");
1754 $INVR->set_items ($self->{container}{0});
1755 } elsif ($_->{container} == $self->{player}{tag}) {
1756 $INVR_LBL->set_text ("Player");
1757 $INV->set_items ($self->{container}{$self->{player}{tag}})
1758 } else {
1759 $OPENCONT = $_->{container};
1760 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1415 $INV->set_items ($self->{container}{$_->{container}}) 1761 $INVR->set_items ($self->{container}{$_->{container}});
1416 if $_->{container} == $self->{player}{tag}; 1762 }
1417 } 1763 }
1418} 1764}
1419 1765
1420sub conn::item_update { 1766sub conn::item_update {
1421 my ($self, $item) = @_; 1767 my ($self, $item) = @_;
1422 1768
1423 update_floorbox if $item->{container} == 0; 1769 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1424 1770
1771 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1772 $OPENCONT = 0;
1773 $INVR_LBL->set_text ("Floor");
1774 $INVR->set_items ($self->{container}{0});
1775
1776 $item->{widget}->update_item
1777 if $item->{widget};
1778 } else {
1779 if ($item->{container} == 0) {
1780 update_floorbox;
1781 $OPENCONT = 0;
1782 $INVR_LBL->set_text ("Floor");
1783 $INVR->set_items ($self->{container}{0});
1784 } elsif ($item->{container} == $self->{player}{tag}) {
1425 $INV->set_items ($self->{container}{$item->{container}}) 1785 $INV->set_items ($self->{container}{$item->{container}})
1426 if $item->{container} == $self->{player}{tag}; 1786 }
1787 }
1427} 1788}
1428 1789
1429%SDL_CB = ( 1790%SDL_CB = (
1430 CFClient::SDL_QUIT => sub { 1791 CFClient::SDL_QUIT => sub {
1431 Event::unloop -1; 1792 Event::unloop -1;
1432 }, 1793 },
1433 CFClient::SDL_VIDEORESIZE => sub { 1794 CFClient::SDL_VIDEORESIZE => sub {
1434 }, 1795 },
1435 CFClient::SDL_VIDEOEXPOSE => sub { 1796 CFClient::SDL_VIDEOEXPOSE => sub {
1436 $WANT_REFRESH++; 1797 CFClient::UI::full_refresh;
1437 }, 1798 },
1438 CFClient::SDL_ACTIVEEVENT => sub { 1799 CFClient::SDL_ACTIVEEVENT => sub {
1439# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1800# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1440 }, 1801 },
1441 CFClient::SDL_KEYDOWN => sub { 1802 CFClient::SDL_KEYDOWN => sub {
… …
1477 sdl_mode => 0, 1838 sdl_mode => 0,
1478 width => 640, 1839 width => 640,
1479 height => 480, 1840 height => 480,
1480 fullscreen => 0, 1841 fullscreen => 0,
1481 fast => 0, 1842 fast => 0,
1482 map_scale => 0.5, 1843 map_scale => 1,
1483 fow_enable => 1, 1844 fow_enable => 1,
1484 fow_intensity => 0.45, 1845 fow_intensity => 0.45,
1485 fow_smooth => 0, 1846 fow_smooth => 0,
1486 gui_fontsize => 1, 1847 gui_fontsize => 1,
1487 log_fontsize => 1, 1848 log_fontsize => 1,
… …
1492 host => "crossfire.schmorp.de", 1853 host => "crossfire.schmorp.de",
1493 say_command => 'say', 1854 say_command => 'say',
1494 audio_enable => 1, 1855 audio_enable => 1,
1495 bgm_enable => 1, 1856 bgm_enable => 1,
1496 bgm_volume => 0.25, 1857 bgm_volume => 0.25,
1858 output_sync => 1,
1859 output_count => 1,
1497 ); 1860 );
1498 1861
1499 while (my ($k, $v) = each %DEF_CFG) { 1862 while (my ($k, $v) = each %DEF_CFG) {
1500 $CFG->{$k} = $v unless exists $CFG->{$k}; 1863 $CFG->{$k} = $v unless exists $CFG->{$k};
1501 } 1864 }
… …
1522 DejaVuSansMono-BoldOblique.ttf 1885 DejaVuSansMono-BoldOblique.ttf
1523 ); 1886 );
1524 1887
1525 CFClient::add_font $_ for @fonts; 1888 CFClient::add_font $_ for @fonts;
1526 1889
1890 CFClient::pango_init;
1891
1527 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1892 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1528 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1893 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1529 1894
1530 $FONT_PROP->make_default; 1895 $FONT_PROP->make_default;
1531 } 1896 }
1532 1897
1898# compare mono (ft) vs. rgba (cairo)
1899# ft - 1.8s, cairo 3s, even in alpha-only mode
1900# for my $rgba (0..1) {
1901# my $t1 = Time::HiRes::time;
1902# for (1..1000) {
1903# my $layout = CFClient::Layout->new ($rgba);
1904# $layout->set_text ("hallo" x 100);
1905# $layout->render;
1906# }
1907# my $t2 = Time::HiRes::time;
1908# warn $t2-$t1;
1909# }
1910
1533 video_init; 1911 video_init;
1534 audio_init; 1912 audio_init;
1535} 1913}
1536 1914
1537Event::loop; 1915Event::loop;
1538 1916
1539END { CFClient::SDL_Quit } 1917END { CFClient::SDL_Quit }
1540 1918
1919=head1 NAME
1920
1541=head1 pclient - Crossfire+ and Crossfire game client 1921pclient - A Crossfire+ and Crossfire game client
1542 1922
1543Pclient is a Crossfire+ and Crossfire game client. 1923=head1 SYNOPSIS
1544 1924
1545=head2 Features 1925Just run it - no commandline arguments are supported.
1546
1547=over 4
1548
1549=item Fullscreen Map
1550
1551PClient can uses a fullscreen map, which greatly enhances how much of the
1552game world you can see.
1553
1554=item Persistent Map Cache (Crossfire+ only)
1555
1556PClient can persistently cache all map data it received from the
1557server. This not only allows it to display an overview map, but also
1558ensures that once-explored areas will be available the next time you want
1559to explore more.
1560
1561=item Hardware acceleration
1562
1563Unlike most Crossfire clients, PClient take advantage of OpenGL hardware
1564acceleration. Most modern graphics cards have difficulties with 2D
1565acceleration, while 3D graphics is accelerated well.
1566
1567=item No arbitrary limits
1568
1569Unlike other Crossfire clients, pclient does not suffer from arbitrary
1570limits (like a fixed amount of face numbers). There are still limits, but
1571they are not arbitrarily low :)
1572
1573=back
1574 1926
1575=head1 USAGE 1927=head1 USAGE
1576 1928
1577=head2 The Map 1929Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used
1578 1930fullscreen and interactively.
1579The map is always displayed in the background, behind all other windows and UI elements.
1580
1581#TODO# middle-click scrolls
1582#
1583# keys:
1584#
1585# a apply
1586# keypad moves, kp_5 applies ranged attack to self
1587
1588Starting to type enters the I<completion mode>. In that mode, you can type
1589abbreviations or commands and have them executed as soon as they match a
1590valid command. This is best explained by a few examples:
1591
1592Typing B<climb> will display a list of commands with I<climb> in their
1593name, such as I<ready_skill climbing> and I<use_skill climbing>.
1594
1595You can abbreviate commands by typing only the first character of every
1596word. For example, typing I<iwor> will likely select I<invoke word of
1597recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli>
1598will likely select I<ready_skill climbing> and I<usl> will give you
1599I<use_skill levitation>.
1600
1601=head2 The map overview
1602
1603#TODO#
1604
1605=head2 The Status area in the lower right corner
1606
1607#TODO#
1608
1609=head2 The I<Statistics>/I>Stats> window
1610
1611#TODO#
1612
1613=head1 FAQ
1614
1615=over 4
1616
1617=item The client is very sluggish and slow, what can I do about this?
1618
1619Most likely, you don't have accelerated OpenGL support. Try to find a
1620newer driver, or a driver from your hardware vendor, that features OpenGL
1621support.
1622
1623If this is not an option, the following Setup options reduce the load and
1624will likely make the client playable with sofwtare rendering (it will
1625still be slow, though):
1626
1627=over 4
1628
1629=item B<Video Mode> should be set as low as possible (e.g. 640x480)
1630
1631=item Enable B<Fast & Ugly> mode
1632
1633=item Disable B<Fog of War>
1634
1635=item Increase B<Map Scale>
1636
1637=back
1638
1639=back
1640 1931
1641=head1 AUTHOR 1932=head1 AUTHOR
1642 1933
1643Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1934Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1644 1935

Diff Legend

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