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.192 by root, Fri Apr 28 18:06:13 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;
… …
76our $MAPWIDGET; 81our $MAPWIDGET;
77our $BUTTONBAR; 82our $BUTTONBAR;
78our $LOGVIEW; 83our $LOGVIEW;
79our $CONSOLE; 84our $CONSOLE;
80our $METASERVER; 85our $METASERVER;
86our $LOGIN_BUTTON;
81 87
82our $FLOORBOX; 88our $FLOORBOX;
83our $GAUGES; 89our $GAUGES;
84our $STATWIDS; 90our $STATWIDS;
85 91
… …
89our $SDL_MIXER; 95our $SDL_MIXER;
90our @SOUNDS; # event => file mapping 96our @SOUNDS; # event => file mapping
91our %AUDIO_CHUNKS; # audio files 97our %AUDIO_CHUNKS; # audio files
92 98
93our $ALT_ENTER_MESSAGE; 99our $ALT_ENTER_MESSAGE;
94our $STATUS_LINE; 100our $STATUSBOX;
95our $DEBUG_STATUS; 101our $DEBUG_STATUS;
96 102
97our $INVWIN; 103our $INVWIN;
98our $INV; 104our $INV;
105our $INVR;
106our $INVR_LBL;
107our $OPENCONT;
99 108
100sub status { 109sub status {
101 $STATUS_LINE->set_text ($_[0]); 110 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
102 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
103} 111}
104 112
105sub debug { 113sub debug {
106 $DEBUG_STATUS->set_text ($_[0]); 114 $DEBUG_STATUS->set_text ($_[0]);
107 $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);
108} 117}
109 118
110sub start_game { 119sub start_game {
111 status "logging in..."; 120 status "logging in...";
112 121
113 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 122 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
114 123
115 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 124 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
116
117 $MAP = new CFClient::Map $mapsize, $mapsize; 125 $MAP = new CFClient::Map $mapsize, $mapsize;
118 126
119 my ($host, $port) = split /:/, $CFG->{host}; 127 my ($host, $port) = split /:/, $CFG->{host};
120 128
121 $CONN = new conn 129 $CONN = eval {
130 new conn
122 host => $host, 131 host => $host,
123 port => $port || 13327, 132 port => $port || 13327,
124 user => $CFG->{user}, 133 user => $CFG->{user},
125 pass => $CFG->{password}, 134 pass => $CFG->{password},
126 mapw => $mapsize, 135 mapw => $mapsize,
127 maph => $mapsize, 136 maph => $mapsize,
137 ;
128 ; 138 };
129 139
130 status "login successful"; 140 if ($CONN) {
131
132 CFClient::lowdelay fileno $CONN->{fh}; 141 CFClient::lowdelay fileno $CONN->{fh};
142
143 $LOGIN_BUTTON->set_text ("Logout");
144 status "login successful";
145
146 $BUTTONBAR->{children}[1]->emit ("activate")
147 if $BUTTONBAR->{children}[1]->{state};
148
149 } else {
150 status "unable to connect";
151 stop_game();
152 }
133} 153}
134 154
135sub stop_game { 155sub stop_game {
156 return unless $CONN;
157
158 status "connection closed";
159 $LOGIN_BUTTON->set_text ("Login");
160 $CONN->destroy;
161 $CONN = 0; # false, does not autovivify
162
163 $BUTTONBAR->{children}[1]->emit ("activate")
164 unless $BUTTONBAR->{children}[1]->{state};
165
166 undef $MAPCACHE;
136 undef $CONN; 167 undef $MAP;
137} 168}
138 169
139sub client_setup { 170sub client_setup {
140 my $dialog = new CFClient::UI::FancyFrame 171 my $dialog = new CFClient::UI::FancyFrame
141 title => "Client Setup", 172 title => "Client Setup",
… …
143 $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]);
144 175
145 $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");
146 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 177 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
147 178
148 $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]);
149 $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");
150 181
151 $mode_slider->connect (changed => sub { 182 $mode_slider->connect (changed => sub {
152 my ($self, $value) = @_; 183 my ($self, $value) = @_;
153 184
… …
178 } 209 }
179 ); 210 );
180 211
181 $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");
182 $table->add (1, $row++, new CFClient::UI::Slider 213 $table->add (1, $row++, new CFClient::UI::Slider
183 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 214 range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05],
184 tooltip => "Enlarge or shrink the displayed map", 215 tooltip => "Enlarge or shrink the displayed map",
185 connect_changed => sub { 216 connect_changed => sub {
186 my ($self, $value) = @_; 217 my ($self, $value) = @_;
187 $CFG->{map_scale} = 0.05 * int $value / 0.05; 218 $CFG->{map_scale} = $value;
188 } 219 }
189 ); 220 );
190 221
191 $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");
192 $table->add (1, $row++, new CFClient::UI::CheckBox 223 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
219 } 250 }
220 ); 251 );
221 252
222 $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");
223 $table->add (1, $row++, new CFClient::UI::Slider 254 $table->add (1, $row++, new CFClient::UI::Slider
224 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 255 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
225 tooltip => "The font size used by most GUI elements", 256 tooltip => "The font size used by most GUI elements",
226 connect_changed => sub { 257 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
227 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
228# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
229 }
230 ); 258 );
231 259
232 $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");
233 $table->add (1, $row++, new CFClient::UI::Slider 261 $table->add (1, $row++, new CFClient::UI::Slider
234 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 262 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
235 tooltip => "The font size used by the server log window only", 263 tooltip => "The font size used by the server log window only",
236 connect_changed => sub { 264 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
237 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
238 }
239 ); 265 );
240 266
241 $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");
242 268
243 $table->add (1, $row++, new CFClient::UI::Slider 269 $table->add (1, $row++, new CFClient::UI::Slider
244 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 270 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
245 tooltip => "The font size used by the statistics window only", 271 tooltip => "The font size used by the statistics window only",
246 connect_changed => sub { 272 connect_changed => sub {
247 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 273 $CFG->{stat_fontsize} = $_[1];
248 &set_stats_window_fontsize; 274 &set_stats_window_fontsize;
249 } 275 }
250 ); 276 );
251 277
252 $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");
253 $table->add (1, $row++, new CFClient::UI::Slider 279 $table->add (1, $row++, new CFClient::UI::Slider
254 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 280 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
255 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",
256 connect_changed => sub { 282 connect_changed => sub {
257 $CFG->{gauge_size} = $_[1]; 283 $CFG->{gauge_size} = $_[1];
258 my $h = int $HEIGHT * $CFG->{gauge_size}; 284 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
259 $GAUGES->{win}->set_size ($WIDTH, $h);
260 $GAUGES->{win}->move (0, $HEIGHT - $h);
261 } 285 }
262 ); 286 );
263 287
264 $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");
265 $table->add (1, $row++, new CFClient::UI::Slider 289 $table->add (1, $row++, new CFClient::UI::Slider
266 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 290 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
267 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 291 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
268 connect_changed => sub { 292 connect_changed => sub {
269 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 293 $CFG->{gauge_fontsize} = $_[1];
270 &set_gauge_window_fontsize; 294 &set_gauge_window_fontsize;
271 } 295 }
272 ); 296 );
273 297
274 $table->add (1, $row++, new CFClient::UI::Button 298 $table->add (1, $row++, new CFClient::UI::Button
… …
348# local $GAUGES->{win}{parent};#d# 372# local $GAUGES->{win}{parent};#d#
349# 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;
350} 374}
351 375
352sub make_gauge_window { 376sub make_gauge_window {
353 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 377 my $gh = int $HEIGHT * $CFG->{gauge_size};
354# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
355 378
356 my $win = new CFClient::UI::Frame ( 379 my $win = new CFClient::UI::Frame (
357 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 380 req_y => -1,
381 user_w => $WIDTH,
382 user_h => $gh,
358 ); 383 );
384
359 $win->add (my $hbox = new CFClient::UI::HBox 385 $win->add (my $hbox = new CFClient::UI::HBox
360 children => [ 386 children => [
361 (new CFClient::UI::HBox expand => 1), 387 (new CFClient::UI::HBox expand => 1),
362 ($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 ]),
363 (my $vbox = new CFClient::UI::VBox), 392 (my $vbox = new CFClient::UI::VBox),
364 ], 393 ],
365 ); 394 );
366 395
367 $vbox->add (new CFClient::UI::HBox 396 $vbox->add (new CFClient::UI::HBox
… …
371 (my $hb = new CFClient::UI::HBox), 400 (my $hb = new CFClient::UI::HBox),
372 ], 401 ],
373 ); 402 );
374 403
375 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 404 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
376 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.");
377 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 406 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
378 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.");
379 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 408 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
380 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.");
381 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 410 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
382 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.");
383 412
384 $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,
385 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.");
386 $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,
387 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.)");
388 417
389 $GAUGES = { 418 $GAUGES = {
390 exp => $exp, win => $win, range => $rng, 419 exp => $exp, win => $win, range => $rng,
391 food => $fg, mana => $mg, hp => $hg, grace => $gg 420 food => $fg, mana => $mg, hp => $hg, grace => $gg
392 }; 421 };
… …
398 427
399sub make_stats_window { 428sub make_stats_window {
400 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";
401 430
402 $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);
403 $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.");
404 $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).");
405 438
406 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 439 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
407
408 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 440 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
409 441
410 my $black = [0, 0, 0]; 442 my $black = [0, 0, 0];
411 443
412 for ( 444 for (
413 [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"],
414 [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"],
415 [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"],
416 [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"],
417 [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"],
418 [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"],
419 [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."],
420 452
421 [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."],
422 [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."],
423 [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."],
424 [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."],
425 [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."],
426 [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."],
427 ) { 459 ) {
428 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 460 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
429 461
430 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 462 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
431 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);
… …
437 469
438 my $row = 0; 470 my $row = 0;
439 my $col = 0; 471 my $col = 0;
440 472
441 my %resist_names = ( 473 my %resist_names = (
442 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.)",
443 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.)",
444 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.)",
445 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, ...)",
446 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)",
447 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)",
448 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)",
449 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)",
450 pois => "Poison (resistance to getting poisoned)", 482 pois => "<b>Poison</b> (resistance to getting poisoned)",
451 para => "Paralysation (this resistance affects the chance you get paralysed)", 483 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
452 deat => "Death (resistance against death spells)", 484 deat => "<b>Death</b> (resistance against death spells)",
453 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)",
454 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)",
455 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)",
456 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...",
457 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, ...)",
458 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, ...)",
459 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)",
460 ); 492 );
461 for (qw/slow holyw conf fire depl magic 493 for (qw/slow holyw conf fire depl magic
462 drain acid pois para deat phys 494 drain acid pois para deat phys
463 blind fear tund elec cold ghit/) 495 blind fear tund elec cold ghit/)
464 { 496 {
… …
565 597
566} 598}
567 599
568sub metaserver_dialog { 600sub metaserver_dialog {
569 my $dialog = new CFClient::UI::FancyFrame 601 my $dialog = new CFClient::UI::FancyFrame
570 title => "Metaserver", 602 title => "Server List",
571 child => (my $vbox = new CFClient::UI::VBox); 603 child => (my $vbox = new CFClient::UI::VBox);
572 604
573 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 605 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
574 606
575 $dialog 607 $dialog
… …
644 $HOST->set_text ($CFG->{host} = $host); 676 $HOST->set_text ($CFG->{host} = $host);
645 }), 677 }),
646 (new CFClient::UI::Empty expand => 1), 678 (new CFClient::UI::Empty expand => 1),
647 ]); 679 ]);
648 680
649 $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)
650 for 0 .. $#$m; 683 for 0 .. $#$m;
651 } 684 }
652 } 685 }
653 }); 686 });
654} 687}
… …
677 710
678 $METASERVER = metaserver_dialog; 711 $METASERVER = metaserver_dialog;
679 712
680 $vbox->add (new CFClient::UI::Flopper 713 $vbox->add (new CFClient::UI::Flopper
681 expand => 1, 714 expand => 1,
682 text => "Metaserver", 715 text => "Server List",
683 other => $METASERVER, 716 other => $METASERVER,
684 tooltip => "Show a list of avaible crossfire servers", 717 tooltip => "Show a list of available crossfire servers",
685 connect_open => sub { 718 connect_open => sub {
686 update_metaserver $HOST; 719 update_metaserver $HOST;
687 } 720 }
688 ); 721 );
689 } 722 }
… …
710 ); 743 );
711 744
712 $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");
713 $table->add (1, 7, new CFClient::UI::Slider 746 $table->add (1, 7, new CFClient::UI::Slider
714 req_w => 100, 747 req_w => 100,
715 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 748 range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1],
716 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. "
717 ."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.",
718 connect_changed => sub { 751 connect_changed => sub {
719 my ($self, $value) = @_; 752 my ($self, $value) = @_;
720 753
721 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 754 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
722 }, 755 },
723 ); 756 );
724 757
725 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 758 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
726 start_game; 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] },
727 }); 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
772 $table->add (1, 10, $LOGIN_BUTTON = new CFClient::UI::Button
773 expand => 1,
774 align => 0,
775 text => "Login",
776 connect_activate => sub {
777 $CONN ? stop_game
778 : start_game;
779 },
780 );
728 781
729 $dialog 782 $dialog
730} 783}
731 784
732sub message_window { 785sub message_window {
733 my $window = new CFClient::UI::FancyFrame 786 my $window = new CFClient::UI::FancyFrame
734 title => "Messages", 787 title => "Messages",
735 border_bg => [1, 1, 1, 1], 788 border_bg => [1, 1, 1, 1],
736 bg => [0, 0, 0, 0.5], 789 bg => [0, 0, 0, 0.75],
737 user_w => int $::WIDTH / 3, 790 user_w => int $::WIDTH / 3,
738 user_h => int $::HEIGHT / 5, 791 user_h => int $::HEIGHT / 5,
739 child => (my $vbox = new CFClient::UI::VBox); 792 child => (my $vbox = new CFClient::UI::VBox);
740 793
741 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 794 $vbox->add ($LOGVIEW);
742 expand => 1,
743 font => $FONT_FIXED,
744 fontsize => $::CFG->{log_fontsize},
745 );
746 795
747 $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.",
748 connect_focus_in => sub { 801 connect_focus_in => sub {
749 my ($input, $prev_focus) = @_; 802 my ($input, $prev_focus) = @_;
750 803
751 delete $input->{refocus_map}; 804 delete $input->{refocus_map};
752 805
… …
782 835
783 $window 836 $window
784} 837}
785 838
786sub make_inventory_window { 839sub make_inventory_window {
787 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
788 $invwin->add (my $hb = new CFClient::UI::HBox); 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");
789 $hb->add ($INV = new CFClient::UI::Inventory expand => 1); 848 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
849
790 $hb->add (my $rng = new CFClient::UI::Slider vertical => 1); 850 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
791 $INV->set_range ($rng); 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
792 $invwin 855 $invwin
793} 856}
794 857
795sub sdl_init { 858sub sdl_init {
796 CFClient::SDL_Init 859 CFClient::SDL_Init
… …
798} 861}
799 862
800sub video_init { 863sub video_init {
801 sdl_init; 864 sdl_init;
802 865
866 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
867
803 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 868 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
804 $FULLSCREEN = $CFG->{fullscreen}; 869 $FULLSCREEN = $CFG->{fullscreen};
805 $FAST = $CFG->{fast}; 870 $FAST = $CFG->{fast};
806 871
807 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 872 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
808 or die "SDL_SetVideoMode failed!\n"; 873 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
809 874
810 $SDL_ACTIVE = 1; 875 $SDL_ACTIVE = 1;
811
812 $LAST_REFRESH = time - 0.01; 876 $LAST_REFRESH = time - 0.01;
813 877
814 CFClient::gl_init; 878 CFClient::gl_init;
815 879
816 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 880 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
817 881
882 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
883
818 ############################################################################# 884 #############################################################################
819 885
886 unless ($DEBUG_STATUS) {
887 # create the widgets
888
820 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 889 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
821 $DEBUG_STATUS->show; 890 $DEBUG_STATUS->show;
822 891
823 $STATUS_LINE = new CFClient::UI::Label 892 $STATUSBOX = new CFClient::UI::Statusbox;
824 padding => 0, 893 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
825 y => $HEIGHT - $FONTSIZE * 1.8;
826 $STATUS_LINE->show;
827 894
828 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 895 (new CFClient::UI::Frame
829 padding => 0, 896 bg => [0, 0, 0, 0.4],
830 fontsize => 0.8, 897 req_y => -1,
831 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 898 child => $STATUSBOX,
832 $ALT_ENTER_MESSAGE->show; 899 )->show;
833 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
834 900
835 CFClient::UI::FancyFrame->new ( 901 CFClient::UI::FancyFrame->new (
836 border_bg => [1, 1, 1, 192/255], 902 border_bg => [1, 1, 1, 192/255],
837 bg => [1, 1, 1, 0], 903 bg => [1, 1, 1, 0],
838 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 ),
839 )->show; 907 )->show;
840 908
841 $MAPWIDGET = new CFClient::MapWidget; 909 $MAPWIDGET = new CFClient::MapWidget;
842 $MAPWIDGET->connect (activate_console => sub { 910 $MAPWIDGET->connect (activate_console => sub {
843 my ($mapwidget, $preset) = @_; 911 my ($mapwidget, $preset) = @_;
844 912
845 if ($CONSOLE) { 913 if ($CONSOLE) {
846 $CONSOLE->{input}->{auto_activated} = 1; 914 $CONSOLE->{input}->{auto_activated} = 1;
847 $CONSOLE->{input}->focus_in; 915 $CONSOLE->{input}->focus_in;
848 916
849 if ($preset && $CONSOLE->{input}->get_text eq '') { 917 if ($preset && $CONSOLE->{input}->get_text eq '') {
850 $CONSOLE->{input}->set_text ($preset); 918 $CONSOLE->{input}->set_text ($preset);
919 }
851 } 920 }
852 } 921 });
853 });
854 $MAPWIDGET->show; 922 $MAPWIDGET->show;
855 $MAPWIDGET->focus_in; 923 $MAPWIDGET->focus_in;
856 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
857 $BUTTONBAR = new CFClient::UI::HBox; 934 $BUTTONBAR = new CFClient::UI::HBox;
858 935
859 $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.");
860 $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.");
861 $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.");
862 942
863 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
864 944
865 $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.");
866 $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 :).");
867 949
868 $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 {
869 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 954 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
870 status "Configuration Saved"; 955 status "Configuration Saved";
871 }); 956 },
957 );
872 958
873 $BUTTONBAR->show; 959 $BUTTONBAR->show;
874 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 {
875 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 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
968 });
969 force_refresh ();
970 }
876} 971}
877 972
878sub video_shutdown { 973sub video_shutdown {
879 $CFClient::UI::ROOT->{children} = [];
880 undef $CFClient::UI::GRAB;
881 undef $CFClient::UI::HOVER;
882 undef $SDL_ACTIVE; 974 undef $SDL_ACTIVE;
883} 975}
884 976
885my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 977my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
886my $bgmusic;#TODO#hack#d# 978my $bgmusic;#TODO#hack#d#
979
980sub audio_channel_finished {
981 my ($channel) = @_;
982
983 #warn "channel $channel finished\n";#d#
984}
887 985
888sub audio_music_finished { 986sub audio_music_finished {
889 return unless $CFG->{bgm_enable}; 987 return unless $CFG->{bgm_enable};
890 988
891 # TODO: hack, do play loop and mood music 989 # TODO: hack, do play loop and mood music
… …
895 push @bgmusic, shift @bgmusic; 993 push @bgmusic, shift @bgmusic;
896} 994}
897 995
898sub audio_init { 996sub audio_init {
899 if ($CFG->{audio_enable}) { 997 if ($CFG->{audio_enable}) {
900 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 998 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
901 $SDL_MIXER = !CFClient::Mix_OpenAudio; 999 $SDL_MIXER = !CFClient::Mix_OpenAudio;
902 CFClient::Mix_AllocateChannels 8; 1000 CFClient::Mix_AllocateChannels 8;
903 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1001 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
904 1002
905 audio_music_finished; 1003 audio_music_finished;
… …
932} 1030}
933 1031
934my %animate_object; 1032my %animate_object;
935my $animate_timer; 1033my $animate_timer;
936 1034
937my $want_refresh;
938my $can_refresh;
939
940my $fps = 9; 1035my $fps = 9;
941 1036
1037my %demo;#d#
1038
942sub force_refresh { 1039sub force_refresh {
943 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 1040 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
944 debug sprintf "%3.2f", $fps; 1041 debug sprintf "%3.2f", $fps;
945 1042
946 $want_refresh = 0;
947 $can_refresh = 0;
948
949 $CFClient::UI::ROOT->draw; 1043 $CFClient::UI::ROOT->draw;
950 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
951 CFClient::SDL_GL_SwapBuffers; 1103 CFClient::SDL_GL_SwapBuffers;
952
953 $LAST_REFRESH = $NOW;
954} 1104}
955 1105
956my $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 {
957 $NOW = time; 1107 $NOW = time;
958 1108
959 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1109 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
960 for CFClient::SDL_PollEvent; 1110 for CFClient::SDL_PollEvent;
961 1111
962 if (%animate_object) { 1112 if (%animate_object) {
963 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1113 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
964 $want_refresh++; 1114 $WANT_REFRESH++;
965 } 1115 }
966 1116
967 if ($want_refresh) { 1117 if ($WANT_REFRESH) {
968 force_refresh; 1118 force_refresh;
969 } else { 1119 } else {
970 $can_refresh = 1; 1120 $CAN_REFRESH = 1;
971 } 1121 }
972}); 1122});
973
974sub refresh {
975 $want_refresh++;
976}
977 1123
978sub animation_start { 1124sub animation_start {
979 my ($widget) = @_; 1125 my ($widget) = @_;
980 $animate_object{$widget} = $widget; 1126 $animate_object{$widget} = $widget;
981} 1127}
… …
985 delete $animate_object{$widget}; 1131 delete $animate_object{$widget};
986} 1132}
987 1133
988@conn::ISA = Crossfire::Protocol::; 1134@conn::ISA = Crossfire::Protocol::;
989 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
990sub conn::stats_update { 1166sub conn::stats_update {
991 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 }
992 1175
993 update_stats_window ($stats); 1176 update_stats_window ($stats);
994} 1177}
995 1178
996sub conn::user_send { 1179sub conn::user_send {
… …
1051 $self->set_texture ($id => $data); 1234 $self->set_texture ($id => $data);
1052 } 1235 }
1053 } 1236 }
1054} 1237}
1055 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
1056# this method does a "flood fill" into every tile direction 1272# this method does a "flood fill" into every tile direction
1057# it assumes that tiles are arranged in a rectangular grid, 1273# it assumes that tiles are arranged in a rectangular grid,
1058# 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.
1059# failure to comply are harmless and result in display errors 1275# failure to comply are harmless and result in display errors
1060# at worst. 1276# at worst.
1061sub conn::flood_fill { 1277sub conn::flood_fill {
1062 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1278 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1063 1279
1064 # the server does not allow map paths > 6 1280 # the server does not allow map paths > 6
1065 return if 7 <= length $path; 1281 return if 7 <= length $path;
1066 1282
1067 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1283 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1068 1284
1069 for ( 1285 for (
1070 [1, 0, -1], 1286 [1, 3, 0, -1],
1071 [2, 1, 0], 1287 [2, 4, 1, 0],
1072 [3, 0, 1], 1288 [3, 1, 0, 1],
1073 [4, -1, 0], 1289 [4, 2, -1, 0],
1074 ) { 1290 ) {
1075 my ($tile, $dx, $dy) = @$_; 1291 my ($tile, $tile2, $dx, $dy) = @$_;
1292
1293 next if $block & (1 << $tile);
1294 my $block = $block | (1 << $tile2);
1076 1295
1077 my $gx = $gx + $dx; 1296 my $gx = $gx + $dx;
1078 my $gy = $gy + $dy; 1297 my $gy = $gy + $dy;
1079 1298
1080 next unless $flags & (1 << ($tile - 1)); 1299 next unless $flags & (1 << ($tile - 1));
… …
1082 1301
1083 my $neigh = $self->{neigh_map}{$hash} ||= []; 1302 my $neigh = $self->{neigh_map}{$hash} ||= [];
1084 if (my $info = $neigh->[$tile]) { 1303 if (my $info = $neigh->[$tile]) {
1085 my ($flags, $x, $y, $w, $h, $hash) = @$info; 1304 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1086 1305
1087 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1306 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1088 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1307 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1089 1308
1090 } else { 1309 } else {
1091 $self->send_mapinfo ("spatial $path$tile", sub { 1310 $self->send_mapinfo ("spatial $path$tile", sub {
1092 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1311 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1093 1312
1094 return if $mode ne "spatial"; 1313 return if $mode ne "spatial";
1095 1314
1096 $x += $MAP->ox; 1315 $x += $MAP->ox;
1097 $y += $MAP->oy; 1316 $y += $MAP->oy;
1098 1317
1099 $self->load_map ($hash, $x, $y) 1318 $self->load_map ($hash, $x, $y)
1100 unless $self->{neigh_map}{$hash}[5]++;#d# 1319 unless $self->{neigh_map}{$hash}[5]++;#d#
1101 1320
1102 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 1321 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1103 1322
1104 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1323 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1105 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1324 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1106 }); 1325 });
1107 } 1326 }
1108 } 1327 }
1109} 1328}
… …
1122 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1341 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1123 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1342 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1124 ]; 1343 ];
1125 1344
1126 delete $self->{neigh_grid}; 1345 delete $self->{neigh_grid};
1127 $self->flood_fill (0, 0, "", $hash, $flags);
1128 1346
1129 $x += $ox; 1347 $x += $ox;
1130 $y += $oy; 1348 $y += $oy;
1131 1349
1132 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1350 $self->{map_info} = [$hash, $x, $y, $w, $h];
1133 1351
1134 my $map = $self->{map_info}[0];
1135 $map =~ s/^.*?\/([^\/]+)$/\1/; 1352 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1136 $STATWIDS->{map}->set_text ("Map: " . $map); 1353 $STATWIDS->{map}->set_text ("Map: " . $map);
1137 1354
1138 $self->load_map ($hash, $x, $y); 1355 $self->load_map ($hash, $x, $y);
1356 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1139} 1357}
1140 1358
1141sub conn::face_find { 1359sub conn::face_find {
1142 my ($self, $facenum, $face) = @_; 1360 my ($self, $facenum, $face) = @_;
1143 1361
… …
1293 [0.55, 0.41, 0.13], 1511 [0.55, 0.41, 0.13],
1294 [0.99, 0.77, 0.26], 1512 [0.99, 0.77, 0.26],
1295 [0.74, 0.65, 0.41], 1513 [0.74, 0.65, 0.41],
1296 ); 1514 );
1297 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
1298 $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);
1299} 1537}
1300 1538
1301sub conn::spell_add { 1539sub conn::spell_add {
1302 my ($self, $spell) = @_; 1540 my ($self, $spell) = @_;
1303 1541
1304 # TODO 1542 # TODO
1305 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1543 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1306 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1544 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1307 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1545 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1308} 1546}
1309 1547
1310sub conn::spell_delete { 1548sub conn::spell_delete {
1311 my ($self, $spell) = @_; 1549 my ($self, $spell) = @_;
1312} 1550}
1313 1551
1314sub conn::addme_success { 1552sub conn::addme_success {
1315 my ($self) = @_; 1553 my ($self) = @_;
1316 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
1317 for my $skill (values %{$self->{skill_info}}) { 1567 for my $skill (values %{$self->{skill_info}}) {
1318 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1568 $MAPWIDGET->add_command ("ready_skill $skill",
1319 $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});
1320 } 1574 }
1575}
1576
1577sub conn::eof {
1578 $MAPWIDGET->clr_commands;
1579
1580 stop_game;
1321} 1581}
1322 1582
1323sub update_floorbox { 1583sub update_floorbox {
1324 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1584 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1585 return unless $CONN;
1586
1325 $FLOORBOX->clear; 1587 $FLOORBOX->clear;
1326 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1588 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1327 1589
1328 my @items = values %{ $CONN->{container}{0} }; 1590 my $count = 4;
1329 1591 for (@{ $CONN->{container}{0} }) {
1330 # we basically have to use the same sorting as everybody else 1592 if (--$count) {
1331 @items = sort { $a->{type} <=> $b->{type} } @items; 1593 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1332 1594 } else {
1333 for my $item (reverse @items) { 1595 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1334 my $desc = $item->{nrof} < 2
1335 ? $item->{name}
1336 : "$item->{nrof} $item->{name_pl}";
1337 # todo: animation widget, face widget, weight(?) etc.
1338 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1339 tooltip => (CFClient::UI::Label->escape ($desc)
1340 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1341 can_hover => 1,
1342 can_events => 1,
1343 connect_button_down => sub {
1344 my ($self, $ev, $x, $y) = @_;
1345
1346 # todo: maybe put examine on 1? but should just be a tooltip :(
1347 if ($ev->{button} == 1) {
1348 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1349 } elsif ($ev->{button} == 2) {
1350 $CONN->send ("apply $item->{tag}");
1351 } elsif ($ev->{button} == 3) {
1352 CFClient::UI::Menu->new (
1353 items => [
1354 ["examine", sub { $CONN->send ("examine $item->{tag}") }],
1355 [
1356 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
1357 sub { $CONN->send ("lock $item->{tag}") },
1358 ],
1359 ["mark", sub { $CONN->send ("mark $item->{tag}") }],
1360 ["apply", sub { $CONN->send ("apply $item->{tag}") }],
1361 ],
1362 )->popup ($ev);
1363 }
1364
1365 1
1366 }, 1596 last;
1367 );
1368
1369 $hbox->add (new CFClient::UI::Face
1370 can_events => 0,
1371 face => $item->{face},
1372 anim => $item->{anim},
1373 animspeed => $item->{animspeed},
1374 );
1375 1597 }
1376 $hbox->add (new CFClient::UI::Label
1377 can_events => 0,
1378 text => $desc,
1379 );
1380 } 1598 }
1381 }); 1599 });
1382 refresh; 1600
1601 $WANT_REFRESH++;
1383} 1602}
1384 1603
1385sub conn::container_add { 1604sub conn::container_add {
1386 my ($self, $id, $items) = @_; 1605 my ($self, $tag, $items) = @_;
1387 1606
1388 update_floorbox if $id == 0; 1607 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1608
1609 if ($tag == 0) {
1610 update_floorbox;
1611 $OPENCONT = 0;
1612 $INVR_LBL->set_text ("Floor");
1613 $INVR->set_items ($self->{container}{0});
1389 if ($self->{player}{tag} == $id) { 1614 } elsif ($tag == $self->{player}{tag}) {
1615 $INVR_LBL->set_text ("Player");
1390 $INV->set_items ($self->{container}{$self->{player}{tag}}); 1616 $INV->set_items ($self->{container}{$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});
1391 } 1621 }
1622
1392 # $self-<{player}{tag} => player inv 1623 # $self-<{player}{tag} => player inv
1393 #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}};
1394} 1625}
1395 1626
1396sub conn::container_clear { 1627sub conn::container_clear {
1397 my ($self, $id) = @_; 1628 my ($self, $tag) = @_;
1398 1629
1399 update_floorbox if $id == 0; 1630 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1400 if ($self->{player}{tag} == $id) { 1631
1632 if ($tag == 0) {
1633 update_floorbox;
1634 $OPENCONT = 0;
1635 $INVR_LBL->set_text ("Floor");
1401 $INV->set_items ($self->{container}{$id}); 1636 $INVR->set_items ($self->{container}{0});
1637 } elsif ($tag == $self->{player}{tag}) {
1638 $INVR_LBL->set_text ("Player");
1639 $INV->set_items ($self->{container}{$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});
1402 } 1644 }
1403 1645
1404# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1646# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1405} 1647}
1406 1648
1407sub conn::item_delete { 1649sub conn::item_delete {
1408 my ($self, @items) = @_; 1650 my ($self, @items) = @_;
1409 1651
1410 for (@items) { 1652 for (@items) {
1411 update_floorbox if $_->{container} == 0; 1653 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1412 if ($self->{player}{tag} == $_->{container}) { 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}));
1413 $INV->set_items ($self->{container}{$_->{container}}); 1666 $INVR->set_items ($self->{container}{$_->{container}});
1414 } 1667 }
1415 } 1668 }
1416} 1669}
1417 1670
1418sub conn::item_update { 1671sub conn::item_update {
1419 my ($self, $item) = @_; 1672 my ($self, $item) = @_;
1420 1673
1421 update_floorbox if $item->{container} == 0; 1674 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1422 if ($self->{player}{tag} == $item->{container}) { 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}) {
1423 $INV->set_items ($self->{container}{$item->{container}}); 1690 $INV->set_items ($self->{container}{$item->{container}})
1691 }
1424 } 1692 }
1425} 1693}
1426 1694
1427%SDL_CB = ( 1695%SDL_CB = (
1428 CFClient::SDL_QUIT => sub { 1696 CFClient::SDL_QUIT => sub {
1429 Event::unloop -1; 1697 Event::unloop -1;
1430 }, 1698 },
1431 CFClient::SDL_VIDEORESIZE => sub { 1699 CFClient::SDL_VIDEORESIZE => sub {
1432 }, 1700 },
1433 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1701 CFClient::SDL_VIDEOEXPOSE => sub {
1702 CFClient::UI::full_refresh;
1703 },
1434 CFClient::SDL_ACTIVEEVENT => sub { 1704 CFClient::SDL_ACTIVEEVENT => sub {
1435# 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#
1436 }, 1706 },
1437 CFClient::SDL_KEYDOWN => sub { 1707 CFClient::SDL_KEYDOWN => sub {
1438 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1708 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1442 video_init; 1712 video_init;
1443 } else { 1713 } else {
1444 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1714 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1445 } 1715 }
1446 }, 1716 },
1447 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1717 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1448 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1718 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1449 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1719 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1450 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1720 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1451 CFClient::SDL_USEREVENT => \&audio_music_finished, 1721 CFClient::SDL_USEREVENT => sub {
1722 if ($_[0]{code} == 1) {
1723 audio_channel_finished $_[0]{data1};
1724 } elsif ($_[0]{code} == 0) {
1725 audio_music_finished;
1726 }
1727 },
1452); 1728);
1453 1729
1454############################################################################# 1730#############################################################################
1455 1731
1456$SIG{INT} = $SIG{TERM} = sub { exit }; 1732$SIG{INT} = $SIG{TERM} = sub { exit };
1457 1733
1458$TILECACHE = CFClient::db_table "tilecache";
1459$FACEMAP = CFClient::db_table "facemap";
1460
1461CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1462
1463my %DEF_CFG = (
1464 sdl_mode => 0,
1465 width => 640,
1466 height => 480,
1467 fullscreen => 0,
1468 fast => 0,
1469 map_scale => 0.5,
1470 fow_enable => 1,
1471 fow_intensity => 0.45,
1472 fow_smooth => 0,
1473 gui_fontsize => 1,
1474 log_fontsize => 1,
1475 gauge_fontsize => 1,
1476 gauge_size => 0.35,
1477 stat_fontsize => 1,
1478 mapsize => 100,
1479 host => "crossfire.schmorp.de",
1480 say_command => 'say',
1481 audio_enable => 1,
1482 bgm_enable => 1,
1483 bgm_volume => 0.25,
1484);
1485
1486while (my ($k, $v) = each %DEF_CFG) {
1487 $CFG->{$k} = $v unless exists $CFG->{$k};
1488}
1489
1490sdl_init;
1491
1492@SDL_MODES = reverse
1493 grep $_->[0] >= 640 && $_->[1] >= 480,
1494 CFClient::SDL_ListModes;
1495
1496@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1497
1498$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1499
1500{ 1734{
1735 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1736
1737 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1738
1739 $TILECACHE = CFClient::db_table "tilecache";
1740 $FACEMAP = CFClient::db_table "facemap";
1741
1742 my %DEF_CFG = (
1743 sdl_mode => 0,
1744 width => 640,
1745 height => 480,
1746 fullscreen => 0,
1747 fast => 0,
1748 map_scale => 1,
1749 fow_enable => 1,
1750 fow_intensity => 0.45,
1751 fow_smooth => 0,
1752 gui_fontsize => 1,
1753 log_fontsize => 1,
1754 gauge_fontsize=> 1,
1755 gauge_size => 0.35,
1756 stat_fontsize => 1,
1757 mapsize => 100,
1758 host => "crossfire.schmorp.de",
1759 say_command => 'say',
1760 audio_enable => 1,
1761 bgm_enable => 1,
1762 bgm_volume => 0.25,
1763 output_sync => 1,
1764 output_count => 1,
1765 );
1766
1767 while (my ($k, $v) = each %DEF_CFG) {
1768 $CFG->{$k} = $v unless exists $CFG->{$k};
1769 }
1770
1771 sdl_init;
1772
1773 @SDL_MODES = reverse
1774 grep $_->[0] >= 640 && $_->[1] >= 480,
1775 CFClient::SDL_ListModes;
1776
1777 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1778
1779 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1780
1781 {
1501 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1782 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1502 DejaVuSans.ttf 1783 DejaVuSans.ttf
1503 DejaVuSansMono.ttf 1784 DejaVuSansMono.ttf
1504 DejaVuSans-Bold.ttf 1785 DejaVuSans-Bold.ttf
1505 DejaVuSansMono-Bold.ttf 1786 DejaVuSansMono-Bold.ttf
1506 DejaVuSans-Oblique.ttf 1787 DejaVuSans-Oblique.ttf
1507 DejaVuSansMono-Oblique.ttf 1788 DejaVuSansMono-Oblique.ttf
1508 DejaVuSans-BoldOblique.ttf 1789 DejaVuSans-BoldOblique.ttf
1509 DejaVuSansMono-BoldOblique.ttf 1790 DejaVuSansMono-BoldOblique.ttf
1510 ); 1791 );
1511 1792
1512 CFClient::add_font $_ for @fonts; 1793 CFClient::add_font $_ for @fonts;
1513 1794
1795 CFClient::pango_init;
1796
1514 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1797 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1515 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1798 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1516 1799
1517 $FONT_PROP->make_default; 1800 $FONT_PROP->make_default;
1518} 1801 }
1519 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# }
1815
1520video_init; 1816 video_init;
1521audio_init; 1817 audio_init;
1818}
1522 1819
1523Event::loop; 1820Event::loop;
1524 1821
1525END { CFClient::SDL_Quit } 1822END { CFClient::SDL_Quit }
1526 1823
… …
1577 1874
1578Typing 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
1579name, such as I<ready_skill climbing> and I<use_skill climbing>. 1876name, such as I<ready_skill climbing> and I<use_skill climbing>.
1580 1877
1581You can abbreviate commands by typing only the first character of every 1878You can abbreviate commands by typing only the first character of every
1582word. 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
1583recall>, 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,
1584will 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>
1585I<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>.
1586 1887
1587=head2 The map overview 1888=head2 The map overview
1588 1889
1589#TODO# 1890#TODO#
1590 1891

Diff Legend

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