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

Diff Legend

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