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.85 by elmex, Sun Jul 2 19:32:56 2006 UTC vs.
Revision 1.98 by root, Sat Jul 22 13:20:33 2006 UTC

… …
40use CFClient::UI; 40use CFClient::UI;
41use CFClient::BindingEditor; 41use CFClient::BindingEditor;
42use CFClient::MapWidget; 42use CFClient::MapWidget;
43 43
44$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
45$SIG{PIPE} = 'IGNORE';
45 46
46$Event::DIED = sub { 47$Event::DIED = sub {
47 # TODO: display dialog box or so 48 # TODO: display dialog box or so
48 Carp::confess $_[1];#d#TODO: remove when stable 49 Carp::confess $_[1];#d#TODO: remove when stable
49 CFClient::error $_[1]; 50 CFClient::error $_[1];
… …
85our $CONSOLE; 86our $CONSOLE;
86our $METASERVER; 87our $METASERVER;
87our $LOGIN_BUTTON; 88our $LOGIN_BUTTON;
88our $QUIT_DIALOG; 89our $QUIT_DIALOG;
89our $HOST_ENTRY; 90our $HOST_ENTRY;
91our $FULLSCREEN_ENABLE;
92our $PICKUP_ENABLE;
90our $SERVER_INFO; 93our $SERVER_INFO;
91 94
92our $SETUP_DIALOG; 95our $SETUP_DIALOG;
93our $SETUP_NOTEBOOK; 96our $SETUP_NOTEBOOK;
94our $SETUP_SERVER; 97our $SETUP_SERVER;
95our $SETUP_KEYBOARD; 98our $SETUP_KEYBOARD;
96our $SETUP_SPELLS;
97 99
100our $PL_NOTEBOOK;
98our $STATS_WINDOW; 101our $PL_WINDOW;
102
103our $INVENTORY_PAGE;
104our $STATS_PAGE;
105our $SKILL_PAGE;
106our $SPELL_PAGE;
107
108our $HELP_WINDOW;
99our $MESSAGE_WINDOW; 109our $MESSAGE_WINDOW;
100our $FLOORBOX; 110our $FLOORBOX;
101our $GAUGES; 111our $GAUGES;
102our $STATWIDS; 112our $STATWIDS;
103 113
… …
113our $DEBUG_STATUS; 123our $DEBUG_STATUS;
114 124
115our $INV; 125our $INV;
116our $INVR; 126our $INVR;
117our $INV_RIGHT_HB; 127our $INV_RIGHT_HB;
118
119our $PL_NOTEBOOK;
120our $PL_WINDOW;
121 128
122our $BIND_EDITOR; 129our $BIND_EDITOR;
123our $BIND_UPD_CB; 130our $BIND_UPD_CB;
124 131
125our $PICKUP_CFG; 132our $PICKUP_CFG;
… …
182 $MESSAGE_WINDOW->show; 189 $MESSAGE_WINDOW->show;
183 190
184 unshift @dialog, new CFClient::UI::Label 191 unshift @dialog, new CFClient::UI::Label
185 max_w => $::WIDTH * 0.4, 192 max_w => $::WIDTH * 0.4,
186 ellipsise => 0, 193 ellipsise => 0,
187 markup => "\nOr use your keyboard:\n"; 194 markup => "\nOr use your keyboard and the text entry below:\n";
188 195
189 unshift @dialog, my $table = new CFClient::UI::Table; 196 unshift @dialog, my $table = new CFClient::UI::Table;
190 197
191 $table->add (0, 0, new CFClient::UI::Button 198 $table->add (0, 0, new CFClient::UI::Button
192 text => "Next Race", 199 text => "Next Race",
… …
209 max_w => $::WIDTH * 0.4, 216 max_w => $::WIDTH * 0.4,
210 ellipsise => 0, 217 ellipsise => 0,
211 markup => 218 markup =>
212 "<big><b>Character Creation: Race</b></big>\n\n" 219 "<big><b>Character Creation: Race</b></big>\n\n"
213 . "Look at the <b>Messages</b> window to see a description of this race " 220 . "Look at the <b>Messages</b> window to see a description of this race "
214 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
215 . "and the center of the screen to see how this race looks like " 221 . "and the center of the screen to see how this race looks like "
216 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n" 222 . "(<small>below this dialog window: you may need to move the dialog away and "
223 . "click into the display area to make it visible</small>).\n\n"
217 . "You can look at another race, or accept this race (you will come back to this race eventually, " 224 . "You can look at another race, or accept this race (you will cycle back to "
218 . "so you can take your time making this important choice." 225 . "this race eventually, so you can take your time making this important choice."
219 ; 226 ;
220 227
221 } elsif ($prompt =~ /roll new stats/) { 228 } elsif ($prompt =~ /roll new stats/) {
222 if (my $stat = delete $conn->{stat_change_with}) { 229 if (my $stat = delete $conn->{stat_change_with}) {
223 $conn->send ("reply $stat"); 230 $conn->send ("reply $stat");
224 destroy_query_dialog $conn; 231 destroy_query_dialog $conn;
225 return; 232 return;
226 } 233 }
227 234
228 $STATS_WINDOW->show; 235 $STATS_PAGE->show;
229 $MESSAGE_WINDOW->hide; 236 $MESSAGE_WINDOW->hide;
230 237
231 unshift @dialog, new CFClient::UI::Label 238 unshift @dialog, new CFClient::UI::Label
232 max_w => $::WIDTH * 0.4, 239 max_w => $::WIDTH * 0.4,
233 ellipsise => 0, 240 ellipsise => 0,
234 markup => "\nOr use your keyboard:\n"; 241 markup => "\nOr use your keyboard and the text entry below:\n";
235 242
236 unshift @dialog, my $table = new CFClient::UI::Table; 243 unshift @dialog, my $table = new CFClient::UI::Table;
237 244
238 # left: re-roll 245 # left: re-roll
239 $table->add (0, 0, new CFClient::UI::Button 246 $table->add (0, 0, new CFClient::UI::Button
… …
245 }, 252 },
246 ); 253 );
247 254
248 # center: swap stats 255 # center: swap stats
249 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 256 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
257 expand => 1,
250 value => $_, 258 value => $_,
251 options => [ 259 options => [
252 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 260 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
253 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 261 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
254 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 262 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
… …
273 # right: accept 281 # right: accept
274 $table->add (4, 0, new CFClient::UI::Button 282 $table->add (4, 0, new CFClient::UI::Button
275 text => "Accept", 283 text => "Accept",
276 on_activate => sub { 284 on_activate => sub {
277 $conn->send ("reply n"); 285 $conn->send ("reply n");
278 $STATS_WINDOW->hide; 286 $STATS_PAGE->hide;
279 destroy_query_dialog $conn; 287 destroy_query_dialog $conn;
280 0 288 0
281 }, 289 },
282 ); 290 );
291
292 unshift @dialog, my $hbox = new CFClient::UI::HBox;
293 for (
294 [Str => CS_STAT_STR],
295 [Dex => CS_STAT_DEX],
296 [Con => CS_STAT_CON],
297 [Int => CS_STAT_INT],
298 [Wis => CS_STAT_WIS],
299 [Pow => CS_STAT_POW],
300 [Cha => CS_STAT_CHA],
301 ) {
302 my ($name, $id) = @$_;
303 $hbox->add (new CFClient::UI::Label
304 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
305 align => 0,
306 expand => 1,
307 can_events => 1,
308 can_hover => 1,
309 tooltip => $CFClient::STAT_TOOLTIP{$name},
310 );
311 }
283 312
284 unshift @dialog, new CFClient::UI::Label 313 unshift @dialog, new CFClient::UI::Label
285 max_w => $::WIDTH * 0.4, 314 max_w => $::WIDTH * 0.4,
286 ellipsise => 0, 315 ellipsise => 0,
287 markup => 316 markup =>
288 "<big><b>Character Creation: Stats</b></big>\n\n" 317 "<big><b>Character Creation: Stats</b></big>\n\n"
289 . "Look at the <b>Stats</b> window to see your basic stats " 318 . "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
290 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n" 319 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
320 . "They will be modified later by both the race and the class you choose.\n\n"
291 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. " 321 . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
292 . "Race selection will influence those values later on."
293 ; 322 ;
294 } 323 }
295 324
296 push @dialog, my $entry = new CFClient::UI::Entry 325 push @dialog, my $entry = new CFClient::UI::Entry
297 on_changed => sub { 326 on_changed => sub {
… …
376sub stop_game { 405sub stop_game {
377 $LOGIN_BUTTON->set_text ("Login"); 406 $LOGIN_BUTTON->set_text ("Login");
378 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 407 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
379 $SETUP_DIALOG->show; 408 $SETUP_DIALOG->show;
380 $PL_WINDOW->hide; 409 $PL_WINDOW->hide;
381 $SETUP_SPELLS->clear_spells; 410 $SPELL_PAGE->clear_spells;
382 411
383 return unless $CONN; 412 return unless $CONN;
384 413
385 status "connection closed"; 414 status "connection closed";
386 415
… …
411 $mode_slider->emit (changed => $mode_slider->{range}[0]); 440 $mode_slider->emit (changed => $mode_slider->{range}[0]);
412 441
413 my $row = 1; 442 my $row = 1;
414 443
415 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 444 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
416 $table->add (1, $row++, new CFClient::UI::CheckBox 445 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
417 state => $CFG->{fullscreen}, 446 state => $CFG->{fullscreen},
418 tooltip => "Bring the client into fullscreen mode.", 447 tooltip => "Bring the client into fullscreen mode.",
419 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 448 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
420 ); 449 );
421 450
… …
471 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 500 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
472 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 501 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
473 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 502 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
474 ); 503 );
475 504
476 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
477
478 $table->add (1, $row++, new CFClient::UI::Slider
479 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
480 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
481 on_changed => sub {
482 $CFG->{stat_fontsize} = $_[1];
483 &set_stats_window_fontsize;
484 0
485 }
486 );
487
488 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 505 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
489 $table->add (1, $row++, new CFClient::UI::Slider 506 $table->add (1, $row++, new CFClient::UI::Slider
490 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 507 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
491 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 508 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
492 on_changed => sub { 509 on_changed => sub {
… …
561 ); 578 );
562 579
563 $vbox 580 $vbox
564} 581}
565 582
566sub set_stats_window_fontsize {
567 for (values %{$STATWIDS}) {
568 $_->set_fontsize ($::CFG->{stat_fontsize});
569 }
570}
571
572sub set_gauge_window_fontsize { 583sub set_gauge_window_fontsize {
573 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 584 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
574 $_->set_fontsize ($::CFG->{gauge_fontsize}); 585 $_->set_fontsize ($::CFG->{gauge_fontsize});
575 } 586 }
576} 587}
… …
655 666
656 $table 667 $table
657} 668}
658 669
659sub stats_window { 670sub stats_window {
660 my $tgw = 671 my $r = new CFClient::UI::ScrolledWindow (
661 new CFClient::UI::Window 672 expand => 1,
673 scroll_y => 1
674 );
662 child => my $vb = new CFClient::UI::VBox; 675 $r->add (my $vb = new CFClient::UI::VBox);
663 676
664 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 677 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
665 can_hover => 1, can_events => 1, 678 can_hover => 1, can_events => 1,
666 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 679 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
667 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 680 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
… …
681 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 694 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
682 695
683 my $color2 = [1, 1, 0]; 696 my $color2 = [1, 1, 0];
684 697
685 for ( 698 for (
686 [0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"], 699 [0, 0, st_str => "Str", 30],
687 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"], 700 [0, 1, st_dex => "Dex", 30],
688 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"], 701 [0, 2, st_con => "Con", 30],
689 [0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"], 702 [0, 3, st_int => "Int", 30],
690 [0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"], 703 [0, 4, st_wis => "Wis", 30],
691 [0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"], 704 [0, 5, st_pow => "Pow", 30],
692 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 705 [0, 6, st_cha => "Cha", 30],
693 706
694 [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."], 707 [2, 0, st_wc => "Wc", -120],
695 [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."], 708 [2, 1, st_ac => "Ac", -120],
696 [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."], 709 [2, 2, st_dam => "Dam", 120],
697 [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."], 710 [2, 3, st_arm => "Arm", 120],
698 [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."], 711 [2, 4, st_spd => "Spd", 10.54],
699 [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."], 712 [2, 5, st_wspd => "WSp", 10.54],
700 ) { 713 ) {
701 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 714 my ($col, $row, $id, $label, $template) = @$_;
702 715
703 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 716 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
704 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 717 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
718 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});
705 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 719 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
706 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 720 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
721 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});
707 } 722 }
708 723
709 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 724 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
710 725
711 my $row = 0; 726 my $row = 0;
712 my $col = 0; 727 my $col = 0;
713 728
714 my %resist_names = ( 729 my %resist_names = (
730 slow => ["Slow",
715 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.)", 731 "<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.)"],
732 holyw => ["Holy Word",
716 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.)", 733 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
734 conf => ["Confusion",
717 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 735 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
736 fire => ["Fire",
718 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 737 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
738 depl => ["Depletion",
719 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 739 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
740 magic => ["Magic",
720 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 741 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
742 drain => ["Draining",
721 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 743 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
744 acid => ["Acid",
722 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 745 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
746 pois => ["Poison",
723 pois => "<b>Poison</b> (resistance to getting poisoned)", 747 "<b>Poison</b> (resistance to getting poisoned)"],
748 para => ["Paralysation",
724 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 749 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
750 deat => ["Death",
725 deat => "<b>Death</b> (resistance against death spells)", 751 "<b>Death</b> (resistance against death spells)"],
752 phys => ["Physical",
726 phys => "<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.)", 753 "<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.)"],
754 blind => ["Blind",
727 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 755 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
756 fear => ["Fear",
728 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)", 757 "<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)"],
758 tund => ["Turn undead",
729 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 759 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
760 elec => ["Electricity",
730 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 761 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
762 cold => ["Cold",
731 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 763 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
764 ghit => ["Ghost hit",
732 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 765 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
733 ); 766 );
734 for (qw/slow holyw conf fire depl magic 767 for (qw/slow holyw conf fire depl magic
735 drain acid pois para deat phys 768 drain acid pois para deat phys
736 blind fear tund elec cold ghit/) 769 blind fear tund elec cold ghit/)
737 { 770 {
… …
742 template => "-100%", 775 template => "-100%",
743 align => +1, 776 align => +1,
744 valign => 0, 777 valign => 0,
745 can_events => 1, 778 can_events => 1,
746 can_hover => 1, 779 can_hover => 1,
747 tooltip => $resist_names{$_}, 780 tooltip => $resist_names{$_}->[1],
748 ); 781 );
749 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 782 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
750 font => $FONT_FIXED, 783 font => $FONT_FIXED,
751 can_hover => 1, 784 can_hover => 1,
752 can_events => 1, 785 can_events => 1,
753 path => "ui/resist/resist_$_.png", 786 path => "ui/resist/resist_$_.png",
754 tooltip => $resist_names{$_}, 787 tooltip => $resist_names{$_}->[1],
788 );
789 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
790 text => $resist_names{$_}->[0],
791 font => $FONT_FIXED,
792 can_hover => 1,
793 can_events => 1,
794 tooltip => $resist_names{$_}->[1],
755 ); 795 );
756 796
757 $row++; 797 $row++;
758 if ($row % 6 == 0) { 798 if ($row % 6 == 0) {
759 $col += 2; 799 $col += 3;
760 $row = 0; 800 $row = 0;
761 } 801 }
762 } 802 }
763 803
764 &set_stats_window_fontsize;
765 update_stats_window ({}); 804 #update_stats_window ({});
766 805
806 $r
807}
808
809sub skill_window {
810 my $sw = new CFClient::UI::ScrolledWindow (expand => 1);
811 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
767 $tgw 812 $sw
768} 813}
769 814
770sub formsep($) { 815sub formsep($) {
771 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 816 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
772}
773
774sub update_stats_window {
775 my ($stats) = @_;
776
777 # I love text protocols...
778
779 my $hp = $stats->{+CS_STAT_HP} * 1;
780 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
781 my $sp = $stats->{+CS_STAT_SP} * 1;
782 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
783 my $fo = $stats->{+CS_STAT_FOOD} * 1;
784 my $fo_m = 999;
785 my $gr = $stats->{+CS_STAT_GRACE} * 1;
786 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
787
788 $GAUGES->{hp} ->set_value ($hp, $hp_m);
789 $GAUGES->{mana} ->set_value ($sp, $sp_m);
790 $GAUGES->{food} ->set_value ($fo, $fo_m);
791 $GAUGES->{grace} ->set_value ($gr, $gr_m);
792 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
793 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
794 my $rng = $stats->{+CS_STAT_RANGE};
795 $rng =~ s/^Range: //; # thank you so much dear server
796 $GAUGES->{range} ->set_text ("Rng: " . $rng);
797 my $title = $stats->{+CS_STAT_TITLE};
798 $title =~ s/^Player: //;
799 $STATWIDS->{title} ->set_text ("Title: " . $title);
800
801 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
802 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
803 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
804 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
805 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
806 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
807 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
808 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
809 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
810 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
811 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
812 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
813 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
814
815 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
816
817 my %tbl = (
818 phys => CS_STAT_RES_PHYS,
819 magic => CS_STAT_RES_MAG,
820 fire => CS_STAT_RES_FIRE,
821 elec => CS_STAT_RES_ELEC,
822 cold => CS_STAT_RES_COLD,
823 conf => CS_STAT_RES_CONF,
824 acid => CS_STAT_RES_ACID,
825 drain => CS_STAT_RES_DRAIN,
826 ghit => CS_STAT_RES_GHOSTHIT,
827 pois => CS_STAT_RES_POISON,
828 slow => CS_STAT_RES_SLOW,
829 para => CS_STAT_RES_PARA,
830 tund => CS_STAT_TURN_UNDEAD,
831 fear => CS_STAT_RES_FEAR,
832 depl => CS_STAT_RES_DEPLETE,
833 deat => CS_STAT_RES_DEATH,
834 holyw => CS_STAT_RES_HOLYWORD,
835 blind => CS_STAT_RES_BLIND,
836 );
837
838 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
839 for keys %tbl;
840} 817}
841 818
842my $METASERVER_ATIME; 819my $METASERVER_ATIME;
843 820
844sub update_metaserver { 821sub update_metaserver {
… …
1090sub message_window { 1067sub message_window {
1091 my $window = new CFClient::UI::FancyFrame 1068 my $window = new CFClient::UI::FancyFrame
1092 name => "message_window", 1069 name => "message_window",
1093 title => "Messages", 1070 title => "Messages",
1094 border_bg => [1, 1, 1, 1], 1071 border_bg => [1, 1, 1, 1],
1095 bg => [0, 0, 0, 0.75],
1096 x => "max", 1072 x => "max",
1097 y => 0, 1073 y => 0,
1098 force_w => $::WIDTH * 0.4, 1074 force_w => $::WIDTH * 0.4,
1099 force_h => $::HEIGHT * 0.5, 1075 force_h => $::HEIGHT * 0.5,
1100 child => (my $vbox = new CFClient::UI::VBox), 1076 child => (my $vbox = new CFClient::UI::VBox),
… …
1186sub autopickup_setup { 1162sub autopickup_setup {
1187 my $table = new CFClient::UI::Table; 1163 my $table = new CFClient::UI::Table;
1188 1164
1189 for ( 1165 for (
1190 ["General", 0, 0, 1166 ["General", 0, 0,
1191 ["Enable autopickup" => PICKUP_NEWMODE], 1167 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1192 ["Inhibit autopickup" => PICKUP_INHIBIT], 1168 ["Inhibit autopickup" => PICKUP_INHIBIT],
1193 ["Stop before pickup" => PICKUP_STOP], 1169 ["Stop before pickup" => PICKUP_STOP],
1194 ["Debug autopickup" => PICKUP_DEBUG], 1170 ["Debug autopickup" => PICKUP_DEBUG],
1195 ], 1171 ],
1196 ["Weapons", 0, 6, 1172 ["Weapons", 0, 6,
… …
1233 for (@bits) { 1209 for (@bits) {
1234 ++$y; 1210 ++$y;
1235 1211
1236 my $mask = $_->[1]; 1212 my $mask = $_->[1];
1237 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1213 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1238 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1214 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1239 state => $::CFG->{pickup} & $mask, 1215 state => $::CFG->{pickup} & $mask,
1240 on_changed => sub { 1216 on_changed => sub {
1241 my ($box, $value) = @_; 1217 my ($box, $value) = @_;
1242 1218
1243 if ($value) { 1219 if ($value) {
… …
1249 $::CONN->send_command ("pickup $::CFG->{pickup}") 1225 $::CONN->send_command ("pickup $::CFG->{pickup}")
1250 if defined $::CONN; 1226 if defined $::CONN;
1251 1227
1252 0 1228 0
1253 }); 1229 });
1230
1231 ${$_->[2]} = $checkbox if $_->[2];
1254 } 1232 }
1255 } 1233 }
1256 1234
1257 $table->add (2, 18, new CFClient::UI::ValSlider 1235 $table->add (2, 18, new CFClient::UI::ValSlider
1258 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1236 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
… …
1281sub inventory_widget { 1259sub inventory_widget {
1282 my $hb = new CFClient::UI::HBox homogeneous => 1; 1260 my $hb = new CFClient::UI::HBox homogeneous => 1;
1283 1261
1284 $hb->add (my $vb1 = new CFClient::UI::VBox); 1262 $hb->add (my $vb1 = new CFClient::UI::VBox);
1285 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1263 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1264 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1286 $vb1->add ($INV = new CFClient::UI::Inventory); 1265 $sw1->add ($INV = new CFClient::UI::Inventory);
1287 1266
1288 $hb->add (my $vb2 = new CFClient::UI::VBox); 1267 $hb->add (my $vb2 = new CFClient::UI::VBox);
1289 1268
1290 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1269 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1291 1270
1271 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1292 $vb2->add ($INVR = new CFClient::UI::Inventory); 1272 $sw2->add ($INVR = new CFClient::UI::Inventory);
1293 1273
1294 # XXX: Call after $INVR = ... because set_opencont sets the items 1274 # XXX: Call after $INVR = ... because set_opencont sets the items
1295 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1275 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1296 1276
1297 $hb 1277 $hb
1278}
1279
1280sub toggle_player_page {
1281 my ($widget) = @_;
1282
1283 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1284 $PL_WINDOW->hide;
1285 } else {
1286 $PL_NOTEBOOK->set_current_page ($widget);
1287 $PL_WINDOW->show;
1288 }
1298} 1289}
1299 1290
1300sub player_window { 1291sub player_window {
1301 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame 1292 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1302 x => "center", 1293 x => "center",
1303 y => "center", 1294 y => "center",
1304 force_w => $WIDTH * 9/10, 1295 force_w => $WIDTH * 9/10,
1305 force_h => $HEIGHT * 9/10, 1296 force_h => $HEIGHT * 9/10,
1306 title => "Player", 1297 title => "Player",
1298 name => "playerbook",
1307 has_close_button => 1 1299 has_close_button => 1
1308 ; 1300 ;
1309 1301
1310 my $ntb = 1302 my $ntb =
1311 $PL_NOTEBOOK = 1303 $PL_NOTEBOOK =
1312 new CFClient::UI::Notebook 1304 new CFClient::UI::Notebook expand => 1, debug => 1;
1313 expand => 1, 1305
1314 debug => 1,
1315 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1316 ;
1317 $ntb->add ( 1306 $ntb->add (
1318 Inventory => inventory_widget, 1307 "Statistics (F2)" => $STATS_PAGE = stats_window,
1308 "Shows statistics, where all your Stats and Resistances are shown."
1309 );
1310 $ntb->add (
1311 "Skills (F3)" => $SKILL_PAGE = skill_window,
1312 "Shows all your Skills."
1313 );
1314
1315 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1316 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
1317 $ntb->add (
1318 "Spellbook (F4)" => $spellsw,
1319 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1320 );
1321 $ntb->add (
1322 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1319 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1323 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1320 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1324 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1321 ); 1325 );
1322 1326
1323 $ntb->add ( 1327 $ntb->set_current_page ($INVENTORY_PAGE);
1324 Stats => $STATS_WINDOW = stats_window,
1325 "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."
1326 );
1327 $ntb->add (
1328 Spells => $SETUP_SPELLS = new CFClient::UI::SpellList,
1329 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1330 );
1331 1328
1332 $plwin->add ($ntb); 1329 $plwin->add ($ntb);
1333 $plwin 1330 $plwin
1334} 1331}
1335 1332
… …
1443 $refresh->(); 1440 $refresh->();
1444 1441
1445 $vb 1442 $vb
1446} 1443}
1447 1444
1445# just weirdness, pls. ignore
1446sub load_html_page {
1447 my ($viewer, $base) = @_;
1448
1449 $viewer->clear;
1450
1451 require LWP::Simple;
1452 require HTML::Parser;
1453 require URI;
1454
1455 my $page = LWP::Simple::get ($base)
1456 or return;
1457
1458 my @s = { };
1459 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1460
1461 my $parser = HTML::Parser->new (
1462 text_h => [sub {
1463 my ($text) = @_;
1464 $text =~ s/\s+/ /g;
1465 $s[-1]{text} .= CFClient::UI::Label::escape $text;
1466 }, "dtext"],
1467 start_h => [sub {
1468 my ($tag, $attr) = @_;
1469 if ($passthrough{$tag}) {
1470 $s[-1]{text} .= "<$tag>";
1471 } elsif ($tag eq "h1") {
1472 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1473 } elsif ($tag eq "h2") {
1474 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1475 } elsif ($tag eq "h3") {
1476 push @s, { text => "<span size='large'>" };
1477 } elsif ($tag eq "a") {
1478 push @s, { text => "", url => $attr->{href} };
1479 } elsif ($tag eq "p") {
1480 push @s, { };
1481 } elsif ($tag eq "img") {
1482 eval {
1483 push @{$s[-1]{obj}}, new CFClient::UI::Image
1484 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1485 $s[-1]{text} .= "\x{fffc}";
1486 };
1487 }
1488 }, "tagname, attr"],
1489 end_h => [sub {
1490 my ($tag) = @_;
1491 if ($passthrough{$tag}) {
1492 $s[-1]{text} .= "</$tag>";
1493 } elsif ($tag =~ /^h\d$/) {
1494 $s[-1]{text} .= "</span>";
1495 push @s, { };
1496 } elsif ($tag eq "a") {
1497 my $S = pop @s;
1498 $s[-1]{text} .= "\x{fffc}";
1499 push @{$s[-1]{obj}}, new CFClient::UI::Label
1500 fg => [0.8, 0.8, 1],
1501 markup => "<u>$S->{text}</u>",
1502 fontsize => 0.8,
1503 can_events => 1,
1504 can_focus => 1,
1505 on_button_up => sub {
1506 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1507 },
1508 ;
1509 }
1510 }, "tagname"],
1511 );
1512
1513 $parser->parse ($page);
1514 $parser->eof;
1515
1516 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1517 for @s;
1518
1519 $viewer->set_offset (0);
1520}
1521
1448sub help_window { 1522sub help_window {
1449 my $win = new CFClient::UI::FancyFrame 1523 my $win = new CFClient::UI::FancyFrame
1450 x => 'center', 1524 x => 'center',
1451 y => 'center', 1525 y => 'center',
1452 z => 2, 1526 z => 2,
1453 name => 'doc_browser', 1527 name => 'doc_browser',
1454 force_w => int $WIDTH * 7/8, 1528 force_w => int $WIDTH * 7/8,
1455 force_h => int $HEIGHT * 7/8, 1529 force_h => int $HEIGHT * 7/8,
1456 title => "Documentation"; 1530 title => "Help Browser",
1531 has_close_button => 1;
1457 1532
1458 $win->add (my $vbox = new CFClient::UI::VBox); 1533 $win->add (my $vbox = new CFClient::UI::VBox);
1459 1534
1460 $vbox->add (my $buttons = new CFClient::UI::HBox); 1535 $vbox->add (my $buttons = new CFClient::UI::HBox);
1461 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1536 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1469 [manual => "Main Manual"], 1544 [manual => "Main Manual"],
1470 [skill_help => "Skill Reference"], 1545 [skill_help => "Skill Reference"],
1471 [command_help => "Command Reference"], 1546 [command_help => "Command Reference"],
1472 [dmcommand_help => "DM Commands"], 1547 [dmcommand_help => "DM Commands"],
1473 [COPYING => "License Terms"], 1548 [COPYING => "License Terms"],
1549 [test => "test (do not select)"], #d#TODO
1474 ], 1550 ],
1475 on_changed => sub { 1551 on_changed => sub {
1476 my ($self, $pod) = @_; 1552 my ($self, $pod) = @_;
1553
1554 if ($pod eq "test") {#d#TODO
1555 eval {
1556 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1557 };
1558 warn "$@" if $@;
1559 return;
1560 }
1477 1561
1478 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1562 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1479 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1563 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1480 1564
1481 $viewer->clear; 1565 $viewer->clear;
… …
1638 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1722 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1639 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1723 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1640 1724
1641 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 1725 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
1642 1726
1643 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Player", other => player_window, 1727 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1644 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 1728 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1645 1729
1646 $BUTTONBAR->add (new CFClient::UI::Button 1730 $BUTTONBAR->add (new CFClient::UI::Button
1647 text => "Save Config", 1731 text => "Save Config",
1648 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1732 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
… …
1652 status "Configuration Saved"; 1736 status "Configuration Saved";
1653 0 1737 0
1654 }, 1738 },
1655 ); 1739 );
1656 1740
1657 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1741 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1658 tooltip => "View Documentation"); 1742 tooltip => "View Documentation");
1659 1743
1660 $BUTTONBAR->add (new CFClient::UI::Button 1744 $BUTTONBAR->add (new CFClient::UI::Button
1661 text => "Quit", 1745 text => "Quit",
1662 tooltip => "Terminates the program", 1746 tooltip => "Terminates the program",
… …
1868# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1952# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1869 }, 1953 },
1870 CFClient::SDL_KEYDOWN => sub { 1954 CFClient::SDL_KEYDOWN => sub {
1871 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1955 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1872 # alt-enter 1956 # alt-enter
1957 $FULLSCREEN_ENABLE->toggle;
1873 video_shutdown; 1958 video_shutdown;
1874 $CFG->{fullscreen} = !$CFG->{fullscreen};
1875 video_init; 1959 video_init;
1876 } else { 1960 } else {
1877 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1961 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1878 } 1962 }
1879 }, 1963 },
… …
1895$SIG{INT} = $SIG{TERM} = sub { exit }; 1979$SIG{INT} = $SIG{TERM} = sub { exit };
1896 1980
1897{ 1981{
1898 local $SIG{__DIE__} = sub { 1982 local $SIG{__DIE__} = sub {
1899 return unless defined $^S && !$^S; 1983 return unless defined $^S && !$^S;
1900 Carp::confess $_[1];#d#TODO: remove when stable 1984 Carp::confess $_[0];#d#TODO: remove when stable
1901 CFClient::fatal $_[0]; 1985 CFClient::fatal $_[0];
1902 }; 1986 };
1903 1987
1904 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1988 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1905 CFClient::UI::set_layout ($::CFG->{layout}); 1989 CFClient::UI::set_layout ($::CFG->{layout});

Diff Legend

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