ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.60 by root, Tue Jun 6 02:55:50 2006 UTC vs.
Revision 1.92 by elmex, Fri Jul 14 17:35:35 2006 UTC

… …
36 36
37use CFClient; 37use CFClient;
38use CFClient::OpenGL (); 38use CFClient::OpenGL ();
39use CFClient::Protocol; 39use CFClient::Protocol;
40use CFClient::UI; 40use CFClient::UI;
41use CFClient::BindingEditor;
41use CFClient::MapWidget; 42use CFClient::MapWidget;
42 43
43$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
45$SIG{PIPE} = 'IGNORE';
44 46
45$Event::DIED = sub { 47$Event::DIED = sub {
46 # TODO: display dialog box or so 48 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable 49 Carp::confess $_[1];#d#TODO: remove when stable
48 CFClient::error $_[1]; 50 CFClient::error $_[1];
… …
84our $CONSOLE; 86our $CONSOLE;
85our $METASERVER; 87our $METASERVER;
86our $LOGIN_BUTTON; 88our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 89our $QUIT_DIALOG;
88our $HOST_ENTRY; 90our $HOST_ENTRY;
91our $PICKUP_ENABLE;
92our $SERVER_INFO;
89 93
90our $SETUP_DIALOG; 94our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK; 95our $SETUP_NOTEBOOK;
92our $SETUP_SERVER; 96our $SETUP_SERVER;
93our $SETUP_KEYBOARD; 97our $SETUP_KEYBOARD;
94our $SETUP_SPELLS;
95 98
99our $PL_NOTEBOOK;
96our $STATS_WINDOW; 100our $PL_WINDOW;
101
102our $INVENTORY_PAGE;
103our $STATS_PAGE;
104our $SPELL_PAGE;
105
106our $HELP_WINDOW;
97our $MESSAGE_WINDOW; 107our $MESSAGE_WINDOW;
98our $FLOORBOX; 108our $FLOORBOX;
99our $GAUGES; 109our $GAUGES;
100our $STATWIDS; 110our $STATWIDS;
101 111
… …
108 118
109our $ALT_ENTER_MESSAGE; 119our $ALT_ENTER_MESSAGE;
110our $STATUSBOX; 120our $STATUSBOX;
111our $DEBUG_STATUS; 121our $DEBUG_STATUS;
112 122
113our $INV_WINDOW;
114our $INV; 123our $INV;
115our $INVR; 124our $INVR;
116our $INV_RIGHT_HB; 125our $INV_RIGHT_HB;
117 126
118our $BIND_EDITOR; 127our $BIND_EDITOR;
128our $BIND_UPD_CB;
119 129
120our $PICKUP_CFG; 130our $PICKUP_CFG;
121 131
122sub status { 132sub status {
123 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 133 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
154 $hbox->add (new CFClient::UI::Button 164 $hbox->add (new CFClient::UI::Button
155 text => "No", 165 text => "No",
156 on_activate => sub { 166 on_activate => sub {
157 $conn->send ("reply n"); 167 $conn->send ("reply n");
158 $dialog->destroy; 168 $dialog->destroy;
169 0
159 } 170 }
160 ); 171 );
161 $hbox->add (new CFClient::UI::Button 172 $hbox->add (new CFClient::UI::Button
162 text => "Yes", 173 text => "Yes",
163 on_activate => sub { 174 on_activate => sub {
164 $conn->send ("reply y"); 175 $conn->send ("reply y");
165 destroy_query_dialog $conn; 176 destroy_query_dialog $conn;
177 0
166 }, 178 },
167 ); 179 );
168 180
169 $dialog->focus_in; 181 $dialog->grab_focus;
170 182
171 } elsif ($flags & CS_QUERY_SINGLECHAR) { 183 } elsif ($flags & CS_QUERY_SINGLECHAR) {
172 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 184 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
173 185
174 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 186 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
… …
184 $table->add (0, 0, new CFClient::UI::Button 196 $table->add (0, 0, new CFClient::UI::Button
185 text => "Next Race", 197 text => "Next Race",
186 on_activate => sub { 198 on_activate => sub {
187 $conn->send ("reply n"); 199 $conn->send ("reply n");
188 destroy_query_dialog $conn; 200 destroy_query_dialog $conn;
201 0
189 }, 202 },
190 ); 203 );
191 $table->add (2, 0, new CFClient::UI::Button 204 $table->add (2, 0, new CFClient::UI::Button
192 text => "Accept", 205 text => "Accept",
193 on_activate => sub { 206 on_activate => sub {
194 $conn->send ("reply d"); 207 $conn->send ("reply d");
195 destroy_query_dialog $conn; 208 destroy_query_dialog $conn;
209 0
196 }, 210 },
197 ); 211 );
198 212
199 unshift @dialog, new CFClient::UI::Label 213 unshift @dialog, new CFClient::UI::Label
200 max_w => $::WIDTH * 0.4, 214 max_w => $::WIDTH * 0.4,
… …
214 $conn->send ("reply $stat"); 228 $conn->send ("reply $stat");
215 destroy_query_dialog $conn; 229 destroy_query_dialog $conn;
216 return; 230 return;
217 } 231 }
218 232
219 $STATS_WINDOW->show; 233 $STATS_PAGE->show;
220 $MESSAGE_WINDOW->hide; 234 $MESSAGE_WINDOW->hide;
221 235
222 unshift @dialog, new CFClient::UI::Label 236 unshift @dialog, new CFClient::UI::Label
223 max_w => $::WIDTH * 0.4, 237 max_w => $::WIDTH * 0.4,
224 ellipsise => 0, 238 ellipsise => 0,
… …
230 $table->add (0, 0, new CFClient::UI::Button 244 $table->add (0, 0, new CFClient::UI::Button
231 text => "Roll Again", 245 text => "Roll Again",
232 on_activate => sub { 246 on_activate => sub {
233 $conn->send ("reply y"); 247 $conn->send ("reply y");
234 destroy_query_dialog $conn; 248 destroy_query_dialog $conn;
249 0
235 }, 250 },
236 ); 251 );
237 252
238 # center: swap stats 253 # center: swap stats
239 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 254 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
240 value => $_, 255 value => $_,
241 options => [ 256 options => [
242 [Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"], 257 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
243 [Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 258 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244 [Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"], 259 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
245 [Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"], 260 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
246 [Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"], 261 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
247 [Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"], 262 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
248 [Cha => 7, "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 263 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
249 ], 264 ],
250 ), 1 .. 2; 265 ), 1 .. 2;
251 266
252 $table->add (2, 0, new CFClient::UI::Button 267 $table->add (2, 0, new CFClient::UI::Button
253 text => "Swap Stats", 268 text => "Swap Stats",
254 on_activate => sub { 269 on_activate => sub {
255 $conn->{stat_change_with} = $sw2->{value}; 270 $conn->{stat_change_with} = $sw2->{value};
256 $conn->send ("reply $sw1->{value}"); 271 $conn->send ("reply $sw1->{value}");
257 destroy_query_dialog $conn; 272 destroy_query_dialog $conn;
273 0
258 }, 274 },
259 ); 275 );
260 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 276 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
261 277
262 # right: accept 278 # right: accept
263 $table->add (4, 0, new CFClient::UI::Button 279 $table->add (4, 0, new CFClient::UI::Button
264 text => "Accept", 280 text => "Accept",
265 on_activate => sub { 281 on_activate => sub {
266 $conn->send ("reply n"); 282 $conn->send ("reply n");
267 $STATS_WINDOW->hide; 283 $STATS_PAGE->hide;
268 destroy_query_dialog $conn; 284 destroy_query_dialog $conn;
285 0
269 }, 286 },
270 ); 287 );
271 288
272 unshift @dialog, new CFClient::UI::Label 289 unshift @dialog, new CFClient::UI::Label
273 max_w => $::WIDTH * 0.4, 290 max_w => $::WIDTH * 0.4,
… …
283 300
284 push @dialog, my $entry = new CFClient::UI::Entry 301 push @dialog, my $entry = new CFClient::UI::Entry
285 on_changed => sub { 302 on_changed => sub {
286 $conn->send ("reply $_[1]"); 303 $conn->send ("reply $_[1]");
287 destroy_query_dialog $conn; 304 destroy_query_dialog $conn;
305 0
288 }, 306 },
289 ; 307 ;
290 308
291 $entry->focus_in; 309 $entry->grab_focus;
292 310
293 } else { 311 } else {
294 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 312 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
295 313
296 push @dialog, my $entry = new CFClient::UI::Entry 314 push @dialog, my $entry = new CFClient::UI::Entry
297 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 315 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298 on_activate => sub { 316 on_activate => sub {
299 $conn->send ("reply $_[1]"); 317 $conn->send ("reply $_[1]");
300 destroy_query_dialog $conn; 318 destroy_query_dialog $conn;
319 0
301 }, 320 },
302 ; 321 ;
303 322
304 $entry->focus_in; 323 $entry->grab_focus;
305 } 324 }
306 325
307 $vbox->add (@dialog); 326 $vbox->add (@dialog);
308 $dialog->show; 327 $dialog->show;
309} 328}
… …
314 $LOGIN_BUTTON->set_text ("Logout"); 333 $LOGIN_BUTTON->set_text ("Logout");
315 $SETUP_DIALOG->hide; 334 $SETUP_DIALOG->hide;
316 335
317 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 336 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
318 337
319 my ($host, $port) = split /:/, $CFG->{host}; 338 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
320 339
321 $MAP = new CFClient::Map $mapsize, $mapsize; 340 $MAP = new CFClient::Map $mapsize, $mapsize;
322 341
323 $CONN = eval { 342 $CONN = eval {
324 new CFClient::Protocol 343 new CFClient::Protocol
325 host => $host, 344 host => $host,
326 port => $port || 13327, 345 port => $port || 13327,
327 user => $CFG->{user}, 346 user => $CFG->{profile}{default}{user},
328 pass => $CFG->{password}, 347 pass => $CFG->{profile}{default}{password},
329 mapw => $mapsize, 348 mapw => $mapsize,
330 maph => $mapsize, 349 maph => $mapsize,
331 350
332 map_widget => $MAPWIDGET, 351 map_widget => $MAPWIDGET,
333 logview => $LOGVIEW, 352 logview => $LOGVIEW,
… …
361 380
362sub stop_game { 381sub stop_game {
363 $LOGIN_BUTTON->set_text ("Login"); 382 $LOGIN_BUTTON->set_text ("Login");
364 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 383 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365 $SETUP_DIALOG->show; 384 $SETUP_DIALOG->show;
366 $INV_WINDOW->hide; 385 $PL_WINDOW->hide;
386 $SPELL_PAGE->clear_spells;
367 387
368 return unless $CONN; 388 return unless $CONN;
369 389
370 status "connection closed"; 390 status "connection closed";
371 391
372 destroy_query_dialog $CONN; 392 destroy_query_dialog $CONN;
373 $CONN->destroy; 393 $CONN->destroy;
374 $CONN = 0; # false, does not autovivify 394 $CONN = 0; # false, does not autovivify
395
396 undef $MAP;
375} 397}
376 398
377sub graphics_setup { 399sub graphics_setup {
378 my $vbox = new CFClient::UI::VBox; 400 my $vbox = new CFClient::UI::VBox;
379 401
… …
397 419
398 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 420 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
399 $table->add (1, $row++, new CFClient::UI::CheckBox 421 $table->add (1, $row++, new CFClient::UI::CheckBox
400 state => $CFG->{fullscreen}, 422 state => $CFG->{fullscreen},
401 tooltip => "Bring the client into fullscreen mode.", 423 tooltip => "Bring the client into fullscreen mode.",
402 on_changed => sub { 424 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
403 my ($self, $value) = @_;
404 $CFG->{fullscreen} = $value;
405 }
406 ); 425 );
407 426
408 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 427 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
409 $table->add (1, $row++, new CFClient::UI::CheckBox 428 $table->add (1, $row++, new CFClient::UI::CheckBox
410 state => $CFG->{fast}, 429 state => $CFG->{fast},
411 tooltip => "Lower the visual quality considerably to speed up rendering.", 430 tooltip => "Lower the visual quality considerably to speed up rendering.",
412 on_changed => sub { 431 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
413 my ($self, $value) = @_;
414 $CFG->{fast} = $value;
415 }
416 ); 432 );
417 433
418 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 434 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
419 $table->add (1, $row++, new CFClient::UI::Slider 435 $table->add (1, $row++, new CFClient::UI::Slider
420 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 436 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
421 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 437 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
422 on_changed => sub { 438 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
423 my ($self, $value) = @_;
424 $CFG->{map_scale} = 2 ** $value;
425 }
426 ); 439 );
427 440
428 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 441 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
429 $table->add (1, $row++, new CFClient::UI::CheckBox 442 $table->add (1, $row++, new CFClient::UI::CheckBox
430 state => $CFG->{fow_enable}, 443 state => $CFG->{fow_enable},
431 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 444 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
432 on_changed => sub { 445 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
433 my ($self, $value) = @_;
434 $CFG->{fow_enable} = $value;
435 }
436 ); 446 );
437 447
438 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 448 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
439 $table->add (1, $row++, new CFClient::UI::Slider 449 $table->add (1, $row++, new CFClient::UI::Slider
440 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 450 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
441 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 451 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
442 on_changed => sub { 452 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
443 my ($self, $value) = @_;
444 $CFG->{fow_intensity} = $value;
445 }
446 ); 453 );
447 454
448 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 455 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
449 $table->add (1, $row++, new CFClient::UI::CheckBox 456 $table->add (1, $row++, new CFClient::UI::CheckBox
450 state => $CFG->{fow_smooth}, 457 state => $CFG->{fow_smooth},
451 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 458 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
452 on_changed => sub { 459 on_changed => sub {
453 my ($self, $value) = @_; 460 my ($self, $value) = @_;
454 $CFG->{fow_smooth} = $value; 461 $CFG->{fow_smooth} = $value;
455 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 462 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
463 0
456 } 464 }
457 ); 465 );
458 466
459 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 467 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
460 $table->add (1, $row++, new CFClient::UI::Slider 468 $table->add (1, $row++, new CFClient::UI::Slider
461 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 469 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
462 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 470 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
463 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 471 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
464 ); 472 );
465 473
466 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 474 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
467 $table->add (1, $row++, new CFClient::UI::Slider 475 $table->add (1, $row++, new CFClient::UI::Slider
468 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 476 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
469 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 477 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
470 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 478 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
471 );
472
473 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
474
475 $table->add (1, $row++, new CFClient::UI::Slider
476 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
477 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
478 on_changed => sub {
479 $CFG->{stat_fontsize} = $_[1];
480 &set_stats_window_fontsize;
481 }
482 ); 479 );
483 480
484 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 481 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
485 $table->add (1, $row++, new CFClient::UI::Slider 482 $table->add (1, $row++, new CFClient::UI::Slider
486 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 483 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
487 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 484 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
488 on_changed => sub { 485 on_changed => sub {
489 $CFG->{gauge_fontsize} = $_[1]; 486 $CFG->{gauge_fontsize} = $_[1];
490 &set_gauge_window_fontsize; 487 &set_gauge_window_fontsize;
488 0
491 } 489 }
492 ); 490 );
493 491
494 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 492 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
495 $table->add (1, $row++, new CFClient::UI::Slider 493 $table->add (1, $row++, new CFClient::UI::Slider
496 range => [$CFG->{gauge_size}, 0.2, 0.8], 494 range => [$CFG->{gauge_size}, 0.2, 0.8],
497 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 495 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
498 on_changed => sub { 496 on_changed => sub {
499 $CFG->{gauge_size} = $_[1]; 497 $CFG->{gauge_size} = $_[1];
500 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 498 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
499 0
501 } 500 }
502 ); 501 );
503 502
504 $table->add (1, $row++, new CFClient::UI::Button 503 $table->add (1, $row++, new CFClient::UI::Button
505 expand => 1, align => 0, text => "Apply", 504 expand => 1, align => 0, text => "Apply",
506 tooltip => "Apply the video settings", 505 tooltip => "Apply the video settings",
507 on_activate => sub { 506 on_activate => sub {
508 video_shutdown (); 507 video_shutdown ();
509 video_init (); 508 video_init ();
509 0
510 } 510 }
511 ); 511 );
512 512
513 $vbox 513 $vbox
514} 514}
… …
522 522
523 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 523 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
524 $table->add (1, $row++, new CFClient::UI::CheckBox 524 $table->add (1, $row++, new CFClient::UI::CheckBox
525 state => $CFG->{audio_enable}, 525 state => $CFG->{audio_enable},
526 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 526 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
527 on_changed => sub { 527 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
528 $CFG->{audio_enable} = $_[1];
529 }
530 ); 528 );
531# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 529# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
532# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 530# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
533# $CFG->{effects_volume} = $_[1]; 531# $CFG->{effects_volume} = $_[1];
534# }); 532# });
535 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 533 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
536 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 534 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
537 $hbox->add (new CFClient::UI::CheckBox 535 $hbox->add (new CFClient::UI::CheckBox
538 expand => 1, state => $CFG->{bgm_enable}, 536 expand => 1, state => $CFG->{bgm_enable},
539 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 537 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
540 on_changed => sub { 538 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
541 $CFG->{bgm_enable} = $_[1];
542 }
543 ); 539 );
544 $hbox->add (new CFClient::UI::Slider 540 $hbox->add (new CFClient::UI::Slider
545 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 541 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
546 tooltip => "The volume of the background music. Changes are instant.", 542 tooltip => "The volume of the background music. Changes are instant.",
547 on_changed => sub { 543 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
548 $CFG->{bgm_volume} = $_[1];
549 CFClient::MixMusic::volume $_[1] * 128;
550 }
551 ); 544 );
552 545
553 $table->add (1, $row++, new CFClient::UI::Button 546 $table->add (1, $row++, new CFClient::UI::Button
554 expand => 1, align => 0, text => "Apply", 547 expand => 1, align => 0, text => "Apply",
555 tooltip => "Apply the audio settings", 548 tooltip => "Apply the audio settings",
556 on_activate => sub { 549 on_activate => sub {
557 audio_shutdown (); 550 audio_shutdown ();
558 audio_init (); 551 audio_init ();
552 0
559 } 553 }
560 ); 554 );
561 555
562 $vbox 556 $vbox
563}
564
565sub set_stats_window_fontsize {
566 for (values %{$STATWIDS}) {
567 $_->set_fontsize ($::CFG->{stat_fontsize});
568 }
569} 557}
570 558
571sub set_gauge_window_fontsize { 559sub set_gauge_window_fontsize {
572 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 560 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
573 $_->set_fontsize ($::CFG->{gauge_fontsize}); 561 $_->set_fontsize ($::CFG->{gauge_fontsize});
… …
625 &set_gauge_window_fontsize; 613 &set_gauge_window_fontsize;
626 614
627 $win 615 $win
628} 616}
629 617
618sub debug_setup {
619 my $table = new CFClient::UI::Table;
620
621 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
622 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
623 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
624 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
625 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
626 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
627 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
628 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
629
630 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
631
632 for my $x (0..2) {
633 for my $y (0 .. 2) {
634 $table->add ($x + 3, $y,
635 new CFClient::UI::Entry
636 text => $default_smooth[$x * 3 + $y],
637 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
638 );
639 }
640 }
641
642
643 $table
644}
630 645
631sub stats_window { 646sub stats_window {
632 my $tgw = new CFClient::UI::FancyFrame 647 my $vb = new CFClient::UI::VBox;
633 y => $HEIGHT * (2/8),
634 x => "max",
635 title => "Stats",
636 name => "stats_window";
637 648
638 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
639 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 649 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
640 can_hover => 1, can_events => 1, 650 can_hover => 1, can_events => 1,
641 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 651 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
642 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 652 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
643 can_hover => 1, can_events => 1, 653 can_hover => 1, can_events => 1,
… …
667 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 677 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
668 678
669 [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."], 679 [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."],
670 [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."], 680 [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."],
671 [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."], 681 [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."],
672 [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."], 682 [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. This is the same as the physical resistance."],
673 [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."], 683 [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."],
674 [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."], 684 [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."],
675 ) { 685 ) {
676 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 686 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
677 687
… …
679 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 689 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
680 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 690 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
681 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 691 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);
682 } 692 }
683 693
684 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 694 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
685 695
686 my $row = 0; 696 my $row = 0;
687 my $col = 0; 697 my $col = 0;
688 698
689 my %resist_names = ( 699 my %resist_names = (
700 slow => ["Slow",
690 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.)", 701 "<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.)"],
702 holyw => ["Holy Word",
691 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.)", 703 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
704 conf => ["Confusion",
692 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 705 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
706 fire => ["Fire",
693 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 707 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
708 depl => ["Depletion",
694 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 709 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
710 magic => ["Magic",
695 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 711 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
712 drain => ["Draining",
696 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 713 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
714 acid => ["Acid",
697 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 715 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
716 pois => ["Poison",
698 pois => "<b>Poison</b> (resistance to getting poisoned)", 717 "<b>Poison</b> (resistance to getting poisoned)"],
718 para => ["Paralysation",
699 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 719 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
720 deat => ["Death",
700 deat => "<b>Death</b> (resistance against death spells)", 721 "<b>Death</b> (resistance against death spells)"],
701 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 722 phys => ["Physical",
723 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
724 blind => ["Blind",
702 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 725 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
726 fear => ["Fear",
703 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)", 727 "<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)"],
728 tund => ["Turn undead",
704 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 729 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
730 elec => ["Electricity",
705 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 731 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
732 cold => ["Cold",
706 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 733 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
734 ghit => ["Ghost hit",
707 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 735 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
708 ); 736 );
709 for (qw/slow holyw conf fire depl magic 737 for (qw/slow holyw conf fire depl magic
710 drain acid pois para deat phys 738 drain acid pois para deat phys
711 blind fear tund elec cold ghit/) 739 blind fear tund elec cold ghit/)
712 { 740 {
… …
717 template => "-100%", 745 template => "-100%",
718 align => +1, 746 align => +1,
719 valign => 0, 747 valign => 0,
720 can_events => 1, 748 can_events => 1,
721 can_hover => 1, 749 can_hover => 1,
722 tooltip => $resist_names{$_}, 750 tooltip => $resist_names{$_}->[1],
723 ); 751 );
724 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 752 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
725 font => $FONT_FIXED, 753 font => $FONT_FIXED,
726 can_hover => 1, 754 can_hover => 1,
727 can_events => 1, 755 can_events => 1,
728 image => "ui/resist/resist_$_.png", 756 path => "ui/resist/resist_$_.png",
729 tooltip => $resist_names{$_}, 757 tooltip => $resist_names{$_}->[1],
758 );
759 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
760 text => $resist_names{$_}->[0],
761 font => $FONT_FIXED,
762 can_hover => 1,
763 can_events => 1,
764 tooltip => $resist_names{$_}->[1],
730 ); 765 );
731 766
732 $row++; 767 $row++;
733 if ($row % 6 == 0) { 768 if ($row % 6 == 0) {
734 $col += 2; 769 $col += 3;
735 $row = 0; 770 $row = 0;
736 } 771 }
737 } 772 }
738 773
739 &set_stats_window_fontsize;
740 update_stats_window ({}); 774 update_stats_window ({});
741 775
742 $tgw 776 $vb
777}
778
779sub skill_window {
780 my ($self) = @_;
781 $STATWIDS->{"_skill_tbl"} = new CFClient::UI::Table expand => 1;
743} 782}
744 783
745sub formsep($) { 784sub formsep($) {
746 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 785 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
747} 786}
… …
781 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 820 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
782 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 821 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
783 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 822 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
784 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 823 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
785 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 824 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
786 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 825 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
787 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 826 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
788 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 827 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
789 828
790 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 829 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
791 830
792 # TODO: replace by CS_STAT_RES_xxx constants
793 my %tbl = ( 831 my %tbl = (
794 phys => 100, 832 phys => CS_STAT_RES_PHYS,
795 magic => 101, 833 magic => CS_STAT_RES_MAG,
796 fire => 102, 834 fire => CS_STAT_RES_FIRE,
797 elec => 103, 835 elec => CS_STAT_RES_ELEC,
798 cold => 104, 836 cold => CS_STAT_RES_COLD,
799 conf => 105, 837 conf => CS_STAT_RES_CONF,
800 acid => 106, 838 acid => CS_STAT_RES_ACID,
801 drain => 107, 839 drain => CS_STAT_RES_DRAIN,
802 ghit => 108, 840 ghit => CS_STAT_RES_GHOSTHIT,
803 pois => 109, 841 pois => CS_STAT_RES_POISON,
804 slow => 110, 842 slow => CS_STAT_RES_SLOW,
805 para => 111, 843 para => CS_STAT_RES_PARA,
806 tund => 112, 844 tund => CS_STAT_TURN_UNDEAD,
807 fear => 113, 845 fear => CS_STAT_RES_FEAR,
808 depl => 113, 846 depl => CS_STAT_RES_DEPLETE,
809 deat => 115, 847 deat => CS_STAT_RES_DEATH,
810 holyw => 116, 848 holyw => CS_STAT_RES_HOLYWORD,
811 blind => 117, 849 blind => CS_STAT_RES_BLIND,
812 ); 850 );
851
852 if ($::CONN && !$STATWIDS->{_skill_tbl_init}) {
853 my $sktbl = $STATWIDS->{_skill_tbl};
854 $sktbl->clear;
855
856 $sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1);
857 $sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1);
858 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname");
859
860 my @skills;
861
862 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
863 push @skills, [$i, $::CONN->{skill_info}{$i}];
864 }
865
866 my $y = 1;
867 for (sort { $a->[1] cmp $b->[1] } @skills) {
868 my ($idx, $name) = @$_;
869
870 unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) {
871 $sktbl->add (0, $y, $STATWIDS->{"sk_xp_$idx"} = new CFClient::UI::Label text => "0", align => 1);
872 $sktbl->add (1, $y, $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1);
873 $sktbl->add (2, $y++, new CFClient::UI::Label text => $name);
874 }
875 }
876
877 $STATWIDS->{_skill_tbl_init} = 1;
878 }
879
880 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
881 if (exists $stats->{$i}) {
882 $STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1])
883 if $STATWIDS->{"sk_xp_$i"};
884 $STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0])
885 if $STATWIDS->{"sk_lvl_$i"};
886 }
887 }
813 888
814 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 889 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
815 for keys %tbl; 890 for keys %tbl;
816} 891}
817 892
818my $METASERVER_ATIME; 893my $METASERVER_ATIME;
819 894
820sub update_metaserver { 895sub update_metaserver {
896 my ($metaserver_dialog) = @_;
897
898 $METASERVER = $metaserver_dialog
899 if defined $metaserver_dialog;
900
821 return if $METASERVER_ATIME > time; 901 return if $METASERVER_ATIME > time;
822 $METASERVER_ATIME = time + 60; 902 $METASERVER_ATIME = time + 60;
823 903
824 my $table = $METASERVER->{table}; 904 my $table = $METASERVER->{table};
825 $table->clear; 905 $table->clear;
… …
846 926
847 utf8::decode $buf if utf8::valid $buf; 927 utf8::decode $buf if utf8::valid $buf;
848 928
849 $table->clear; 929 $table->clear;
850 930
931 my @tip = (
932 "The current number of users logged in on the server.",
933 "The hostname of the server.",
934 "The time this server has been running without being restarted.",
935 "The server software version - a '+' indicates a Crossfire+ server.",
936 "Short information about this server provided by its admins.",
937 );
851 my @col = qw(Use #Users Host Uptime Version Description); 938 my @col = qw(#Users Host Uptime Version Description);
852 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 939 $table->add ($_, 0, new CFClient::UI::Label
940 can_hover => 1, can_events => 1,
941 align => 0, fg => [1, 1, 0],
942 text => $col[$_], tooltip => $tip[$_])
853 for 0 .. $#col; 943 for 0 .. $#col;
854 944
855 my @align = qw(1 0 1 1 -1); 945 my @align = qw(1 0 1 1 -1);
856 946
857 my $y = 0; 947 my $y = 0;
858 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 948 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
875 965
876 $m = [$users, $host, $uptime, $version, $desc]; 966 $m = [$users, $host, $uptime, $version, $desc];
877 967
878 $y++; 968 $y++;
879 969
880 $table->add (0, $y, new CFClient::UI::VBox children => [ 970 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
881 (new CFClient::UI::Button text => "Use", on_activate => sub { 971 (new CFClient::UI::Button
972 text => "Use",
973 tooltip => "Put this server into the <b>Host:Port</b> field",
974 on_activate => sub {
882 $HOST_ENTRY->set_text ($CFG->{host} = $host); 975 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
883 $METASERVER->toggle_visibility; 976 $METASERVER->hide;
977 0
978 },
884 }), 979 ),
885 (new CFClient::UI::Empty expand => 1), 980 (new CFClient::UI::Empty expand => 1),
886 ]); 981 ]);
887 982
888 $table->add ($_ + 1, $y, new CFClient::UI::Label 983 $table->add ($_, $y, new CFClient::UI::Label
889 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 984 ellipsise => 0,
985 align => $align[$_],
986 text => $m->[$_],
987 tooltip => $tip[$_],
988 can_hover => 1,
989 can_events => 1,
990 fontsize => 0.8)
890 for 0 .. $#$m; 991 for 0 .. $#$m;
891 } 992 }
892 } 993 }
893 }); 994 });
894} 995}
895 996
896sub metaserver_dialog { 997sub metaserver_dialog {
998 my $vbox = new CFClient::UI::VBox;
999 my $table = new CFClient::UI::Table;
1000 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
1001
897 my $dialog = new CFClient::UI::FancyFrame 1002 my $dialog = new CFClient::UI::FancyFrame
898 title => "Server List", 1003 title => "Server List",
899 name => 'metaserver_dialog', 1004 name => 'metaserver_dialog',
900 x => 'center', 1005 x => 'center',
901 y => 'center', 1006 y => 'center',
902 z => 3, 1007 z => 3,
903 child => (my $vbox = new CFClient::UI::VBox), 1008 force_h => $::HEIGHT * 0.4,
1009 child => $vbox,
1010 has_close_button => 1,
1011 table => $table,
904 on_visibility_change => sub { 1012 on_visibility_change => sub {
905 update_metaserver if $_[1]; 1013 update_metaserver ($_[0]) if $_[1];
1014 0
906 }, 1015 },
907 ; 1016 ;
908
909 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
910 1017
911 $dialog 1018 $dialog
912} 1019}
913 1020
914sub server_setup { 1021sub server_setup {
… …
921 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1028 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
922 1029
923 $vbox->add ( 1030 $vbox->add (
924 $HOST_ENTRY = new CFClient::UI::Entry 1031 $HOST_ENTRY = new CFClient::UI::Entry
925 expand => 1, 1032 expand => 1,
926 text => $CFG->{host}, 1033 text => $CFG->{profile}{default}{host},
927 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1034 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
928 on_changed => sub { 1035 on_changed => sub {
929 my ($self, $value) = @_; 1036 my ($self, $value) = @_;
930 $CFG->{host} = $value; 1037 $CFG->{profile}{default}{host} = $value;
1038 0
931 } 1039 }
932 ); 1040 );
933
934 $METASERVER = metaserver_dialog;
935 1041
936 $vbox->add (new CFClient::UI::Button 1042 $vbox->add (new CFClient::UI::Button
937 expand => 1, 1043 expand => 1,
938 text => "Server List", 1044 text => "Server List",
939 other => $METASERVER, 1045 other => $METASERVER,
940 tooltip => "Show a list of available crossfire servers", 1046 tooltip => "Show a list of available crossfire servers",
941 on_activate => sub { $METASERVER->toggle_visibility }, 1047 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1048 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
942 ); 1049 );
943 } 1050 }
944 1051
945 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1052 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
946 $table->add (1, 4, new CFClient::UI::Entry 1053 $table->add (1, 4, new CFClient::UI::Entry
947 text => $CFG->{user}, 1054 text => $CFG->{profile}{default}{user},
948 tooltip => "The name of your character on the server", 1055 tooltip => "The name of your character on the server",
949 on_changed => sub { 1056 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
950 my ($self, $value) = @_;
951 $CFG->{user} = $value;
952 }
953 ); 1057 );
954 1058
955 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1059 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
956 $table->add (1, 5, new CFClient::UI::Entry 1060 $table->add (1, 5, new CFClient::UI::Entry
957 text => $CFG->{password}, 1061 text => $CFG->{profile}{default}{password},
958 hidden => 1, 1062 hidden => 1,
959 tooltip => "The password for your character", 1063 tooltip => "The password for your character",
960 on_changed => sub { 1064 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
961 my ($self, $value) = @_;
962 $CFG->{password} = $value;
963 }
964 ); 1065 );
965 1066
966 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1067 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
967 $table->add (1, 7, new CFClient::UI::Slider 1068 $table->add (1, 7, new CFClient::UI::Slider
968 force_w => 100, 1069 force_w => 100,
969 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1070 range => [$CFG->{mapsize}, 10, 100, 0, 1],
970 tooltip => "This is the size of the portion of the map update the server sends you. " 1071 tooltip => "This is the size of the portion of the map update the server sends you. "
971 . "If you set this to a high value you will be able to see further, " 1072 . "If you set this to a high value you will be able to see further, "
972 . "but you also increase bandwidth requirements and latency. " 1073 . "but you also increase bandwidth requirements and latency. "
973 . "This option is only used once at log-in.", 1074 . "This option is only used once at log-in.",
974 on_changed => sub { 1075 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
975 my ($self, $value) = @_;
976
977 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
978 },
979 ); 1076 );
980 1077
981 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1078 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
982 $table->add (1, 8, new CFClient::UI::CheckBox 1079 $table->add (1, 8, new CFClient::UI::CheckBox
983 state => $CFG->{face_prefetch}, 1080 state => $CFG->{face_prefetch},
… …
986 . "This might increase or create lag, but increases the chances " 1083 . "This might increase or create lag, but increases the chances "
987 . "of faces being ready for display when you encounter them. " 1084 . "of faces being ready for display when you encounter them. "
988 . "It also uses up server bandwidth on every connect, " 1085 . "It also uses up server bandwidth on every connect, "
989 . "so only set it if you really need to prefetch images. " 1086 . "so only set it if you really need to prefetch images. "
990 . "This option can be set and unset any time.", 1087 . "This option can be set and unset any time.",
991 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1088 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
992 ); 1089 );
993 1090
994 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1091 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
995 $table->add (1, 9, new CFClient::UI::Entry 1092 $table->add (1, 9, new CFClient::UI::Entry
996 text => $CFG->{output_count}, 1093 text => $CFG->{output_count},
997 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1094 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
998 on_changed => sub { $CFG->{output_count} = $_[1] }, 1095 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
999 ); 1096 );
1000 1097
1001 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1098 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
1002 $table->add (1, 10, new CFClient::UI::Entry 1099 $table->add (1, 10, new CFClient::UI::Entry
1003 text => $CFG->{output_sync}, 1100 text => $CFG->{output_sync},
1004 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1101 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1005 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1102 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1006 ); 1103 );
1007 1104
1008 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1105 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1009 expand => 1, 1106 expand => 1,
1010 align => 0, 1107 align => 0,
1011 text => "Login", 1108 text => "Login",
1012 on_activate => sub { 1109 on_activate => sub {
1013 $CONN ? stop_game 1110 $CONN ? stop_game
1014 : start_game; 1111 : start_game;
1112 0
1015 }, 1113 },
1016 ); 1114 );
1017 1115
1018 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1116 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1019 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1117 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
… …
1022 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1120 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1023 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1121 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1024 on_changed => sub { 1122 on_changed => sub {
1025 my ($self, $value) = @_; 1123 my ($self, $value) = @_;
1026 $CFG->{say_command} = $value; 1124 $CFG->{say_command} = $value;
1125 0
1027 } 1126 }
1028 ); 1127 );
1128
1129 $vbox->add (new CFClient::UI::Label
1130 text => "Server Info",
1131 fontsize => 1.2,
1132 padding_y => 8,
1133 fg => [1, 1, 0, 1],
1134 );
1135
1136 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1029 1137
1030 $vbox 1138 $vbox
1031} 1139}
1032 1140
1033sub message_window { 1141sub message_window {
… …
1038 bg => [0, 0, 0, 0.75], 1146 bg => [0, 0, 0, 0.75],
1039 x => "max", 1147 x => "max",
1040 y => 0, 1148 y => 0,
1041 force_w => $::WIDTH * 0.4, 1149 force_w => $::WIDTH * 0.4,
1042 force_h => $::HEIGHT * 0.5, 1150 force_h => $::HEIGHT * 0.5,
1043 child => (my $vbox = new CFClient::UI::VBox); 1151 child => (my $vbox = new CFClient::UI::VBox),
1152 has_close_button => 1;
1044 1153
1045 $vbox->add ($LOGVIEW); 1154 $vbox->add ($LOGVIEW);
1046 1155
1047 $vbox->add (my $input = new CFClient::UI::Entry 1156 $vbox->add (my $input = new CFClient::UI::Entry
1048 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1157 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
1056 1165
1057 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1166 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1058 $input->{refocus_map} = 1; 1167 $input->{refocus_map} = 1;
1059 } 1168 }
1060 delete $input->{auto_activated}; 1169 delete $input->{auto_activated};
1170
1171 0
1061 }, 1172 },
1062 on_activate => sub { 1173 on_activate => sub {
1063 my ($input, $text) = @_; 1174 my ($input, $text) = @_;
1064 $input->set_text (''); 1175 $input->set_text ('');
1065 1176
… …
1071 } 1182 }
1072 if ($input->{refocus_map}) { 1183 if ($input->{refocus_map}) {
1073 delete $input->{refocus_map}; 1184 delete $input->{refocus_map};
1074 $MAPWIDGET->focus_in 1185 $MAPWIDGET->focus_in
1075 } 1186 }
1187
1188 0
1076 }, 1189 },
1077 on_escape => sub { 1190 on_escape => sub {
1078 $MAPWIDGET->focus_in 1191 $MAPWIDGET->grab_focus;
1192
1193 0
1079 }, 1194 },
1080 ); 1195 );
1081 1196
1082 $CONSOLE = { 1197 $CONSOLE = {
1083 window => $window, 1198 window => $window,
… …
1105 ); 1220 );
1106 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1221 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1107 $hb->add (new CFClient::UI::Button 1222 $hb->add (new CFClient::UI::Button
1108 text => "Ok", 1223 text => "Ok",
1109 expand => 1, 1224 expand => 1,
1110 on_activate => sub { $QUIT_DIALOG->hide }, 1225 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1111 ); 1226 );
1112 $hb->add (new CFClient::UI::Button 1227 $hb->add (new CFClient::UI::Button
1113 text => "Quit anyway", 1228 text => "Quit anyway",
1114 expand => 1, 1229 expand => 1,
1115 on_activate => sub { exit }, 1230 on_activate => sub { exit },
… …
1122sub autopickup_setup { 1237sub autopickup_setup {
1123 my $table = new CFClient::UI::Table; 1238 my $table = new CFClient::UI::Table;
1124 1239
1125 for ( 1240 for (
1126 ["General", 0, 0, 1241 ["General", 0, 0,
1127 ["Enable autopickup" => PICKUP_NEWMODE], 1242 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1128 ["Inhibit autopickup" => PICKUP_INHIBIT], 1243 ["Inhibit autopickup" => PICKUP_INHIBIT],
1129 ["Stop before pickup" => PICKUP_STOP], 1244 ["Stop before pickup" => PICKUP_STOP],
1130 ["Debug autopickup" => PICKUP_DEBUG], 1245 ["Debug autopickup" => PICKUP_DEBUG],
1131 ], 1246 ],
1132 ["Weapons", 0, 6, 1247 ["Weapons", 0, 6,
… …
1158 ["Potions" => PICKUP_POTION], 1273 ["Potions" => PICKUP_POTION],
1159 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1274 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1160 ["Ignore cursed" => PICKUP_NOT_CURSED], 1275 ["Ignore cursed" => PICKUP_NOT_CURSED],
1161 ["Jewelery" => PICKUP_JEWELS], 1276 ["Jewelery" => PICKUP_JEWELS],
1162 ], 1277 ],
1278 ["Weight/Value ratio", 2, 17]
1163 ) 1279 )
1164 { 1280 {
1165 my ($title, $x, $y, @bits) = @$_; 1281 my ($title, $x, $y, @bits) = @$_;
1166 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1282 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1167 1283
1168 for (@bits) { 1284 for (@bits) {
1169 ++$y; 1285 ++$y;
1170 1286
1171 my $mask = $_->[1]; 1287 my $mask = $_->[1];
1172 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1288 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1173 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1289 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1174 state => $CFG->{pickup} & $mask, 1290 state => $::CFG->{pickup} & $mask,
1175 on_changed => sub { 1291 on_changed => sub {
1176 my ($box, $value) = @_; 1292 my ($box, $value) = @_;
1293
1177 if ($value) { 1294 if ($value) {
1178 $::CFG->{pickup} |= $mask; 1295 $::CFG->{pickup} |= $mask;
1179 } else { 1296 } else {
1180 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1297 $::CFG->{pickup} &= ~$mask;
1181 } 1298 }
1299
1182 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1300 $::CONN->send_command ("pickup $::CFG->{pickup}")
1183 if defined $::CONN; 1301 if defined $::CONN;
1302
1303 0
1184 }); 1304 });
1305
1306 ${$_->[2]} = $checkbox if $_->[2];
1185 } 1307 }
1186 } 1308 }
1187 1309
1310 $table->add (2, 18, new CFClient::UI::ValSlider
1311 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1312 template => ">= 99",
1313 to_value => sub { ">= " . 5 * $_[0] },
1314 on_changed => sub {
1315 my ($slider, $value) = @_;
1316
1317 $::CFG->{pickup} &= ~0xF;
1318 $::CFG->{pickup} |= int $value
1319 if $value;
1320 1;
1321 });
1322
1323 $table->add (3, 18, new CFClient::UI::Button
1324 text => "set",
1325 on_activate => sub {
1326 $::CONN->send_command ("pickup $::CFG->{pickup}")
1327 if defined $::CONN;
1328 0
1329 });
1330
1188 $table 1331 $table
1189} 1332}
1190 1333
1191sub inventory_window { 1334sub inventory_widget {
1335 my $hb = new CFClient::UI::HBox homogeneous => 1;
1336
1337 $hb->add (my $vb1 = new CFClient::UI::VBox);
1338 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1339 $vb1->add ($INV = new CFClient::UI::Inventory);
1340
1341 $hb->add (my $vb2 = new CFClient::UI::VBox);
1342
1343 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1344
1345 $vb2->add ($INVR = new CFClient::UI::Inventory);
1346
1347 # XXX: Call after $INVR = ... because set_opencont sets the items
1348 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1349
1350 $hb
1351}
1352
1353sub toggle_player_page {
1354 my ($widget) = @_;
1355
1356 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1357 $PL_WINDOW->hide;
1358 } else {
1359 $PL_NOTEBOOK->set_current_page ($widget);
1360 $PL_WINDOW->show;
1361 }
1362}
1363
1364sub player_window {
1192 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1365 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1193 x => "center", 1366 x => "center",
1194 y => "center", 1367 y => "center",
1195 force_w => $WIDTH * 9/10, 1368 force_w => $WIDTH * 9/10,
1196 force_h => $HEIGHT * 9/10, 1369 force_h => $HEIGHT * 9/10,
1197 title => "Inventory", 1370 title => "Player",
1371 name => "playerbook",
1372 has_close_button => 1
1198 ; 1373 ;
1199 1374
1200 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1375 my $ntb =
1376 $PL_NOTEBOOK =
1377 new CFClient::UI::Notebook
1378 expand => 1,
1379 debug => 1,
1380 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1381 ;
1201 1382
1202 $hb->add (my $vb1 = new CFClient::UI::VBox); 1383 $ntb->add (
1203 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1384 "Stats" => $STATS_PAGE = stats_window,
1204 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1385 "Shows statistics, where all your Stats and Resistances are shown."
1386 );
1387 $ntb->add (
1388 "Skills" => $STATS_PAGE = skill_window,
1389 "Shows all your Skills."
1390 );
1391 $ntb->add (
1392 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,
1393 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1394 );
1395 $ntb->add (
1396 Inventory => $INVENTORY_PAGE = inventory_widget,
1397 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1398 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1399 );
1205 1400
1206 $hb->add (my $vb2 = new CFClient::UI::VBox); 1401 $ntb->set_current_page ($INVENTORY_PAGE);
1207 1402
1208 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1403 $plwin->add ($ntb);
1209 1404 $plwin
1210 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1211
1212 # XXX: Call after $INVR = ... because set_opencont sets the items
1213 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1214
1215 $invwin
1216} 1405}
1217 1406
1218sub spell_setup { 1407sub update_bindings {
1219 new CFClient::UI::SpellList 1408 $BIND_UPD_CB->() if $BIND_UPD_CB;
1220} 1409}
1221 1410
1222sub keyboard_setup { 1411sub keyboard_setup {
1223 my $binding_list = new CFClient::UI::VBox; 1412 my $binding_list = new CFClient::UI::VBox;
1224 1413
1225 my $refresh; 1414 my $refresh;
1226 $refresh = sub { 1415 $refresh = $BIND_UPD_CB = sub {
1227 $binding_list->clear (); 1416 $binding_list->clear ();
1228 1417
1229 for my $mod (keys %{$::CFG->{bindings}}) { 1418 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1230 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1419 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1231 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1420 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1232 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1421 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1233 1422
1234 my $lbl = join "; ", @$cmds; 1423 my $lbl = join "; ", @$cmds;
1235 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1424 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1236 $binding_list->add (my $hb = new CFClient::UI::HBox); 1425 $binding_list->add (my $hb = new CFClient::UI::HBox);
1237 $hb->add (new CFClient::UI::Button 1426 $hb->add (new CFClient::UI::Button
1238 text => "delete", 1427 text => "delete",
1239 tooltip => "Deletes the binding", 1428 tooltip => "Deletes the binding",
1240 on_activate => sub { 1429 on_activate => sub {
1241 $binding_list->remove ($hb); 1430 $binding_list->remove ($hb);
1242 delete $::CFG->{bindings}->{$mod}->{$sym}; 1431 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1432 0
1243 }); 1433 });
1244 1434
1245 $hb->add (new CFClient::UI::Button 1435 $hb->add (new CFClient::UI::Button
1246 text => "edit", 1436 text => "edit",
1247 tooltip => "Edits the binding", 1437 tooltip => "Edits the binding",
1248 on_activate => sub { 1438 on_activate => sub {
1249 $::BIND_EDITOR->set_binding ( 1439 $::BIND_EDITOR->set_binding (
1250 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1440 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1251 sub { 1441 sub {
1252 my ($nmod, $nsym, $ncmds) = @_; 1442 my ($nmod, $nsym, $ncmds) = @_;
1253 delete $::CFG->{bindings}->{$mod}->{$sym}; 1443 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1254 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1444 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1255 $refresh->(); 1445 $refresh->();
1256 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1446 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1257 $SETUP_DIALOG->show; 1447 $SETUP_DIALOG->show;
1258 }, 1448 },
1259 sub { 1449 sub {
1260 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1450 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1261 $SETUP_DIALOG->show; 1451 $SETUP_DIALOG->show;
1262 }); 1452 });
1263 $::BIND_EDITOR->show; 1453 $::BIND_EDITOR->show;
1264 $SETUP_DIALOG->hide; 1454 $SETUP_DIALOG->hide;
1455 0
1265 }); 1456 });
1266 1457
1267 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1458 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1268 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1459 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1269 } 1460 }
1270 } 1461 }
1271 }; 1462 };
1272 1463
1273 my $vb = new CFClient::UI::VBox; 1464 my $vb = new CFClient::UI::VBox;
1465 $vb->add (my $hb = new CFClient::UI::HBox);
1466 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1467 $hb->add (new CFClient::UI::CheckBox
1468 expand => 1,
1469 state => $CFG->{shift_fire_stop},
1470 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1471 on_changed => sub {
1472 my ($cbox, $value) = @_;
1473 $CFG->{shift_fire_stop} = $value;
1474 0
1475 });
1476
1274 $vb->add ($binding_list); 1477 $vb->add ($binding_list);
1275 $vb->add (my $hb = new CFClient::UI::HBox); 1478 $vb->add (my $hb = new CFClient::UI::HBox);
1276 1479
1277 $hb->add (new CFClient::UI::Button 1480 $hb->add (new CFClient::UI::Button
1278 text => "record new", 1481 text => "record new",
… …
1280 tooltip => "This button opens the binding editor with an empty binding.", 1483 tooltip => "This button opens the binding editor with an empty binding.",
1281 on_activate => sub { 1484 on_activate => sub {
1282 $::BIND_EDITOR->set_binding (undef, undef, [], 1485 $::BIND_EDITOR->set_binding (undef, undef, [],
1283 sub { 1486 sub {
1284 my ($mod, $sym, $cmds) = @_; 1487 my ($mod, $sym, $cmds) = @_;
1285 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1488 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1286 $refresh->(); 1489 $refresh->();
1287 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1490 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1288 $SETUP_DIALOG->show; 1491 $SETUP_DIALOG->show;
1289 }, 1492 },
1290 sub { 1493 sub {
… …
1292 $SETUP_DIALOG->show; 1495 $SETUP_DIALOG->show;
1293 }, 1496 },
1294 ); 1497 );
1295 $SETUP_DIALOG->hide; 1498 $SETUP_DIALOG->hide;
1296 $::BIND_EDITOR->show; 1499 $::BIND_EDITOR->show;
1500 0
1297 }, 1501 },
1298 ); 1502 );
1299 1503
1300 $hb->add (new CFClient::UI::Button 1504 $hb->add (new CFClient::UI::Button
1301 text => "close", 1505 text => "close",
1302 tooltip => "Closes the binding window", 1506 tooltip => "Closes the binding window",
1303 expand => 1, 1507 expand => 1,
1304 on_activate => sub { 1508 on_activate => sub {
1305 $SETUP_DIALOG->hide; 1509 $SETUP_DIALOG->hide;
1510 0
1306 } 1511 }
1307 ); 1512 );
1308 1513
1309 $refresh->(); 1514 $refresh->();
1310 1515
1311 $vb 1516 $vb
1312} 1517}
1313 1518
1314sub make_help_window { 1519sub help_window {
1315 my $win = new CFClient::UI::FancyFrame 1520 my $win = new CFClient::UI::FancyFrame
1316 x => 'center', 1521 x => 'center',
1317 y => 'center', 1522 y => 'center',
1318 z => 2, 1523 z => 2,
1319 name => 'doc_browser', 1524 name => 'doc_browser',
1320 force_w => int $WIDTH * 7/8, 1525 force_w => int $WIDTH * 7/8,
1321 force_h => int $HEIGHT * 7/8, 1526 force_h => int $HEIGHT * 7/8,
1322 title => "Documentation"; 1527 title => "Help Browser",
1528 has_close_button => 1;
1323 1529
1324 $win->add (my $vbox = new CFClient::UI::VBox); 1530 $win->add (my $vbox = new CFClient::UI::VBox);
1325 1531
1326 $vbox->add (my $buttons = new CFClient::UI::HBox); 1532 $vbox->add (my $buttons = new CFClient::UI::HBox);
1327 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1533 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1534 expand => 1, fontsize => 0.8, padding_x => 4);
1328 1535
1329 for ( 1536 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1537 $buttons->add (my $combo = new CFClient::UI::Combobox
1538 value => undef,
1539 options => [
1330 [intro => "Introduction"], 1540 [intro => "Introduction"],
1331 [manual => "Manual"], 1541 [manual => "Main Manual"],
1542 [skill_help => "Skill Reference"],
1543 [command_help => "Command Reference"],
1332 [command_help => "Commands"], 1544 [dmcommand_help => "DM Commands"],
1333 [skill_help => "Skills"], 1545 [COPYING => "License Terms"],
1334 ) { 1546 ],
1335 my ($pod, $label) = @$_; 1547 on_changed => sub {
1548 my ($self, $pod) = @_;
1336 1549
1337 $buttons->add (new CFClient::UI::Button
1338 text => $label,
1339 on_activate => sub {
1340 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1550 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1341 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1551 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1342 1552
1343 $viewer->clear; 1553 $viewer->clear;
1554
1555# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1556# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1557# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1558# ]);#d#
1344 1559
1345 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1560 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1346 for @$pom; 1561 for @$pom;
1347 1562
1348 $viewer->set_offset (0); 1563 $viewer->set_offset (0);
1564
1349 }, 1565 0
1566 },
1567 on_visibility_change => sub {
1568 my ($self, $visible) = @_;
1569 return unless $visible;
1570 return if $self->{value};
1571 $self->set_value ("intro");
1572 0
1573 },
1350 ); 1574 );
1351 }
1352
1353 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1354 1575
1355 $win 1576 $win
1356} 1577}
1357 1578
1358sub sdl_init { 1579sub sdl_init {
… …
1395 z => 100, 1616 z => 100,
1396 force_x => "max", 1617 force_x => "max",
1397 force_y => 0; 1618 force_y => 0;
1398 $DEBUG_STATUS->show; 1619 $DEBUG_STATUS->show;
1399 1620
1400 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1621 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1401 1622
1402 $STATUSBOX = new CFClient::UI::Statusbox; 1623 $STATUSBOX = new CFClient::UI::Statusbox;
1403 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1624 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1404 1625
1405 (new CFClient::UI::Frame 1626 (new CFClient::UI::Frame
… …
1425 $MAPWIDGET->connect (activate_console => sub { 1646 $MAPWIDGET->connect (activate_console => sub {
1426 my ($mapwidget, $preset) = @_; 1647 my ($mapwidget, $preset) = @_;
1427 1648
1428 if ($CONSOLE) { 1649 if ($CONSOLE) {
1429 $CONSOLE->{input}->{auto_activated} = 1; 1650 $CONSOLE->{input}->{auto_activated} = 1;
1430 $CONSOLE->{input}->focus_in; 1651 $CONSOLE->{input}->grab_focus;
1431 1652
1432 if ($preset && $CONSOLE->{input}->get_text eq '') { 1653 if ($preset && $CONSOLE->{input}->get_text eq '') {
1433 $CONSOLE->{input}->set_text ($preset); 1654 $CONSOLE->{input}->set_text ($preset);
1434 } 1655 }
1435 } 1656 }
1436 }); 1657 });
1437 $MAPWIDGET->show; 1658 $MAPWIDGET->show;
1438 $MAPWIDGET->focus_in; 1659 $MAPWIDGET->grab_focus;
1439 1660
1440 $LOGVIEW = new CFClient::UI::TextView 1661 $LOGVIEW = new CFClient::UI::TextScroller
1441 expand => 1, 1662 expand => 1,
1442 font => $FONT_FIXED, 1663 font => $FONT_FIXED,
1443 fontsize => $::CFG->{log_fontsize}, 1664 fontsize => $::CFG->{log_fontsize},
1665 indent => -4,
1444 can_hover => 1, 1666 can_hover => 1,
1445 can_events => 1, 1667 can_events => 1,
1446 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1668 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1447 ; 1669 ;
1448 1670
… …
1452 x => 'center', 1674 x => 'center',
1453 y => 'center', 1675 y => 'center',
1454 z => 2, 1676 z => 2,
1455 force_w => $::WIDTH * 0.6, 1677 force_w => $::WIDTH * 0.6,
1456 force_h => $::HEIGHT * 0.6, 1678 force_h => $::HEIGHT * 0.6,
1679 has_close_button => 1,
1457 ; 1680 ;
1681
1682 $METASERVER = metaserver_dialog;
1458 1683
1459 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1684 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1460 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1685 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1461 1686
1462 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1687 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1466 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1691 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1467 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1692 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1468 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1693 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1469 "Configure the use of audio, sound effects and background music."); 1694 "Configure the use of audio, sound effects and background music.");
1470 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1695 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1471 "Lets you define, edit and delete bindings." 1696 "Lets you define, edit and delete key bindings."
1472 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1697 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1473 . "with nothing set and the recording started. After doing the actions you " 1698 . "with nothing set and the recording started. After doing the actions you "
1474 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1699 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1475 . "After pressing the combo the binding will be saved automatically and the " 1700 . "After pressing the combo the binding will be saved automatically and the "
1476 . "binding editor closes"); 1701 . "binding editor closes");
1477 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1702 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1478 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1703 "Some debuggin' options. Do not ask.");
1479 1704
1480 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1705 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1481 1706
1482 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1707 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1483 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1708 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
… …
1485 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1710 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1486 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1711 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1487 1712
1488 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 1713 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
1489 1714
1490 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1491 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1492 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1715 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1493 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1716 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1494 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1495 1717
1496 $BUTTONBAR->add (new CFClient::UI::Button 1718 $BUTTONBAR->add (new CFClient::UI::Button
1497 text => "Save Config", 1719 text => "Save Config",
1498 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1720 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1499 on_activate => sub { 1721 on_activate => sub {
1500 $::CFG->{layout} = CFClient::UI::get_layout; 1722 $::CFG->{layout} = CFClient::UI::get_layout;
1501 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1723 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1502 status "Configuration Saved"; 1724 status "Configuration Saved";
1725 0
1503 }, 1726 },
1504 ); 1727 );
1505 1728
1506 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1729 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1507 tooltip => "View Documentation"); 1730 tooltip => "View Documentation");
1508 1731
1509 $BUTTONBAR->add (new CFClient::UI::Button 1732 $BUTTONBAR->add (new CFClient::UI::Button
1510 text => "Quit", 1733 text => "Quit",
1511 tooltip => "Terminates the program", 1734 tooltip => "Terminates the program",
… …
1513 if ($CONN) { 1736 if ($CONN) {
1514 open_quit_dialog; 1737 open_quit_dialog;
1515 } else { 1738 } else {
1516 exit; 1739 exit;
1517 } 1740 }
1741 0
1518 }, 1742 },
1519 ); 1743 );
1520 1744
1521 $BUTTONBAR->show; 1745 $BUTTONBAR->show;
1522 $SETUP_DIALOG->show; 1746 $SETUP_DIALOG->show;
… …
1524 1748
1525 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1749 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1526} 1750}
1527 1751
1528sub video_shutdown { 1752sub video_shutdown {
1753 CFClient::OpenGL::shutdown;
1754
1529 undef $SDL_ACTIVE; 1755 undef $SDL_ACTIVE;
1530} 1756}
1531 1757
1532my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1758my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1533my $bgmusic;#TODO#hack#d# 1759my $bgmusic;#TODO#hack#d#
… …
1749 1975
1750 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1976 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1751 CFClient::UI::set_layout ($::CFG->{layout}); 1977 CFClient::UI::set_layout ($::CFG->{layout});
1752 1978
1753 my %DEF_CFG = ( 1979 my %DEF_CFG = (
1754 sdl_mode => 0, 1980 sdl_mode => 0,
1755 width => 640, 1981 width => 640,
1756 height => 480, 1982 height => 480,
1757 fullscreen => 0, 1983 fullscreen => 0,
1758 fast => 0, 1984 fast => 0,
1759 map_scale => 1, 1985 map_scale => 1,
1760 fow_enable => 1, 1986 fow_enable => 1,
1761 fow_intensity => 0.45, 1987 fow_intensity => 0.45,
1762 fow_smooth => 0, 1988 fow_smooth => 0,
1763 gui_fontsize => 1, 1989 gui_fontsize => 1,
1764 log_fontsize => 0.7, 1990 log_fontsize => 0.7,
1765 gauge_fontsize=> 1, 1991 gauge_fontsize => 1,
1766 gauge_size => 0.35, 1992 gauge_size => 0.35,
1767 stat_fontsize => 0.7, 1993 stat_fontsize => 0.7,
1768 mapsize => 100, 1994 mapsize => 100,
1769 host => "crossfire.schmorp.de",
1770 say_command => 'say', 1995 say_command => 'say',
1771 audio_enable => 1, 1996 audio_enable => 1,
1772 bgm_enable => 1, 1997 bgm_enable => 1,
1773 bgm_volume => 0.25, 1998 bgm_volume => 0.25,
1774 face_prefetch => 0, 1999 face_prefetch => 0,
1775 output_sync => 1, 2000 output_sync => 1,
1776 output_count => 1, 2001 output_count => 1,
2002 pickup => 0,
2003 default => "profile", # default profile
2004 );
1777 ); 2005
1778
1779 while (my ($k, $v) = each %DEF_CFG) { 2006 while (my ($k, $v) = each %DEF_CFG) {
1780 $CFG->{$k} = $v unless exists $CFG->{$k}; 2007 $CFG->{$k} = $v unless exists $CFG->{$k};
1781 } 2008 }
2009
2010 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1782 2011
1783 sdl_init; 2012 sdl_init;
1784 2013
1785 @SDL_MODES = reverse 2014 @SDL_MODES = reverse
1786 grep $_->[0] >= 640 && $_->[1] >= 480, 2015 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1828 video_init; 2057 video_init;
1829 audio_init; 2058 audio_init;
1830} 2059}
1831 2060
1832Event::loop; 2061Event::loop;
2062#CFClient::SDL_Quit;
2063#CFClient::_exit 0;
1833 2064
1834END { CFClient::SDL_Quit } 2065END { CFClient::SDL_Quit }
1835 2066
1836=head1 NAME 2067=head1 NAME
1837 2068

Diff Legend

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