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.203 by root, Mon May 8 20:55:49 2006 UTC vs.
Revision 1.240 by root, Tue May 23 21:14:42 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
… …
59our $NOW; 61our $NOW;
60 62
61our $CFG; 63our $CFG;
62our $CONN; 64our $CONN;
63our $FAST; # fast, low-quality mode, possibly useful for software-rendering 65our $FAST; # fast, low-quality mode, possibly useful for software-rendering
66
67our $WANT_REFRESH;
68our $CAN_REFRESH;
64 69
65our @SDL_MODES; 70our @SDL_MODES;
66our $WIDTH; 71our $WIDTH;
67our $HEIGHT; 72our $HEIGHT;
68our $FULLSCREEN; 73our $FULLSCREEN;
… …
77our $BUTTONBAR; 82our $BUTTONBAR;
78our $LOGVIEW; 83our $LOGVIEW;
79our $CONSOLE; 84our $CONSOLE;
80our $METASERVER; 85our $METASERVER;
81our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
87our $QUIT_DIALOG;
82 88
83our $FLOORBOX; 89our $FLOORBOX;
84our $GAUGES; 90our $GAUGES;
85our $STATWIDS; 91our $STATWIDS;
86 92
… …
90our $SDL_MIXER; 96our $SDL_MIXER;
91our @SOUNDS; # event => file mapping 97our @SOUNDS; # event => file mapping
92our %AUDIO_CHUNKS; # audio files 98our %AUDIO_CHUNKS; # audio files
93 99
94our $ALT_ENTER_MESSAGE; 100our $ALT_ENTER_MESSAGE;
95our $STATUS_LINE; 101our $STATUSBOX;
96our $DEBUG_STATUS; 102our $DEBUG_STATUS;
97 103
98our $INVWIN; 104our $INVWIN;
99our $INV; 105our $INV;
106our $INVR;
107our $INVR_LBL;
108our $OPENCONT;
100 109
101sub status { 110sub status {
102 $STATUS_LINE->set_text ($_[0]); 111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
103 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
104} 112}
105 113
106sub debug { 114sub debug {
107 $DEBUG_STATUS->set_text ($_[0]); 115 $DEBUG_STATUS->set_text ($_[0]);
108 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h}); 116 my ($w, $h) = $DEBUG_STATUS->size_request;
117 $DEBUG_STATUS->move ($WIDTH - $w, 0);
109} 118}
110 119
111sub start_game { 120sub start_game {
112 status "logging in..."; 121 status "logging in...";
113 122
… …
128 maph => $mapsize, 137 maph => $mapsize,
129 ; 138 ;
130 }; 139 };
131 140
132 if ($CONN) { 141 if ($CONN) {
142 CFClient::lowdelay fileno $CONN->{fh};
143
133 $LOGIN_BUTTON->set_text ("Logout"); 144 $LOGIN_BUTTON->set_text ("Logout");
134
135 status "login successful"; 145 status "login successful";
136 146
137 CFClient::lowdelay fileno $CONN->{fh}; 147 $BUTTONBAR->{children}[1]->emit ("activate")
148 if $BUTTONBAR->{children}[1]->{state};
149
138 } else { 150 } else {
139 status "unable to connect"; 151 status "unable to connect";
140 stop_game(); 152 stop_game();
141 } 153 }
142} 154}
… …
146 158
147 status "connection closed"; 159 status "connection closed";
148 $LOGIN_BUTTON->set_text ("Login"); 160 $LOGIN_BUTTON->set_text ("Login");
149 $CONN->destroy; 161 $CONN->destroy;
150 $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};
151 166
152 undef $MAPCACHE; 167 undef $MAPCACHE;
153 undef $MAP; 168 undef $MAP;
154} 169}
155 170
… …
160 $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]);
161 176
162 $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");
163 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 178 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
164 179
165 $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]);
166 $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");
167 182
168 $mode_slider->connect (changed => sub { 183 $mode_slider->connect (changed => sub {
169 my ($self, $value) = @_; 184 my ($self, $value) = @_;
170 185
… …
195 } 210 }
196 ); 211 );
197 212
198 $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");
199 $table->add (1, $row++, new CFClient::UI::Slider 214 $table->add (1, $row++, new CFClient::UI::Slider
200 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 215 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
201 tooltip => "Enlarge or shrink the displayed map", 216 tooltip => "Enlarge or shrink the displayed map",
202 connect_changed => sub { 217 connect_changed => sub {
203 my ($self, $value) = @_; 218 my ($self, $value) = @_;
204 $CFG->{map_scale} = 0.05 * int $value / 0.05; 219 $CFG->{map_scale} = 2 ** $value;
205 } 220 }
206 ); 221 );
207 222
208 $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");
209 $table->add (1, $row++, new CFClient::UI::CheckBox 224 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
236 } 251 }
237 ); 252 );
238 253
239 $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");
240 $table->add (1, $row++, new CFClient::UI::Slider 255 $table->add (1, $row++, new CFClient::UI::Slider
241 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 256 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
242 tooltip => "The font size used by most GUI elements", 257 tooltip => "The font size used by most GUI elements",
243 connect_changed => sub { 258 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
244 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
245# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
246 }
247 ); 259 );
248 260
249 $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");
250 $table->add (1, $row++, new CFClient::UI::Slider 262 $table->add (1, $row++, new CFClient::UI::Slider
251 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 263 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
252 tooltip => "The font size used by the server log window only", 264 tooltip => "The font size used by the server log window only",
253 connect_changed => sub { 265 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
254 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
255 }
256 ); 266 );
257 267
258 $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");
259 269
260 $table->add (1, $row++, new CFClient::UI::Slider 270 $table->add (1, $row++, new CFClient::UI::Slider
261 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 271 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
262 tooltip => "The font size used by the statistics window only", 272 tooltip => "The font size used by the statistics window only",
263 connect_changed => sub { 273 connect_changed => sub {
264 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 274 $CFG->{stat_fontsize} = $_[1];
265 &set_stats_window_fontsize; 275 &set_stats_window_fontsize;
266 } 276 }
267 ); 277 );
268 278
269 $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");
270 $table->add (1, $row++, new CFClient::UI::Slider 280 $table->add (1, $row++, new CFClient::UI::Slider
271 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 281 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
272 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",
273 connect_changed => sub { 283 connect_changed => sub {
274 $CFG->{gauge_size} = $_[1]; 284 $CFG->{gauge_size} = $_[1];
275 my $h = int $HEIGHT * $CFG->{gauge_size}; 285 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
276 $GAUGES->{win}->set_size ($WIDTH, $h);
277 $GAUGES->{win}->move (0, $HEIGHT - $h);
278 } 286 }
279 ); 287 );
280 288
281 $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");
282 $table->add (1, $row++, new CFClient::UI::Slider 290 $table->add (1, $row++, new CFClient::UI::Slider
283 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 291 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
284 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 292 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
285 connect_changed => sub { 293 connect_changed => sub {
286 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 294 $CFG->{gauge_fontsize} = $_[1];
287 &set_gauge_window_fontsize; 295 &set_gauge_window_fontsize;
288 } 296 }
289 ); 297 );
290 298
291 $table->add (1, $row++, new CFClient::UI::Button 299 $table->add (1, $row++, new CFClient::UI::Button
… …
365# local $GAUGES->{win}{parent};#d# 373# local $GAUGES->{win}{parent};#d#
366# 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;
367} 375}
368 376
369sub make_gauge_window { 377sub make_gauge_window {
370 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 378 my $gh = int $HEIGHT * $CFG->{gauge_size};
371# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
372 379
373 my $win = new CFClient::UI::Frame ( 380 my $win = new CFClient::UI::Frame (
374 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 381 req_y => -1,
382 user_w => $WIDTH,
383 user_h => $gh,
375 ); 384 );
385
376 $win->add (my $hbox = new CFClient::UI::HBox 386 $win->add (my $hbox = new CFClient::UI::HBox
377 children => [ 387 children => [
378 (new CFClient::UI::HBox expand => 1), 388 (new CFClient::UI::HBox expand => 1),
379 ($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 ]),
380 (my $vbox = new CFClient::UI::VBox), 393 (my $vbox = new CFClient::UI::VBox),
381 ], 394 ],
382 ); 395 );
383 396
384 $vbox->add (new CFClient::UI::HBox 397 $vbox->add (new CFClient::UI::HBox
… …
388 (my $hb = new CFClient::UI::HBox), 401 (my $hb = new CFClient::UI::HBox),
389 ], 402 ],
390 ); 403 );
391 404
392 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 405 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
393 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.");
394 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 407 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
395 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.");
396 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 409 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
397 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.");
398 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 411 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
399 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.");
400 413
401 $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,
402 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.");
403 $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,
404 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.)");
405 418
406 $GAUGES = { 419 $GAUGES = {
407 exp => $exp, win => $win, range => $rng, 420 exp => $exp, win => $win, range => $rng,
408 food => $fg, mana => $mg, hp => $hg, grace => $gg 421 food => $fg, mana => $mg, hp => $hg, grace => $gg
409 }; 422 };
… …
415 428
416sub make_stats_window { 429sub make_stats_window {
417 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats"; 430 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats";
418 431
419 $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);
420 $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.");
421 $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).");
422 439
423 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 440 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
424
425 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 441 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
426 442
427 my $black = [0, 0, 0]; 443 my $black = [0, 0, 0];
428 444
429 for ( 445 for (
430 [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"],
431 [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"],
432 [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"],
433 [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"],
434 [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"],
435 [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"],
436 [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."],
437 453
438 [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."],
439 [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."],
440 [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."],
441 [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."],
442 [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."],
443 [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."],
444 ) { 460 ) {
445 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 461 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
446 462
447 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 463 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
448 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);
… …
454 470
455 my $row = 0; 471 my $row = 0;
456 my $col = 0; 472 my $col = 0;
457 473
458 my %resist_names = ( 474 my %resist_names = (
459 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.)",
460 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.)",
461 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.)",
462 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, ...)",
463 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)",
464 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)",
465 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)",
466 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)",
467 pois => "Poison (resistance to getting poisoned)", 483 pois => "<b>Poison</b> (resistance to getting poisoned)",
468 para => "Paralysation (this resistance affects the chance you get paralysed)", 484 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
469 deat => "Death (resistance against death spells)", 485 deat => "<b>Death</b> (resistance against death spells)",
470 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)",
471 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)",
472 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)",
473 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...",
474 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, ...)",
475 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, ...)",
476 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)",
477 ); 493 );
478 for (qw/slow holyw conf fire depl magic 494 for (qw/slow holyw conf fire depl magic
479 drain acid pois para deat phys 495 drain acid pois para deat phys
480 blind fear tund elec cold ghit/) 496 blind fear tund elec cold ghit/)
481 { 497 {
… …
661 $HOST->set_text ($CFG->{host} = $host); 677 $HOST->set_text ($CFG->{host} = $host);
662 }), 678 }),
663 (new CFClient::UI::Empty expand => 1), 679 (new CFClient::UI::Empty expand => 1),
664 ]); 680 ]);
665 681
666 $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)
667 for 0 .. $#$m; 684 for 0 .. $#$m;
668 } 685 }
669 } 686 }
670 }); 687 });
671} 688}
… …
727 ); 744 );
728 745
729 $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");
730 $table->add (1, 7, new CFClient::UI::Slider 747 $table->add (1, 7, new CFClient::UI::Slider
731 req_w => 100, 748 req_w => 100,
732 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 749 range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1],
733 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. "
734 ."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.",
735 connect_changed => sub { 752 connect_changed => sub {
736 my ($self, $value) = @_; 753 my ($self, $value) = @_;
737 754
738 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 755 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
739 }, 756 },
740 ); 757 );
741 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
742 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button 773 $table->add (1, 10, $LOGIN_BUTTON = new CFClient::UI::Button
743 expand => 1, 774 expand => 1,
744 align => 0, 775 align => 0,
745 text => "Login", 776 text => "Login",
746 connect_activate => sub { 777 connect_activate => sub {
747 $CONN ? stop_game 778 $CONN ? stop_game
… …
754 785
755sub message_window { 786sub message_window {
756 my $window = new CFClient::UI::FancyFrame 787 my $window = new CFClient::UI::FancyFrame
757 title => "Messages", 788 title => "Messages",
758 border_bg => [1, 1, 1, 1], 789 border_bg => [1, 1, 1, 1],
759 bg => [0, 0, 0, 0.5], 790 bg => [0, 0, 0, 0.75],
760 user_w => int $::WIDTH / 3, 791 user_w => int $::WIDTH / 3,
761 user_h => int $::HEIGHT / 5, 792 user_h => int $::HEIGHT / 5,
762 child => (my $vbox = new CFClient::UI::VBox); 793 child => (my $vbox = new CFClient::UI::VBox);
763 794
764 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 795 $vbox->add ($LOGVIEW);
765 expand => 1,
766 font => $FONT_FIXED,
767 fontsize => $::CFG->{log_fontsize},
768 );
769 796
770 $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.",
771 connect_focus_in => sub { 802 connect_focus_in => sub {
772 my ($input, $prev_focus) = @_; 803 my ($input, $prev_focus) = @_;
773 804
774 delete $input->{refocus_map}; 805 delete $input->{refocus_map};
775 806
… …
804 }; 835 };
805 836
806 $window 837 $window
807} 838}
808 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
809sub make_inventory_window { 870sub make_inventory_window {
810 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");
811 $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
812 $invwin 886 $invwin
813} 887}
814 888
815sub sdl_init { 889sub sdl_init {
816 CFClient::SDL_Init 890 CFClient::SDL_Init
… …
825 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 899 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
826 $FULLSCREEN = $CFG->{fullscreen}; 900 $FULLSCREEN = $CFG->{fullscreen};
827 $FAST = $CFG->{fast}; 901 $FAST = $CFG->{fast};
828 902
829 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 903 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
830 or die "SDL_SetVideoMode failed!\n"; 904 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
831 905
832 $SDL_ACTIVE = 1; 906 $SDL_ACTIVE = 1;
833 $LAST_REFRESH = time - 0.01; 907 $LAST_REFRESH = time - 0.01;
834 908
835 CFClient::gl_init; 909 CFClient::gl_init;
… …
838 912
839 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 913 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
840 914
841 ############################################################################# 915 #############################################################################
842 916
843 if ($DEBUG_STATUS) { 917 unless ($DEBUG_STATUS) {
844 # reconfigure all widgets
845 $CFClient::UI::ROOT->reconfigure;
846
847 } else {
848 # create the widgets 918 # create the widgets
849 919
850 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 920 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
851 $DEBUG_STATUS->show; 921 $DEBUG_STATUS->show;
852 922
853 $STATUS_LINE = new CFClient::UI::Label 923 $STATUSBOX = new CFClient::UI::Statusbox;
854 padding => 0, 924 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
855 y => $HEIGHT - $FONTSIZE * 1.8;
856 $STATUS_LINE->show;
857 925
858 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 926 (new CFClient::UI::Frame
859 padding => 0, 927 bg => [0, 0, 0, 0.4],
860 fontsize => 0.8, 928 req_y => -1,
861 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 929 child => $STATUSBOX,
862 $ALT_ENTER_MESSAGE->show; 930 )->show;
863 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
864 931
865 CFClient::UI::FancyFrame->new ( 932 CFClient::UI::FancyFrame->new (
866 border_bg => [1, 1, 1, 192/255], 933 border_bg => [1, 1, 1, 192/255],
867 bg => [1, 1, 1, 0], 934 bg => [1, 1, 1, 0],
868 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 935 child => ($MAPMAP = new CFClient::MapWidget::MapMap
936 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
937 ),
869 )->show; 938 )->show;
870 939
871 $MAPWIDGET = new CFClient::MapWidget; 940 $MAPWIDGET = new CFClient::MapWidget;
872 $MAPWIDGET->connect (activate_console => sub { 941 $MAPWIDGET->connect (activate_console => sub {
873 my ($mapwidget, $preset) = @_; 942 my ($mapwidget, $preset) = @_;
… …
882 } 951 }
883 }); 952 });
884 $MAPWIDGET->show; 953 $MAPWIDGET->show;
885 $MAPWIDGET->focus_in; 954 $MAPWIDGET->focus_in;
886 955
956 $LOGVIEW = new CFClient::UI::TextView
957 expand => 1,
958 font => $FONT_FIXED,
959 fontsize => $::CFG->{log_fontsize},
960 can_hover => 1,
961 can_events => 1,
962 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
963 ;
964
887 $BUTTONBAR = new CFClient::UI::HBox; 965 $BUTTONBAR = new CFClient::UI::HBox;
888 966
889 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 967 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
968 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
890 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 969 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
970 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
891 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 971 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
972 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
892 973
893 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 974 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
894 975
895 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 976 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
977 tooltip => "Toggles the statistics window, where all your Stats and Resistances are beign displaye at all times.");
896 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window); 978 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
979 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");
897 980
898 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 981 $BUTTONBAR->add (new CFClient::UI::Button
982 text => "Save Config",
983 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
984 connect_activate => sub {
899 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 985 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
900 status "Configuration Saved"; 986 status "Configuration Saved";
987 },
988 );
989
990 $BUTTONBAR->add (new CFClient::UI::Button
991 text => "Quit",
992 tooltip => "Terminates the program",
993 connect_activate => sub {
994 if ($CONN) {
995 open_quit_dialog
996 } else {
997 exit 1
998 }
999 },
1000 );
1001
1002 $BUTTONBAR->show;
1003
1004 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1005
1006 # delay till geometry is constant
1007 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1008 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1009 my $widget = $GAUGES->{win};
1010 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
901 }); 1011 });
902 1012 force_refresh ();
903 $BUTTONBAR->show;
904
905 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
906 } 1013 }
907} 1014}
908 1015
909sub video_shutdown { 1016sub video_shutdown {
910 undef $SDL_ACTIVE; 1017 undef $SDL_ACTIVE;
… …
914my $bgmusic;#TODO#hack#d# 1021my $bgmusic;#TODO#hack#d#
915 1022
916sub audio_channel_finished { 1023sub audio_channel_finished {
917 my ($channel) = @_; 1024 my ($channel) = @_;
918 1025
919 warn "channel $channel finished\n";#d# 1026 #warn "channel $channel finished\n";#d#
920} 1027}
921 1028
922sub audio_music_finished { 1029sub audio_music_finished {
923 return unless $CFG->{bgm_enable}; 1030 return unless $CFG->{bgm_enable};
924 1031
… …
931 1038
932sub audio_init { 1039sub audio_init {
933 if ($CFG->{audio_enable}) { 1040 if ($CFG->{audio_enable}) {
934 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1041 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
935 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1042 $SDL_MIXER = !CFClient::Mix_OpenAudio;
1043
1044 unless ($SDL_MIXER) {
1045 status "Unable to open sound device: there will be no sound";
1046 return;
1047 }
1048
936 CFClient::Mix_AllocateChannels 8; 1049 CFClient::Mix_AllocateChannels 8;
937 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1050 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
938 1051
939 audio_music_finished; 1052 audio_music_finished;
940 1053
… …
966} 1079}
967 1080
968my %animate_object; 1081my %animate_object;
969my $animate_timer; 1082my $animate_timer;
970 1083
971my $want_refresh;
972my $can_refresh;
973
974my $fps = 9; 1084my $fps = 9;
975 1085
1086my %demo;#d#
1087
976sub force_refresh { 1088sub force_refresh {
977 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 1089 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
978 debug sprintf "%3.2f", $fps; 1090 debug sprintf "%3.2f", $fps;
979 1091
980 $want_refresh = 0;
981 $can_refresh = 0;
982
983 $CFClient::UI::ROOT->draw; 1092 $CFClient::UI::ROOT->draw;
984 1093
1094 $WANT_REFRESH = 0;
1095 $CAN_REFRESH = 0;
1096 $LAST_REFRESH = $NOW;
1097
10980 && do {
1099 # some weird model-drawing code, just a joke right now
1100 use CFClient::OpenGL;
1101
1102 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1103 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1104 $demo{r} ||= do {
1105 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1106 $mod->{v} = pack "f*", @{$mod->{v}};
1107 $_ = [scalar @$_, pack "S!*", @$_]
1108 for values %{$mod->{g}};
1109 $mod
1110 };
1111
1112 my $r = $demo{r} or die;
1113
1114 glDepthMask 1;
1115 glClear GL_DEPTH_BUFFER_BIT;
1116 glEnable GL_TEXTURE_2D;
1117 glEnable GL_DEPTH_TEST;
1118 glEnable GL_CULL_FACE;
1119 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1120
1121 glMatrixMode GL_PROJECTION;
1122 glLoadIdentity;
1123 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1124 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1125 glMatrixMode GL_MODELVIEW;
1126 glLoadIdentity;
1127
1128 glPushMatrix;
1129 glTranslate 0, 0, -800;
1130 glScale 1, -1, 1;
1131 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1132 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1133 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1134 glScale 50, 50, 50;
1135
1136 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1137 while (my ($k, $v) = each %{$r->{g}}) {
1138 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1139 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1140 }
1141
1142 glPopMatrix;
1143
1144 glShadeModel GL_FLAT;
1145 glDisable GL_DEPTH_TEST;
1146 glDisable GL_TEXTURE_2D;
1147 glDepthMask 0;
1148
1149 $WANT_REFRESH++;
1150};
1151
985 CFClient::SDL_GL_SwapBuffers; 1152 CFClient::SDL_GL_SwapBuffers;
986
987 $LAST_REFRESH = $NOW;
988} 1153}
989 1154
990my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1155my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
991 $NOW = time; 1156 $NOW = time;
992 1157
993 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1158 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
994 for CFClient::SDL_PollEvent; 1159 for CFClient::SDL_PollEvent;
995 1160
996 if (%animate_object) { 1161 if (%animate_object) {
997 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1162 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
998 $want_refresh++; 1163 $WANT_REFRESH++;
999 } 1164 }
1000 1165
1001 if ($want_refresh) { 1166 if ($WANT_REFRESH) {
1002 force_refresh; 1167 force_refresh;
1003 } else { 1168 } else {
1004 $can_refresh = 1; 1169 $CAN_REFRESH = 1;
1005 } 1170 }
1006}); 1171});
1007
1008sub refresh {
1009 $want_refresh++;
1010}
1011 1172
1012sub animation_start { 1173sub animation_start {
1013 my ($widget) = @_; 1174 my ($widget) = @_;
1014 $animate_object{$widget} = $widget; 1175 $animate_object{$widget} = $widget;
1015} 1176}
… …
1019 delete $animate_object{$widget}; 1180 delete $animate_object{$widget};
1020} 1181}
1021 1182
1022@conn::ISA = Crossfire::Protocol::; 1183@conn::ISA = Crossfire::Protocol::;
1023 1184
1185sub conn::new {
1186 my $class = shift;
1187
1188 my $self = $class->Crossfire::Protocol::new (@_);
1189
1190 $MAPWIDGET->clr_commands;
1191
1192 my $parser = new Pod::POM;
1193 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1194
1195 for my $head2 ($pod->head2) {
1196 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1197 or next;
1198
1199 my $cmd = $1;
1200 my @args = split /\|/, $2;
1201 @args = (".*") unless @args;
1202
1203 my $text = CFClient::pod_to_pango $head2->content;
1204
1205 for my $arg (@args) {
1206 $arg = $arg eq ".*" ? "" : " $arg";
1207
1208 $MAPWIDGET->add_command ("$cmd$arg", $text);
1209 }
1210 }
1211
1212 $self->{noface} = new_from_file CFClient::Texture
1213 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
1214
1215 $self
1216}
1217
1024sub conn::stats_update { 1218sub conn::stats_update {
1025 my ($self, $stats) = @_; 1219 my ($self, $stats) = @_;
1220
1221 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1222 my $diff = $exp - $self->{prev_exp};
1223 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1224 if exists $self->{prev_exp} && $diff;
1225 $self->{prev_exp} = $exp;
1226 }
1026 1227
1027 update_stats_window ($stats); 1228 update_stats_window ($stats);
1028} 1229}
1029 1230
1030sub conn::user_send { 1231sub conn::user_send {
… …
1085 $self->set_texture ($id => $data); 1286 $self->set_texture ($id => $data);
1086 } 1287 }
1087 } 1288 }
1088} 1289}
1089 1290
1291# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1292# (server resource,s latency, bandwidth), so this hack is warranted.
1293# the right fix is to make real tiled maps with an overview file
1294sub conn::send_mapinfo {
1295 my ($self, $data, $cb) = @_;
1296
1297 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1298 my ($wx, $wy) = ($1, $2);
1299
1300 if ($data =~ /^spatial ([1-4]+)$/) {
1301 my @dx = (0, 0, 1, 0, -1);
1302 my @dy = (0, -1, 0, 1, 0);
1303 my ($dx, $dy);
1304
1305 for (split //, $1) {
1306 $dx += $dx[$_];
1307 $dy += $dy[$_];
1308 }
1309
1310 $cb->(spatial => 15,
1311 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1312 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1313 50, 50,
1314 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1315 );
1316
1317 return;
1318 }
1319 }
1320
1321 $self->SUPER::send_mapinfo ($data, $cb);
1322}
1323
1090# this method does a "flood fill" into every tile direction 1324# this method does a "flood fill" into every tile direction
1091# it assumes that tiles are arranged in a rectangular grid, 1325# it assumes that tiles are arranged in a rectangular grid,
1092# i.e. a map is the same as the left of the right map etc. 1326# i.e. a map is the same as the left of the right map etc.
1093# failure to comply are harmless and result in display errors 1327# failure to comply are harmless and result in display errors
1094# at worst. 1328# at worst.
1095sub conn::flood_fill { 1329sub conn::flood_fill {
1096 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1330 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1097 1331
1098 # the server does not allow map paths > 6 1332 # the server does not allow map paths > 6
1099 return if 7 <= length $path; 1333 return if 7 <= length $path;
1100 1334
1101 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1335 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1102 1336
1103 for ( 1337 for (
1104 [1, 0, -1], 1338 [1, 3, 0, -1],
1105 [2, 1, 0], 1339 [2, 4, 1, 0],
1106 [3, 0, 1], 1340 [3, 1, 0, 1],
1107 [4, -1, 0], 1341 [4, 2, -1, 0],
1108 ) { 1342 ) {
1109 my ($tile, $dx, $dy) = @$_; 1343 my ($tile, $tile2, $dx, $dy) = @$_;
1344
1345 next if $block & (1 << $tile);
1346 my $block = $block | (1 << $tile2);
1110 1347
1111 my $gx = $gx + $dx; 1348 my $gx = $gx + $dx;
1112 my $gy = $gy + $dy; 1349 my $gy = $gy + $dy;
1113 1350
1114 next unless $flags & (1 << ($tile - 1)); 1351 next unless $flags & (1 << ($tile - 1));
… …
1116 1353
1117 my $neigh = $self->{neigh_map}{$hash} ||= []; 1354 my $neigh = $self->{neigh_map}{$hash} ||= [];
1118 if (my $info = $neigh->[$tile]) { 1355 if (my $info = $neigh->[$tile]) {
1119 my ($flags, $x, $y, $w, $h, $hash) = @$info; 1356 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1120 1357
1121 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1358 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1122 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1359 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1123 1360
1124 } else { 1361 } else {
1125 $self->send_mapinfo ("spatial $path$tile", sub { 1362 $self->send_mapinfo ("spatial $path$tile", sub {
1126 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1363 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1127 1364
1128 return if $mode ne "spatial"; 1365 return if $mode ne "spatial";
1129 1366
1130 $x += $MAP->ox; 1367 $x += $MAP->ox;
1131 $y += $MAP->oy; 1368 $y += $MAP->oy;
1132 1369
1133 $self->load_map ($hash, $x, $y) 1370 $self->load_map ($hash, $x, $y)
1134 unless $self->{neigh_map}{$hash}[5]++;#d# 1371 unless $self->{neigh_map}{$hash}[5]++;#d#
1135 1372
1136 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 1373 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1137 1374
1138 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1375 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1139 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1376 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1140 }); 1377 });
1141 } 1378 }
1142 } 1379 }
1143} 1380}
… …
1156 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1393 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1157 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1394 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1158 ]; 1395 ];
1159 1396
1160 delete $self->{neigh_grid}; 1397 delete $self->{neigh_grid};
1161 $self->flood_fill (0, 0, "", $hash, $flags);
1162 1398
1163 $x += $ox; 1399 $x += $ox;
1164 $y += $oy; 1400 $y += $oy;
1165 1401
1166 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1402 $self->{map_info} = [$hash, $x, $y, $w, $h];
1167 1403
1168 my $map = $self->{map_info}[0];
1169 $map =~ s/^.*?\/([^\/]+)$/\1/; 1404 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1170 $STATWIDS->{map}->set_text ("Map: " . $map); 1405 $STATWIDS->{map}->set_text ("Map: " . $map);
1171 1406
1172 $self->load_map ($hash, $x, $y); 1407 $self->load_map ($hash, $x, $y);
1408 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1173} 1409}
1174 1410
1175sub conn::face_find { 1411sub conn::face_find {
1176 my ($self, $facenum, $face) = @_; 1412 my ($self, $facenum, $face) = @_;
1177 1413
… …
1179 1415
1180 my $id = $FACEMAP->get ($hash); 1416 my $id = $FACEMAP->get ($hash);
1181 1417
1182 unless ($id) { 1418 unless ($id) {
1183 # create new id for face 1419 # create new id for face
1184 # i love transactions 1420 # I love transactions
1185 for (1..100) { 1421 for (1..100) {
1186 my $txn = $CFClient::DB_ENV->txn_begin; 1422 my $txn = $CFClient::DB_ENV->txn_begin;
1187 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW); 1423 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
1188 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 1424 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
1189 $id++; 1425 $id = ($id || 16) + 1;
1190 if ($FACEMAP->put (id => $id) == 0 1426 if ($FACEMAP->put (id => $id) == 0
1191 && $FACEMAP->put ($hash => $id) == 0) { 1427 && $FACEMAP->put ($hash => $id) == 0) {
1192 $txn->txn_commit; 1428 $txn->txn_commit;
1193 1429
1194 goto gotid; 1430 goto gotid;
… …
1202 1438
1203gotid: 1439gotid:
1204 $face->{id} = $id; 1440 $face->{id} = $id;
1205 $MAP->set_face ($facenum => $id); 1441 $MAP->set_face ($facenum => $id);
1206 $self->{faceid}[$facenum] = $id;#d# 1442 $self->{faceid}[$facenum] = $id;#d#
1443
1207 $TILECACHE->get ($id) 1444 $TILECACHE->get ($id) || do {
1445 my $tex = $self->{noface};
1446 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1447 undef
1448 };
1208} 1449}
1209 1450
1210sub conn::face_update { 1451sub conn::face_update {
1211 my ($self, $facenum, $face) = @_; 1452 my ($self, $facenum, $face) = @_;
1212 1453
… …
1305 ); 1546 );
1306 1547
1307 $entry->focus_in; 1548 $entry->focus_in;
1308 } 1549 }
1309 1550
1310 $dialog->show; 1551 $dialog->show_centered;
1311} 1552}
1312 1553
1313sub conn::drawinfo { 1554sub conn::drawinfo {
1314 my ($self, $color, $text) = @_; 1555 my ($self, $color, $text) = @_;
1315 1556
… …
1327 [0.55, 0.41, 0.13], 1568 [0.55, 0.41, 0.13],
1328 [0.99, 0.77, 0.26], 1569 [0.99, 0.77, 0.26],
1329 [0.74, 0.65, 0.41], 1570 [0.74, 0.65, 0.41],
1330 ); 1571 );
1331 1572
1573 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1574
1575 $text = CFClient::UI::Label::escape $text;
1576 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1577 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1578
1332 $LOGVIEW->add_paragraph ($color[$color], $text); 1579 $LOGVIEW->add_paragraph ($color[$color],
1580 join "\n", map "$time $_", split /\n/, $text);
1581
1582 $STATUSBOX->add ($text,
1583 group => $text,
1584 fg => $color[$color],
1585 timeout => 60,
1586 tooltip_font => $::FONT_FIXED,
1587 );
1588}
1589
1590sub conn::drawextinfo {
1591 my ($self, $color, $type, $subtype, $message) = @_;
1592
1593 $self->drawinfo ($color, $message);
1333} 1594}
1334 1595
1335sub conn::spell_add { 1596sub conn::spell_add {
1336 my ($self, $spell) = @_; 1597 my ($self, $spell) = @_;
1337 1598
1338 # TODO 1599 # TODO
1339 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1600 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1340 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1601 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1341 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1602 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1342} 1603}
1343 1604
1344sub conn::spell_delete { 1605sub conn::spell_delete {
1345 my ($self, $spell) = @_; 1606 my ($self, $spell) = @_;
1346} 1607}
1347 1608
1348sub conn::addme_success { 1609sub conn::addme_success {
1349 my ($self) = @_; 1610 my ($self) = @_;
1350 1611
1612 $self->send ("command output-sync $CFG->{output_sync}");
1613 $self->send ("command output-count $CFG->{output_count}");
1614
1615 my $parser = new Pod::POM;
1616 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1617
1618 my %skill_tooltip;
1619
1620 for my $head2 ($pod->head2) {
1621 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1622 }
1623
1351 for my $skill (values %{$self->{skill_info}}) { 1624 for my $skill (values %{$self->{skill_info}}) {
1352 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1625 $MAPWIDGET->add_command ("ready_skill $skill",
1353 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1626 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1627 . $skill_tooltip{$skill});
1628 $MAPWIDGET->add_command ("use_skill $skill",
1629 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1630 . $skill_tooltip{$skill});
1354 } 1631 }
1355
1356 $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you");
1357 $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players");
1358 $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1359 $MAPWIDGET->add_command ("kill\\_pets", "kill your pets");
1360} 1632}
1361 1633
1362sub conn::eof { 1634sub conn::eof {
1635 $MAPWIDGET->clr_commands;
1636
1363 stop_game; 1637 stop_game;
1364} 1638}
1365 1639
1366sub update_floorbox { 1640sub update_floorbox {
1367 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1641 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1368 return unless $CONN; 1642 return unless $CONN;
1369 1643
1370 $FLOORBOX->clear; 1644 $FLOORBOX->clear;
1371 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1645 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1372 1646
1373 # we basically have to use the same sorting as everybody else 1647 my $count = 4;
1374 for my $item (@{ $CONN->{container}{0} }) { 1648 for (@{ $CONN->{container}{0} }) {
1649 if (--$count) {
1375 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $item); 1650 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1651 } else {
1652 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1653 last;
1654 }
1376 } 1655 }
1377 }); 1656 });
1378 refresh; 1657
1658 $WANT_REFRESH++;
1379} 1659}
1380 1660
1381sub conn::container_add { 1661sub conn::container_add {
1382 my ($self, $tag, $items) = @_; 1662 my ($self, $tag, $items) = @_;
1383 1663
1384 update_floorbox if $tag == 0; 1664 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1385 1665
1666 if ($tag == 0) {
1667 update_floorbox;
1668 $OPENCONT = 0;
1669 $INVR_LBL->set_text ("Floor");
1670 $INVR->set_items ($self->{container}{0});
1671 } elsif ($tag == $self->{player}{tag}) {
1672 $INVR_LBL->set_text ("Player");
1386 $INV->set_items ($self->{container}{$self->{player}{tag}}) 1673 $INV->set_items ($self->{container}{$self->{player}{tag}})
1387 if $tag == $self->{player}{tag}; 1674 } else {
1675 $OPENCONT = $tag;
1676 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1677 $INVR->set_items ($self->{container}{$tag});
1678 }
1388 1679
1389 # $self-<{player}{tag} => player inv 1680 # $self-<{player}{tag} => player inv
1390 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1681 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1391} 1682}
1392 1683
1393sub conn::container_clear { 1684sub conn::container_clear {
1394 my ($self, $tag) = @_; 1685 my ($self, $tag) = @_;
1395 1686
1396 update_floorbox if $tag == 0; 1687 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1397 1688
1689 if ($tag == 0) {
1690 update_floorbox;
1691 $OPENCONT = 0;
1692 $INVR_LBL->set_text ("Floor");
1693 $INVR->set_items ($self->{container}{0});
1694 } elsif ($tag == $self->{player}{tag}) {
1695 $INVR_LBL->set_text ("Player");
1398 $INV->set_items ($self->{container}{$tag}) 1696 $INV->set_items ($self->{container}{$tag})
1399 if $tag == $self->{player}{tag}; 1697 } else {
1698 $OPENCONT = $tag;
1699 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1700 $INVR->set_items ($self->{container}{$tag});
1701 }
1400 1702
1401# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1703# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1402} 1704}
1403 1705
1404sub conn::item_delete { 1706sub conn::item_delete {
1405 my ($self, @items) = @_; 1707 my ($self, @items) = @_;
1406 1708
1407 for (@items) { 1709 for (@items) {
1408 update_floorbox if $_->{container} == 0; 1710 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1409 1711
1712 if ($_->{container} == 0) {
1713 update_floorbox;
1714 $OPENCONT = 0;
1715 $INVR_LBL->set_text ("Floor");
1716 $INVR->set_items ($self->{container}{0});
1717 } elsif ($_->{container} == $self->{player}{tag}) {
1718 $INVR_LBL->set_text ("Player");
1719 $INV->set_items ($self->{container}{$self->{player}{tag}})
1720 } else {
1721 $OPENCONT = $_->{container};
1722 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1410 $INV->set_items ($self->{container}{$_->{container}}) 1723 $INVR->set_items ($self->{container}{$_->{container}});
1411 if $_->{container} == $self->{player}{tag}; 1724 }
1412 } 1725 }
1413} 1726}
1414 1727
1415sub conn::item_update { 1728sub conn::item_update {
1416 my ($self, $item) = @_; 1729 my ($self, $item) = @_;
1417 1730
1418 update_floorbox if $item->{container} == 0; 1731 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1419 1732
1733 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1734 $OPENCONT = 0;
1735 $INVR_LBL->set_text ("Floor");
1736 $INVR->set_items ($self->{container}{0});
1737
1738 $item->{widget}->update_item
1739 if $item->{widget};
1740 } else {
1741 if ($item->{container} == 0) {
1742 update_floorbox;
1743 $OPENCONT = 0;
1744 $INVR_LBL->set_text ("Floor");
1745 $INVR->set_items ($self->{container}{0});
1746 } elsif ($item->{container} == $self->{player}{tag}) {
1420 $INV->set_items ($self->{container}{$item->{container}}) 1747 $INV->set_items ($self->{container}{$item->{container}})
1421 if $item->{container}; == $self->{player}{tag}; 1748 }
1749 }
1422} 1750}
1423 1751
1424%SDL_CB = ( 1752%SDL_CB = (
1425 CFClient::SDL_QUIT => sub { 1753 CFClient::SDL_QUIT => sub {
1426 Event::unloop -1; 1754 Event::unloop -1;
1427 }, 1755 },
1428 CFClient::SDL_VIDEORESIZE => sub { 1756 CFClient::SDL_VIDEORESIZE => sub {
1429 }, 1757 },
1430 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1758 CFClient::SDL_VIDEOEXPOSE => sub {
1759 CFClient::UI::full_refresh;
1760 },
1431 CFClient::SDL_ACTIVEEVENT => sub { 1761 CFClient::SDL_ACTIVEEVENT => sub {
1432# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1762# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1433 }, 1763 },
1434 CFClient::SDL_KEYDOWN => sub { 1764 CFClient::SDL_KEYDOWN => sub {
1435 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1765 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1456 1786
1457############################################################################# 1787#############################################################################
1458 1788
1459$SIG{INT} = $SIG{TERM} = sub { exit }; 1789$SIG{INT} = $SIG{TERM} = sub { exit };
1460 1790
1461CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1462
1463$TILECACHE = CFClient::db_table "tilecache";
1464$FACEMAP = CFClient::db_table "facemap";
1465
1466my %DEF_CFG = (
1467 sdl_mode => 0,
1468 width => 640,
1469 height => 480,
1470 fullscreen => 0,
1471 fast => 0,
1472 map_scale => 0.5,
1473 fow_enable => 1,
1474 fow_intensity => 0.45,
1475 fow_smooth => 0,
1476 gui_fontsize => 1,
1477 log_fontsize => 1,
1478 gauge_fontsize => 1,
1479 gauge_size => 0.35,
1480 stat_fontsize => 1,
1481 mapsize => 100,
1482 host => "crossfire.schmorp.de",
1483 say_command => 'say',
1484 audio_enable => 1,
1485 bgm_enable => 1,
1486 bgm_volume => 0.25,
1487);
1488
1489while (my ($k, $v) = each %DEF_CFG) {
1490 $CFG->{$k} = $v unless exists $CFG->{$k};
1491}
1492
1493sdl_init;
1494
1495@SDL_MODES = reverse
1496 grep $_->[0] >= 640 && $_->[1] >= 480,
1497 CFClient::SDL_ListModes;
1498
1499@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1500
1501$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1502
1503{ 1791{
1792 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1793
1794 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1795
1796 $TILECACHE = CFClient::db_table "tilecache";
1797 $FACEMAP = CFClient::db_table "facemap";
1798
1799 my %DEF_CFG = (
1800 sdl_mode => 0,
1801 width => 640,
1802 height => 480,
1803 fullscreen => 0,
1804 fast => 0,
1805 map_scale => 1,
1806 fow_enable => 1,
1807 fow_intensity => 0.45,
1808 fow_smooth => 0,
1809 gui_fontsize => 1,
1810 log_fontsize => 1,
1811 gauge_fontsize=> 1,
1812 gauge_size => 0.35,
1813 stat_fontsize => 1,
1814 mapsize => 100,
1815 host => "crossfire.schmorp.de",
1816 say_command => 'say',
1817 audio_enable => 1,
1818 bgm_enable => 1,
1819 bgm_volume => 0.25,
1820 output_sync => 1,
1821 output_count => 1,
1822 );
1823
1824 while (my ($k, $v) = each %DEF_CFG) {
1825 $CFG->{$k} = $v unless exists $CFG->{$k};
1826 }
1827
1828 sdl_init;
1829
1830 @SDL_MODES = reverse
1831 grep $_->[0] >= 640 && $_->[1] >= 480,
1832 CFClient::SDL_ListModes;
1833
1834 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1835
1836 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1837
1838 {
1504 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1839 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1505 DejaVuSans.ttf 1840 DejaVuSans.ttf
1506 DejaVuSansMono.ttf 1841 DejaVuSansMono.ttf
1507 DejaVuSans-Bold.ttf 1842 DejaVuSans-Bold.ttf
1508 DejaVuSansMono-Bold.ttf 1843 DejaVuSansMono-Bold.ttf
1509 DejaVuSans-Oblique.ttf 1844 DejaVuSans-Oblique.ttf
1510 DejaVuSansMono-Oblique.ttf 1845 DejaVuSansMono-Oblique.ttf
1511 DejaVuSans-BoldOblique.ttf 1846 DejaVuSans-BoldOblique.ttf
1512 DejaVuSansMono-BoldOblique.ttf 1847 DejaVuSansMono-BoldOblique.ttf
1513 ); 1848 );
1514 1849
1515 CFClient::add_font $_ for @fonts; 1850 CFClient::add_font $_ for @fonts;
1516 1851
1852 CFClient::pango_init;
1853
1517 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1854 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1518 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1855 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1519 1856
1520 $FONT_PROP->make_default; 1857 $FONT_PROP->make_default;
1521} 1858 }
1522 1859
1860# compare mono (ft) vs. rgba (cairo)
1861# ft - 1.8s, cairo 3s, even in alpha-only mode
1862# for my $rgba (0..1) {
1863# my $t1 = Time::HiRes::time;
1864# for (1..1000) {
1865# my $layout = CFClient::Layout->new ($rgba);
1866# $layout->set_text ("hallo" x 100);
1867# $layout->render;
1868# }
1869# my $t2 = Time::HiRes::time;
1870# warn $t2-$t1;
1871# }
1872
1523video_init; 1873 video_init;
1524audio_init; 1874 audio_init;
1875}
1525 1876
1526Event::loop; 1877Event::loop;
1527 1878
1528END { CFClient::SDL_Quit } 1879END { CFClient::SDL_Quit }
1529 1880
… …
1580 1931
1581Typing B<climb> will display a list of commands with I<climb> in their 1932Typing B<climb> will display a list of commands with I<climb> in their
1582name, such as I<ready_skill climbing> and I<use_skill climbing>. 1933name, such as I<ready_skill climbing> and I<use_skill climbing>.
1583 1934
1584You can abbreviate commands by typing only the first character of every 1935You can abbreviate commands by typing only the first character of every
1585word. For example, typing I<iwor> will likely select I<invoke word of 1936word (or even characters within the word - the client will try to make
1586recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli> 1937a good guess, as long as the characters are in order). For example,
1587will likely select I<ready_skill climbing> and I<usl> will give you 1938typing I<iwor> will likely select I<invoke word of recall>, while I<ccfo>
1588I<use_skill levitation>. 1939will select I<cast create food>. Likewise, I<rscli> will likely select
1940I<ready_skill climbing> and I<usl> will give you I<use_skill levitation>.
1941
1942You can enter space and other text as arguemnt to the command. For
1943example, C<cfoo waybread> will expand to C<cast create food waybread>.
1589 1944
1590=head2 The map overview 1945=head2 The map overview
1591 1946
1592#TODO# 1947#TODO#
1593 1948

Diff Legend

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