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.200 by root, Mon May 8 17:23:08 2006 UTC vs.
Revision 1.238 by elmex, Tue May 23 18:10:52 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 => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05],
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} = $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 * (4/5), user_h => $HEIGHT * (4/5), 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
834 $LAST_REFRESH = time - 0.01; 907 $LAST_REFRESH = time - 0.01;
835 908
836 CFClient::gl_init; 909 CFClient::gl_init;
837 910
838 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 911 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
839 912
913 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
914
840 ############################################################################# 915 #############################################################################
841 916
917 unless ($DEBUG_STATUS) {
918 # create the widgets
919
842 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 920 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
843 $DEBUG_STATUS->show; 921 $DEBUG_STATUS->show;
844 922
845 $STATUS_LINE = new CFClient::UI::Label 923 $STATUSBOX = new CFClient::UI::Statusbox;
846 padding => 0, 924 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
847 y => $HEIGHT - $FONTSIZE * 1.8;
848 $STATUS_LINE->show;
849 925
850 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 926 (new CFClient::UI::Frame
851 padding => 0, 927 bg => [0, 0, 0, 0.4],
852 fontsize => 0.8, 928 req_y => -1,
853 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 929 child => $STATUSBOX,
854 $ALT_ENTER_MESSAGE->show; 930 )->show;
855 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
856 931
857 CFClient::UI::FancyFrame->new ( 932 CFClient::UI::FancyFrame->new (
858 border_bg => [1, 1, 1, 192/255], 933 border_bg => [1, 1, 1, 192/255],
859 bg => [1, 1, 1, 0], 934 bg => [1, 1, 1, 0],
860 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 ),
861 )->show; 938 )->show;
862 939
863 $MAPWIDGET = new CFClient::MapWidget; 940 $MAPWIDGET = new CFClient::MapWidget;
864 $MAPWIDGET->connect (activate_console => sub { 941 $MAPWIDGET->connect (activate_console => sub {
865 my ($mapwidget, $preset) = @_; 942 my ($mapwidget, $preset) = @_;
866 943
867 if ($CONSOLE) { 944 if ($CONSOLE) {
868 $CONSOLE->{input}->{auto_activated} = 1; 945 $CONSOLE->{input}->{auto_activated} = 1;
869 $CONSOLE->{input}->focus_in; 946 $CONSOLE->{input}->focus_in;
870 947
871 if ($preset && $CONSOLE->{input}->get_text eq '') { 948 if ($preset && $CONSOLE->{input}->get_text eq '') {
872 $CONSOLE->{input}->set_text ($preset); 949 $CONSOLE->{input}->set_text ($preset);
950 }
873 } 951 }
874 } 952 });
875 });
876 $MAPWIDGET->show; 953 $MAPWIDGET->show;
877 $MAPWIDGET->focus_in; 954 $MAPWIDGET->focus_in;
878 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
879 $BUTTONBAR = new CFClient::UI::HBox; 965 $BUTTONBAR = new CFClient::UI::HBox;
880 966
881 $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.");
882 $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.");
883 $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.");
884 973
885 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
886 975
887 $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.");
888 $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 :).");
889 980
890 $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 {
891 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 985 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
892 status "Configuration Saved"; 986 status "Configuration Saved";
893 }); 987 },
988 );
894 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
895 $BUTTONBAR->show; 1002 $BUTTONBAR->show;
896 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 {
897 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 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
1011 });
1012 force_refresh ();
1013 }
898} 1014}
899 1015
900sub video_shutdown { 1016sub video_shutdown {
901 $CFClient::UI::ROOT->{children} = [];
902 undef $CFClient::UI::GRAB;
903 undef $CFClient::UI::HOVER;
904 undef $SDL_ACTIVE; 1017 undef $SDL_ACTIVE;
905} 1018}
906 1019
907my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1020my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
908my $bgmusic;#TODO#hack#d# 1021my $bgmusic;#TODO#hack#d#
909 1022
910sub audio_channel_finished { 1023sub audio_channel_finished {
911 my ($channel) = @_; 1024 my ($channel) = @_;
912 1025
913 warn "channel $channel finished\n";#d# 1026 #warn "channel $channel finished\n";#d#
914} 1027}
915 1028
916sub audio_music_finished { 1029sub audio_music_finished {
917 return unless $CFG->{bgm_enable}; 1030 return unless $CFG->{bgm_enable};
918 1031
… …
960} 1073}
961 1074
962my %animate_object; 1075my %animate_object;
963my $animate_timer; 1076my $animate_timer;
964 1077
965my $want_refresh;
966my $can_refresh;
967
968my $fps = 9; 1078my $fps = 9;
969 1079
1080my %demo;#d#
1081
970sub force_refresh { 1082sub force_refresh {
971 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 1083 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
972 debug sprintf "%3.2f", $fps; 1084 debug sprintf "%3.2f", $fps;
973 1085
974 $want_refresh = 0;
975 $can_refresh = 0;
976
977 $CFClient::UI::ROOT->draw; 1086 $CFClient::UI::ROOT->draw;
978 1087
1088 $WANT_REFRESH = 0;
1089 $CAN_REFRESH = 0;
1090 $LAST_REFRESH = $NOW;
1091
10920 && do {
1093 # some weird model-drawing code, just a joke right now
1094 use CFClient::OpenGL;
1095
1096 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1097 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1098 $demo{r} ||= do {
1099 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1100 $mod->{v} = pack "f*", @{$mod->{v}};
1101 $_ = [scalar @$_, pack "S!*", @$_]
1102 for values %{$mod->{g}};
1103 $mod
1104 };
1105
1106 my $r = $demo{r} or die;
1107
1108 glDepthMask 1;
1109 glClear GL_DEPTH_BUFFER_BIT;
1110 glEnable GL_TEXTURE_2D;
1111 glEnable GL_DEPTH_TEST;
1112 glEnable GL_CULL_FACE;
1113 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1114
1115 glMatrixMode GL_PROJECTION;
1116 glLoadIdentity;
1117 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1118 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1119 glMatrixMode GL_MODELVIEW;
1120 glLoadIdentity;
1121
1122 glPushMatrix;
1123 glTranslate 0, 0, -800;
1124 glScale 1, -1, 1;
1125 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1126 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1127 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1128 glScale 50, 50, 50;
1129
1130 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1131 while (my ($k, $v) = each %{$r->{g}}) {
1132 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1133 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1134 }
1135
1136 glPopMatrix;
1137
1138 glShadeModel GL_FLAT;
1139 glDisable GL_DEPTH_TEST;
1140 glDisable GL_TEXTURE_2D;
1141 glDepthMask 0;
1142
1143 $WANT_REFRESH++;
1144};
1145
979 CFClient::SDL_GL_SwapBuffers; 1146 CFClient::SDL_GL_SwapBuffers;
980
981 $LAST_REFRESH = $NOW;
982} 1147}
983 1148
984my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1149my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
985 $NOW = time; 1150 $NOW = time;
986 1151
987 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1152 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
988 for CFClient::SDL_PollEvent; 1153 for CFClient::SDL_PollEvent;
989 1154
990 if (%animate_object) { 1155 if (%animate_object) {
991 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1156 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
992 $want_refresh++; 1157 $WANT_REFRESH++;
993 } 1158 }
994 1159
995 if ($want_refresh) { 1160 if ($WANT_REFRESH) {
996 force_refresh; 1161 force_refresh;
997 } else { 1162 } else {
998 $can_refresh = 1; 1163 $CAN_REFRESH = 1;
999 } 1164 }
1000}); 1165});
1001
1002sub refresh {
1003 $want_refresh++;
1004}
1005 1166
1006sub animation_start { 1167sub animation_start {
1007 my ($widget) = @_; 1168 my ($widget) = @_;
1008 $animate_object{$widget} = $widget; 1169 $animate_object{$widget} = $widget;
1009} 1170}
… …
1013 delete $animate_object{$widget}; 1174 delete $animate_object{$widget};
1014} 1175}
1015 1176
1016@conn::ISA = Crossfire::Protocol::; 1177@conn::ISA = Crossfire::Protocol::;
1017 1178
1179sub conn::new {
1180 my $class = shift;
1181
1182 my $self = $class->Crossfire::Protocol::new (@_);
1183
1184 $MAPWIDGET->clr_commands;
1185
1186 my $parser = new Pod::POM;
1187 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1188
1189 for my $head2 ($pod->head2) {
1190 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1191 or next;
1192
1193 my $cmd = $1;
1194 my @args = split /\|/, $2;
1195 @args = (".*") unless @args;
1196
1197 my $text = CFClient::pod_to_pango $head2->content;
1198
1199 for my $arg (@args) {
1200 $arg = $arg eq ".*" ? "" : " $arg";
1201
1202 $MAPWIDGET->add_command ("$cmd$arg", $text);
1203 }
1204 }
1205
1206 $self
1207}
1208
1018sub conn::stats_update { 1209sub conn::stats_update {
1019 my ($self, $stats) = @_; 1210 my ($self, $stats) = @_;
1211
1212 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1213 my $diff = $exp - $self->{prev_exp};
1214 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1215 if exists $self->{prev_exp} && $diff;
1216 $self->{prev_exp} = $exp;
1217 }
1020 1218
1021 update_stats_window ($stats); 1219 update_stats_window ($stats);
1022} 1220}
1023 1221
1024sub conn::user_send { 1222sub conn::user_send {
… …
1079 $self->set_texture ($id => $data); 1277 $self->set_texture ($id => $data);
1080 } 1278 }
1081 } 1279 }
1082} 1280}
1083 1281
1282# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1283# (server resource,s latency, bandwidth), so this hack is warranted.
1284# the right fix is to make real tiled maps with an overview file
1285sub conn::send_mapinfo {
1286 my ($self, $data, $cb) = @_;
1287
1288 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1289 my ($wx, $wy) = ($1, $2);
1290
1291 if ($data =~ /^spatial ([1-4]+)$/) {
1292 my @dx = (0, 0, 1, 0, -1);
1293 my @dy = (0, -1, 0, 1, 0);
1294 my ($dx, $dy);
1295
1296 for (split //, $1) {
1297 $dx += $dx[$_];
1298 $dy += $dy[$_];
1299 }
1300
1301 $cb->(spatial => 15,
1302 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1303 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1304 50, 50,
1305 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1306 );
1307
1308 return;
1309 }
1310 }
1311
1312 $self->SUPER::send_mapinfo ($data, $cb);
1313}
1314
1084# this method does a "flood fill" into every tile direction 1315# this method does a "flood fill" into every tile direction
1085# it assumes that tiles are arranged in a rectangular grid, 1316# it assumes that tiles are arranged in a rectangular grid,
1086# i.e. a map is the same as the left of the right map etc. 1317# i.e. a map is the same as the left of the right map etc.
1087# failure to comply are harmless and result in display errors 1318# failure to comply are harmless and result in display errors
1088# at worst. 1319# at worst.
1089sub conn::flood_fill { 1320sub conn::flood_fill {
1090 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1321 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1091 1322
1092 # the server does not allow map paths > 6 1323 # the server does not allow map paths > 6
1093 return if 7 <= length $path; 1324 return if 7 <= length $path;
1094 1325
1095 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1326 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1096 1327
1097 for ( 1328 for (
1098 [1, 0, -1], 1329 [1, 3, 0, -1],
1099 [2, 1, 0], 1330 [2, 4, 1, 0],
1100 [3, 0, 1], 1331 [3, 1, 0, 1],
1101 [4, -1, 0], 1332 [4, 2, -1, 0],
1102 ) { 1333 ) {
1103 my ($tile, $dx, $dy) = @$_; 1334 my ($tile, $tile2, $dx, $dy) = @$_;
1335
1336 next if $block & (1 << $tile);
1337 my $block = $block | (1 << $tile2);
1104 1338
1105 my $gx = $gx + $dx; 1339 my $gx = $gx + $dx;
1106 my $gy = $gy + $dy; 1340 my $gy = $gy + $dy;
1107 1341
1108 next unless $flags & (1 << ($tile - 1)); 1342 next unless $flags & (1 << ($tile - 1));
… …
1110 1344
1111 my $neigh = $self->{neigh_map}{$hash} ||= []; 1345 my $neigh = $self->{neigh_map}{$hash} ||= [];
1112 if (my $info = $neigh->[$tile]) { 1346 if (my $info = $neigh->[$tile]) {
1113 my ($flags, $x, $y, $w, $h, $hash) = @$info; 1347 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1114 1348
1115 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1349 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1116 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1350 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1117 1351
1118 } else { 1352 } else {
1119 $self->send_mapinfo ("spatial $path$tile", sub { 1353 $self->send_mapinfo ("spatial $path$tile", sub {
1120 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1354 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1121 1355
1122 return if $mode ne "spatial"; 1356 return if $mode ne "spatial";
1123 1357
1124 $x += $MAP->ox; 1358 $x += $MAP->ox;
1125 $y += $MAP->oy; 1359 $y += $MAP->oy;
1126 1360
1127 $self->load_map ($hash, $x, $y) 1361 $self->load_map ($hash, $x, $y)
1128 unless $self->{neigh_map}{$hash}[5]++;#d# 1362 unless $self->{neigh_map}{$hash}[5]++;#d#
1129 1363
1130 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 1364 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1131 1365
1132 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1366 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1133 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1367 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1134 }); 1368 });
1135 } 1369 }
1136 } 1370 }
1137} 1371}
… …
1150 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1384 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1151 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1385 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1152 ]; 1386 ];
1153 1387
1154 delete $self->{neigh_grid}; 1388 delete $self->{neigh_grid};
1155 $self->flood_fill (0, 0, "", $hash, $flags);
1156 1389
1157 $x += $ox; 1390 $x += $ox;
1158 $y += $oy; 1391 $y += $oy;
1159 1392
1160 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1393 $self->{map_info} = [$hash, $x, $y, $w, $h];
1161 1394
1162 my $map = $self->{map_info}[0];
1163 $map =~ s/^.*?\/([^\/]+)$/\1/; 1395 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1164 $STATWIDS->{map}->set_text ("Map: " . $map); 1396 $STATWIDS->{map}->set_text ("Map: " . $map);
1165 1397
1166 $self->load_map ($hash, $x, $y); 1398 $self->load_map ($hash, $x, $y);
1399 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1167} 1400}
1168 1401
1169sub conn::face_find { 1402sub conn::face_find {
1170 my ($self, $facenum, $face) = @_; 1403 my ($self, $facenum, $face) = @_;
1171 1404
… …
1195 } 1428 }
1196 1429
1197gotid: 1430gotid:
1198 $face->{id} = $id; 1431 $face->{id} = $id;
1199 $MAP->set_face ($facenum => $id); 1432 $MAP->set_face ($facenum => $id);
1433 $self->{faceid}[$facenum] = $id;#d#
1200 $TILECACHE->get ($id) 1434 $TILECACHE->get ($id)
1201} 1435}
1202 1436
1203sub conn::face_update { 1437sub conn::face_update {
1204 my ($self, $facenum, $face) = @_; 1438 my ($self, $facenum, $face) = @_;
… …
1298 ); 1532 );
1299 1533
1300 $entry->focus_in; 1534 $entry->focus_in;
1301 } 1535 }
1302 1536
1303 $dialog->show; 1537 $dialog->show_centered;
1304} 1538}
1305 1539
1306sub conn::drawinfo { 1540sub conn::drawinfo {
1307 my ($self, $color, $text) = @_; 1541 my ($self, $color, $text) = @_;
1308 1542
… …
1320 [0.55, 0.41, 0.13], 1554 [0.55, 0.41, 0.13],
1321 [0.99, 0.77, 0.26], 1555 [0.99, 0.77, 0.26],
1322 [0.74, 0.65, 0.41], 1556 [0.74, 0.65, 0.41],
1323 ); 1557 );
1324 1558
1559 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1560
1561 $text = CFClient::UI::Label::escape $text;
1562 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1563 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1564
1325 $LOGVIEW->add_paragraph ($color[$color], $text); 1565 $LOGVIEW->add_paragraph ($color[$color],
1566 join "\n", map "$time $_", split /\n/, $text);
1567
1568 $STATUSBOX->add ($text,
1569 group => $text,
1570 fg => $color[$color],
1571 timeout => 60,
1572 tooltip_font => $::FONT_FIXED,
1573 );
1574}
1575
1576sub conn::drawextinfo {
1577 my ($self, $color, $type, $subtype, $message) = @_;
1578
1579 $self->drawinfo ($color, $message);
1326} 1580}
1327 1581
1328sub conn::spell_add { 1582sub conn::spell_add {
1329 my ($self, $spell) = @_; 1583 my ($self, $spell) = @_;
1330 1584
1331 # TODO 1585 # TODO
1332 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1586 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1333 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1587 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1334 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1588 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1335} 1589}
1336 1590
1337sub conn::spell_delete { 1591sub conn::spell_delete {
1338 my ($self, $spell) = @_; 1592 my ($self, $spell) = @_;
1339} 1593}
1340 1594
1341sub conn::addme_success { 1595sub conn::addme_success {
1342 my ($self) = @_; 1596 my ($self) = @_;
1343 1597
1598 $self->send ("command output-sync $CFG->{output_sync}");
1599 $self->send ("command output-count $CFG->{output_count}");
1600
1601 my $parser = new Pod::POM;
1602 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1603
1604 my %skill_tooltip;
1605
1606 for my $head2 ($pod->head2) {
1607 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1608 }
1609
1344 for my $skill (values %{$self->{skill_info}}) { 1610 for my $skill (values %{$self->{skill_info}}) {
1345 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1611 $MAPWIDGET->add_command ("ready_skill $skill",
1346 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1612 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1613 . $skill_tooltip{$skill});
1614 $MAPWIDGET->add_command ("use_skill $skill",
1615 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1616 . $skill_tooltip{$skill});
1347 } 1617 }
1348
1349 $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you");
1350 $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players");
1351 $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1352 $MAPWIDGET->add_command ("kill\\_pets", "kill your pets");
1353} 1618}
1354 1619
1355sub conn::eof { 1620sub conn::eof {
1621 $MAPWIDGET->clr_commands;
1622
1356 stop_game; 1623 stop_game;
1357} 1624}
1358 1625
1359sub update_floorbox { 1626sub update_floorbox {
1360 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1627 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1361 return unless $CONN; 1628 return unless $CONN;
1362 1629
1363 $FLOORBOX->clear; 1630 $FLOORBOX->clear;
1364 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1631 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1365 1632
1366 # we basically have to use the same sorting as everybody else 1633 my $count = 4;
1367 for my $item (@{ $CONN->{container}{0} }) { 1634 for (@{ $CONN->{container}{0} }) {
1635 if (--$count) {
1368 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $item); 1636 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1637 } else {
1638 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1639 last;
1640 }
1369 } 1641 }
1370 }); 1642 });
1371 refresh; 1643
1644 $WANT_REFRESH++;
1372} 1645}
1373 1646
1374sub conn::container_add { 1647sub conn::container_add {
1375 my ($self, $id, $items) = @_; 1648 my ($self, $tag, $items) = @_;
1376 1649
1377 update_floorbox if $id == 0; 1650 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1651
1652 if ($tag == 0) {
1653 update_floorbox;
1654 $OPENCONT = 0;
1655 $INVR_LBL->set_text ("Floor");
1656 $INVR->set_items ($self->{container}{0});
1378 if ($self->{player}{tag} == $id) { 1657 } elsif ($tag == $self->{player}{tag}) {
1658 $INVR_LBL->set_text ("Player");
1379 $INV->set_items ($self->{container}{$self->{player}{tag}}); 1659 $INV->set_items ($self->{container}{$self->{player}{tag}})
1660 } else {
1661 $OPENCONT = $tag;
1662 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1663 $INVR->set_items ($self->{container}{$tag});
1380 } 1664 }
1665
1381 # $self-<{player}{tag} => player inv 1666 # $self-<{player}{tag} => player inv
1382 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1667 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1383} 1668}
1384 1669
1385sub conn::container_clear { 1670sub conn::container_clear {
1386 my ($self, $id) = @_; 1671 my ($self, $tag) = @_;
1387 1672
1388 update_floorbox if $id == 0; 1673 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1389 if ($self->{player}{tag} == $id) { 1674
1675 if ($tag == 0) {
1676 update_floorbox;
1677 $OPENCONT = 0;
1678 $INVR_LBL->set_text ("Floor");
1390 $INV->set_items ($self->{container}{$id}); 1679 $INVR->set_items ($self->{container}{0});
1680 } elsif ($tag == $self->{player}{tag}) {
1681 $INVR_LBL->set_text ("Player");
1682 $INV->set_items ($self->{container}{$tag})
1683 } else {
1684 $OPENCONT = $tag;
1685 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1686 $INVR->set_items ($self->{container}{$tag});
1391 } 1687 }
1392 1688
1393# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1689# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1394} 1690}
1395 1691
1396sub conn::item_delete { 1692sub conn::item_delete {
1397 my ($self, @items) = @_; 1693 my ($self, @items) = @_;
1398 1694
1399 for (@items) { 1695 for (@items) {
1400 update_floorbox if $_->{container} == 0; 1696 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1401 if ($self->{player}{tag} == $_->{container}) { 1697
1698 if ($_->{container} == 0) {
1699 update_floorbox;
1700 $OPENCONT = 0;
1701 $INVR_LBL->set_text ("Floor");
1702 $INVR->set_items ($self->{container}{0});
1703 } elsif ($_->{container} == $self->{player}{tag}) {
1704 $INVR_LBL->set_text ("Player");
1705 $INV->set_items ($self->{container}{$self->{player}{tag}})
1706 } else {
1707 $OPENCONT = $_->{container};
1708 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1402 $INV->set_items ($self->{container}{$_->{container}}); 1709 $INVR->set_items ($self->{container}{$_->{container}});
1403 } 1710 }
1404 } 1711 }
1405} 1712}
1406 1713
1407sub conn::item_update { 1714sub conn::item_update {
1408 my ($self, $item) = @_; 1715 my ($self, $item) = @_;
1409 1716
1410 update_floorbox if $item->{container} == 0; 1717 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1411 if ($self->{player}{tag} == $item->{container}) { 1718
1719 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1720 $OPENCONT = 0;
1721 $INVR_LBL->set_text ("Floor");
1722 $INVR->set_items ($self->{container}{0});
1723
1724 $item->{widget}->update_item
1725 if $item->{widget};
1726 } else {
1727 if ($item->{container} == 0) {
1728 update_floorbox;
1729 $OPENCONT = 0;
1730 $INVR_LBL->set_text ("Floor");
1731 $INVR->set_items ($self->{container}{0});
1732 } elsif ($item->{container} == $self->{player}{tag}) {
1412 $INV->set_items ($self->{container}{$item->{container}}); 1733 $INV->set_items ($self->{container}{$item->{container}})
1734 }
1413 } 1735 }
1414} 1736}
1415 1737
1416%SDL_CB = ( 1738%SDL_CB = (
1417 CFClient::SDL_QUIT => sub { 1739 CFClient::SDL_QUIT => sub {
1418 Event::unloop -1; 1740 Event::unloop -1;
1419 }, 1741 },
1420 CFClient::SDL_VIDEORESIZE => sub { 1742 CFClient::SDL_VIDEORESIZE => sub {
1421 }, 1743 },
1422 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1744 CFClient::SDL_VIDEOEXPOSE => sub {
1745 CFClient::UI::full_refresh;
1746 },
1423 CFClient::SDL_ACTIVEEVENT => sub { 1747 CFClient::SDL_ACTIVEEVENT => sub {
1424# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1748# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1425 }, 1749 },
1426 CFClient::SDL_KEYDOWN => sub { 1750 CFClient::SDL_KEYDOWN => sub {
1427 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1751 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1448 1772
1449############################################################################# 1773#############################################################################
1450 1774
1451$SIG{INT} = $SIG{TERM} = sub { exit }; 1775$SIG{INT} = $SIG{TERM} = sub { exit };
1452 1776
1453CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1454
1455$TILECACHE = CFClient::db_table "tilecache";
1456$FACEMAP = CFClient::db_table "facemap";
1457
1458my %DEF_CFG = (
1459 sdl_mode => 0,
1460 width => 640,
1461 height => 480,
1462 fullscreen => 0,
1463 fast => 0,
1464 map_scale => 0.5,
1465 fow_enable => 1,
1466 fow_intensity => 0.45,
1467 fow_smooth => 0,
1468 gui_fontsize => 1,
1469 log_fontsize => 1,
1470 gauge_fontsize => 1,
1471 gauge_size => 0.35,
1472 stat_fontsize => 1,
1473 mapsize => 100,
1474 host => "crossfire.schmorp.de",
1475 say_command => 'say',
1476 audio_enable => 1,
1477 bgm_enable => 1,
1478 bgm_volume => 0.25,
1479);
1480
1481while (my ($k, $v) = each %DEF_CFG) {
1482 $CFG->{$k} = $v unless exists $CFG->{$k};
1483}
1484
1485sdl_init;
1486
1487@SDL_MODES = reverse
1488 grep $_->[0] >= 640 && $_->[1] >= 480,
1489 CFClient::SDL_ListModes;
1490
1491@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1492
1493$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1494
1495{ 1777{
1778 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1779
1780 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1781
1782 $TILECACHE = CFClient::db_table "tilecache";
1783 $FACEMAP = CFClient::db_table "facemap";
1784
1785 my %DEF_CFG = (
1786 sdl_mode => 0,
1787 width => 640,
1788 height => 480,
1789 fullscreen => 0,
1790 fast => 0,
1791 map_scale => 1,
1792 fow_enable => 1,
1793 fow_intensity => 0.45,
1794 fow_smooth => 0,
1795 gui_fontsize => 1,
1796 log_fontsize => 1,
1797 gauge_fontsize=> 1,
1798 gauge_size => 0.35,
1799 stat_fontsize => 1,
1800 mapsize => 100,
1801 host => "crossfire.schmorp.de",
1802 say_command => 'say',
1803 audio_enable => 1,
1804 bgm_enable => 1,
1805 bgm_volume => 0.25,
1806 output_sync => 1,
1807 output_count => 1,
1808 );
1809
1810 while (my ($k, $v) = each %DEF_CFG) {
1811 $CFG->{$k} = $v unless exists $CFG->{$k};
1812 }
1813
1814 sdl_init;
1815
1816 @SDL_MODES = reverse
1817 grep $_->[0] >= 640 && $_->[1] >= 480,
1818 CFClient::SDL_ListModes;
1819
1820 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1821
1822 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1823
1824 {
1496 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1825 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1497 DejaVuSans.ttf 1826 DejaVuSans.ttf
1498 DejaVuSansMono.ttf 1827 DejaVuSansMono.ttf
1499 DejaVuSans-Bold.ttf 1828 DejaVuSans-Bold.ttf
1500 DejaVuSansMono-Bold.ttf 1829 DejaVuSansMono-Bold.ttf
1501 DejaVuSans-Oblique.ttf 1830 DejaVuSans-Oblique.ttf
1502 DejaVuSansMono-Oblique.ttf 1831 DejaVuSansMono-Oblique.ttf
1503 DejaVuSans-BoldOblique.ttf 1832 DejaVuSans-BoldOblique.ttf
1504 DejaVuSansMono-BoldOblique.ttf 1833 DejaVuSansMono-BoldOblique.ttf
1505 ); 1834 );
1506 1835
1507 CFClient::add_font $_ for @fonts; 1836 CFClient::add_font $_ for @fonts;
1508 1837
1838 CFClient::pango_init;
1839
1509 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1840 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1510 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1841 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1511 1842
1512 $FONT_PROP->make_default; 1843 $FONT_PROP->make_default;
1513} 1844 }
1514 1845
1846# compare mono (ft) vs. rgba (cairo)
1847# ft - 1.8s, cairo 3s, even in alpha-only mode
1848# for my $rgba (0..1) {
1849# my $t1 = Time::HiRes::time;
1850# for (1..1000) {
1851# my $layout = CFClient::Layout->new ($rgba);
1852# $layout->set_text ("hallo" x 100);
1853# $layout->render;
1854# }
1855# my $t2 = Time::HiRes::time;
1856# warn $t2-$t1;
1857# }
1858
1515video_init; 1859 video_init;
1516audio_init; 1860 audio_init;
1861}
1517 1862
1518Event::loop; 1863Event::loop;
1519 1864
1520END { CFClient::SDL_Quit } 1865END { CFClient::SDL_Quit }
1521 1866
… …
1572 1917
1573Typing B<climb> will display a list of commands with I<climb> in their 1918Typing B<climb> will display a list of commands with I<climb> in their
1574name, such as I<ready_skill climbing> and I<use_skill climbing>. 1919name, such as I<ready_skill climbing> and I<use_skill climbing>.
1575 1920
1576You can abbreviate commands by typing only the first character of every 1921You can abbreviate commands by typing only the first character of every
1577word. For example, typing I<iwor> will likely select I<invoke word of 1922word (or even characters within the word - the client will try to make
1578recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli> 1923a good guess, as long as the characters are in order). For example,
1579will likely select I<ready_skill climbing> and I<usl> will give you 1924typing I<iwor> will likely select I<invoke word of recall>, while I<ccfo>
1580I<use_skill levitation>. 1925will select I<cast create food>. Likewise, I<rscli> will likely select
1926I<ready_skill climbing> and I<usl> will give you I<use_skill levitation>.
1927
1928You can enter space and other text as arguemnt to the command. For
1929example, C<cfoo waybread> will expand to C<cast create food waybread>.
1581 1930
1582=head2 The map overview 1931=head2 The map overview
1583 1932
1584#TODO# 1933#TODO#
1585 1934

Diff Legend

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