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.205 by root, Tue May 9 16:22:44 2006 UTC vs.
Revision 1.236 by root, Mon May 22 03:28:55 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;
… …
90our $SDL_MIXER; 95our $SDL_MIXER;
91our @SOUNDS; # event => file mapping 96our @SOUNDS; # event => file mapping
92our %AUDIO_CHUNKS; # audio files 97our %AUDIO_CHUNKS; # audio files
93 98
94our $ALT_ENTER_MESSAGE; 99our $ALT_ENTER_MESSAGE;
95our $STATUS_LINE; 100our $STATUSBOX;
96our $DEBUG_STATUS; 101our $DEBUG_STATUS;
97 102
98our $INVWIN; 103our $INVWIN;
99our $INV; 104our $INV;
105our $INVR;
106our $INVR_LBL;
107our $OPENCONT;
100 108
101sub status { 109sub status {
102 $STATUS_LINE->set_text ($_[0]); 110 $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} 111}
105 112
106sub debug { 113sub debug {
107 $DEBUG_STATUS->set_text ($_[0]); 114 $DEBUG_STATUS->set_text ($_[0]);
108 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h}); 115 my ($w, $h) = $DEBUG_STATUS->size_request;
116 $DEBUG_STATUS->move ($WIDTH - $w, 0);
109} 117}
110 118
111sub start_game { 119sub start_game {
112 status "logging in..."; 120 status "logging in...";
113 121
… …
128 maph => $mapsize, 136 maph => $mapsize,
129 ; 137 ;
130 }; 138 };
131 139
132 if ($CONN) { 140 if ($CONN) {
141 CFClient::lowdelay fileno $CONN->{fh};
142
133 $LOGIN_BUTTON->set_text ("Logout"); 143 $LOGIN_BUTTON->set_text ("Logout");
134
135 status "login successful"; 144 status "login successful";
136 145
137 CFClient::lowdelay fileno $CONN->{fh}; 146 $BUTTONBAR->{children}[1]->emit ("activate")
147 if $BUTTONBAR->{children}[1]->{state};
148
138 } else { 149 } else {
139 status "unable to connect"; 150 status "unable to connect";
140 stop_game(); 151 stop_game();
141 } 152 }
142} 153}
… …
146 157
147 status "connection closed"; 158 status "connection closed";
148 $LOGIN_BUTTON->set_text ("Login"); 159 $LOGIN_BUTTON->set_text ("Login");
149 $CONN->destroy; 160 $CONN->destroy;
150 $CONN = 0; # false, does not autovivify 161 $CONN = 0; # false, does not autovivify
162
163 $BUTTONBAR->{children}[1]->emit ("activate")
164 unless $BUTTONBAR->{children}[1]->{state};
151 165
152 undef $MAPCACHE; 166 undef $MAPCACHE;
153 undef $MAP; 167 undef $MAP;
154} 168}
155 169
… …
160 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 174 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
161 175
162 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 176 $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); 177 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
164 178
165 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 179 $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"); 180 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
167 181
168 $mode_slider->connect (changed => sub { 182 $mode_slider->connect (changed => sub {
169 my ($self, $value) = @_; 183 my ($self, $value) = @_;
170 184
… …
195 } 209 }
196 ); 210 );
197 211
198 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 212 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
199 $table->add (1, $row++, new CFClient::UI::Slider 213 $table->add (1, $row++, new CFClient::UI::Slider
200 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 214 range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05],
201 tooltip => "Enlarge or shrink the displayed map", 215 tooltip => "Enlarge or shrink the displayed map",
202 connect_changed => sub { 216 connect_changed => sub {
203 my ($self, $value) = @_; 217 my ($self, $value) = @_;
204 $CFG->{map_scale} = 0.05 * int $value / 0.05; 218 $CFG->{map_scale} = $value;
205 } 219 }
206 ); 220 );
207 221
208 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 222 $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 223 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
236 } 250 }
237 ); 251 );
238 252
239 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 253 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
240 $table->add (1, $row++, new CFClient::UI::Slider 254 $table->add (1, $row++, new CFClient::UI::Slider
241 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 255 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
242 tooltip => "The font size used by most GUI elements", 256 tooltip => "The font size used by most GUI elements",
243 connect_changed => sub { 257 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 ); 258 );
248 259
249 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); 260 $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 261 $table->add (1, $row++, new CFClient::UI::Slider
251 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 262 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
252 tooltip => "The font size used by the server log window only", 263 tooltip => "The font size used by the server log window only",
253 connect_changed => sub { 264 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
254 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
255 }
256 ); 265 );
257 266
258 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 267 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
259 268
260 $table->add (1, $row++, new CFClient::UI::Slider 269 $table->add (1, $row++, new CFClient::UI::Slider
261 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 270 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
262 tooltip => "The font size used by the statistics window only", 271 tooltip => "The font size used by the statistics window only",
263 connect_changed => sub { 272 connect_changed => sub {
264 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 273 $CFG->{stat_fontsize} = $_[1];
265 &set_stats_window_fontsize; 274 &set_stats_window_fontsize;
266 } 275 }
267 ); 276 );
268 277
269 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 278 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
270 $table->add (1, $row++, new CFClient::UI::Slider 279 $table->add (1, $row++, new CFClient::UI::Slider
271 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 280 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
272 tooltip => "Adjust the size of the stats gauges at the bottom right", 281 tooltip => "Adjust the size of the stats gauges at the bottom right",
273 connect_changed => sub { 282 connect_changed => sub {
274 $CFG->{gauge_size} = $_[1]; 283 $CFG->{gauge_size} = $_[1];
275 my $h = int $HEIGHT * $CFG->{gauge_size}; 284 $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 } 285 }
279 ); 286 );
280 287
281 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 288 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
282 $table->add (1, $row++, new CFClient::UI::Slider 289 $table->add (1, $row++, new CFClient::UI::Slider
283 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 290 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
284 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 291 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
285 connect_changed => sub { 292 connect_changed => sub {
286 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 293 $CFG->{gauge_fontsize} = $_[1];
287 &set_gauge_window_fontsize; 294 &set_gauge_window_fontsize;
288 } 295 }
289 ); 296 );
290 297
291 $table->add (1, $row++, new CFClient::UI::Button 298 $table->add (1, $row++, new CFClient::UI::Button
… …
365# local $GAUGES->{win}{parent};#d# 372# local $GAUGES->{win}{parent};#d#
366# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D; 373# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
367} 374}
368 375
369sub make_gauge_window { 376sub make_gauge_window {
370 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 377 my $gh = int $HEIGHT * $CFG->{gauge_size};
371# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
372 378
373 my $win = new CFClient::UI::Frame ( 379 my $win = new CFClient::UI::Frame (
374 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 380 req_y => -1,
381 user_w => $WIDTH,
382 user_h => $gh,
375 ); 383 );
384
376 $win->add (my $hbox = new CFClient::UI::HBox 385 $win->add (my $hbox = new CFClient::UI::HBox
377 children => [ 386 children => [
378 (new CFClient::UI::HBox expand => 1), 387 (new CFClient::UI::HBox expand => 1),
379 ($FLOORBOX = new CFClient::UI::VBox), 388 (new CFClient::UI::VBox children => [
389 (new CFClient::UI::Empty expand => 1),
390 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)),
391 ]),
380 (my $vbox = new CFClient::UI::VBox), 392 (my $vbox = new CFClient::UI::VBox),
381 ], 393 ],
382 ); 394 );
383 395
384 $vbox->add (new CFClient::UI::HBox 396 $vbox->add (new CFClient::UI::HBox
… …
388 (my $hb = new CFClient::UI::HBox), 400 (my $hb = new CFClient::UI::HBox),
389 ], 401 ],
390 ); 402 );
391 403
392 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 404 $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."); 405 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', 406 $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."); 407 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', 408 $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."); 409 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', 410 $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."); 411 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 412
401 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 413 $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."); 414 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, 415 $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.)"); 416 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
405 417
406 $GAUGES = { 418 $GAUGES = {
407 exp => $exp, win => $win, range => $rng, 419 exp => $exp, win => $win, range => $rng,
408 food => $fg, mana => $mg, hp => $hg, grace => $gg 420 food => $fg, mana => $mg, hp => $hg, grace => $gg
409 }; 421 };
… …
415 427
416sub make_stats_window { 428sub make_stats_window {
417 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats"; 429 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats";
418 430
419 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 431 $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); 432 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
433 can_hover => 1, can_events => 1,
434 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); 435 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
436 can_hover => 1, can_events => 1,
437 tooltip => "The map you are currently on (if supported by the server).");
422 438
423 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 439 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
424
425 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 440 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
426 441
427 my $black = [0, 0, 0]; 442 my $black = [0, 0, 0];
428 443
429 for ( 444 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"], 445 [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"], 446 [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"], 447 [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"], 448 [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"], 449 [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"], 450 [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."], 451 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
437 452
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."], 453 [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."], 454 [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."], 455 [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."], 456 [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."], 457 [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."], 458 [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 ) { 459 ) {
445 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 460 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
446 461
447 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 462 $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); 463 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
… …
454 469
455 my $row = 0; 470 my $row = 0;
456 my $col = 0; 471 my $col = 0;
457 472
458 my %resist_names = ( 473 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.)", 474 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.)", 475 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.)", 476 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, ...)", 477 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)", 478 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)", 479 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)", 480 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)", 481 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
467 pois => "Poison (resistance to getting poisoned)", 482 pois => "<b>Poison</b> (resistance to getting poisoned)",
468 para => "Paralysation (this resistance affects the chance you get paralysed)", 483 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
469 deat => "Death (resistance against death spells)", 484 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)", 485 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)", 486 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)", 487 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", 488 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, ...)", 489 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, ...)", 490 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)", 491 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)",
477 ); 492 );
478 for (qw/slow holyw conf fire depl magic 493 for (qw/slow holyw conf fire depl magic
479 drain acid pois para deat phys 494 drain acid pois para deat phys
480 blind fear tund elec cold ghit/) 495 blind fear tund elec cold ghit/)
481 { 496 {
… …
661 $HOST->set_text ($CFG->{host} = $host); 676 $HOST->set_text ($CFG->{host} = $host);
662 }), 677 }),
663 (new CFClient::UI::Empty expand => 1), 678 (new CFClient::UI::Empty expand => 1),
664 ]); 679 ]);
665 680
666 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8) 681 $table->add ($_ + 1, $y, new CFClient::UI::Label
682 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)
667 for 0 .. $#$m; 683 for 0 .. $#$m;
668 } 684 }
669 } 685 }
670 }); 686 });
671} 687}
… …
727 ); 743 );
728 744
729 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 745 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
730 $table->add (1, 7, new CFClient::UI::Slider 746 $table->add (1, 7, new CFClient::UI::Slider
731 req_w => 100, 747 req_w => 100,
732 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 748 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. " 749 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.", 750 ."If you set this to a high value you will be able to see further for example.",
735 connect_changed => sub { 751 connect_changed => sub {
736 my ($self, $value) = @_; 752 my ($self, $value) = @_;
737 753
738 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 754 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
739 }, 755 },
740 ); 756 );
741 757
758 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
759 $table->add (1, 8, new CFClient::UI::Entry
760 text => $CFG->{output_count},
761 tooltip => "Should be set to 1 unless you know what you are doing",
762 connect_changed => sub { $CFG->{output_count} = $_[1] },
763 );
764
765 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
766 $table->add (1, 9, new CFClient::UI::Entry
767 text => $CFG->{output_sync},
768 tooltip => "Should be set to 1 unless you know what you are doing",
769 connect_changed => sub { $CFG->{output_sync} = $_[1] },
770 );
771
742 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button 772 $table->add (1, 10, $LOGIN_BUTTON = new CFClient::UI::Button
743 expand => 1, 773 expand => 1,
744 align => 0, 774 align => 0,
745 text => "Login", 775 text => "Login",
746 connect_activate => sub { 776 connect_activate => sub {
747 $CONN ? stop_game 777 $CONN ? stop_game
… …
754 784
755sub message_window { 785sub message_window {
756 my $window = new CFClient::UI::FancyFrame 786 my $window = new CFClient::UI::FancyFrame
757 title => "Messages", 787 title => "Messages",
758 border_bg => [1, 1, 1, 1], 788 border_bg => [1, 1, 1, 1],
759 bg => [0, 0, 0, 0.5], 789 bg => [0, 0, 0, 0.75],
760 user_w => int $::WIDTH / 3, 790 user_w => int $::WIDTH / 3,
761 user_h => int $::HEIGHT / 5, 791 user_h => int $::HEIGHT / 5,
762 child => (my $vbox = new CFClient::UI::VBox); 792 child => (my $vbox = new CFClient::UI::VBox);
763 793
764 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 794 $vbox->add ($LOGVIEW);
765 expand => 1,
766 font => $FONT_FIXED,
767 fontsize => $::CFG->{log_fontsize},
768 );
769 795
770 $vbox->add (my $input = new CFClient::UI::Entry 796 $vbox->add (my $input = new CFClient::UI::Entry
797 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
798 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
799 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
800 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
771 connect_focus_in => sub { 801 connect_focus_in => sub {
772 my ($input, $prev_focus) = @_; 802 my ($input, $prev_focus) = @_;
773 803
774 delete $input->{refocus_map}; 804 delete $input->{refocus_map};
775 805
… …
805 835
806 $window 836 $window
807} 837}
808 838
809sub make_inventory_window { 839sub make_inventory_window {
810 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory"; 840 my $invwin = new CFClient::UI::FancyFrame
841 user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory";
842
843 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
844
845 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
846 $vb1->add (my $lbl = new CFClient::UI::Label);
847 $lbl->set_text ("Player");
811 $invwin->add ($INV = new CFClient::UI::Inventory expand => 1); 848 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
849
850 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
851 $vb2->add ($INVR_LBL = new CFClient::UI::Label);
852 $INVR_LBL->set_text ("Floor");
853 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
854
812 $invwin 855 $invwin
813} 856}
814 857
815sub sdl_init { 858sub sdl_init {
816 CFClient::SDL_Init 859 CFClient::SDL_Init
… …
825 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 868 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
826 $FULLSCREEN = $CFG->{fullscreen}; 869 $FULLSCREEN = $CFG->{fullscreen};
827 $FAST = $CFG->{fast}; 870 $FAST = $CFG->{fast};
828 871
829 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 872 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
830 or die "SDL_SetVideoMode failed!\n"; 873 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
831 874
832 $SDL_ACTIVE = 1; 875 $SDL_ACTIVE = 1;
833 $LAST_REFRESH = time - 0.01; 876 $LAST_REFRESH = time - 0.01;
834 877
835 CFClient::gl_init; 878 CFClient::gl_init;
… …
838 881
839 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 882 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
840 883
841 ############################################################################# 884 #############################################################################
842 885
843 if ($DEBUG_STATUS) { 886 unless ($DEBUG_STATUS) {
844 # reconfigure all widgets
845 $CFClient::UI::ROOT->reconfigure;
846
847 } else {
848 # create the widgets 887 # create the widgets
849 888
850 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 889 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
851 $DEBUG_STATUS->show; 890 $DEBUG_STATUS->show;
852 891
853 $STATUS_LINE = new CFClient::UI::Label 892 $STATUSBOX = new CFClient::UI::Statusbox;
854 padding => 0, 893 $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 894
858 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 895 (new CFClient::UI::Frame
859 padding => 0, 896 bg => [0, 0, 0, 0.4],
860 fontsize => 0.8, 897 req_y => -1,
861 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 898 child => $STATUSBOX,
862 $ALT_ENTER_MESSAGE->show; 899 )->show;
863 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
864 900
865 CFClient::UI::FancyFrame->new ( 901 CFClient::UI::FancyFrame->new (
866 border_bg => [1, 1, 1, 192/255], 902 border_bg => [1, 1, 1, 192/255],
867 bg => [1, 1, 1, 0], 903 bg => [1, 1, 1, 0],
868 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 904 child => ($MAPMAP = new CFClient::MapWidget::MapMap
905 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
906 ),
869 )->show; 907 )->show;
870 908
871 $MAPWIDGET = new CFClient::MapWidget; 909 $MAPWIDGET = new CFClient::MapWidget;
872 $MAPWIDGET->connect (activate_console => sub { 910 $MAPWIDGET->connect (activate_console => sub {
873 my ($mapwidget, $preset) = @_; 911 my ($mapwidget, $preset) = @_;
… …
882 } 920 }
883 }); 921 });
884 $MAPWIDGET->show; 922 $MAPWIDGET->show;
885 $MAPWIDGET->focus_in; 923 $MAPWIDGET->focus_in;
886 924
925 $LOGVIEW = new CFClient::UI::TextView
926 expand => 1,
927 font => $FONT_FIXED,
928 fontsize => $::CFG->{log_fontsize},
929 can_hover => 1,
930 can_events => 1,
931 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
932 ;
933
887 $BUTTONBAR = new CFClient::UI::HBox; 934 $BUTTONBAR = new CFClient::UI::HBox;
888 935
889 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 936 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
937 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); 938 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
939 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); 940 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
941 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
892 942
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 943 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 944
895 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 945 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
946 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); 947 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
948 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");
897 949
898 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 950 $BUTTONBAR->add (new CFClient::UI::Button
951 text => "Save Config",
952 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
953 connect_activate => sub {
899 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 954 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
900 status "Configuration Saved"; 955 status "Configuration Saved";
956 },
957 );
958
959 $BUTTONBAR->show;
960
961 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
962
963 # delay till geometry is constant
964 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
965 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
966 my $widget = $GAUGES->{win};
967 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
901 }); 968 });
902 969 force_refresh ();
903 $BUTTONBAR->show;
904
905 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
906 } 970 }
907} 971}
908 972
909sub video_shutdown { 973sub video_shutdown {
910 undef $SDL_ACTIVE; 974 undef $SDL_ACTIVE;
… …
914my $bgmusic;#TODO#hack#d# 978my $bgmusic;#TODO#hack#d#
915 979
916sub audio_channel_finished { 980sub audio_channel_finished {
917 my ($channel) = @_; 981 my ($channel) = @_;
918 982
919 warn "channel $channel finished\n";#d# 983 #warn "channel $channel finished\n";#d#
920} 984}
921 985
922sub audio_music_finished { 986sub audio_music_finished {
923 return unless $CFG->{bgm_enable}; 987 return unless $CFG->{bgm_enable};
924 988
… …
966} 1030}
967 1031
968my %animate_object; 1032my %animate_object;
969my $animate_timer; 1033my $animate_timer;
970 1034
971my $want_refresh;
972my $can_refresh;
973
974my $fps = 9; 1035my $fps = 9;
975 1036
1037my %demo;#d#
1038
976sub force_refresh { 1039sub force_refresh {
977 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 1040 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
978 debug sprintf "%3.2f", $fps; 1041 debug sprintf "%3.2f", $fps;
979 1042
980 $want_refresh = 0;
981 $can_refresh = 0;
982
983 $CFClient::UI::ROOT->draw; 1043 $CFClient::UI::ROOT->draw;
984 1044
1045 $WANT_REFRESH = 0;
1046 $CAN_REFRESH = 0;
1047 $LAST_REFRESH = $NOW;
1048
10490 && do {
1050 # some weird model-drawing code, just a joke right now
1051 use CFClient::OpenGL;
1052
1053 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1054 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1055 $demo{r} ||= do {
1056 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1057 $mod->{v} = pack "f*", @{$mod->{v}};
1058 $_ = [scalar @$_, pack "S!*", @$_]
1059 for values %{$mod->{g}};
1060 $mod
1061 };
1062
1063 my $r = $demo{r} or die;
1064
1065 glDepthMask 1;
1066 glClear GL_DEPTH_BUFFER_BIT;
1067 glEnable GL_TEXTURE_2D;
1068 glEnable GL_DEPTH_TEST;
1069 glEnable GL_CULL_FACE;
1070 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1071
1072 glMatrixMode GL_PROJECTION;
1073 glLoadIdentity;
1074 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1075 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1076 glMatrixMode GL_MODELVIEW;
1077 glLoadIdentity;
1078
1079 glPushMatrix;
1080 glTranslate 0, 0, -800;
1081 glScale 1, -1, 1;
1082 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1083 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1084 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1085 glScale 50, 50, 50;
1086
1087 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1088 while (my ($k, $v) = each %{$r->{g}}) {
1089 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1090 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1091 }
1092
1093 glPopMatrix;
1094
1095 glShadeModel GL_FLAT;
1096 glDisable GL_DEPTH_TEST;
1097 glDisable GL_TEXTURE_2D;
1098 glDepthMask 0;
1099
1100 $WANT_REFRESH++;
1101};
1102
985 CFClient::SDL_GL_SwapBuffers; 1103 CFClient::SDL_GL_SwapBuffers;
986
987 $LAST_REFRESH = $NOW;
988} 1104}
989 1105
990my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1106my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
991 $NOW = time; 1107 $NOW = time;
992 1108
993 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1109 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
994 for CFClient::SDL_PollEvent; 1110 for CFClient::SDL_PollEvent;
995 1111
996 if (%animate_object) { 1112 if (%animate_object) {
997 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1113 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
998 $want_refresh++; 1114 $WANT_REFRESH++;
999 } 1115 }
1000 1116
1001 if ($want_refresh) { 1117 if ($WANT_REFRESH) {
1002 force_refresh; 1118 force_refresh;
1003 } else { 1119 } else {
1004 $can_refresh = 1; 1120 $CAN_REFRESH = 1;
1005 } 1121 }
1006}); 1122});
1007
1008sub refresh {
1009 $want_refresh++;
1010}
1011 1123
1012sub animation_start { 1124sub animation_start {
1013 my ($widget) = @_; 1125 my ($widget) = @_;
1014 $animate_object{$widget} = $widget; 1126 $animate_object{$widget} = $widget;
1015} 1127}
… …
1019 delete $animate_object{$widget}; 1131 delete $animate_object{$widget};
1020} 1132}
1021 1133
1022@conn::ISA = Crossfire::Protocol::; 1134@conn::ISA = Crossfire::Protocol::;
1023 1135
1136sub conn::new {
1137 my $class = shift;
1138
1139 my $self = $class->Crossfire::Protocol::new (@_);
1140
1141 $MAPWIDGET->clr_commands;
1142
1143 my $parser = new Pod::POM;
1144 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1145
1146 for my $head2 ($pod->head2) {
1147 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1148 or next;
1149
1150 my $cmd = $1;
1151 my @args = split /\|/, $2;
1152 @args = (".*") unless @args;
1153
1154 my $text = CFClient::pod_to_pango $head2->content;
1155
1156 for my $arg (@args) {
1157 $arg = $arg eq ".*" ? "" : " $arg";
1158
1159 $MAPWIDGET->add_command ("$cmd$arg", $text);
1160 }
1161 }
1162
1163 $self
1164}
1165
1024sub conn::stats_update { 1166sub conn::stats_update {
1025 my ($self, $stats) = @_; 1167 my ($self, $stats) = @_;
1168
1169 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1170 my $diff = $exp - $self->{prev_exp};
1171 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1172 if exists $self->{prev_exp} && $diff;
1173 $self->{prev_exp} = $exp;
1174 }
1026 1175
1027 update_stats_window ($stats); 1176 update_stats_window ($stats);
1028} 1177}
1029 1178
1030sub conn::user_send { 1179sub conn::user_send {
… …
1085 $self->set_texture ($id => $data); 1234 $self->set_texture ($id => $data);
1086 } 1235 }
1087 } 1236 }
1088} 1237}
1089 1238
1239# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1240# (server resource,s latency, bandwidth), so this hack is warranted.
1241# the right fix is to make real tiled maps with an overview file
1242sub conn::send_mapinfo {
1243 my ($self, $data, $cb) = @_;
1244
1245 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1246 my ($wx, $wy) = ($1, $2);
1247
1248 if ($data =~ /^spatial ([1-4]+)$/) {
1249 my @dx = (0, 0, 1, 0, -1);
1250 my @dy = (0, -1, 0, 1, 0);
1251 my ($dx, $dy);
1252
1253 for (split //, $1) {
1254 $dx += $dx[$_];
1255 $dy += $dy[$_];
1256 }
1257
1258 $cb->(spatial => 15,
1259 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1260 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1261 50, 50,
1262 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1263 );
1264
1265 return;
1266 }
1267 }
1268
1269 $self->SUPER::send_mapinfo ($data, $cb);
1270}
1271
1090# this method does a "flood fill" into every tile direction 1272# this method does a "flood fill" into every tile direction
1091# it assumes that tiles are arranged in a rectangular grid, 1273# 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. 1274# 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 1275# failure to comply are harmless and result in display errors
1094# at worst. 1276# at worst.
1095sub conn::flood_fill { 1277sub conn::flood_fill {
1096 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1278 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1097 1279
1098 # the server does not allow map paths > 6 1280 # the server does not allow map paths > 6
1099 return if 7 <= length $path; 1281 return if 7 <= length $path;
1100 1282
1101 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1283 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1102 1284
1103 for ( 1285 for (
1104 [1, 0, -1], 1286 [1, 3, 0, -1],
1105 [2, 1, 0], 1287 [2, 4, 1, 0],
1106 [3, 0, 1], 1288 [3, 1, 0, 1],
1107 [4, -1, 0], 1289 [4, 2, -1, 0],
1108 ) { 1290 ) {
1109 my ($tile, $dx, $dy) = @$_; 1291 my ($tile, $tile2, $dx, $dy) = @$_;
1292
1293 next if $block & (1 << $tile);
1294 my $block = $block | (1 << $tile2);
1110 1295
1111 my $gx = $gx + $dx; 1296 my $gx = $gx + $dx;
1112 my $gy = $gy + $dy; 1297 my $gy = $gy + $dy;
1113 1298
1114 next unless $flags & (1 << ($tile - 1)); 1299 next unless $flags & (1 << ($tile - 1));
… …
1116 1301
1117 my $neigh = $self->{neigh_map}{$hash} ||= []; 1302 my $neigh = $self->{neigh_map}{$hash} ||= [];
1118 if (my $info = $neigh->[$tile]) { 1303 if (my $info = $neigh->[$tile]) {
1119 my ($flags, $x, $y, $w, $h, $hash) = @$info; 1304 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1120 1305
1121 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1306 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1122 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1307 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1123 1308
1124 } else { 1309 } else {
1125 $self->send_mapinfo ("spatial $path$tile", sub { 1310 $self->send_mapinfo ("spatial $path$tile", sub {
1126 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1311 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1127 1312
1128 return if $mode ne "spatial"; 1313 return if $mode ne "spatial";
1129 1314
1130 $x += $MAP->ox; 1315 $x += $MAP->ox;
1131 $y += $MAP->oy; 1316 $y += $MAP->oy;
1132 1317
1133 $self->load_map ($hash, $x, $y) 1318 $self->load_map ($hash, $x, $y)
1134 unless $self->{neigh_map}{$hash}[5]++;#d# 1319 unless $self->{neigh_map}{$hash}[5]++;#d#
1135 1320
1136 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 1321 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1137 1322
1138 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1323 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1139 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1324 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1140 }); 1325 });
1141 } 1326 }
1142 } 1327 }
1143} 1328}
… …
1156 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1341 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1157 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1342 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1158 ]; 1343 ];
1159 1344
1160 delete $self->{neigh_grid}; 1345 delete $self->{neigh_grid};
1161 $self->flood_fill (0, 0, "", $hash, $flags);
1162 1346
1163 $x += $ox; 1347 $x += $ox;
1164 $y += $oy; 1348 $y += $oy;
1165 1349
1166 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1350 $self->{map_info} = [$hash, $x, $y, $w, $h];
1167 1351
1168 my $map = $self->{map_info}[0];
1169 $map =~ s/^.*?\/([^\/]+)$/\1/; 1352 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1170 $STATWIDS->{map}->set_text ("Map: " . $map); 1353 $STATWIDS->{map}->set_text ("Map: " . $map);
1171 1354
1172 $self->load_map ($hash, $x, $y); 1355 $self->load_map ($hash, $x, $y);
1356 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1173} 1357}
1174 1358
1175sub conn::face_find { 1359sub conn::face_find {
1176 my ($self, $facenum, $face) = @_; 1360 my ($self, $facenum, $face) = @_;
1177 1361
… …
1327 [0.55, 0.41, 0.13], 1511 [0.55, 0.41, 0.13],
1328 [0.99, 0.77, 0.26], 1512 [0.99, 0.77, 0.26],
1329 [0.74, 0.65, 0.41], 1513 [0.74, 0.65, 0.41],
1330 ); 1514 );
1331 1515
1516 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1517
1518 $text = CFClient::UI::Label::escape $text;
1519 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1520 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1521
1332 $LOGVIEW->add_paragraph ($color[$color], $text); 1522 $LOGVIEW->add_paragraph ($color[$color],
1523 join "\n", map "$time $_", split /\n/, $text);
1524
1525 $STATUSBOX->add ($text,
1526 group => $text,
1527 fg => $color[$color],
1528 timeout => 60,
1529 tooltip_font => $::FONT_FIXED,
1530 );
1531}
1532
1533sub conn::drawextinfo {
1534 my ($self, $color, $type, $subtype, $message) = @_;
1535
1536 $self->drawinfo ($color, $message);
1333} 1537}
1334 1538
1335sub conn::spell_add { 1539sub conn::spell_add {
1336 my ($self, $spell) = @_; 1540 my ($self, $spell) = @_;
1337 1541
1338 # TODO 1542 # TODO
1339 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1543 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1340 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1544 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1341 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1545 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1342} 1546}
1343 1547
1344sub conn::spell_delete { 1548sub conn::spell_delete {
1345 my ($self, $spell) = @_; 1549 my ($self, $spell) = @_;
1346} 1550}
1347 1551
1348sub conn::addme_success { 1552sub conn::addme_success {
1349 my ($self) = @_; 1553 my ($self) = @_;
1350 1554
1555 $self->send ("command output-sync $CFG->{output_sync}");
1556 $self->send ("command output-count $CFG->{output_count}");
1557
1558 my $parser = new Pod::POM;
1559 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1560
1561 my %skill_tooltip;
1562
1563 for my $head2 ($pod->head2) {
1564 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1565 }
1566
1351 for my $skill (values %{$self->{skill_info}}) { 1567 for my $skill (values %{$self->{skill_info}}) {
1352 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1568 $MAPWIDGET->add_command ("ready_skill $skill",
1353 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1569 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1570 . $skill_tooltip{$skill});
1571 $MAPWIDGET->add_command ("use_skill $skill",
1572 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1573 . $skill_tooltip{$skill});
1354 } 1574 }
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} 1575}
1361 1576
1362sub conn::eof { 1577sub conn::eof {
1578 $MAPWIDGET->clr_commands;
1579
1363 stop_game; 1580 stop_game;
1364} 1581}
1365 1582
1366sub update_floorbox { 1583sub update_floorbox {
1367 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1584 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1368 return unless $CONN; 1585 return unless $CONN;
1369 1586
1370 $FLOORBOX->clear; 1587 $FLOORBOX->clear;
1371 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1588 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1372 1589
1373 # we basically have to use the same sorting as everybody else 1590 my $count = 4;
1374 $FLOORBOX->add ( 1591 for (@{ $CONN->{container}{0} }) {
1592 if (--$count) {
1375 map +(new CFClient::UI::InventoryItem item => $_), 1593 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1376 @{ $CONN->{container}{0} } 1594 } else {
1595 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1596 last;
1597 }
1377 ); 1598 }
1378 }); 1599 });
1379 refresh; 1600
1601 $WANT_REFRESH++;
1380} 1602}
1381 1603
1382sub conn::container_add { 1604sub conn::container_add {
1383 my ($self, $tag, $items) = @_; 1605 my ($self, $tag, $items) = @_;
1384 1606
1385 update_floorbox if $tag == 0; 1607 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1386 1608
1609 if ($tag == 0) {
1610 update_floorbox;
1611 $OPENCONT = 0;
1612 $INVR_LBL->set_text ("Floor");
1613 $INVR->set_items ($self->{container}{0});
1614 } elsif ($tag == $self->{player}{tag}) {
1615 $INVR_LBL->set_text ("Player");
1387 $INV->set_items ($self->{container}{$self->{player}{tag}}) 1616 $INV->set_items ($self->{container}{$self->{player}{tag}})
1388 if $tag == $self->{player}{tag}; 1617 } else {
1618 $OPENCONT = $tag;
1619 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1620 $INVR->set_items ($self->{container}{$tag});
1621 }
1389 1622
1390 # $self-<{player}{tag} => player inv 1623 # $self-<{player}{tag} => player inv
1391 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1624 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1392} 1625}
1393 1626
1394sub conn::container_clear { 1627sub conn::container_clear {
1395 my ($self, $tag) = @_; 1628 my ($self, $tag) = @_;
1396 1629
1397 update_floorbox if $tag == 0; 1630 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1398 1631
1632 if ($tag == 0) {
1633 update_floorbox;
1634 $OPENCONT = 0;
1635 $INVR_LBL->set_text ("Floor");
1636 $INVR->set_items ($self->{container}{0});
1637 } elsif ($tag == $self->{player}{tag}) {
1638 $INVR_LBL->set_text ("Player");
1399 $INV->set_items ($self->{container}{$tag}) 1639 $INV->set_items ($self->{container}{$tag})
1400 if $tag == $self->{player}{tag}; 1640 } else {
1641 $OPENCONT = $tag;
1642 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1643 $INVR->set_items ($self->{container}{$tag});
1644 }
1401 1645
1402# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1646# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1403} 1647}
1404 1648
1405sub conn::item_delete { 1649sub conn::item_delete {
1406 my ($self, @items) = @_; 1650 my ($self, @items) = @_;
1407 1651
1408 for (@items) { 1652 for (@items) {
1409 update_floorbox if $_->{container} == 0; 1653 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1410 1654
1655 if ($_->{container} == 0) {
1656 update_floorbox;
1657 $OPENCONT = 0;
1658 $INVR_LBL->set_text ("Floor");
1659 $INVR->set_items ($self->{container}{0});
1660 } elsif ($_->{container} == $self->{player}{tag}) {
1661 $INVR_LBL->set_text ("Player");
1662 $INV->set_items ($self->{container}{$self->{player}{tag}})
1663 } else {
1664 $OPENCONT = $_->{container};
1665 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1411 $INV->set_items ($self->{container}{$_->{container}}) 1666 $INVR->set_items ($self->{container}{$_->{container}});
1412 if $_->{container} == $self->{player}{tag}; 1667 }
1413 } 1668 }
1414} 1669}
1415 1670
1416sub conn::item_update { 1671sub conn::item_update {
1417 my ($self, $item) = @_; 1672 my ($self, $item) = @_;
1418 1673
1419 update_floorbox if $item->{container} == 0; 1674 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1420 1675
1676 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1677 $OPENCONT = 0;
1678 $INVR_LBL->set_text ("Floor");
1679 $INVR->set_items ($self->{container}{0});
1680
1681 $item->{widget}->update_item
1682 if $item->{widget};
1683 } else {
1684 if ($item->{container} == 0) {
1685 update_floorbox;
1686 $OPENCONT = 0;
1687 $INVR_LBL->set_text ("Floor");
1688 $INVR->set_items ($self->{container}{0});
1689 } elsif ($item->{container} == $self->{player}{tag}) {
1421 $INV->set_items ($self->{container}{$item->{container}}) 1690 $INV->set_items ($self->{container}{$item->{container}})
1422 if $item->{container} == $self->{player}{tag}; 1691 }
1692 }
1423} 1693}
1424 1694
1425%SDL_CB = ( 1695%SDL_CB = (
1426 CFClient::SDL_QUIT => sub { 1696 CFClient::SDL_QUIT => sub {
1427 Event::unloop -1; 1697 Event::unloop -1;
1428 }, 1698 },
1429 CFClient::SDL_VIDEORESIZE => sub { 1699 CFClient::SDL_VIDEORESIZE => sub {
1430 }, 1700 },
1431 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1701 CFClient::SDL_VIDEOEXPOSE => sub {
1702 CFClient::UI::full_refresh;
1703 },
1432 CFClient::SDL_ACTIVEEVENT => sub { 1704 CFClient::SDL_ACTIVEEVENT => sub {
1433# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1705# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1434 }, 1706 },
1435 CFClient::SDL_KEYDOWN => sub { 1707 CFClient::SDL_KEYDOWN => sub {
1436 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1708 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1471 sdl_mode => 0, 1743 sdl_mode => 0,
1472 width => 640, 1744 width => 640,
1473 height => 480, 1745 height => 480,
1474 fullscreen => 0, 1746 fullscreen => 0,
1475 fast => 0, 1747 fast => 0,
1476 map_scale => 0.5, 1748 map_scale => 1,
1477 fow_enable => 1, 1749 fow_enable => 1,
1478 fow_intensity => 0.45, 1750 fow_intensity => 0.45,
1479 fow_smooth => 0, 1751 fow_smooth => 0,
1480 gui_fontsize => 1, 1752 gui_fontsize => 1,
1481 log_fontsize => 1, 1753 log_fontsize => 1,
1482 gauge_fontsize => 1, 1754 gauge_fontsize=> 1,
1483 gauge_size => 0.35, 1755 gauge_size => 0.35,
1484 stat_fontsize => 1, 1756 stat_fontsize => 1,
1485 mapsize => 100, 1757 mapsize => 100,
1486 host => "crossfire.schmorp.de", 1758 host => "crossfire.schmorp.de",
1487 say_command => 'say', 1759 say_command => 'say',
1488 audio_enable => 1, 1760 audio_enable => 1,
1489 bgm_enable => 1, 1761 bgm_enable => 1,
1490 bgm_volume => 0.25, 1762 bgm_volume => 0.25,
1763 output_sync => 1,
1764 output_count => 1,
1491 ); 1765 );
1492 1766
1493 while (my ($k, $v) = each %DEF_CFG) { 1767 while (my ($k, $v) = each %DEF_CFG) {
1494 $CFG->{$k} = $v unless exists $CFG->{$k}; 1768 $CFG->{$k} = $v unless exists $CFG->{$k};
1495 } 1769 }
… …
1516 DejaVuSansMono-BoldOblique.ttf 1790 DejaVuSansMono-BoldOblique.ttf
1517 ); 1791 );
1518 1792
1519 CFClient::add_font $_ for @fonts; 1793 CFClient::add_font $_ for @fonts;
1520 1794
1795 CFClient::pango_init;
1796
1521 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1797 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1522 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1798 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1523 1799
1524 $FONT_PROP->make_default; 1800 $FONT_PROP->make_default;
1525 } 1801 }
1802
1803# compare mono (ft) vs. rgba (cairo)
1804# ft - 1.8s, cairo 3s, even in alpha-only mode
1805# for my $rgba (0..1) {
1806# my $t1 = Time::HiRes::time;
1807# for (1..1000) {
1808# my $layout = CFClient::Layout->new ($rgba);
1809# $layout->set_text ("hallo" x 100);
1810# $layout->render;
1811# }
1812# my $t2 = Time::HiRes::time;
1813# warn $t2-$t1;
1814# }
1526 1815
1527 video_init; 1816 video_init;
1528 audio_init; 1817 audio_init;
1529} 1818}
1530 1819
… …
1585 1874
1586Typing B<climb> will display a list of commands with I<climb> in their 1875Typing B<climb> will display a list of commands with I<climb> in their
1587name, such as I<ready_skill climbing> and I<use_skill climbing>. 1876name, such as I<ready_skill climbing> and I<use_skill climbing>.
1588 1877
1589You can abbreviate commands by typing only the first character of every 1878You can abbreviate commands by typing only the first character of every
1590word. For example, typing I<iwor> will likely select I<invoke word of 1879word (or even characters within the word - the client will try to make
1591recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli> 1880a good guess, as long as the characters are in order). For example,
1592will likely select I<ready_skill climbing> and I<usl> will give you 1881typing I<iwor> will likely select I<invoke word of recall>, while I<ccfo>
1593I<use_skill levitation>. 1882will select I<cast create food>. Likewise, I<rscli> will likely select
1883I<ready_skill climbing> and I<usl> will give you I<use_skill levitation>.
1884
1885You can enter space and other text as arguemnt to the command. For
1886example, C<cfoo waybread> will expand to C<cast create food waybread>.
1594 1887
1595=head2 The map overview 1888=head2 The map overview
1596 1889
1597#TODO# 1890#TODO#
1598 1891

Diff Legend

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