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.146 by root, Wed Apr 19 21:17:16 2006 UTC vs.
Revision 1.184 by root, Tue Apr 25 11:25:20 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6BEGIN {
7 if (%PAR::LibCache) {
8 @INC = grep ref, @INC; # weed out all paths except pars loader refs
9
10 while (my ($filename, $zip) = each %PAR::LibCache) {
11 for ($zip->memberNames) {
12 next unless /^\/root\/(.*)/;
13 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
14 unless -e "$ENV{PAR_TEMP}/$1";
15 }
16 }
17
18 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 }
24}
25
26# need to do it again because that pile of garbage called PAR nukes it before main
27unshift @INC, $ENV{PAR_TEMP};
28
6use Time::HiRes 'time'; 29use Time::HiRes 'time';
7use Event; 30use Event;
8
9use SDL::Event;
10
11use SDL::OpenGL;
12 31
13use Crossfire; 32use Crossfire;
14use Crossfire::Protocol; 33use Crossfire::Protocol;
15 34
16use Compress::LZF; 35use Compress::LZF;
17 36
18use CFClient; 37use CFClient;
19use CFClient::UI; 38use CFClient::UI;
20use CFClient::MapWidget; 39use CFClient::MapWidget;
40
41$Event::DIED = sub {
42 CFClient::error $_[1];
43};
44
45#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
21 46
22our $VERSION = '0.1'; 47our $VERSION = '0.1';
23 48
24my $MAX_FPS = 60; 49my $MAX_FPS = 60;
25my $MIN_FPS = 5; # unused as of yet 50my $MIN_FPS = 5; # unused as of yet
… …
40our @SDL_MODES; 65our @SDL_MODES;
41our $WIDTH; 66our $WIDTH;
42our $HEIGHT; 67our $HEIGHT;
43our $FULLSCREEN; 68our $FULLSCREEN;
44our $FONTSIZE; 69our $FONTSIZE;
70
71our $FONT_PROP;
72our $FONT_FIXED;
45 73
46our $MAP; 74our $MAP;
47our $MAPWIDGET; 75our $MAPWIDGET;
48our $BUTTONBAR; 76our $BUTTONBAR;
49our $LOGVIEW; 77our $LOGVIEW;
50our $CONSOLE; 78our $CONSOLE;
51our $METASERVER; 79our $METASERVER;
52 80
81our $FLOORBOX;
53our $GAUGES; 82our $GAUGES;
83our $STATWIDS;
54 84
55our $SDL_ACTIVE; 85our $SDL_ACTIVE;
56our $SDL_EV;
57our %SDL_CB; 86our %SDL_CB;
58 87
59our $SDL_MIXER; 88our $SDL_MIXER;
60our @SOUNDS; # event => file mapping 89our @SOUNDS; # event => file mapping
61our %AUDIO_CHUNKS; # audio files 90our %AUDIO_CHUNKS; # audio files
… …
103 undef $CONN; 132 undef $CONN;
104} 133}
105 134
106sub client_setup { 135sub client_setup {
107 my $dialog = new CFClient::UI::FancyFrame 136 my $dialog = new CFClient::UI::FancyFrame
137 title => "Client Setup",
108 child => (my $vbox = new CFClient::UI::VBox); 138 child => (my $vbox = new CFClient::UI::VBox);
109 $vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Client Setup");
110 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 139 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
111 140
112 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 141 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
113 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 142 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
114 143
115 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 144 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
116 $hbox->add (my $mode_label = new CFClient::UI::Label valign => 0, height => 0.8); 145 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
117 146
118 $mode_slider->connect (changed => sub { 147 $mode_slider->connect (changed => sub {
119 my ($self, $value) = @_; 148 my ($self, $value) = @_;
120 149
121 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 150 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
122 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 151 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
123 }); 152 });
124 $mode_slider->emit (changed => $mode_slider->{range}[0]); 153 $mode_slider->emit (changed => $mode_slider->{range}[0]);
125 154
155 my $row = 1;
156
126 $table->add (0, 1, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 157 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
127 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub { 158 $table->add (1, $row++, new CFClient::UI::CheckBox
159 state => $CFG->{fullscreen},
160 tooltip => "Bring the client into fullscreen mode",
161 connect_changed => sub {
128 my ($self, $value) = @_; 162 my ($self, $value) = @_;
129 $CFG->{fullscreen} = $value; 163 $CFG->{fullscreen} = $value;
164 }
130 }); 165 );
131 166
132 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 167 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
133 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub { 168 $table->add (1, $row++, new CFClient::UI::CheckBox
169 state => $CFG->{fast},
170 tooltip => "Lower the visual quality considerably to speed up rendering.",
171 connect_changed => sub {
134 my ($self, $value) = @_; 172 my ($self, $value) = @_;
135 $CFG->{fast} = $value; 173 $CFG->{fast} = $value;
174 }
136 }); 175 );
137 176
177 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
178 $table->add (1, $row++, new CFClient::UI::Slider
179 range => [$CFG->{map_scale}, 0.25, 2, 0.05],
180 tooltip => "Enlarge or shrink the displayed map",
181 connect_changed => sub {
182 my ($self, $value) = @_;
183 $CFG->{map_scale} = 0.05 * int $value / 0.05;
184 }
185 );
186
138 $table->add (0, 3, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 187 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
139 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub { 188 $table->add (1, $row++, new CFClient::UI::CheckBox
189 state => $CFG->{fow_enable},
190 tooltip => "Fog-of-War marks areas that cannot be seen by the player",
191 connect_changed => sub {
140 my ($self, $value) = @_; 192 my ($self, $value) = @_;
141 $CFG->{fow_enable} = $value; 193 $CFG->{fow_enable} = $value;
194 }
142 }); 195 );
143 196
144 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 197 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
145 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub { 198 $table->add (1, $row++, new CFClient::UI::Slider
199 range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001],
200 tooltip => "The higher the intensity, the lighter the Fog-of-War color",
201 connect_changed => sub {
146 my ($self, $value) = @_; 202 my ($self, $value) = @_;
147 $CFG->{fow_intensity} = $value; 203 $CFG->{fow_intensity} = $value;
204 }
148 }); 205 );
149 206
150 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 207 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
151 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { 208 $table->add (1, $row++, new CFClient::UI::CheckBox
209 state => $CFG->{fow_smooth},
210 tooltip => "Smooth the Fog-of-War a bit to make it more realistic",
211 connect_changed => sub {
152 my ($self, $value) = @_; 212 my ($self, $value) = @_;
153 $CFG->{fow_smooth} = $value; 213 $CFG->{fow_smooth} = $value;
154 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 214 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
215 }
155 }); 216 );
156 217
157 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 218 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
158 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub { 219 $table->add (1, $row++, new CFClient::UI::Slider
220 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1],
221 tooltip => "The font size used by most GUI elements",
222 connect_changed => sub {
159 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10; 223 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
160# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 224# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
225 }
161 }); 226 );
162 227
163 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); 228 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
164 $table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub { 229 $table->add (1, $row++, new CFClient::UI::Slider
230 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1],
231 tooltip => "The font size used by the server log window only",
232 connect_changed => sub {
165 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10); 233 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
234 }
166 }); 235 );
167 236
168 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 237 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
238
239 $table->add (1, $row++, new CFClient::UI::Slider
240 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1],
241 tooltip => "The font size used by the statistics window only",
242 connect_changed => sub {
243 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
244 &set_stats_window_fontsize;
245 }
246 );
247
248 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
249 $table->add (1, $row++, new CFClient::UI::Slider
250 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
251 tooltip => "Adjust the size of the stats gauges at the bottom right",
252 connect_changed => sub {
253 $CFG->{gauge_size} = $_[1];
254 my $h = 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 }
268 );
269
270 $table->add (1, $row++, new CFClient::UI::Button
271 expand => 1, align => 0, text => "Apply",
272 tooltip => "Apply the video settings",
273 connect_activate => sub {
169 video_shutdown (); 274 video_shutdown ();
170 video_init (); 275 video_init ();
276 }
171 }); 277 );
172 278
173 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 279 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
174 $table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub { 280 $table->add (1, $row++, new CFClient::UI::CheckBox
281 state => $CFG->{audio_enable},
282 tooltip => "If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
283 connect_changed => sub {
175 $CFG->{audio_enable} = $_[1]; 284 $CFG->{audio_enable} = $_[1];
285 }
176 }); 286 );
177# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 287# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
178# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub { 288# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
179# $CFG->{effects_volume} = $_[1]; 289# $CFG->{effects_volume} = $_[1];
180# }); 290# });
181 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 291 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
182 $table->add (1, 10, my $hbox = new CFClient::UI::HBox); 292 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
183 $hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub { 293 $hbox->add (new CFClient::UI::CheckBox
294 expand => 1, state => $CFG->{bgm_enable},
295 tooltip => "Enable background music playing",
296 connect_changed => sub {
184 $CFG->{bgm_enable} = $_[1]; 297 $CFG->{bgm_enable} = $_[1];
298 }
185 }); 299 );
186 $hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub { 300 $hbox->add (new CFClient::UI::Slider
301 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1],
302 tooltip => "The volume of the background music",
303 connect_changed => sub {
187 $CFG->{bgm_volume} = $_[1]; 304 $CFG->{bgm_volume} = $_[1];
188 CFClient::Mix_VolumeMusic ($_[1]); 305 CFClient::MixMusic::volume $_[1] * 128;
306 }
189 }); 307 );
190 308
191 $table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 309 $table->add (1, $row++, new CFClient::UI::Button
310 expand => 1, align => 0, text => "Apply",
311 tooltip => "Apply the audio settings",
312 connect_activate => sub {
192 audio_shutdown (); 313 audio_shutdown ();
193 audio_init (); 314 audio_init ();
315 }
194 }); 316 );
195 317
196 $dialog 318 $dialog
319}
320
321sub set_stats_window_fontsize {
322 for (values %{$STATWIDS}) {
323 $_->set_fontsize ($::CFG->{stat_fontsize});
324 }
325}
326
327sub set_gauge_window_fontsize {
328 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
329 $_->set_fontsize ($::CFG->{gauge_fontsize});
330 }
331
332# local $GAUGES->{win}{parent};#d#
333# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
334}
335
336sub make_gauge_window {
337 my $gh = int ($HEIGHT * $CFG->{gauge_size});
338# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
339
340 my $win = new CFClient::UI::Frame (
341 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh
342 );
343 $win->add (my $hbox = new CFClient::UI::HBox
344 children => [
345 (new CFClient::UI::HBox expand => 1),
346 ($FLOORBOX = new CFClient::UI::VBox),
347 (my $vbox = new CFClient::UI::VBox),
348 ],
349 );
350
351 $vbox->add (new CFClient::UI::HBox
352 expand => 1,
353 children => [
354 (new CFClient::UI::Empty expand => 1),
355 (my $hb = new CFClient::UI::HBox),
356 ],
357 );
358
359 $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.");
361 $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.");
363 $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.");
365 $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.");
367
368 $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.");
370 $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.)");
372
373 $GAUGES = {
374 exp => $exp, win => $win, range => $rng,
375 food => $fg, mana => $mg, hp => $hg, grace => $gg
376 };
377
378 &set_gauge_window_fontsize;
379
380 $win
381}
382
383sub make_stats_window {
384 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats";
385
386 $tgw->add (my $vb = new CFClient::UI::VBox);
387 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
388 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
389
390 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
391
392 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
393
394 my $black = [0, 0, 0];
395
396 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"],
398 [0, 1, st_dex => "Dex", 30, "Dexterity, 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"],
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"],
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"],
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"],
403 [0, 6, st_cha => "Cha", 30, "Charisma, how well you are received by NPCs. Affects buying and selling prices in shops."],
404
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."],
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."],
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."],
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."],
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."],
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."],
411 ) {
412 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
413
414 $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);
416 $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);
418 }
419
420 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
421
422 my $row = 0;
423 my $col = 0;
424
425 my %resist_names = (
426 slow => "Slow",
427 holyw => "Holy Word",
428 conf => "Confusion",
429 fire => "Fire",
430 depl => "Depletion (some monsters and other effects can cause stats depletion)",
431 magic => "Magic",
432 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)",
433 acid => "Acid",
434 pois => "Poison",
435 para => "Paralysation",
436 deat => "Death (resistance against death spells)",
437 phys => "Physical",
438 blind => "Blind",
439 fear => "Fear",
440 tund => "Turn undead",
441 elec => "Electricity",
442 cold => "Cold",
443 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)",
444 );
445 for (qw/slow holyw conf fire depl magic
446 drain acid pois para deat phys
447 blind fear tund elec cold ghit/)
448 {
449 $tbl2->add ($col, $row,
450 $STATWIDS->{"res_$_"} =
451 new CFClient::UI::Label
452 font => $FONT_FIXED,
453 template => "-100%",
454 align => +1,
455 valign => 0,
456 can_events => 1,
457 can_hover => 1,
458 tooltip => $resist_names{$_},
459 );
460 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
461 can_hover => 1,
462 can_events => 1,
463 image => "ui/resist/resist_$_.png",
464 tooltip => $resist_names{$_},
465 );
466
467 $row++;
468 if ($row % 6 == 0) {
469 $col += 2;
470 $row = 0;
471 }
472 }
473
474 &set_stats_window_fontsize;
475 update_stats_window ({});
476
477 $tgw
478}
479
480sub formsep {
481 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1
482}
483
484sub update_stats_window {
485 my ($stats) = @_;
486
487 # i love text protocols!!!
488 my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1;
489 my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1;
490 my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1;
491 my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1;
492 my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1;
493 my $fo_m = 999;
494 my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1;
495 my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1;
496
497 $GAUGES->{hp} ->set_value ($hp, $hp_m);
498 $GAUGES->{mana} ->set_value ($sp, $sp_m);
499 $GAUGES->{food} ->set_value ($fo, $fo_m);
500 $GAUGES->{grace} ->set_value ($gr, $gr_m);
501 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64})
502 . " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")");
503 my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE};
504 $rng =~ s/^Range: //; # thank you so much dear server
505 $GAUGES->{range} ->set_text ("Rng: " . $rng);
506 my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE};
507 $title =~ s/^Player: //;
508 $STATWIDS->{title} ->set_text ("Title: " . $title);
509
510 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
511 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
512 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
513 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
514 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
515 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
516 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
517 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
518 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
519 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
520 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
521 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_SPEED});
522 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_WEAP_SP});
523
524 my %tbl = (
525 phys => 100,
526 magic => 101,
527 fire => 102,
528 elec => 103,
529 cold => 104,
530 conf => 105,
531 acid => 106,
532 drain => 107,
533 ghit => 108,
534 pois => 109,
535 slow => 110,
536 para => 111,
537 tund => 112,
538 fear => 113,
539 depl => 113,
540 deat => 115,
541 holyw => 116,
542 blind => 117
543 );
544
545 for (keys %tbl) {
546 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
547 }
548
197} 549}
198 550
199sub metaserver_dialog { 551sub metaserver_dialog {
200 my $dialog = new CFClient::UI::FancyFrame 552 my $dialog = new CFClient::UI::FancyFrame
553 title => "Metaserver",
201 child => (my $vbox = new CFClient::UI::VBox); 554 child => (my $vbox = new CFClient::UI::VBox);
202 555
203 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 556 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
204 557
205 $dialog 558 $dialog
206} 559}
560
561my $METASERVER_ATIME;
207 562
208sub update_metaserver { 563sub update_metaserver {
209 my ($HOST) = @_; 564 my ($HOST) = @_;
210 565
211 status "fetching metaserver list..."; 566 return if $METASERVER_ATIME > time;
567 $METASERVER_ATIME = time + 60;
568
569 my $table = $METASERVER->{table};
570 $table->clear;
571 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
212 572
213 my $buf; 573 my $buf;
214 574
215 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 575 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
576
577 unless ($fh) {
578 $label->set_text ("unable to contact metaserver: $!");
579 return;
580 }
216 581
217 Event->io (fd => $fh, poll => 'r', cb => sub { 582 Event->io (fd => $fh, poll => 'r', cb => sub {
218 my $res = sysread $fh, $buf, 8192, length $buf; 583 my $res = sysread $fh, $buf, 8192, length $buf;
219 584
220 if (!defined $res) { 585 if (!defined $res) {
221 $_[0]->w->cancel; 586 $_[0]->w->cancel;
222 status "metaserver: $!"; 587 $label->set_text ("error while retrieving server list: $!");
223 } elsif ($res == 0) { 588 } elsif ($res == 0) {
224 $_[0]->w->cancel; 589 $_[0]->w->cancel;
225 status "server list retrieved"; 590 status "server list retrieved";
226 591
227 my $table = $METASERVER->{table}; 592 utf8::decode $buf if utf8::valid $buf;
228 593
229 $table->clear; 594 $table->clear;
230 595
231 my @col = qw(Use #Users Host Uptime Version Description); 596 my @col = qw(Use #Users Host Uptime Version Description);
232 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 597 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
… …
256 $m = [$users, $host, $uptime, $version, $desc]; 621 $m = [$users, $host, $uptime, $version, $desc];
257 622
258 $y++; 623 $y++;
259 624
260 $table->add (0, $y, new CFClient::UI::VBox children => [ 625 $table->add (0, $y, new CFClient::UI::VBox children => [
261 (new CFClient::UI::Button text => " ", connect_activate => sub { 626 (new CFClient::UI::Button text => "Use", connect_activate => sub {
262 $HOST->set_text ($CFG->{host} = $host); 627 $HOST->set_text ($CFG->{host} = $host);
263 }), 628 }),
264 (new CFClient::UI::Empty expand => 1), 629 (new CFClient::UI::Empty expand => 1),
265 ]); 630 ]);
266 631
… …
271 }); 636 });
272} 637}
273 638
274sub server_setup { 639sub server_setup {
275 my $dialog = new CFClient::UI::FancyFrame 640 my $dialog = new CFClient::UI::FancyFrame
641 title => "Server Setup",
276 child => (my $vbox = new CFClient::UI::VBox); 642 child => (my $vbox = new CFClient::UI::VBox);
277 643
278 $vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Server Setup");
279 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 644 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
280 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 645 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
281 646
282 { 647 {
283 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 648 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
284 649
285 $vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub { 650 $vbox->add (
651 my $HOST = new CFClient::UI::Entry
652 expand => 1,
653 text => $CFG->{host},
654 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
655 connect_changed => sub {
656 my ($self, $value) = @_;
657 $CFG->{host} = $value;
658 }
659 );
660
661 $METASERVER = metaserver_dialog;
662
663 $vbox->add (new CFClient::UI::Flopper
664 expand => 1,
665 text => "Metaserver",
666 other => $METASERVER,
667 tooltip => "Show a list of avaible crossfire servers",
668 connect_open => sub {
669 update_metaserver $HOST;
670 }
671 );
672 }
673
674 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
675 $table->add (1, 4, new CFClient::UI::Entry
676 text => $CFG->{user},
677 tooltip => "The name of your character on the server",
678 connect_changed => sub {
286 my ($self, $value) = @_; 679 my ($self, $value) = @_;
287 $CFG->{host} = $value;
288 });
289
290 $METASERVER = metaserver_dialog;
291
292 $vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
293 update_metaserver $HOST;
294 });
295 }
296
297 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
298 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
299 my ($self, $value) = @_;
300 $CFG->{user} = $value; 680 $CFG->{user} = $value;
681 }
301 }); 682 );
302 683
303 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 684 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
304 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub { 685 $table->add (1, 5, new CFClient::UI::Entry
686 text => $CFG->{password},
687 hidden => 1,
688 tooltip => "The password for your character",
689 connect_changed => sub {
305 my ($self, $value) = @_; 690 my ($self, $value) = @_;
306 $CFG->{password} = $value; 691 $CFG->{password} = $value;
692 }
307 }); 693 );
308 694
309 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd"); 695 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
310 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub { 696 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
697 text => $CFG->{say_command},
698 tooltip => "This is the command that will be used if you write a line in the message window entry. "
699 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
700 ."But you could also set it to 'tell &lt;playername&gt;' to only chat with that user.",
701 connect_changed => sub {
311 my ($self, $value) = @_; 702 my ($self, $value) = @_;
312 $CFG->{say_command} = $value; 703 $CFG->{say_command} = $value;
704 }
313 }); 705 );
314 706
315 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 707 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
316 $table->add (1, 7, new CFClient::UI::Slider 708 $table->add (1, 7, new CFClient::UI::Slider
317 req_w => 100, 709 req_w => 100,
318 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 710 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
711 tooltip => "This is the size of the portion of the map update the server sends you. "
712 ."If you set this to a high value you will be able to see further for example.",
319 connect_changed => sub { 713 connect_changed => sub {
320 my ($self, $value) = @_; 714 my ($self, $value) = @_;
321 715
322 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 716 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
323 }, 717 },
… …
330 $dialog 724 $dialog
331} 725}
332 726
333sub message_window { 727sub message_window {
334 my $window = new CFClient::UI::FancyFrame 728 my $window = new CFClient::UI::FancyFrame
729 title => "Messages",
335 border_bg => [1, 1, 1, 0.5], 730 border_bg => [1, 1, 1, 0.5],
336 bg => [0.3, 0.3, 0.3, 0.8], 731 bg => [0.3, 0.3, 0.3, 0.8],
337 user_w => int $::WIDTH / 3, 732 user_w => int $::WIDTH / 3,
338 user_h => int $::HEIGHT / 5, 733 user_h => int $::HEIGHT / 5,
339 child => (my $vbox = new CFClient::UI::VBox); 734 child => (my $vbox = new CFClient::UI::VBox);
340 735
341 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 736 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
342 expand => 1, 737 expand => 1,
738 font => $FONT_FIXED,
343 fontsize => $::CFG->{log_fontsize}, 739 fontsize => $::CFG->{log_fontsize},
344 ); 740 );
345 741
346 $vbox->add (my $input = new CFClient::UI::Entry 742 $vbox->add (my $input = new CFClient::UI::Entry
347 connect_focus_in => sub { 743 connect_focus_in => sub {
… …
395 $FAST = $CFG->{fast}; 791 $FAST = $CFG->{fast};
396 792
397 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 793 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
398 or die "SDL_SetVideoMode failed!\n"; 794 or die "SDL_SetVideoMode failed!\n";
399 795
400 $SDL_EV = new SDL::Event;
401 $SDL_EV->set_unicode (1);
402
403 $SDL_ACTIVE = 1; 796 $SDL_ACTIVE = 1;
404 797
405 $LAST_REFRESH = time - 0.01; 798 $LAST_REFRESH = time - 0.01;
406 799
407 CFClient::gl_init; 800 CFClient::gl_init;
… …
444 837
445 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 838 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
446 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 839 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
447 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 840 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
448 841
842 $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
843 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
844
449 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 845 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
450 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 846 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
451 status "Configuration Saved"; 847 status "Configuration Saved";
452 }); 848 });
453 849
454 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 850 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
455
456 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
457 $tgw->add (my $hbox = new CFClient::UI::HBox ());
458
459 $hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
460 $hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
461 $hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
462 $hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
463
464 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
465 $CFClient::UI::ROOT->add ($tgw);
466} 851}
467 852
468sub video_shutdown { 853sub video_shutdown {
469 $CFClient::UI::ROOT->{children} = []; 854 $CFClient::UI::ROOT->{children} = [];
855 undef $CFClient::UI::GRAB;
856 undef $CFClient::UI::HOVER;
470 undef $SDL_ACTIVE; 857 undef $SDL_ACTIVE;
471 undef $SDL_EV;
472} 858}
473 859
860my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
474my $bgmusic;#TODO#hack#d# 861my $bgmusic;#TODO#hack#d#
862
863sub audio_music_finished {
864 return unless $CFG->{bgm_enable};
865
866 # TODO: hack, do play loop and mood music
867 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
868 $bgmusic->play (0);
869
870 push @bgmusic, shift @bgmusic;
871}
475 872
476sub audio_init { 873sub audio_init {
477 if ($CFG->{audio_enable}) { 874 if ($CFG->{audio_enable}) {
478 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 875 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
479
480 $SDL_MIXER = !CFClient::Mix_OpenAudio; 876 $SDL_MIXER = !CFClient::Mix_OpenAudio;
481 CFClient::Mix_AllocateChannels 8; 877 CFClient::Mix_AllocateChannels 8;
482 CFClient::MixMusic::volume $CFG->{bgm_volume}; 878 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
483 879
484 # TODO: hack, do play loop and mood music 880 audio_music_finished;
485 if ($CFG->{bgm_enable}) {
486 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/game3.ogg";
487 $bgmusic->play;
488 }
489 881
490 while (<$fh>) { 882 while (<$fh>) {
491 next if /^\s*#/; 883 next if /^\s*#/;
492 next if /^\s*$/; 884 next if /^\s*$/;
493 885
… …
529 $want_refresh = 0; 921 $want_refresh = 0;
530 $can_refresh = 0; 922 $can_refresh = 0;
531 923
532 $CFClient::UI::ROOT->draw; 924 $CFClient::UI::ROOT->draw;
533 925
534 SDL::GLSwapBuffers; 926 CFClient::SDL_GL_SwapBuffers;
535 927
536 $LAST_REFRESH = $NOW; 928 $LAST_REFRESH = $NOW;
537} 929}
538 930
539my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 931my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
540 $NOW = time; 932 $NOW = time;
541 933
542 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 934 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
543 while $SDL_EV->poll; 935 for CFClient::SDL_PollEvent;
544 936
545 if (%animate_object) { 937 if (%animate_object) {
546 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 938 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
547 $want_refresh++; 939 $want_refresh++;
548 } 940 }
… …
571@conn::ISA = Crossfire::Protocol::; 963@conn::ISA = Crossfire::Protocol::;
572 964
573sub conn::stats_update { 965sub conn::stats_update {
574 my ($self, $stats) = @_; 966 my ($self, $stats) = @_;
575 967
576 # i love text protocols!!! 968 update_stats_window ($stats);
577 # FIXME: the stats are somehow weird
578 my $hp = $stats->{1};
579 my $hp_m = $stats->{2};
580 my $sp = $stats->{3};
581 my $sp_m = $stats->{4};
582 my $fo = $stats->{18};
583 my $fo_m = 1000;
584 my $gr = $stats->{23};
585 my $gr_m = $stats->{24};
586
587 #d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
588 $GAUGES->{hp}->set_value ($hp, $hp_m);
589 $GAUGES->{mana}->set_value ($sp, $sp_m);
590 $GAUGES->{food}->set_value ($fo, $fo_m);
591 $GAUGES->{grace}->set_value ($gr, $gr_m);
592} 969}
593 970
594sub conn::user_send { 971sub conn::user_send {
595 my ($self, $command) = @_; 972 my ($self, $command) = @_;
596 973
… …
621 998
622 my ($hash, $x, $y, $w, $h) = @$map_info; 999 my ($hash, $x, $y, $w, $h) = @$map_info;
623 1000
624 my $data = $MAP->get_rect ($x, $y, $w, $h); 1001 my $data = $MAP->get_rect ($x, $y, $w, $h);
625 $MAPCACHE->put ($hash => Compress::LZF::compress $data); 1002 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
626
627 warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 1003 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
628
629} 1004}
630 1005
631sub conn::map_clear { 1006sub conn::map_clear {
632 my ($self) = @_; 1007 my ($self) = @_;
633 1008
634 $self->flush_map; 1009 $self->flush_map;
635 delete $self->{neigh}; 1010 delete $self->{neigh_map};
636 1011
637 $MAP->clear; 1012 $MAP->clear;
638} 1013}
639 1014
640 1015
641sub conn::load_map($$$) { 1016sub conn::load_map($$$) {
642 my ($self, $hash, $x, $y) = @_; 1017 my ($self, $hash, $x, $y) = @_;
643 1018
644 if (defined (my $data = $MAPCACHE->get ($hash))) { 1019 if (defined (my $data = $MAPCACHE->get ($hash))) {
645 $data = Compress::LZF::decompress $data; 1020 $data = Compress::LZF::decompress $data;
646 warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 1021 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
647 for my $id ($MAP->set_rect ($x, $y, $data)) { 1022 for my $id ($MAP->set_rect ($x, $y, $data)) {
648 my $data = $TILECACHE->get ($id) 1023 my $data = $TILECACHE->get ($id)
649 or next; 1024 or next;
650 1025
651 $self->set_texture ($id => $data); 1026 $self->set_texture ($id => $data);
652 } 1027 }
653 } 1028 }
654} 1029}
655 1030
1031# this method does a "flood fill" into every tile direction
1032# it assumes that tiles are arranged in a rectangular grid,
1033# i.e. a map is the same as the left of the right map etc.
1034# failure to comply are harmless and result in display errors
1035# at worst.
656sub conn::flood_fill { 1036sub conn::flood_fill {
657 my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_; 1037 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
658 1038
659 # the server does not allow map paths > 6 1039 # the server does not allow map paths > 6
660 return if 6 <= length $path; 1040 return if 6 <= length $path;
661 1041
662 for my $tile (1..4) { 1042 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
663 next if $self->{neigh}{$hash}[$tile]; 1043
1044 for (
1045 [1, 0, -1],
1046 [2, 1, 0],
1047 [3, 0, 1],
1048 [4, -1, 0],
1049 ) {
1050 my ($tile, $dx, $dy) = @$_;
1051
1052 my $gx = $gx + $dx;
1053 my $gy = $gy + $dy;
1054
664 next unless $flags & (1 << ($tile - 1)); 1055 next unless $flags & (1 << ($tile - 1));
1056 next if $self->{neigh_grid}{$gx, $gy}++;
665 1057
666 my $neigh = $self->{neigh}{$hash} ||= []; 1058 my $neigh = $self->{neigh_map}{$hash} ||= [];
667 1059 if (my $info = $neigh->[$tile]) {
668 $self->send_mapinfo ("spatial $path$tile", sub {
669 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1060 my ($flags, $x, $y, $w, $h, $hash) = @$info;
670 1061
671 #warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
672 return if $mode ne "spatial";
673
674 $x += $MAP->ox;
675 $y += $MAP->oy;
676
677 $self->load_map ($hash, $x, $y)
678 unless $self->{neigh}{$hash}[5]++;#d#
679
680 $neigh->[$tile] = [$x, $y, $w, $h];
681
682 $self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1) 1062 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
683 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1063 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1064
1065 } else {
1066 $self->send_mapinfo ("spatial $path$tile", sub {
1067 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1068
1069 return if $mode ne "spatial";
1070
1071 $x += $MAP->ox;
1072 $y += $MAP->oy;
1073
1074 $self->load_map ($hash, $x, $y)
1075 unless $self->{neigh_map}{$hash}[5]++;#d#
1076
1077 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1078
1079 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
1080 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1081 });
684 }); 1082 }
685 } 1083 }
686} 1084}
687 1085
688sub conn::map_change { 1086sub conn::map_change {
689 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 1087 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
… …
692 1090
693 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1091 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
694 1092
695 my $mapmapw = 250; 1093 my $mapmapw = 250;
696 my $mapmaph = 250; 1094 my $mapmaph = 250;
1095
1096 $self->{neigh_rect} = [
1097 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1098 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1099 ];
697 1100
1101 delete $self->{neigh_grid};
698 $self->flood_fill ("", $hash, $flags, 1102 $self->flood_fill (0, 0, "", $hash, $flags);
699 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
700 $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
701 1103
702 $x += $ox; 1104 $x += $ox;
703 $y += $oy; 1105 $y += $oy;
704 1106
705 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1107 $self->{map_info} = [$hash, $x, $y, $w, $h];
1108
1109 my $map = $self->{map_info}[0];
1110 $map =~ s/^.*?\/([^\/]+)$/\1/;
1111 $STATWIDS->{map}->set_text ("Map: " . $map);
706 1112
707 $self->load_map ($hash, $x, $y); 1113 $self->load_map ($hash, $x, $y);
708} 1114}
709 1115
710sub conn::face_find { 1116sub conn::face_find {
… …
736 } 1142 }
737 1143
738gotid: 1144gotid:
739 $face->{id} = $id; 1145 $face->{id} = $id;
740 $MAP->set_face ($facenum => $id); 1146 $MAP->set_face ($facenum => $id);
1147 $self->{faceid}[$facenum] = $id;#d#
741 $TILECACHE->get ($id) 1148 $TILECACHE->get ($id)
742} 1149}
743 1150
744sub conn::face_update { 1151sub conn::face_update {
745 my ($self, $facenum, $face) = @_; 1152 my ($self, $facenum, $face) = @_;
… …
753 my ($self, $id, $data) = @_; 1160 my ($self, $id, $data) = @_;
754 1161
755 $self->{texture}[$id] ||= do { 1162 $self->{texture}[$id] ||= do {
756 my $tex = 1163 my $tex =
757 new_from_image CFClient::Texture 1164 new_from_image CFClient::Texture
758 $data, minify => 1; 1165 $data, minify => 1, mipmap => 1;
759 1166
760 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 1167 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
761 $MAPWIDGET->update; 1168 $MAPWIDGET->update;
762 1169
763 $tex 1170 $tex
… …
775 1182
776 $chunk->play; 1183 $chunk->play;
777# warn "sound $x,$y,$soundnum,$type\n";#d# 1184# warn "sound $x,$y,$soundnum,$type\n";#d#
778} 1185}
779 1186
1187my $LAST_QUERY; # server is stupid, stupid, stupid
1188
780sub conn::query { 1189sub conn::query {
781 my ($self, $flags, $prompt) = @_; 1190 my ($self, $flags, $prompt) = @_;
782 1191
783 #TODO, display dialog with relevant information 1192 $prompt = $LAST_QUERY unless length $prompt;
784 warn "<<<<QUERY:$flags:$prompt>>>\n";#d# 1193 $LAST_QUERY = $prompt;
1194
1195 my $dialog = new CFClient::UI::FancyFrame
1196 title => "Query",
1197 child => my $vbox = new CFClient::UI::VBox;
1198
1199 $vbox->add (new CFClient::UI::Label
1200 max_w => $::WIDTH * 0.4,
1201 text => $prompt);
1202
1203 if ($flags & Crossfire::Protocol::CS_QUERY_YESNO) {
1204 $vbox->add (my $hbox = new CFClient::HBox);
1205 $hbox->add (new CFClient::Button
1206 text => "No",
1207 connect_activate => sub {
1208 $self->send ("reply n");
1209 $dialog->destroy;
1210 $MAPWIDGET->focus_in;
1211 }
1212 );
1213 $hbox->add (new CFClient::Button
1214 text => "Yes",
1215 connect_activate => sub {
1216 $self->send ("reply y");
1217 $dialog->destroy;
1218 $MAPWIDGET->focus_in;
1219 },
1220 );
1221
1222 $dialog->focus_in;
1223
1224 } elsif ($flags & Crossfire::Protocol::CS_QUERY_SINGLECHAR) {
1225 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
1226 $vbox->add (my $entry = new CFClient::UI::Entry
1227 connect_changed => sub {
1228 $self->send ("reply $_[1]");
1229 $dialog->destroy;
1230 $MAPWIDGET->focus_in;
1231 },
1232 );
1233
1234 $entry->focus_in;
1235
1236 } else {
1237 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
1238
1239 $vbox->add (my $entry = new CFClient::UI::Entry
1240 $flags & Crossfire::Protocol::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
1241 connect_activate => sub {
1242 $self->send ("reply $_[1]");
1243 $dialog->destroy;
1244 $MAPWIDGET->focus_in;
1245 },
1246 );
1247
1248 $entry->focus_in;
1249 }
1250
1251 $dialog->show;
785} 1252}
786 1253
787sub conn::drawinfo { 1254sub conn::drawinfo {
788 my ($self, $color, $text) = @_; 1255 my ($self, $color, $text) = @_;
789 1256
… …
807} 1274}
808 1275
809sub conn::spell_add { 1276sub conn::spell_add {
810 my ($self, $spell) = @_; 1277 my ($self, $spell) = @_;
811 1278
1279 # TODO
1280 # create a widget dynamically, using spell face (CF::Protocol downloads them)
812 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub { 1281 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message});
813 });
814 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub { 1282 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message});
815 });
816} 1283}
817 1284
818sub conn::spell_delete { 1285sub conn::spell_delete {
819 my ($self, $spell) = @_; 1286 my ($self, $spell) = @_;
820} 1287}
821 1288
822sub conn::addme_success { 1289sub conn::addme_success {
823 my ($self) = @_; 1290 my ($self) = @_;
824 1291
825 for my $skill (values %{$self->{skill_info}}) { 1292 for my $skill (values %{$self->{skill_info}}) {
826 $MAPWIDGET->add_command ("ready_skill $skill", "", sub { 1293 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
1294 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
1295 }
1296}
1297
1298sub update_floorbox {
1299 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1300 $FLOORBOX->clear;
1301 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1302
1303 my @items = values %{ $CONN->{container}{0} };
1304
1305 # we basically have to use the same sorting as everybody else
1306 @items = sort { $a->{type} <=> $b->{type} } @items;
1307
1308 for my $item (reverse @items) {
1309 my $desc = $item->{nrof} < 2
1310 ? $item->{name}
1311 : "$item->{nrof} $item->{name_pl}";
1312 # todo: animation widget, face widget, weight(?) etc.
1313 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1314 tooltip => (CFClient::UI::Label->escape ($desc)
1315 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1316 can_hover => 1,
1317 can_events => 1,
1318 connect_button_down => sub {
1319 my ($self, $ev, $x, $y) = @_;
1320
1321 # todo: maybe put examine on 1? but should just be a tooltip :(
1322 if ($ev->{button} == 1) {
1323 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1324 } elsif ($ev->{button} == 2) {
1325 $CONN->send ("apply $item->{tag}");
1326 } elsif ($ev->{button} == 3) {
1327 # examine, lock, mark, maybe other things
1328 warn "MENU not implemented yet\n";
1329 }
1330
1331 1
1332 },
1333 );
1334
1335 $hbox->add (new CFClient::UI::Face
1336 can_events => 0,
1337 face => $item->{face},
1338 anim => $item->{anim},
1339 animspeed => $item->{animspeed},
1340 );
1341
1342 $hbox->add (new CFClient::UI::Label
1343 can_events => 0,
1344 text => $desc,
1345 );
827 }); 1346 }
828 $MAPWIDGET->add_command ("use_skill $skill", "", sub {
829 }); 1347 });
1348 refresh;
1349}
1350
1351sub conn::container_add {
1352 my ($self, $id, $items) = @_;
1353
1354 update_floorbox if $id == 0;
1355 # $self-<{player}{tag} => player inv
1356 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1357}
1358
1359sub conn::container_clear {
1360 my ($self, $id) = @_;
1361
1362 update_floorbox if $id == 0;
1363# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1364}
1365
1366sub conn::item_delete {
1367 my ($self, @items) = @_;
1368
1369 for (@items) {
1370 update_floorbox if $_->{container} == 0;
830 } 1371 }
1372}
1373
1374sub conn::item_update {
1375 my ($self, $item) = @_;
1376
1377 update_floorbox if $item->{container} == 0;
831} 1378}
832 1379
833%SDL_CB = ( 1380%SDL_CB = (
834 CFClient::SDL_QUIT => sub { 1381 CFClient::SDL_QUIT => sub {
835 Event::unloop -1; 1382 Event::unloop -1;
836 }, 1383 },
837 CFClient::SDL_VIDEORESIZE => sub { 1384 CFClient::SDL_VIDEORESIZE => sub {
838 }, 1385 },
839 CFClient::SDL_VIDEOEXPOSE => sub { 1386 CFClient::SDL_VIDEOEXPOSE => \&refresh,
840 refresh; 1387 CFClient::SDL_ACTIVEEVENT => sub {
1388# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
841 }, 1389 },
842 CFClient::SDL_KEYDOWN => sub { 1390 CFClient::SDL_KEYDOWN => sub {
843 if ($SDL_EV->key_mod & CFClient::KMOD_ALT && $SDL_EV->key_sym == 13) { 1391 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
844 # alt-enter 1392 # alt-enter
845 video_shutdown; 1393 video_shutdown;
846 $CFG->{fullscreen} = !$CFG->{fullscreen}; 1394 $CFG->{fullscreen} = !$CFG->{fullscreen};
847 video_init; 1395 video_init;
848 } else { 1396 } else {
849 CFClient::UI::feed_sdl_key_down_event ($SDL_EV); 1397 CFClient::UI::feed_sdl_key_down_event ($_[0]);
850 } 1398 }
851 }, 1399 },
852 CFClient::SDL_KEYUP => sub { 1400 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
853 CFClient::UI::feed_sdl_key_up_event ($SDL_EV); 1401 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
854 }, 1402 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
855 CFClient::SDL_MOUSEMOTION => sub { 1403 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
856 CFClient::UI::feed_sdl_motion_event ($SDL_EV); 1404 CFClient::SDL_USEREVENT => \&audio_music_finished,
857 },
858 CFClient::SDL_MOUSEBUTTONDOWN => sub {
859 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
860 },
861 CFClient::SDL_MOUSEBUTTONUP => sub {
862 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
863 },
864 CFClient::SDL_ACTIVEEVENT => sub {
865# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
866 },
867); 1405);
868 1406
869############################################################################# 1407#############################################################################
870 1408
871$SIG{INT} = $SIG{TERM} = sub { exit }; 1409$SIG{INT} = $SIG{TERM} = sub { exit };
… …
879 sdl_mode => 0, 1417 sdl_mode => 0,
880 width => 640, 1418 width => 640,
881 height => 480, 1419 height => 480,
882 fullscreen => 0, 1420 fullscreen => 0,
883 fast => 0, 1421 fast => 0,
1422 map_scale => 0.5,
884 fow_enable => 1, 1423 fow_enable => 1,
885 fow_intensity => 0.45, 1424 fow_intensity => 0.45,
886 fow_smooth => 0, 1425 fow_smooth => 0,
887 gui_fontsize => 1, 1426 gui_fontsize => 1,
888 log_fontsize => 14, 1427 log_fontsize => 1,
1428 gauge_fontsize => 1,
1429 gauge_size => 0.35,
1430 stat_fontsize => 1,
889 mapsize => 100, 1431 mapsize => 100,
890 host => "crossfire.schmorp.de", 1432 host => "crossfire.schmorp.de",
891 say_command => 'say', 1433 say_command => 'say',
892 audio_enable => 1, 1434 audio_enable => 1,
893 bgm_enable => 1, 1435 bgm_enable => 1,
894 bgm_volume => 64, 1436 bgm_volume => 0.25,
895); 1437);
896 1438
897while (my ($k, $v) = each %DEF_CFG) { 1439while (my ($k, $v) = each %DEF_CFG) {
898 $CFG->{$k} = $v unless exists $CFG->{$k}; 1440 $CFG->{$k} = $v unless exists $CFG->{$k};
899} 1441}
… …
907@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 1449@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
908 1450
909$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1451$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
910 1452
911{ 1453{
912 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf); 1454 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1455 DejaVuSans.ttf
1456 DejaVuSansMono.ttf
1457 DejaVuSans-Bold.ttf
1458 DejaVuSansMono-Bold.ttf
1459 DejaVuSans-Oblique.ttf
1460 DejaVuSansMono-Oblique.ttf
1461 DejaVuSans-BoldOblique.ttf
1462 DejaVuSansMono-BoldOblique.ttf
1463 );
913 1464
914 CFClient::add_font $_ for @fonts; 1465 CFClient::add_font $_ for @fonts;
915 CFClient::set_font $fonts[0]; 1466
1467 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1468 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1469
1470 $FONT_PROP->make_default;
916} 1471}
917 1472
918video_init; 1473video_init;
919audio_init; 1474audio_init;
920 1475
921Event::loop; 1476Event::loop;
922 1477
923END { SDL::Quit } 1478END { CFClient::SDL_Quit }
924 1479
1480=head1 pclient - Crossfire+ and Crossfire game client
925 1481
1482Pclient is a Crossfire+ and Crossfire game client.
1483
1484=head2 Features
1485
1486=over 4
1487
1488=item Fullscreen Map
1489
1490PClient can uses a fullscreen map, which greatly enhances how much of the
1491game world you can see.
1492
1493=item Persistent Map Cache (Crossfire+ only)
1494
1495PClient can persistently cache all map data it received from the
1496server. This not only allows it to display an overview map, but also
1497ensures that once-explored areas will be available the next time you want
1498to explore more.
1499
1500=item Hardware acceleration
1501
1502Unlike most Crossfire clients, PClient take advantage of OpenGL hardware
1503acceleration. Most modern graphics cards have difficulties with 2D
1504acceleration, while 3D graphics is accelerated well.
1505
1506=item No arbitrary limits
1507
1508Unlike other Crossfire clients, pclient does not suffer from arbitrary
1509limits (like a fixed amount of face numbers). There are still limits, but
1510they are not arbitrarily low :)
1511
1512=back
1513
1514=head1 USAGE
1515
1516=head2 The Map
1517
1518The map is always displayed in the background, behind all other windows and UI elements.
1519
1520#TODO# middle-click scrolls
1521#
1522# keys:
1523#
1524# a apply
1525# keypad moves, kp_5 applies ranged attack to self
1526
1527Starting to type enters the I<completion mode>. In that mode, you can type
1528abbreviations or commands and have them executed as soon as they match a
1529valid command. This is best explained by a few examples:
1530
1531Typing B<climb> will display a list of commands with I<climb> in their
1532name, such as I<ready_skill climbing> and I<use_skill climbing>.
1533
1534You can abbreviate commands by typing only the first character of every
1535word. For example, typing I<iwor> will likely select I<invoke word of
1536recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli>
1537will likely select I<ready_skill climbing> and I<usl> will give you
1538I<use_skill levitation>.
1539
1540=head2 The map overview
1541
1542#TODO#
1543
1544=head2 The Status area in the lower right corner
1545
1546#TODO#
1547
1548=head2 The I<Statistics>/I>Stats> window
1549
1550#TODO#
1551
1552=head1 FAQ
1553
1554=over 4
1555
1556=item The client is very sluggish and slow, what can I do about this?
1557
1558Most likely, you don't have accelerated OpenGL support. Try to find a
1559newer driver, or a driver from your hardware vendor, that features OpenGL
1560support.
1561
1562If this is not an option, the following Setup options reduce the load and
1563will likely make the client playable with sofwtare rendering (it will
1564still be slow, though):
1565
1566=over 4
1567
1568=item B<Video Mode> should be set as low as possible (e.g. 640x480)
1569
1570=item Enable B<Fast & Ugly> mode
1571
1572=item Disable B<Fog of War>
1573
1574=item Increase B<Map Scale>
1575
1576=back
1577
1578=back
1579
1580=head1 AUTHOR
1581
1582Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1583
1584
1585

Diff Legend

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