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.186 by root, Tue Apr 25 12:10:58 2006 UTC vs.
Revision 1.246 by root, Wed May 24 22:48:19 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;
… …
70 75
71our $FONT_PROP; 76our $FONT_PROP;
72our $FONT_FIXED; 77our $FONT_FIXED;
73 78
74our $MAP; 79our $MAP;
80our $MAPMAP;
75our $MAPWIDGET; 81our $MAPWIDGET;
76our $BUTTONBAR; 82our $BUTTONBAR;
77our $LOGVIEW; 83our $LOGVIEW;
78our $CONSOLE; 84our $CONSOLE;
79our $METASERVER; 85our $METASERVER;
86our $LOGIN_BUTTON;
87our $QUIT_DIALOG;
80 88
81our $FLOORBOX; 89our $FLOORBOX;
82our $GAUGES; 90our $GAUGES;
83our $STATWIDS; 91our $STATWIDS;
84 92
… …
88our $SDL_MIXER; 96our $SDL_MIXER;
89our @SOUNDS; # event => file mapping 97our @SOUNDS; # event => file mapping
90our %AUDIO_CHUNKS; # audio files 98our %AUDIO_CHUNKS; # audio files
91 99
92our $ALT_ENTER_MESSAGE; 100our $ALT_ENTER_MESSAGE;
93our $STATUS_LINE; 101our $STATUSBOX;
94our $DEBUG_STATUS; 102our $DEBUG_STATUS;
95 103
104our $INVWIN;
105our $INV;
106our $INVR;
107our $INVR_LBL;
108our $OPENCONT;
109
96sub status { 110sub status {
97 $STATUS_LINE->set_text ($_[0]); 111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
98 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
99} 112}
100 113
101sub debug { 114sub debug {
102 $DEBUG_STATUS->set_text ($_[0]); 115 $DEBUG_STATUS->set_text ($_[0]);
103 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h}); 116 my ($w, $h) = $DEBUG_STATUS->size_request;
117 $DEBUG_STATUS->move ($WIDTH - $w, 0);
104} 118}
105 119
106sub start_game { 120sub start_game {
107 status "logging in..."; 121 status "logging in...";
108 122
109 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 123 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
110 124
111 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 125 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
112
113 $MAP = new CFClient::Map $mapsize, $mapsize; 126 $MAP = new CFClient::Map $mapsize, $mapsize;
114 127
115 my ($host, $port) = split /:/, $CFG->{host}; 128 my ($host, $port) = split /:/, $CFG->{host};
116 129
117 $CONN = new conn 130 $CONN = eval {
131 new conn
118 host => $host, 132 host => $host,
119 port => $port || 13327, 133 port => $port || 13327,
120 user => $CFG->{user}, 134 user => $CFG->{user},
121 pass => $CFG->{password}, 135 pass => $CFG->{password},
122 mapw => $mapsize, 136 mapw => $mapsize,
123 maph => $mapsize, 137 maph => $mapsize,
138 ;
124 ; 139 };
125 140
126 status "login successful"; 141 if ($CONN) {
127
128 CFClient::lowdelay fileno $CONN->{fh}; 142 CFClient::lowdelay fileno $CONN->{fh};
143
144 $LOGIN_BUTTON->set_text ("Logout");
145 status "login successful";
146
147 $BUTTONBAR->{children}[1]->emit ("activate")
148 if $BUTTONBAR->{children}[1]->{state};
149
150 } else {
151 status "unable to connect";
152 stop_game();
153 }
129} 154}
130 155
131sub stop_game { 156sub stop_game {
157 return unless $CONN;
158
159 status "connection closed";
160 $LOGIN_BUTTON->set_text ("Login");
161 $CONN->destroy;
162 $CONN = 0; # false, does not autovivify
163
164 $BUTTONBAR->{children}[1]->emit ("activate")
165 unless $BUTTONBAR->{children}[1]->{state};
166
167 undef $MAPCACHE;
132 undef $CONN; 168 undef $MAP;
133} 169}
134 170
135sub client_setup { 171sub client_setup {
136 my $dialog = new CFClient::UI::FancyFrame 172 my $dialog = new CFClient::UI::FancyFrame
137 title => "Client Setup", 173 title => "Client Setup",
… …
139 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 175 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
140 176
141 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 177 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
142 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 178 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
143 179
144 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 180 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
145 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 181 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
146 182
147 $mode_slider->connect (changed => sub { 183 $mode_slider->connect (changed => sub {
148 my ($self, $value) = @_; 184 my ($self, $value) = @_;
149 185
… …
174 } 210 }
175 ); 211 );
176 212
177 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
178 $table->add (1, $row++, new CFClient::UI::Slider 214 $table->add (1, $row++, new CFClient::UI::Slider
179 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 215 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
180 tooltip => "Enlarge or shrink the displayed map", 216 tooltip => "Enlarge or shrink the displayed map",
181 connect_changed => sub { 217 connect_changed => sub {
182 my ($self, $value) = @_; 218 my ($self, $value) = @_;
183 $CFG->{map_scale} = 0.05 * int $value / 0.05; 219 $CFG->{map_scale} = 2 ** $value;
184 } 220 }
185 ); 221 );
186 222
187 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
188 $table->add (1, $row++, new CFClient::UI::CheckBox 224 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
194 } 230 }
195 ); 231 );
196 232
197 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
198 $table->add (1, $row++, new CFClient::UI::Slider 234 $table->add (1, $row++, new CFClient::UI::Slider
199 range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], 235 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
200 tooltip => "The higher the intensity, the lighter the Fog-of-War color", 236 tooltip => "The higher the intensity, the lighter the Fog-of-War color",
201 connect_changed => sub { 237 connect_changed => sub {
202 my ($self, $value) = @_; 238 my ($self, $value) = @_;
203 $CFG->{fow_intensity} = $value; 239 $CFG->{fow_intensity} = $value;
204 } 240 }
… …
215 } 251 }
216 ); 252 );
217 253
218 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 254 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
219 $table->add (1, $row++, new CFClient::UI::Slider 255 $table->add (1, $row++, new CFClient::UI::Slider
220 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 256 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
221 tooltip => "The font size used by most GUI elements", 257 tooltip => "The font size used by most GUI elements",
222 connect_changed => sub { 258 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
223 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
224# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
225 }
226 ); 259 );
227 260
228 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); 261 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
229 $table->add (1, $row++, new CFClient::UI::Slider 262 $table->add (1, $row++, new CFClient::UI::Slider
230 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 263 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
231 tooltip => "The font size used by the server log window only", 264 tooltip => "The font size used by the server log window only",
232 connect_changed => sub { 265 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
233 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
234 }
235 ); 266 );
236 267
237 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 268 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
238 269
239 $table->add (1, $row++, new CFClient::UI::Slider 270 $table->add (1, $row++, new CFClient::UI::Slider
240 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 271 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
241 tooltip => "The font size used by the statistics window only", 272 tooltip => "The font size used by the statistics window only",
242 connect_changed => sub { 273 connect_changed => sub {
243 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 274 $CFG->{stat_fontsize} = $_[1];
244 &set_stats_window_fontsize; 275 &set_stats_window_fontsize;
276 }
277 );
278
279 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
280 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
282 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
283 connect_changed => sub {
284 $CFG->{gauge_fontsize} = $_[1];
285 &set_gauge_window_fontsize;
245 } 286 }
246 ); 287 );
247 288
248 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 289 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
249 $table->add (1, $row++, new CFClient::UI::Slider 290 $table->add (1, $row++, new CFClient::UI::Slider
250 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 291 range => [$CFG->{gauge_size}, 0.2, 0.8],
251 tooltip => "Adjust the size of the stats gauges at the bottom right", 292 tooltip => "Adjust the size of the stats gauges at the bottom right",
252 connect_changed => sub { 293 connect_changed => sub {
253 $CFG->{gauge_size} = $_[1]; 294 $CFG->{gauge_size} = $_[1];
254 my $h = int $HEIGHT * $CFG->{gauge_size}; 295 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
255 $GAUGES->{win}->set_size ($WIDTH, $h);
256 $GAUGES->{win}->move (0, $HEIGHT - $h);
257 }
258 );
259
260 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
261 $table->add (1, $row++, new CFClient::UI::Slider
262 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
263 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
264 connect_changed => sub {
265 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
266 &set_gauge_window_fontsize;
267 } 296 }
268 ); 297 );
269 298
270 $table->add (1, $row++, new CFClient::UI::Button 299 $table->add (1, $row++, new CFClient::UI::Button
271 expand => 1, align => 0, text => "Apply", 300 expand => 1, align => 0, text => "Apply",
… …
296 connect_changed => sub { 325 connect_changed => sub {
297 $CFG->{bgm_enable} = $_[1]; 326 $CFG->{bgm_enable} = $_[1];
298 } 327 }
299 ); 328 );
300 $hbox->add (new CFClient::UI::Slider 329 $hbox->add (new CFClient::UI::Slider
301 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], 330 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
302 tooltip => "The volume of the background music", 331 tooltip => "The volume of the background music",
303 connect_changed => sub { 332 connect_changed => sub {
304 $CFG->{bgm_volume} = $_[1]; 333 $CFG->{bgm_volume} = $_[1];
305 CFClient::MixMusic::volume $_[1] * 128; 334 CFClient::MixMusic::volume $_[1] * 128;
306 } 335 }
… …
313 audio_shutdown (); 342 audio_shutdown ();
314 audio_init (); 343 audio_init ();
315 } 344 }
316 ); 345 );
317 346
347 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Communication cmd");
348 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
349 text => $CFG->{say_command},
350 tooltip => "This is the command that will be used if you write a line in the message window entry. "
351 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
352 ."But you could also set it to 'tell <playername>' to only chat with that user.",
353 connect_changed => sub {
354 my ($self, $value) = @_;
355 $CFG->{say_command} = $value;
356 }
357 );
358
318 $dialog 359 $dialog
319} 360}
320 361
321sub set_stats_window_fontsize { 362sub set_stats_window_fontsize {
322 for (values %{$STATWIDS}) { 363 for (values %{$STATWIDS}) {
… …
332# local $GAUGES->{win}{parent};#d# 373# local $GAUGES->{win}{parent};#d#
333# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D; 374# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
334} 375}
335 376
336sub make_gauge_window { 377sub make_gauge_window {
337 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 378 my $gh = int $HEIGHT * $CFG->{gauge_size};
338# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
339 379
340 my $win = new CFClient::UI::Frame ( 380 my $win = new CFClient::UI::Frame (
341 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 381 req_y => -1,
382 user_w => $WIDTH,
383 user_h => $gh,
342 ); 384 );
385
343 $win->add (my $hbox = new CFClient::UI::HBox 386 $win->add (my $hbox = new CFClient::UI::HBox
344 children => [ 387 children => [
345 (new CFClient::UI::HBox expand => 1), 388 (new CFClient::UI::HBox expand => 1),
346 ($FLOORBOX = new CFClient::UI::VBox), 389 (new CFClient::UI::VBox children => [
390 (new CFClient::UI::Empty expand => 1),
391 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)),
392 ]),
347 (my $vbox = new CFClient::UI::VBox), 393 (my $vbox = new CFClient::UI::VBox),
348 ], 394 ],
349 ); 395 );
350 396
351 $vbox->add (new CFClient::UI::HBox 397 $vbox->add (new CFClient::UI::HBox
… …
355 (my $hb = new CFClient::UI::HBox), 401 (my $hb = new CFClient::UI::HBox),
356 ], 402 ],
357 ); 403 );
358 404
359 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 405 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
360 tooltip => "Health points. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment."); 406 tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
361 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 407 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
362 tooltip => "Spell points. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana."); 408 tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
363 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 409 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
364 tooltip => "Grace points - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods."); 410 tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
365 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 411 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
366 tooltip => "Food. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too."); 412 tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
367 413
368 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 414 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
369 tooltip => "Experience points and overall level - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100."); 415 tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
370 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 416 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
371 tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)"); 417 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
372 418
373 $GAUGES = { 419 $GAUGES = {
374 exp => $exp, win => $win, range => $rng, 420 exp => $exp, win => $win, range => $rng,
375 food => $fg, mana => $mg, hp => $hg, grace => $gg 421 food => $fg, mana => $mg, hp => $hg, grace => $gg
376 }; 422 };
… …
379 425
380 $win 426 $win
381} 427}
382 428
383sub make_stats_window { 429sub make_stats_window {
384 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats"; 430 my $tgw = new CFClient::UI::FancyFrame title => "Stats";
385 431
386 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 432 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
387 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1); 433 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
434 can_hover => 1, can_events => 1,
435 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
388 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1); 436 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
437 can_hover => 1, can_events => 1,
438 tooltip => "The map you are currently on (if supported by the server).");
389 439
390 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 440 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
391
392 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 441 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
393 442
394 my $black = [0, 0, 0]; 443 my $color2 = [1, 1, 0];
395 444
396 for ( 445 for (
397 [0, 0, st_str => "Str", 30, "Physical Strength, determines damage dealt with weapons, how much you can carry, and how often you can attack"], 446 [0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"],
398 [0, 1, st_dex => "Dex", 30, "Dexterity, your physical agility. Determines chance of being hit and affects armor class and speed"], 447 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"],
399 [0, 2, st_con => "Con", 30, "Constitution, physical health and toughness. Determines how many healthpoints you can have"], 448 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"],
400 [0, 3, st_int => "Int", 30, "Intelligence, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"], 449 [0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"],
401 [0, 4, st_wis => "Wis", 30, "Wisdom, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"], 450 [0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"],
402 [0, 5, st_pow => "Pow", 30, "Power, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"], 451 [0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"],
403 [0, 6, st_cha => "Cha", 30, "Charisma, how well you are received by NPCs. Affects buying and selling prices in shops."], 452 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
404 453
405 [2, 0, st_wc => "Wc", -120, "Weapon Class, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 454 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],
406 [2, 1, st_ac => "Ac", -120, "Armour Class, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 455 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],
407 [2, 2, st_dam => "Dam", 120, "Damage, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 456 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],
408 [2, 3, st_arm => "Arm", 120, "Armour, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 457 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."],
409 [2, 4, st_spd => "Spd", 10.54, "Speed, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 458 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],
410 [2, 5, st_wspd => "WSp", 10.54, "Weapon Speed, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 459 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],
411 ) { 460 ) {
412 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 461 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
413 462
414 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 463 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
415 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 464 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
416 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 465 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
417 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $black, valign => 0, align => -1, text => $label, tooltip => $tooltip); 466 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);
418 } 467 }
419 468
420 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 469 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
421 470
422 my $row = 0; 471 my $row = 0;
423 my $col = 0; 472 my $col = 0;
424 473
425 my %resist_names = ( 474 my %resist_names = (
426 slow => "Slow", 475 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)",
427 holyw => "Holy Word", 476 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",
428 conf => "Confusion", 477 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)",
429 fire => "Fire", 478 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
430 depl => "Depletion (some monsters and other effects can cause stats depletion)", 479 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)",
431 magic => "Magic", 480 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)",
432 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)", 481 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
433 acid => "Acid", 482 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
434 pois => "Poison", 483 pois => "<b>Poison</b> (resistance to getting poisoned)",
435 para => "Paralysation", 484 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
436 deat => "Death (resistance against death spells)", 485 deat => "<b>Death</b> (resistance against death spells)",
437 phys => "Physical", 486 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
438 blind => "Blind", 487 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
439 fear => "Fear", 488 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
440 tund => "Turn undead", 489 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
441 elec => "Electricity", 490 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
442 cold => "Cold", 491 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
443 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)", 492 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)",
444 ); 493 );
445 for (qw/slow holyw conf fire depl magic 494 for (qw/slow holyw conf fire depl magic
446 drain acid pois para deat phys 495 drain acid pois para deat phys
447 blind fear tund elec cold ghit/) 496 blind fear tund elec cold ghit/)
448 { 497 {
… …
549 598
550} 599}
551 600
552sub metaserver_dialog { 601sub metaserver_dialog {
553 my $dialog = new CFClient::UI::FancyFrame 602 my $dialog = new CFClient::UI::FancyFrame
554 title => "Metaserver", 603 title => "Server List",
555 child => (my $vbox = new CFClient::UI::VBox); 604 child => (my $vbox = new CFClient::UI::VBox);
556 605
557 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 606 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
558 607
559 $dialog 608 $dialog
… …
628 $HOST->set_text ($CFG->{host} = $host); 677 $HOST->set_text ($CFG->{host} = $host);
629 }), 678 }),
630 (new CFClient::UI::Empty expand => 1), 679 (new CFClient::UI::Empty expand => 1),
631 ]); 680 ]);
632 681
633 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8) 682 $table->add ($_ + 1, $y, new CFClient::UI::Label
683 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)
634 for 0 .. $#$m; 684 for 0 .. $#$m;
635 } 685 }
636 } 686 }
637 }); 687 });
638} 688}
… …
661 711
662 $METASERVER = metaserver_dialog; 712 $METASERVER = metaserver_dialog;
663 713
664 $vbox->add (new CFClient::UI::Flopper 714 $vbox->add (new CFClient::UI::Flopper
665 expand => 1, 715 expand => 1,
666 text => "Metaserver", 716 text => "Server List",
667 other => $METASERVER, 717 other => $METASERVER,
668 tooltip => "Show a list of avaible crossfire servers", 718 tooltip => "Show a list of available crossfire servers",
669 connect_open => sub { 719 connect_open => sub {
670 update_metaserver $HOST; 720 update_metaserver $HOST;
671 } 721 }
672 ); 722 );
673 } 723 }
… …
691 my ($self, $value) = @_; 741 my ($self, $value) = @_;
692 $CFG->{password} = $value; 742 $CFG->{password} = $value;
693 } 743 }
694 ); 744 );
695 745
696 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
697 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
698 text => $CFG->{say_command},
699 tooltip => "This is the command that will be used if you write a line in the message window entry. "
700 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
701 ."But you could also set it to 'tell &lt;playername&gt;' to only chat with that user.",
702 connect_changed => sub {
703 my ($self, $value) = @_;
704 $CFG->{say_command} = $value;
705 }
706 );
707
708 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 746 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
709 $table->add (1, 7, new CFClient::UI::Slider 747 $table->add (1, 7, new CFClient::UI::Slider
710 req_w => 100, 748 req_w => 100,
711 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 749 range => [$CFG->{mapsize}, 10, 100, 0, 1],
712 tooltip => "This is the size of the portion of the map update the server sends you. " 750 tooltip => "This is the size of the portion of the map update the server sends you. "
713 ."If you set this to a high value you will be able to see further for example.", 751 . "If you set this to a high value you will be able to see further for example.",
714 connect_changed => sub { 752 connect_changed => sub {
715 my ($self, $value) = @_; 753 my ($self, $value) = @_;
716 754
717 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 755 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
718 }, 756 },
719 ); 757 );
720 758
721 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 759 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
722 start_game; 760 $table->add (1, 8, new CFClient::UI::Entry
761 text => $CFG->{output_count},
762 tooltip => "Should be set to 1 unless you know what you are doing",
763 connect_changed => sub { $CFG->{output_count} = $_[1] },
723 }); 764 );
765
766 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
767 $table->add (1, 9, new CFClient::UI::Entry
768 text => $CFG->{output_sync},
769 tooltip => "Should be set to 1 unless you know what you are doing",
770 connect_changed => sub { $CFG->{output_sync} = $_[1] },
771 );
772
773 $table->add (1, 10, $LOGIN_BUTTON = new CFClient::UI::Button
774 expand => 1,
775 align => 0,
776 text => "Login",
777 connect_activate => sub {
778 $CONN ? stop_game
779 : start_game;
780 },
781 );
724 782
725 $dialog 783 $dialog
726} 784}
727 785
728sub message_window { 786sub message_window {
729 my $window = new CFClient::UI::FancyFrame 787 my $window = new CFClient::UI::FancyFrame
730 title => "Messages", 788 title => "Messages",
731 border_bg => [1, 1, 1, 1], 789 border_bg => [1, 1, 1, 1],
732 bg => [0, 0, 0, 0.5], 790 bg => [0, 0, 0, 0.75],
733 user_w => int $::WIDTH / 3, 791 user_w => int $::WIDTH / 3,
734 user_h => int $::HEIGHT / 5, 792 user_h => int $::HEIGHT / 5,
735 child => (my $vbox = new CFClient::UI::VBox); 793 child => (my $vbox = new CFClient::UI::VBox);
736 794
737 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 795 $vbox->add ($LOGVIEW);
738 expand => 1,
739 font => $FONT_FIXED,
740 fontsize => $::CFG->{log_fontsize},
741 );
742 796
743 $vbox->add (my $input = new CFClient::UI::Entry 797 $vbox->add (my $input = new CFClient::UI::Entry
798 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
799 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
800 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
801 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
744 connect_focus_in => sub { 802 connect_focus_in => sub {
745 my ($input, $prev_focus) = @_; 803 my ($input, $prev_focus) = @_;
746 804
747 delete $input->{refocus_map}; 805 delete $input->{refocus_map};
748 806
… …
777 }; 835 };
778 836
779 $window 837 $window
780} 838}
781 839
840sub open_quit_dialog {
841 unless ($QUIT_DIALOG) {
842
843 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";
844
845 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
846
847 $vb->add (new CFClient::UI::Label
848 text => "You should find a savebed and apply it first!",
849 max_w => $WIDTH * 0.25,
850 ellipsize => 0,
851 );
852 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
853 $hb->add (new CFClient::UI::Button
854 text => "Ok",
855 expand => 1,
856 connect_activate => sub { $QUIT_DIALOG->hide },
857 );
858 $hb->add (new CFClient::UI::Button
859 text => "Quit anyway",
860 expand => 1,
861 connect_activate => sub { exit },
862 );
863
864 $QUIT_DIALOG->show_centered;
865 } else {
866 $QUIT_DIALOG->show_centered;
867 }
868}
869
870sub make_inventory_window {
871 my $invwin = new CFClient::UI::FancyFrame
872 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory";
873
874 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
875
876 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
877 $vb1->add (my $lbl = new CFClient::UI::Label);
878 $lbl->set_text ("Player");
879 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
880
881 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
882 $vb2->add ($INVR_LBL = new CFClient::UI::Label);
883 $INVR_LBL->set_text ("Floor");
884 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
885
886 $invwin
887}
888
889sub make_help_window {
890 my $win = new CFClient::UI::FancyFrame
891 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";
892
893 $win->add (my $vbox = new CFClient::UI::VBox);
894
895 $vbox->add (my $buttons = new CFClient::UI::HBox);
896 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
897
898 for (
899 [intro => "Introduction"],
900 [command_help => "Commands"],
901 [skill_help => "Skills"],
902 ) {
903 my ($pod, $label) = @$_;
904
905 $buttons->add (new CFClient::UI::Button
906 text => $label,
907 connect_activate => sub {
908 my $parser = new Pod::POM;
909 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
910
911 $viewer->clear;
912
913 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
914 for @{ CFClient::pod_to_pango_list $pom };
915
916 $viewer->set_offset (0);
917 },
918 );
919 }
920
921 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
922
923 $win
924}
925
782sub sdl_init { 926sub sdl_init {
783 CFClient::SDL_Init 927 CFClient::SDL_Init
784 and die "SDL::Init failed!\n"; 928 and die "SDL::Init failed!\n";
785} 929}
786 930
787sub video_init { 931sub video_init {
788 sdl_init; 932 sdl_init;
789 933
934 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
935
936 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
937
790 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 938 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
791 $FULLSCREEN = $CFG->{fullscreen}; 939 $FULLSCREEN = $CFG->{fullscreen};
792 $FAST = $CFG->{fast}; 940 $FAST = $CFG->{fast};
793 941
794 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 942 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
795 or die "SDL_SetVideoMode failed!\n"; 943 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
796 944
797 $SDL_ACTIVE = 1; 945 $SDL_ACTIVE = 1;
798
799 $LAST_REFRESH = time - 0.01; 946 $LAST_REFRESH = time - 0.01;
800 947
801 CFClient::gl_init; 948 CFClient::gl_init;
802 949
803 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 950 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
804 951
952 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
953
805 ############################################################################# 954 #############################################################################
806 955
956 if ($DEBUG_STATUS) {
957 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
958 } else {
959 # create the widgets
960
807 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 961 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
808 $DEBUG_STATUS->show; 962 $DEBUG_STATUS->show;
809 963
810 $STATUS_LINE = new CFClient::UI::Label 964 $STATUSBOX = new CFClient::UI::Statusbox;
811 padding => 0, 965 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
812 y => $HEIGHT - $FONTSIZE * 1.8;
813 $STATUS_LINE->show;
814 966
815 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 967 (new CFClient::UI::Frame
816 padding => 0, 968 bg => [0, 0, 0, 0.4],
817 fontsize => 0.8, 969 req_y => -1,
818 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 970 child => $STATUSBOX,
819 $ALT_ENTER_MESSAGE->show; 971 )->show;
820 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
821 972
822 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget); 973 CFClient::UI::FancyFrame->new (
823 $MAPWIDGET->focus_in; 974 border_bg => [1, 1, 1, 192/255],
975 bg => [1, 1, 1, 0],
976 child => ($MAPMAP = new CFClient::MapWidget::MapMap
977 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
978 ),
979 )->show;
980
981 $MAPWIDGET = new CFClient::MapWidget;
824 $MAPWIDGET->connect (activate_console => sub { 982 $MAPWIDGET->connect (activate_console => sub {
825 my ($mapwidget, $preset) = @_; 983 my ($mapwidget, $preset) = @_;
826 984
827 if ($CONSOLE) { 985 if ($CONSOLE) {
828 $CONSOLE->{input}->{auto_activated} = 1; 986 $CONSOLE->{input}->{auto_activated} = 1;
829 $CONSOLE->{input}->focus_in; 987 $CONSOLE->{input}->focus_in;
830 988
831 if ($preset && $CONSOLE->{input}->get_text eq '') { 989 if ($preset && $CONSOLE->{input}->get_text eq '') {
832 $CONSOLE->{input}->set_text ($preset); 990 $CONSOLE->{input}->set_text ($preset);
991 }
833 } 992 }
834 } 993 });
835 }); 994 $MAPWIDGET->show;
995 $MAPWIDGET->focus_in;
836 996
837 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); 997 $LOGVIEW = new CFClient::UI::TextView
998 expand => 1,
999 font => $FONT_FIXED,
1000 fontsize => $::CFG->{log_fontsize},
1001 can_hover => 1,
1002 can_events => 1,
1003 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1004 ;
838 1005
1006 $BUTTONBAR = new CFClient::UI::HBox;
1007
839 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 1008 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1009 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
840 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 1010 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1011 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
841 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 1012 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1013 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
842 1014
843 $CFClient::UI::ROOT->add (make_gauge_window); # 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 1015 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
1016
844 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 1017 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1018 tooltip => "Toggles the statistics window, where all your Stats and Resistances are beign displaye at all times.");
1019 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1020 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");
845 1021
846 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 1022 $BUTTONBAR->add (new CFClient::UI::Button
1023 text => "Save Config",
1024 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1025 connect_activate => sub {
847 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1026 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
848 status "Configuration Saved"; 1027 status "Configuration Saved";
849 }); 1028 },
1029 );
850 1030
1031 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1032 tooltip => "View Documentation");
1033
1034 $BUTTONBAR->add (new CFClient::UI::Button
1035 text => "Quit",
1036 tooltip => "Terminates the program",
1037 connect_activate => sub {
1038 if ($CONN) {
1039 open_quit_dialog;
1040 } else {
1041 exit;
1042 }
1043 },
1044 );
1045
1046 $BUTTONBAR->show;
1047
1048 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1049
1050 # delay till geometry is constant
1051 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
851 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 1052 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1053 my $widget = $GAUGES->{win};
1054 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1055 });
1056 force_refresh ();
1057 }
852} 1058}
853 1059
854sub video_shutdown { 1060sub video_shutdown {
855 $CFClient::UI::ROOT->{children} = [];
856 undef $CFClient::UI::GRAB;
857 undef $CFClient::UI::HOVER;
858 undef $SDL_ACTIVE; 1061 undef $SDL_ACTIVE;
859} 1062}
860 1063
861my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1064my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
862my $bgmusic;#TODO#hack#d# 1065my $bgmusic;#TODO#hack#d#
1066
1067sub audio_channel_finished {
1068 my ($channel) = @_;
1069
1070 #warn "channel $channel finished\n";#d#
1071}
863 1072
864sub audio_music_finished { 1073sub audio_music_finished {
865 return unless $CFG->{bgm_enable}; 1074 return unless $CFG->{bgm_enable};
866 1075
867 # TODO: hack, do play loop and mood music 1076 # TODO: hack, do play loop and mood music
… …
871 push @bgmusic, shift @bgmusic; 1080 push @bgmusic, shift @bgmusic;
872} 1081}
873 1082
874sub audio_init { 1083sub audio_init {
875 if ($CFG->{audio_enable}) { 1084 if ($CFG->{audio_enable}) {
876 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 1085 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
877 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1086 $SDL_MIXER = !CFClient::Mix_OpenAudio;
1087
1088 unless ($SDL_MIXER) {
1089 status "Unable to open sound device: there will be no sound";
1090 return;
1091 }
1092
878 CFClient::Mix_AllocateChannels 8; 1093 CFClient::Mix_AllocateChannels 8;
879 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1094 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
880 1095
881 audio_music_finished; 1096 audio_music_finished;
882 1097
… …
908} 1123}
909 1124
910my %animate_object; 1125my %animate_object;
911my $animate_timer; 1126my $animate_timer;
912 1127
913my $want_refresh;
914my $can_refresh;
915
916my $fps = 9; 1128my $fps = 9;
917 1129
1130my %demo;#d#
1131
918sub force_refresh { 1132sub force_refresh {
919 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 1133 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
920 debug sprintf "%3.2f", $fps; 1134 debug sprintf "%3.2f", $fps;
921 1135
922 $want_refresh = 0;
923 $can_refresh = 0;
924
925 $CFClient::UI::ROOT->draw; 1136 $CFClient::UI::ROOT->draw;
926 1137
1138 $WANT_REFRESH = 0;
1139 $CAN_REFRESH = 0;
1140 $LAST_REFRESH = $NOW;
1141
11420 && do {
1143 # some weird model-drawing code, just a joke right now
1144 use CFClient::OpenGL;
1145
1146 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1147 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1148 $demo{r} ||= do {
1149 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1150 $mod->{v} = pack "f*", @{$mod->{v}};
1151 $_ = [scalar @$_, pack "S!*", @$_]
1152 for values %{$mod->{g}};
1153 $mod
1154 };
1155
1156 my $r = $demo{r} or die;
1157
1158 glDepthMask 1;
1159 glClear GL_DEPTH_BUFFER_BIT;
1160 glEnable GL_TEXTURE_2D;
1161 glEnable GL_DEPTH_TEST;
1162 glEnable GL_CULL_FACE;
1163 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1164
1165 glMatrixMode GL_PROJECTION;
1166 glLoadIdentity;
1167 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1168 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1169 glMatrixMode GL_MODELVIEW;
1170 glLoadIdentity;
1171
1172 glPushMatrix;
1173 glTranslate 0, 0, -800;
1174 glScale 1, -1, 1;
1175 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1176 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1177 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1178 glScale 50, 50, 50;
1179
1180 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1181 while (my ($k, $v) = each %{$r->{g}}) {
1182 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1183 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1184 }
1185
1186 glPopMatrix;
1187
1188 glShadeModel GL_FLAT;
1189 glDisable GL_DEPTH_TEST;
1190 glDisable GL_TEXTURE_2D;
1191 glDepthMask 0;
1192
1193 $WANT_REFRESH++;
1194};
1195
927 CFClient::SDL_GL_SwapBuffers; 1196 CFClient::SDL_GL_SwapBuffers;
928
929 $LAST_REFRESH = $NOW;
930} 1197}
931 1198
932my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1199my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
933 $NOW = time; 1200 $NOW = time;
934 1201
935 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1202 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
936 for CFClient::SDL_PollEvent; 1203 for CFClient::SDL_PollEvent;
937 1204
938 if (%animate_object) { 1205 if (%animate_object) {
939 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1206 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
940 $want_refresh++; 1207 $WANT_REFRESH++;
941 } 1208 }
942 1209
943 if ($want_refresh) { 1210 if ($WANT_REFRESH) {
944 force_refresh; 1211 force_refresh;
945 } else { 1212 } else {
946 $can_refresh = 1; 1213 $CAN_REFRESH = 1;
947 } 1214 }
948}); 1215});
949
950sub refresh {
951 $want_refresh++;
952}
953 1216
954sub animation_start { 1217sub animation_start {
955 my ($widget) = @_; 1218 my ($widget) = @_;
956 $animate_object{$widget} = $widget; 1219 $animate_object{$widget} = $widget;
957} 1220}
… …
961 delete $animate_object{$widget}; 1224 delete $animate_object{$widget};
962} 1225}
963 1226
964@conn::ISA = Crossfire::Protocol::; 1227@conn::ISA = Crossfire::Protocol::;
965 1228
1229sub conn::new {
1230 my $class = shift;
1231
1232 my $self = $class->Crossfire::Protocol::new (@_);
1233
1234 $MAPWIDGET->clr_commands;
1235
1236 my $parser = new Pod::POM;
1237 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1238
1239 for my $head2 ($pod->head2) {
1240 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1241 or next;
1242
1243 my $cmd = $1;
1244 my @args = split /\|/, $2;
1245 @args = (".*") unless @args;
1246
1247 my $text = CFClient::pod_to_pango $head2->content;
1248
1249 for my $arg (@args) {
1250 $arg = $arg eq ".*" ? "" : " $arg";
1251
1252 $MAPWIDGET->add_command ("$cmd$arg", $text);
1253 }
1254 }
1255
1256 $self->{noface} = new_from_file CFClient::Texture
1257 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
1258
1259 $self
1260}
1261
966sub conn::stats_update { 1262sub conn::stats_update {
967 my ($self, $stats) = @_; 1263 my ($self, $stats) = @_;
1264
1265 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1266 my $diff = $exp - $self->{prev_exp};
1267 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1268 if exists $self->{prev_exp} && $diff;
1269 $self->{prev_exp} = $exp;
1270 }
968 1271
969 update_stats_window ($stats); 1272 update_stats_window ($stats);
970} 1273}
971 1274
972sub conn::user_send { 1275sub conn::user_send {
… …
1027 $self->set_texture ($id => $data); 1330 $self->set_texture ($id => $data);
1028 } 1331 }
1029 } 1332 }
1030} 1333}
1031 1334
1335# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1336# (server resource,s latency, bandwidth), so this hack is warranted.
1337# the right fix is to make real tiled maps with an overview file
1338sub conn::send_mapinfo {
1339 my ($self, $data, $cb) = @_;
1340
1341 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1342 my ($wx, $wy) = ($1, $2);
1343
1344 if ($data =~ /^spatial ([1-4]+)$/) {
1345 my @dx = (0, 0, 1, 0, -1);
1346 my @dy = (0, -1, 0, 1, 0);
1347 my ($dx, $dy);
1348
1349 for (split //, $1) {
1350 $dx += $dx[$_];
1351 $dy += $dy[$_];
1352 }
1353
1354 $cb->(spatial => 15,
1355 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1356 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1357 50, 50,
1358 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1359 );
1360
1361 return;
1362 }
1363 }
1364
1365 $self->Crossfire::Protocol::send_mapinfo ($data, $cb);
1366}
1367
1032# this method does a "flood fill" into every tile direction 1368# this method does a "flood fill" into every tile direction
1033# it assumes that tiles are arranged in a rectangular grid, 1369# it assumes that tiles are arranged in a rectangular grid,
1034# i.e. a map is the same as the left of the right map etc. 1370# i.e. a map is the same as the left of the right map etc.
1035# failure to comply are harmless and result in display errors 1371# failure to comply are harmless and result in display errors
1036# at worst. 1372# at worst.
1037sub conn::flood_fill { 1373sub conn::flood_fill {
1038 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1374 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1039 1375
1040 # the server does not allow map paths > 6 1376 # the server does not allow map paths > 6
1041 return if 6 <= length $path; 1377 return if 7 <= length $path;
1042 1378
1043 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1379 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1044 1380
1045 for ( 1381 for (
1046 [1, 0, -1], 1382 [1, 3, 0, -1],
1047 [2, 1, 0], 1383 [2, 4, 1, 0],
1048 [3, 0, 1], 1384 [3, 1, 0, 1],
1049 [4, -1, 0], 1385 [4, 2, -1, 0],
1050 ) { 1386 ) {
1051 my ($tile, $dx, $dy) = @$_; 1387 my ($tile, $tile2, $dx, $dy) = @$_;
1388
1389 next if $block & (1 << $tile);
1390 my $block = $block | (1 << $tile2);
1052 1391
1053 my $gx = $gx + $dx; 1392 my $gx = $gx + $dx;
1054 my $gy = $gy + $dy; 1393 my $gy = $gy + $dy;
1055 1394
1056 next unless $flags & (1 << ($tile - 1)); 1395 next unless $flags & (1 << ($tile - 1));
… …
1058 1397
1059 my $neigh = $self->{neigh_map}{$hash} ||= []; 1398 my $neigh = $self->{neigh_map}{$hash} ||= [];
1060 if (my $info = $neigh->[$tile]) { 1399 if (my $info = $neigh->[$tile]) {
1061 my ($flags, $x, $y, $w, $h, $hash) = @$info; 1400 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1062 1401
1063 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1402 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1064 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1403 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1065 1404
1066 } else { 1405 } else {
1067 $self->send_mapinfo ("spatial $path$tile", sub { 1406 $self->send_mapinfo ("spatial $path$tile", sub {
1068 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1407 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1069 1408
1070 return if $mode ne "spatial"; 1409 return if $mode ne "spatial";
1071 1410
1072 $x += $MAP->ox; 1411 $x += $MAP->ox;
1073 $y += $MAP->oy; 1412 $y += $MAP->oy;
1074 1413
1075 $self->load_map ($hash, $x, $y) 1414 $self->load_map ($hash, $x, $y)
1076 unless $self->{neigh_map}{$hash}[5]++;#d# 1415 unless $self->{neigh_map}{$hash}[5]++;#d#
1077 1416
1078 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 1417 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1079 1418
1080 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1419 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1081 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1420 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1082 }); 1421 });
1083 } 1422 }
1084 } 1423 }
1085} 1424}
… …
1089 1428
1090 $self->flush_map; 1429 $self->flush_map;
1091 1430
1092 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1431 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1093 1432
1094 my $mapmapw = 250; 1433 my $mapmapw = $MAPMAP->{w};
1095 my $mapmaph = 250; 1434 my $mapmaph = $MAPMAP->{h};
1096 1435
1097 $self->{neigh_rect} = [ 1436 $self->{neigh_rect} = [
1098 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1437 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1099 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1438 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1100 ]; 1439 ];
1101 1440
1102 delete $self->{neigh_grid}; 1441 delete $self->{neigh_grid};
1103 $self->flood_fill (0, 0, "", $hash, $flags);
1104 1442
1105 $x += $ox; 1443 $x += $ox;
1106 $y += $oy; 1444 $y += $oy;
1107 1445
1108 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1446 $self->{map_info} = [$hash, $x, $y, $w, $h];
1109 1447
1110 my $map = $self->{map_info}[0];
1111 $map =~ s/^.*?\/([^\/]+)$/\1/; 1448 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1112 $STATWIDS->{map}->set_text ("Map: " . $map); 1449 $STATWIDS->{map}->set_text ("Map: " . $map);
1113 1450
1114 $self->load_map ($hash, $x, $y); 1451 $self->load_map ($hash, $x, $y);
1452 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1115} 1453}
1116 1454
1117sub conn::face_find { 1455sub conn::face_find {
1118 my ($self, $facenum, $face) = @_; 1456 my ($self, $facenum, $face) = @_;
1119 1457
… …
1121 1459
1122 my $id = $FACEMAP->get ($hash); 1460 my $id = $FACEMAP->get ($hash);
1123 1461
1124 unless ($id) { 1462 unless ($id) {
1125 # create new id for face 1463 # create new id for face
1126 # i love transactions 1464 # I love transactions
1127 for (1..100) { 1465 for (1..100) {
1128 my $txn = $CFClient::DB_ENV->txn_begin; 1466 my $txn = $CFClient::DB_ENV->txn_begin;
1129 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW); 1467 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
1130 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 1468 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
1131 $id++; 1469 $id = ($id || 16) + 1;
1132 if ($FACEMAP->put (id => $id) == 0 1470 if ($FACEMAP->put (id => $id) == 0
1133 && $FACEMAP->put ($hash => $id) == 0) { 1471 && $FACEMAP->put ($hash => $id) == 0) {
1134 $txn->txn_commit; 1472 $txn->txn_commit;
1135 1473
1136 goto gotid; 1474 goto gotid;
… …
1144 1482
1145gotid: 1483gotid:
1146 $face->{id} = $id; 1484 $face->{id} = $id;
1147 $MAP->set_face ($facenum => $id); 1485 $MAP->set_face ($facenum => $id);
1148 $self->{faceid}[$facenum] = $id;#d# 1486 $self->{faceid}[$facenum] = $id;#d#
1487
1149 $TILECACHE->get ($id) 1488 $TILECACHE->get ($id) || do {
1489 my $tex = $self->{noface};
1490 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1491 undef
1492 };
1150} 1493}
1151 1494
1152sub conn::face_update { 1495sub conn::face_update {
1153 my ($self, $facenum, $face) = @_; 1496 my ($self, $facenum, $face) = @_;
1154 1497
… …
1247 ); 1590 );
1248 1591
1249 $entry->focus_in; 1592 $entry->focus_in;
1250 } 1593 }
1251 1594
1252 $dialog->show; 1595 $dialog->show_centered;
1253} 1596}
1254 1597
1255sub conn::drawinfo { 1598sub conn::drawinfo {
1256 my ($self, $color, $text) = @_; 1599 my ($self, $color, $text) = @_;
1257 1600
… …
1269 [0.55, 0.41, 0.13], 1612 [0.55, 0.41, 0.13],
1270 [0.99, 0.77, 0.26], 1613 [0.99, 0.77, 0.26],
1271 [0.74, 0.65, 0.41], 1614 [0.74, 0.65, 0.41],
1272 ); 1615 );
1273 1616
1617 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1618
1619 $text = CFClient::UI::Label::escape $text;
1620 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1621 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1622
1274 $LOGVIEW->add_paragraph ($color[$color], $text); 1623 $LOGVIEW->add_paragraph ($color[$color],
1624 join "\n", map "$time $_", split /\n/, $text);
1625
1626 $STATUSBOX->add ($text,
1627 group => $text,
1628 fg => $color[$color],
1629 timeout => 60,
1630 tooltip_font => $::FONT_FIXED,
1631 );
1632}
1633
1634sub conn::drawextinfo {
1635 my ($self, $color, $type, $subtype, $message) = @_;
1636
1637 $self->drawinfo ($color, $message);
1275} 1638}
1276 1639
1277sub conn::spell_add { 1640sub conn::spell_add {
1278 my ($self, $spell) = @_; 1641 my ($self, $spell) = @_;
1279 1642
1280 # TODO 1643 # TODO
1281 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1644 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1282 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1645 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1283 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1646 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1284} 1647}
1285 1648
1286sub conn::spell_delete { 1649sub conn::spell_delete {
1287 my ($self, $spell) = @_; 1650 my ($self, $spell) = @_;
1288} 1651}
1289 1652
1290sub conn::addme_success { 1653sub conn::addme_success {
1291 my ($self) = @_; 1654 my ($self) = @_;
1292 1655
1656 $self->send ("command output-sync $CFG->{output_sync}");
1657 $self->send ("command output-count $CFG->{output_count}");
1658
1659 my $parser = new Pod::POM;
1660 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1661
1662 my %skill_tooltip;
1663
1664 for my $head2 ($pod->head2) {
1665 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1666 }
1667
1293 for my $skill (values %{$self->{skill_info}}) { 1668 for my $skill (values %{$self->{skill_info}}) {
1294 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1669 $MAPWIDGET->add_command ("ready_skill $skill",
1295 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1670 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1671 . $skill_tooltip{$skill});
1672 $MAPWIDGET->add_command ("use_skill $skill",
1673 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1674 . $skill_tooltip{$skill});
1296 } 1675 }
1676}
1677
1678sub conn::eof {
1679 $MAPWIDGET->clr_commands;
1680
1681 stop_game;
1297} 1682}
1298 1683
1299sub update_floorbox { 1684sub update_floorbox {
1300 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1685 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1686 return unless $CONN;
1687
1301 $FLOORBOX->clear; 1688 $FLOORBOX->clear;
1302 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1689 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1303 1690
1304 my @items = values %{ $CONN->{container}{0} }; 1691 my $count = 7;
1305 1692 for (@{ $CONN->{container}{0} }) {
1306 # we basically have to use the same sorting as everybody else 1693 if (--$count) {
1307 @items = sort { $a->{type} <=> $b->{type} } @items; 1694 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1308 1695 } else {
1309 for my $item (reverse @items) { 1696 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1310 my $desc = $item->{nrof} < 2
1311 ? $item->{name}
1312 : "$item->{nrof} $item->{name_pl}";
1313 # todo: animation widget, face widget, weight(?) etc.
1314 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1315 tooltip => (CFClient::UI::Label->escape ($desc)
1316 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1317 can_hover => 1,
1318 can_events => 1,
1319 connect_button_down => sub {
1320 my ($self, $ev, $x, $y) = @_;
1321
1322 # todo: maybe put examine on 1? but should just be a tooltip :(
1323 if ($ev->{button} == 1) {
1324 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1325 } elsif ($ev->{button} == 2) {
1326 $CONN->send ("apply $item->{tag}");
1327 } elsif ($ev->{button} == 3) {
1328 # examine, lock, mark, maybe other things
1329 warn "MENU not implemented yet\n";
1330 }
1331
1332 1
1333 }, 1697 last;
1334 );
1335
1336 $hbox->add (new CFClient::UI::Face
1337 can_events => 0,
1338 face => $item->{face},
1339 anim => $item->{anim},
1340 animspeed => $item->{animspeed},
1341 );
1342 1698 }
1343 $hbox->add (new CFClient::UI::Label
1344 can_events => 0,
1345 text => $desc,
1346 );
1347 } 1699 }
1348 }); 1700 });
1349 refresh; 1701
1702 $WANT_REFRESH++;
1350} 1703}
1351 1704
1352sub conn::container_add { 1705sub conn::container_add {
1353 my ($self, $id, $items) = @_; 1706 my ($self, $tag, $items) = @_;
1354 1707
1355 update_floorbox if $id == 0; 1708 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1709
1710 if ($tag == 0) {
1711 update_floorbox;
1712 $OPENCONT = 0;
1713 $INVR_LBL->set_text ("Floor");
1714 $INVR->set_items ($self->{container}{0});
1715 } elsif ($tag == $self->{player}{tag}) {
1716 $INVR_LBL->set_text ("Player");
1717 $INV->set_items ($self->{container}{$self->{player}{tag}})
1718 } else {
1719 $OPENCONT = $tag;
1720 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1721 $INVR->set_items ($self->{container}{$tag});
1722 }
1723
1356 # $self-<{player}{tag} => player inv 1724 # $self-<{player}{tag} => player inv
1357 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1725 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1358} 1726}
1359 1727
1360sub conn::container_clear { 1728sub conn::container_clear {
1361 my ($self, $id) = @_; 1729 my ($self, $tag) = @_;
1362 1730
1363 update_floorbox if $id == 0; 1731 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1732
1733 if ($tag == 0) {
1734 update_floorbox;
1735 $OPENCONT = 0;
1736 $INVR_LBL->set_text ("Floor");
1737 $INVR->set_items ($self->{container}{0});
1738 } elsif ($tag == $self->{player}{tag}) {
1739 $INVR_LBL->set_text ("Player");
1740 $INV->set_items ($self->{container}{$tag})
1741 } else {
1742 $OPENCONT = $tag;
1743 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1744 $INVR->set_items ($self->{container}{$tag});
1745 }
1746
1364# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1747# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1365} 1748}
1366 1749
1367sub conn::item_delete { 1750sub conn::item_delete {
1368 my ($self, @items) = @_; 1751 my ($self, @items) = @_;
1369 1752
1370 for (@items) { 1753 for (@items) {
1371 update_floorbox if $_->{container} == 0; 1754 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1755
1756 if ($_->{container} == 0) {
1757 update_floorbox;
1758 $OPENCONT = 0;
1759 $INVR_LBL->set_text ("Floor");
1760 $INVR->set_items ($self->{container}{0});
1761 } elsif ($_->{container} == $self->{player}{tag}) {
1762 $INVR_LBL->set_text ("Player");
1763 $INV->set_items ($self->{container}{$self->{player}{tag}})
1764 } else {
1765 $OPENCONT = $_->{container};
1766 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1767 $INVR->set_items ($self->{container}{$_->{container}});
1768 }
1372 } 1769 }
1373} 1770}
1374 1771
1375sub conn::item_update { 1772sub conn::item_update {
1376 my ($self, $item) = @_; 1773 my ($self, $item) = @_;
1377 1774
1378 update_floorbox if $item->{container} == 0; 1775 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1776
1777 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1778 $OPENCONT = 0;
1779 $INVR_LBL->set_text ("Floor");
1780 $INVR->set_items ($self->{container}{0});
1781
1782 $item->{widget}->update_item
1783 if $item->{widget};
1784 } else {
1785 if ($item->{container} == 0) {
1786 update_floorbox;
1787 $OPENCONT = 0;
1788 $INVR_LBL->set_text ("Floor");
1789 $INVR->set_items ($self->{container}{0});
1790 } elsif ($item->{container} == $self->{player}{tag}) {
1791 $INV->set_items ($self->{container}{$item->{container}})
1792 }
1793 }
1379} 1794}
1380 1795
1381%SDL_CB = ( 1796%SDL_CB = (
1382 CFClient::SDL_QUIT => sub { 1797 CFClient::SDL_QUIT => sub {
1383 Event::unloop -1; 1798 Event::unloop -1;
1384 }, 1799 },
1385 CFClient::SDL_VIDEORESIZE => sub { 1800 CFClient::SDL_VIDEORESIZE => sub {
1386 }, 1801 },
1387 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1802 CFClient::SDL_VIDEOEXPOSE => sub {
1803 CFClient::UI::full_refresh;
1804 },
1388 CFClient::SDL_ACTIVEEVENT => sub { 1805 CFClient::SDL_ACTIVEEVENT => sub {
1389# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1806# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1390 }, 1807 },
1391 CFClient::SDL_KEYDOWN => sub { 1808 CFClient::SDL_KEYDOWN => sub {
1392 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1809 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1396 video_init; 1813 video_init;
1397 } else { 1814 } else {
1398 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1815 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1399 } 1816 }
1400 }, 1817 },
1401 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1818 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1402 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1819 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1403 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1820 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1404 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1821 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1405 CFClient::SDL_USEREVENT => \&audio_music_finished, 1822 CFClient::SDL_USEREVENT => sub {
1823 if ($_[0]{code} == 1) {
1824 audio_channel_finished $_[0]{data1};
1825 } elsif ($_[0]{code} == 0) {
1826 audio_music_finished;
1827 }
1828 },
1406); 1829);
1407 1830
1408############################################################################# 1831#############################################################################
1409 1832
1410$SIG{INT} = $SIG{TERM} = sub { exit }; 1833$SIG{INT} = $SIG{TERM} = sub { exit };
1411 1834
1412$TILECACHE = CFClient::db_table "tilecache";
1413$FACEMAP = CFClient::db_table "facemap";
1414
1415CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1416
1417my %DEF_CFG = (
1418 sdl_mode => 0,
1419 width => 640,
1420 height => 480,
1421 fullscreen => 0,
1422 fast => 0,
1423 map_scale => 0.5,
1424 fow_enable => 1,
1425 fow_intensity => 0.45,
1426 fow_smooth => 0,
1427 gui_fontsize => 1,
1428 log_fontsize => 1,
1429 gauge_fontsize => 1,
1430 gauge_size => 0.35,
1431 stat_fontsize => 1,
1432 mapsize => 100,
1433 host => "crossfire.schmorp.de",
1434 say_command => 'say',
1435 audio_enable => 1,
1436 bgm_enable => 1,
1437 bgm_volume => 0.25,
1438);
1439
1440while (my ($k, $v) = each %DEF_CFG) {
1441 $CFG->{$k} = $v unless exists $CFG->{$k};
1442}
1443
1444sdl_init;
1445
1446@SDL_MODES = reverse
1447 grep $_->[0] >= 640 && $_->[1] >= 480,
1448 CFClient::SDL_ListModes;
1449
1450@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1451
1452$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1453
1454{ 1835{
1836 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1837
1838 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1839
1840 $TILECACHE = CFClient::db_table "tilecache";
1841 $FACEMAP = CFClient::db_table "facemap";
1842
1843 my %DEF_CFG = (
1844 sdl_mode => 0,
1845 width => 640,
1846 height => 480,
1847 fullscreen => 0,
1848 fast => 0,
1849 map_scale => 1,
1850 fow_enable => 1,
1851 fow_intensity => 0.45,
1852 fow_smooth => 0,
1853 gui_fontsize => 1,
1854 log_fontsize => 1,
1855 gauge_fontsize=> 1,
1856 gauge_size => 0.35,
1857 stat_fontsize => 1,
1858 mapsize => 100,
1859 host => "crossfire.schmorp.de",
1860 say_command => 'say',
1861 audio_enable => 1,
1862 bgm_enable => 1,
1863 bgm_volume => 0.25,
1864 output_sync => 1,
1865 output_count => 1,
1866 );
1867
1868 while (my ($k, $v) = each %DEF_CFG) {
1869 $CFG->{$k} = $v unless exists $CFG->{$k};
1870 }
1871
1872 sdl_init;
1873
1874 @SDL_MODES = reverse
1875 grep $_->[0] >= 640 && $_->[1] >= 480,
1876 CFClient::SDL_ListModes;
1877
1878 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1879
1880 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1881
1882 {
1455 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1883 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1456 DejaVuSans.ttf 1884 DejaVuSans.ttf
1457 DejaVuSansMono.ttf 1885 DejaVuSansMono.ttf
1458 DejaVuSans-Bold.ttf 1886 DejaVuSans-Bold.ttf
1459 DejaVuSansMono-Bold.ttf 1887 DejaVuSansMono-Bold.ttf
1460 DejaVuSans-Oblique.ttf 1888 DejaVuSans-Oblique.ttf
1461 DejaVuSansMono-Oblique.ttf 1889 DejaVuSansMono-Oblique.ttf
1462 DejaVuSans-BoldOblique.ttf 1890 DejaVuSans-BoldOblique.ttf
1463 DejaVuSansMono-BoldOblique.ttf 1891 DejaVuSansMono-BoldOblique.ttf
1464 ); 1892 );
1465 1893
1466 CFClient::add_font $_ for @fonts; 1894 CFClient::add_font $_ for @fonts;
1467 1895
1896 CFClient::pango_init;
1897
1468 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1898 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1469 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1899 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1470 1900
1471 $FONT_PROP->make_default; 1901 $FONT_PROP->make_default;
1472} 1902 }
1473 1903
1904# compare mono (ft) vs. rgba (cairo)
1905# ft - 1.8s, cairo 3s, even in alpha-only mode
1906# for my $rgba (0..1) {
1907# my $t1 = Time::HiRes::time;
1908# for (1..1000) {
1909# my $layout = CFClient::Layout->new ($rgba);
1910# $layout->set_text ("hallo" x 100);
1911# $layout->render;
1912# }
1913# my $t2 = Time::HiRes::time;
1914# warn $t2-$t1;
1915# }
1916
1474video_init; 1917 video_init;
1475audio_init; 1918 audio_init;
1919}
1476 1920
1477Event::loop; 1921Event::loop;
1478 1922
1479END { CFClient::SDL_Quit } 1923END { CFClient::SDL_Quit }
1480 1924
1925=head1 NAME
1926
1481=head1 pclient - Crossfire+ and Crossfire game client 1927pclient - A Crossfire+ and Crossfire game client
1482 1928
1483Pclient is a Crossfire+ and Crossfire game client. 1929=head1 SYNOPSIS
1484 1930
1485=head2 Features 1931Just run it - no commandline arguments are supported.
1486
1487=over 4
1488
1489=item Fullscreen Map
1490
1491PClient can uses a fullscreen map, which greatly enhances how much of the
1492game world you can see.
1493
1494=item Persistent Map Cache (Crossfire+ only)
1495
1496PClient can persistently cache all map data it received from the
1497server. This not only allows it to display an overview map, but also
1498ensures that once-explored areas will be available the next time you want
1499to explore more.
1500
1501=item Hardware acceleration
1502
1503Unlike most Crossfire clients, PClient take advantage of OpenGL hardware
1504acceleration. Most modern graphics cards have difficulties with 2D
1505acceleration, while 3D graphics is accelerated well.
1506
1507=item No arbitrary limits
1508
1509Unlike other Crossfire clients, pclient does not suffer from arbitrary
1510limits (like a fixed amount of face numbers). There are still limits, but
1511they are not arbitrarily low :)
1512
1513=back
1514 1932
1515=head1 USAGE 1933=head1 USAGE
1516 1934
1517=head2 The Map 1935Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used
1518 1936fullscreen and interactively.
1519The map is always displayed in the background, behind all other windows and UI elements.
1520
1521#TODO# middle-click scrolls
1522#
1523# keys:
1524#
1525# a apply
1526# keypad moves, kp_5 applies ranged attack to self
1527
1528Starting to type enters the I<completion mode>. In that mode, you can type
1529abbreviations or commands and have them executed as soon as they match a
1530valid command. This is best explained by a few examples:
1531
1532Typing B<climb> will display a list of commands with I<climb> in their
1533name, such as I<ready_skill climbing> and I<use_skill climbing>.
1534
1535You can abbreviate commands by typing only the first character of every
1536word. For example, typing I<iwor> will likely select I<invoke word of
1537recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli>
1538will likely select I<ready_skill climbing> and I<usl> will give you
1539I<use_skill levitation>.
1540
1541=head2 The map overview
1542
1543#TODO#
1544
1545=head2 The Status area in the lower right corner
1546
1547#TODO#
1548
1549=head2 The I<Statistics>/I>Stats> window
1550
1551#TODO#
1552
1553=head1 FAQ
1554
1555=over 4
1556
1557=item The client is very sluggish and slow, what can I do about this?
1558
1559Most likely, you don't have accelerated OpenGL support. Try to find a
1560newer driver, or a driver from your hardware vendor, that features OpenGL
1561support.
1562
1563If this is not an option, the following Setup options reduce the load and
1564will likely make the client playable with sofwtare rendering (it will
1565still be slow, though):
1566
1567=over 4
1568
1569=item B<Video Mode> should be set as low as possible (e.g. 640x480)
1570
1571=item Enable B<Fast & Ugly> mode
1572
1573=item Disable B<Fog of War>
1574
1575=item Increase B<Map Scale>
1576
1577=back
1578
1579=back
1580 1937
1581=head1 AUTHOR 1938=head1 AUTHOR
1582 1939
1583Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1940Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1584 1941

Diff Legend

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