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.77 by elmex, Wed Jun 21 12:59:23 2006 UTC vs.
Revision 1.95 by root, Sun Jul 16 23:30: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;
89our $SERVER_INFO; 93our $SERVER_INFO;
90 94
91our $SETUP_DIALOG; 95our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK; 96our $SETUP_NOTEBOOK;
93our $SETUP_SERVER; 97our $SETUP_SERVER;
94our $SETUP_KEYBOARD; 98our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96 99
100our $PL_NOTEBOOK;
97our $STATS_WINDOW; 101our $PL_WINDOW;
102
103our $INVENTORY_PAGE;
104our $STATS_PAGE;
105our $SKILL_PAGE;
106our $SPELL_PAGE;
107
108our $HELP_WINDOW;
98our $MESSAGE_WINDOW; 109our $MESSAGE_WINDOW;
99our $FLOORBOX; 110our $FLOORBOX;
100our $GAUGES; 111our $GAUGES;
101our $STATWIDS; 112our $STATWIDS;
102 113
… …
109 120
110our $ALT_ENTER_MESSAGE; 121our $ALT_ENTER_MESSAGE;
111our $STATUSBOX; 122our $STATUSBOX;
112our $DEBUG_STATUS; 123our $DEBUG_STATUS;
113 124
114our $INV_WINDOW;
115our $INV; 125our $INV;
116our $INVR; 126our $INVR;
117our $INV_RIGHT_HB; 127our $INV_RIGHT_HB;
118 128
119our $BIND_EDITOR; 129our $BIND_EDITOR;
… …
220 $conn->send ("reply $stat"); 230 $conn->send ("reply $stat");
221 destroy_query_dialog $conn; 231 destroy_query_dialog $conn;
222 return; 232 return;
223 } 233 }
224 234
225 $STATS_WINDOW->show; 235 $STATS_PAGE->show;
226 $MESSAGE_WINDOW->hide; 236 $MESSAGE_WINDOW->hide;
227 237
228 unshift @dialog, new CFClient::UI::Label 238 unshift @dialog, new CFClient::UI::Label
229 max_w => $::WIDTH * 0.4, 239 max_w => $::WIDTH * 0.4,
230 ellipsise => 0, 240 ellipsise => 0,
… …
270 # right: accept 280 # right: accept
271 $table->add (4, 0, new CFClient::UI::Button 281 $table->add (4, 0, new CFClient::UI::Button
272 text => "Accept", 282 text => "Accept",
273 on_activate => sub { 283 on_activate => sub {
274 $conn->send ("reply n"); 284 $conn->send ("reply n");
275 $STATS_WINDOW->hide; 285 $STATS_PAGE->hide;
276 destroy_query_dialog $conn; 286 destroy_query_dialog $conn;
277 0 287 0
278 }, 288 },
279 ); 289 );
280 290
… …
372 382
373sub stop_game { 383sub stop_game {
374 $LOGIN_BUTTON->set_text ("Login"); 384 $LOGIN_BUTTON->set_text ("Login");
375 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 385 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
376 $SETUP_DIALOG->show; 386 $SETUP_DIALOG->show;
377 $INV_WINDOW->hide; 387 $PL_WINDOW->hide;
378 $SETUP_SPELLS->clear_spells; 388 $SPELL_PAGE->clear_spells;
379 389
380 return unless $CONN; 390 return unless $CONN;
381 391
382 status "connection closed"; 392 status "connection closed";
383 393
… …
408 $mode_slider->emit (changed => $mode_slider->{range}[0]); 418 $mode_slider->emit (changed => $mode_slider->{range}[0]);
409 419
410 my $row = 1; 420 my $row = 1;
411 421
412 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 422 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
413 $table->add (1, $row++, new CFClient::UI::CheckBox 423 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
414 state => $CFG->{fullscreen}, 424 state => $CFG->{fullscreen},
415 tooltip => "Bring the client into fullscreen mode.", 425 tooltip => "Bring the client into fullscreen mode.",
416 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 426 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
417 ); 427 );
418 428
… …
468 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 478 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.", 479 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]); 0 }, 480 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
471 ); 481 );
472 482
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 0
482 }
483 );
484
485 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 483 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
486 $table->add (1, $row++, new CFClient::UI::Slider 484 $table->add (1, $row++, new CFClient::UI::Slider
487 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 485 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
488 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 486 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
489 on_changed => sub { 487 on_changed => sub {
… …
558 ); 556 );
559 557
560 $vbox 558 $vbox
561} 559}
562 560
563sub set_stats_window_fontsize {
564 for (values %{$STATWIDS}) {
565 $_->set_fontsize ($::CFG->{stat_fontsize});
566 }
567}
568
569sub set_gauge_window_fontsize { 561sub set_gauge_window_fontsize {
570 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 562 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
571 $_->set_fontsize ($::CFG->{gauge_fontsize}); 563 $_->set_fontsize ($::CFG->{gauge_fontsize});
572 } 564 }
573} 565}
… …
652 644
653 $table 645 $table
654} 646}
655 647
656sub stats_window { 648sub stats_window {
657 my $tgw = new CFClient::UI::FancyFrame 649 my $vb = new CFClient::UI::VBox;
658 y => $HEIGHT * (2/8),
659 x => "max",
660 title => "Stats",
661 name => "stats_window",
662 has_close_button => 1;
663 650
664 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
665 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 651 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
666 can_hover => 1, can_events => 1, 652 can_hover => 1, can_events => 1,
667 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 653 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
668 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 654 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
669 can_hover => 1, can_events => 1, 655 can_hover => 1, can_events => 1,
… …
693 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 679 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
694 680
695 [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."], 681 [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."],
696 [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."], 682 [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."],
697 [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."], 683 [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."],
698 [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."], 684 [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."],
699 [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."], 685 [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."],
700 [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."], 686 [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."],
701 ) { 687 ) {
702 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 688 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
703 689
… …
705 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 691 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
706 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 692 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
707 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 693 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);
708 } 694 }
709 695
710 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 696 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
711 697
712 my $row = 0; 698 my $row = 0;
713 my $col = 0; 699 my $col = 0;
714 700
715 my %resist_names = ( 701 my %resist_names = (
702 slow => ["Slow",
716 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.)", 703 "<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.)"],
704 holyw => ["Holy Word",
717 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.)", 705 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
706 conf => ["Confusion",
718 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 707 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
708 fire => ["Fire",
719 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 709 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
710 depl => ["Depletion",
720 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 711 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
712 magic => ["Magic",
721 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 713 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
714 drain => ["Draining",
722 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 715 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
716 acid => ["Acid",
723 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 717 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
718 pois => ["Poison",
724 pois => "<b>Poison</b> (resistance to getting poisoned)", 719 "<b>Poison</b> (resistance to getting poisoned)"],
720 para => ["Paralysation",
725 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 721 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
722 deat => ["Death",
726 deat => "<b>Death</b> (resistance against death spells)", 723 "<b>Death</b> (resistance against death spells)"],
727 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 724 phys => ["Physical",
725 "<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.)"],
726 blind => ["Blind",
728 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 727 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
728 fear => ["Fear",
729 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)", 729 "<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)"],
730 tund => ["Turn undead",
730 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 731 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
732 elec => ["Electricity",
731 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 733 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
734 cold => ["Cold",
732 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 735 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
736 ghit => ["Ghost hit",
733 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 737 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
734 ); 738 );
735 for (qw/slow holyw conf fire depl magic 739 for (qw/slow holyw conf fire depl magic
736 drain acid pois para deat phys 740 drain acid pois para deat phys
737 blind fear tund elec cold ghit/) 741 blind fear tund elec cold ghit/)
738 { 742 {
… …
743 template => "-100%", 747 template => "-100%",
744 align => +1, 748 align => +1,
745 valign => 0, 749 valign => 0,
746 can_events => 1, 750 can_events => 1,
747 can_hover => 1, 751 can_hover => 1,
748 tooltip => $resist_names{$_}, 752 tooltip => $resist_names{$_}->[1],
749 ); 753 );
750 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 754 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
751 font => $FONT_FIXED, 755 font => $FONT_FIXED,
752 can_hover => 1, 756 can_hover => 1,
753 can_events => 1, 757 can_events => 1,
754 image => "ui/resist/resist_$_.png", 758 path => "ui/resist/resist_$_.png",
755 tooltip => $resist_names{$_}, 759 tooltip => $resist_names{$_}->[1],
760 );
761 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
762 text => $resist_names{$_}->[0],
763 font => $FONT_FIXED,
764 can_hover => 1,
765 can_events => 1,
766 tooltip => $resist_names{$_}->[1],
756 ); 767 );
757 768
758 $row++; 769 $row++;
759 if ($row % 6 == 0) { 770 if ($row % 6 == 0) {
760 $col += 2; 771 $col += 3;
761 $row = 0; 772 $row = 0;
762 } 773 }
763 } 774 }
764 775
765 &set_stats_window_fontsize;
766 update_stats_window ({}); 776 #update_stats_window ({});
767 777
768 $tgw 778 $vb
779}
780
781sub skill_window {
782 $STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]
769} 783}
770 784
771sub formsep($) { 785sub formsep($) {
772 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 786 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
773} 787}
774 788
775sub update_stats_window {
776 my ($stats) = @_;
777
778 # I love text protocols...
779
780 my $hp = $stats->{+CS_STAT_HP} * 1;
781 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
782 my $sp = $stats->{+CS_STAT_SP} * 1;
783 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
784 my $fo = $stats->{+CS_STAT_FOOD} * 1;
785 my $fo_m = 999;
786 my $gr = $stats->{+CS_STAT_GRACE} * 1;
787 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
788
789 $GAUGES->{hp} ->set_value ($hp, $hp_m);
790 $GAUGES->{mana} ->set_value ($sp, $sp_m);
791 $GAUGES->{food} ->set_value ($fo, $fo_m);
792 $GAUGES->{grace} ->set_value ($gr, $gr_m);
793 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
794 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
795 my $rng = $stats->{+CS_STAT_RANGE};
796 $rng =~ s/^Range: //; # thank you so much dear server
797 $GAUGES->{range} ->set_text ("Rng: " . $rng);
798 my $title = $stats->{+CS_STAT_TITLE};
799 $title =~ s/^Player: //;
800 $STATWIDS->{title} ->set_text ("Title: " . $title);
801
802 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
803 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
804 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
805 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
806 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
807 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
808 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
809 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
810 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
811 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
812 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
813 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
814 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
815
816 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
817
818 my %tbl = (
819 phys => CS_STAT_RES_PHYS,
820 magic => CS_STAT_RES_MAG,
821 fire => CS_STAT_RES_FIRE,
822 elec => CS_STAT_RES_ELEC,
823 cold => CS_STAT_RES_COLD,
824 conf => CS_STAT_RES_CONF,
825 acid => CS_STAT_RES_ACID,
826 drain => CS_STAT_RES_DRAIN,
827 ghit => CS_STAT_RES_GHOSTHIT,
828 pois => CS_STAT_RES_POISON,
829 slow => CS_STAT_RES_SLOW,
830 para => CS_STAT_RES_PARA,
831 tund => CS_STAT_TURN_UNDEAD,
832 fear => CS_STAT_RES_FEAR,
833 depl => CS_STAT_RES_DEPLETE,
834 deat => CS_STAT_RES_DEATH,
835 holyw => CS_STAT_RES_HOLYWORD,
836 blind => CS_STAT_RES_BLIND,
837 );
838
839 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
840 for keys %tbl;
841}
842
843my $METASERVER_ATIME; 789my $METASERVER_ATIME;
844 790
845sub update_metaserver { 791sub update_metaserver {
792 my ($metaserver_dialog) = @_;
793
794 $METASERVER = $metaserver_dialog
795 if defined $metaserver_dialog;
796
846 return if $METASERVER_ATIME > time; 797 return if $METASERVER_ATIME > time;
847 $METASERVER_ATIME = time + 60; 798 $METASERVER_ATIME = time + 60;
848 799
849 my $table = $METASERVER->{table}; 800 my $table = $METASERVER->{table};
850 $table->clear; 801 $table->clear;
… …
938 } 889 }
939 }); 890 });
940} 891}
941 892
942sub metaserver_dialog { 893sub metaserver_dialog {
894 my $vbox = new CFClient::UI::VBox;
895 my $table = new CFClient::UI::Table;
896 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
897
943 my $dialog = new CFClient::UI::FancyFrame 898 my $dialog = new CFClient::UI::FancyFrame
944 title => "Server List", 899 title => "Server List",
945 name => 'metaserver_dialog', 900 name => 'metaserver_dialog',
946 x => 'center', 901 x => 'center',
947 y => 'center', 902 y => 'center',
948 z => 3, 903 z => 3,
949 force_h => $::HEIGHT * 0.4, 904 force_h => $::HEIGHT * 0.4,
950 child => (my $vbox = new CFClient::UI::VBox), 905 child => $vbox,
906 has_close_button => 1,
907 table => $table,
951 on_visibility_change => sub { 908 on_visibility_change => sub {
952 update_metaserver if $_[1]; 909 update_metaserver ($_[0]) if $_[1];
953 0 910 0
954 }, 911 },
955 ; 912 ;
956
957 $dialog->{table} = new CFClient::UI::Table;
958
959 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
960 913
961 $dialog 914 $dialog
962} 915}
963 916
964sub server_setup { 917sub server_setup {
… …
980 $CFG->{profile}{default}{host} = $value; 933 $CFG->{profile}{default}{host} = $value;
981 0 934 0
982 } 935 }
983 ); 936 );
984 937
985 $METASERVER = metaserver_dialog;
986
987 $vbox->add (new CFClient::UI::Button 938 $vbox->add (new CFClient::UI::Button
988 expand => 1, 939 expand => 1,
989 text => "Server List", 940 text => "Server List",
990 other => $METASERVER, 941 other => $METASERVER,
991 tooltip => "Show a list of available crossfire servers", 942 tooltip => "Show a list of available crossfire servers",
… …
1086sub message_window { 1037sub message_window {
1087 my $window = new CFClient::UI::FancyFrame 1038 my $window = new CFClient::UI::FancyFrame
1088 name => "message_window", 1039 name => "message_window",
1089 title => "Messages", 1040 title => "Messages",
1090 border_bg => [1, 1, 1, 1], 1041 border_bg => [1, 1, 1, 1],
1091 bg => [0, 0, 0, 0.75],
1092 x => "max", 1042 x => "max",
1093 y => 0, 1043 y => 0,
1094 force_w => $::WIDTH * 0.4, 1044 force_w => $::WIDTH * 0.4,
1095 force_h => $::HEIGHT * 0.5, 1045 force_h => $::HEIGHT * 0.5,
1096 child => (my $vbox = new CFClient::UI::VBox), 1046 child => (my $vbox = new CFClient::UI::VBox),
… …
1182sub autopickup_setup { 1132sub autopickup_setup {
1183 my $table = new CFClient::UI::Table; 1133 my $table = new CFClient::UI::Table;
1184 1134
1185 for ( 1135 for (
1186 ["General", 0, 0, 1136 ["General", 0, 0,
1187 ["Enable autopickup" => PICKUP_NEWMODE], 1137 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1188 ["Inhibit autopickup" => PICKUP_INHIBIT], 1138 ["Inhibit autopickup" => PICKUP_INHIBIT],
1189 ["Stop before pickup" => PICKUP_STOP], 1139 ["Stop before pickup" => PICKUP_STOP],
1190 ["Debug autopickup" => PICKUP_DEBUG], 1140 ["Debug autopickup" => PICKUP_DEBUG],
1191 ], 1141 ],
1192 ["Weapons", 0, 6, 1142 ["Weapons", 0, 6,
… …
1229 for (@bits) { 1179 for (@bits) {
1230 ++$y; 1180 ++$y;
1231 1181
1232 my $mask = $_->[1]; 1182 my $mask = $_->[1];
1233 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1183 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1234 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1184 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1235 state => $CFG->{pickup} & $mask, 1185 state => $::CFG->{pickup} & $mask,
1236 on_changed => sub { 1186 on_changed => sub {
1237 my ($box, $value) = @_; 1187 my ($box, $value) = @_;
1238 1188
1239 if ($value) { 1189 if ($value) {
1240 $::CFG->{pickup} |= $mask; 1190 $::CFG->{pickup} |= $mask;
… …
1245 $::CONN->send_command ("pickup $::CFG->{pickup}") 1195 $::CONN->send_command ("pickup $::CFG->{pickup}")
1246 if defined $::CONN; 1196 if defined $::CONN;
1247 1197
1248 0 1198 0
1249 }); 1199 });
1200
1201 ${$_->[2]} = $checkbox if $_->[2];
1250 } 1202 }
1251 } 1203 }
1252 1204
1253 $table->add (2, 18, new CFClient::UI::ValSlider 1205 $table->add (2, 18, new CFClient::UI::ValSlider
1254 range => [0, 0, 16, 1, 1], 1206 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1207 template => ">= 99",
1255 to_value => sub { ">= " . 5 * $_[0] }, 1208 to_value => sub { ">= " . 5 * $_[0] },
1256 on_changed => sub { 1209 on_changed => sub {
1257 my ($slider, $value) = @_; 1210 my ($slider, $value) = @_;
1258 1211
1259 $::CFG->{pickup} &= ~0x7; 1212 $::CFG->{pickup} &= ~0xF;
1260 $::CFG->{pickup} |= int $value 1213 $::CFG->{pickup} |= int $value
1261 if $value; 1214 if $value;
1262 1; 1215 1;
1263 }); 1216 });
1217
1264 $table->add (3, 18, new CFClient::UI::Button 1218 $table->add (3, 18, new CFClient::UI::Button
1265 text => "set", 1219 text => "set",
1266 on_activate => sub { 1220 on_activate => sub {
1267 $::CONN->send_command ("pickup $::CFG->{pickup}") 1221 $::CONN->send_command ("pickup $::CFG->{pickup}")
1268 if defined $::CONN; 1222 if defined $::CONN;
… …
1270 }); 1224 });
1271 1225
1272 $table 1226 $table
1273} 1227}
1274 1228
1275sub inventory_window { 1229sub inventory_widget {
1230 my $hb = new CFClient::UI::HBox homogeneous => 1;
1231
1232 $hb->add (my $vb1 = new CFClient::UI::VBox);
1233 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1234 $vb1->add ($INV = new CFClient::UI::Inventory);
1235
1236 $hb->add (my $vb2 = new CFClient::UI::VBox);
1237
1238 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1239
1240 $vb2->add ($INVR = new CFClient::UI::Inventory);
1241
1242 # XXX: Call after $INVR = ... because set_opencont sets the items
1243 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1244
1245 $hb
1246}
1247
1248sub toggle_player_page {
1249 my ($widget) = @_;
1250
1251 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1252 $PL_WINDOW->hide;
1253 } else {
1254 $PL_NOTEBOOK->set_current_page ($widget);
1255 $PL_WINDOW->show;
1256 }
1257}
1258
1259sub player_window {
1276 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1260 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1277 x => "center", 1261 x => "center",
1278 y => "center", 1262 y => "center",
1279 force_w => $WIDTH * 9/10, 1263 force_w => $WIDTH * 9/10,
1280 force_h => $HEIGHT * 9/10, 1264 force_h => $HEIGHT * 9/10,
1281 title => "Inventory", 1265 title => "Player",
1266 name => "playerbook",
1282 has_close_button => 1, 1267 has_close_button => 1
1283 ; 1268 ;
1284 1269
1285 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1270 my $ntb =
1271 $PL_NOTEBOOK =
1272 new CFClient::UI::Notebook
1273 expand => 1,
1274 debug => 1,
1275 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1276 ;
1286 1277
1287 $hb->add (my $vb1 = new CFClient::UI::VBox); 1278 $ntb->add (
1288 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1279 "Statistics (F2)" => $STATS_PAGE = stats_window,
1289 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1280 "Shows statistics, where all your Stats and Resistances are shown."
1281 );
1282 $ntb->add (
1283 "Skills (F3)" => $SKILL_PAGE = skill_window,
1284 "Shows all your Skills."
1285 );
1286 $ntb->add (
1287 "Spellbook (F4)" => $SPELL_PAGE = new CFClient::UI::SpellList,
1288 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1289 );
1290 $ntb->add (
1291 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1292 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1293 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1294 );
1290 1295
1291 $hb->add (my $vb2 = new CFClient::UI::VBox); 1296 $ntb->set_current_page ($INVENTORY_PAGE);
1292 1297
1293 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1298 $plwin->add ($ntb);
1294 1299 $plwin
1295 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1296
1297 # XXX: Call after $INVR = ... because set_opencont sets the items
1298 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1299
1300 $invwin
1301}
1302
1303sub spell_setup {
1304 new CFClient::UI::SpellList
1305} 1300}
1306 1301
1307sub update_bindings { 1302sub update_bindings {
1308 $BIND_UPD_CB->() if $BIND_UPD_CB; 1303 $BIND_UPD_CB->() if $BIND_UPD_CB;
1309} 1304}
… …
1319 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1314 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1320 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1315 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1321 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1316 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1322 1317
1323 my $lbl = join "; ", @$cmds; 1318 my $lbl = join "; ", @$cmds;
1324 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1319 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1325 $binding_list->add (my $hb = new CFClient::UI::HBox); 1320 $binding_list->add (my $hb = new CFClient::UI::HBox);
1326 $hb->add (new CFClient::UI::Button 1321 $hb->add (new CFClient::UI::Button
1327 text => "delete", 1322 text => "delete",
1328 tooltip => "Deletes the binding", 1323 tooltip => "Deletes the binding",
1329 on_activate => sub { 1324 on_activate => sub {
… …
1422 y => 'center', 1417 y => 'center',
1423 z => 2, 1418 z => 2,
1424 name => 'doc_browser', 1419 name => 'doc_browser',
1425 force_w => int $WIDTH * 7/8, 1420 force_w => int $WIDTH * 7/8,
1426 force_h => int $HEIGHT * 7/8, 1421 force_h => int $HEIGHT * 7/8,
1427 title => "Documentation"; 1422 title => "Help Browser",
1423 has_close_button => 1;
1428 1424
1429 $win->add (my $vbox = new CFClient::UI::VBox); 1425 $win->add (my $vbox = new CFClient::UI::VBox);
1430 1426
1431 $vbox->add (my $buttons = new CFClient::UI::HBox); 1427 $vbox->add (my $buttons = new CFClient::UI::HBox);
1432 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1428 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1435 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1431 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1436 $buttons->add (my $combo = new CFClient::UI::Combobox 1432 $buttons->add (my $combo = new CFClient::UI::Combobox
1437 value => undef, 1433 value => undef,
1438 options => [ 1434 options => [
1439 [intro => "Introduction"], 1435 [intro => "Introduction"],
1440 [manual => "Manual"], 1436 [manual => "Main Manual"],
1441 [skill_help => "Skills"], 1437 [skill_help => "Skill Reference"],
1442 [command_help => "Commands"], 1438 [command_help => "Command Reference"],
1443 [dmcommand_help => "DM Commands"], 1439 [dmcommand_help => "DM Commands"],
1444 [COPYING => "License Terms"], 1440 [COPYING => "License Terms"],
1445 ], 1441 ],
1446 on_changed => sub { 1442 on_changed => sub {
1447 my ($self, $pod) = @_; 1443 my ($self, $pod) = @_;
1448 1444
1449 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1445 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1450 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1446 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1451 1447
1452 $viewer->clear; 1448 $viewer->clear;
1449
1450# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1451# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1452# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1453# ]);#d#
1453 1454
1454 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1455 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1455 for @$pom; 1456 for @$pom;
1456 1457
1457 $viewer->set_offset (0); 1458 $viewer->set_offset (0);
1459
1458 0 1460 0
1459 }, 1461 },
1460 on_visibility_change => sub { 1462 on_visibility_change => sub {
1461 my ($self, $visible) = @_; 1463 my ($self, $visible) = @_;
1462 return unless $visible; 1464 return unless $visible;
… …
1509 z => 100, 1511 z => 100,
1510 force_x => "max", 1512 force_x => "max",
1511 force_y => 0; 1513 force_y => 0;
1512 $DEBUG_STATUS->show; 1514 $DEBUG_STATUS->show;
1513 1515
1514 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1516 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1515 1517
1516 $STATUSBOX = new CFClient::UI::Statusbox; 1518 $STATUSBOX = new CFClient::UI::Statusbox;
1517 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1519 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1518 1520
1519 (new CFClient::UI::Frame 1521 (new CFClient::UI::Frame
… …
1569 z => 2, 1571 z => 2,
1570 force_w => $::WIDTH * 0.6, 1572 force_w => $::WIDTH * 0.6,
1571 force_h => $::HEIGHT * 0.6, 1573 force_h => $::HEIGHT * 0.6,
1572 has_close_button => 1, 1574 has_close_button => 1,
1573 ; 1575 ;
1576
1577 $METASERVER = metaserver_dialog;
1574 1578
1575 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1579 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1576 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1580 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1577 1581
1578 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1582 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1588 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1592 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1589 . "with nothing set and the recording started. After doing the actions you " 1593 . "with nothing set and the recording started. After doing the actions you "
1590 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1594 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1591 . "After pressing the combo the binding will be saved automatically and the " 1595 . "After pressing the combo the binding will be saved automatically and the "
1592 . "binding editor closes"); 1596 . "binding editor closes");
1593 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1594 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1595 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1597 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1596 "Some debuggin' options. Do not ask."); 1598 "Some debuggin' options. Do not ask.");
1597 1599
1598 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1600 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1599 1601
… …
1603 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1605 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1604 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1606 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1605 1607
1606 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 1608 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
1607 1609
1608 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1609 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1610 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1610 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1611 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1611 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1612 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1613 1612
1614 $BUTTONBAR->add (new CFClient::UI::Button 1613 $BUTTONBAR->add (new CFClient::UI::Button
1615 text => "Save Config", 1614 text => "Save Config",
1616 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1615 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1617 on_activate => sub { 1616 on_activate => sub {
… …
1620 status "Configuration Saved"; 1619 status "Configuration Saved";
1621 0 1620 0
1622 }, 1621 },
1623 ); 1622 );
1624 1623
1625 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1624 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1626 tooltip => "View Documentation"); 1625 tooltip => "View Documentation");
1627 1626
1628 $BUTTONBAR->add (new CFClient::UI::Button 1627 $BUTTONBAR->add (new CFClient::UI::Button
1629 text => "Quit", 1628 text => "Quit",
1630 tooltip => "Terminates the program", 1629 tooltip => "Terminates the program",
… …
1836# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1835# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1837 }, 1836 },
1838 CFClient::SDL_KEYDOWN => sub { 1837 CFClient::SDL_KEYDOWN => sub {
1839 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1838 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1840 # alt-enter 1839 # alt-enter
1840 $FULLSCREEN_ENABLE->toggle;
1841 video_shutdown; 1841 video_shutdown;
1842 $CFG->{fullscreen} = !$CFG->{fullscreen};
1843 video_init; 1842 video_init;
1844 } else { 1843 } else {
1845 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1844 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1846 } 1845 }
1847 }, 1846 },
… …
1863$SIG{INT} = $SIG{TERM} = sub { exit }; 1862$SIG{INT} = $SIG{TERM} = sub { exit };
1864 1863
1865{ 1864{
1866 local $SIG{__DIE__} = sub { 1865 local $SIG{__DIE__} = sub {
1867 return unless defined $^S && !$^S; 1866 return unless defined $^S && !$^S;
1868 Carp::confess $_[1];#d#TODO: remove when stable 1867 Carp::confess $_[0];#d#TODO: remove when stable
1869 CFClient::fatal $_[0]; 1868 CFClient::fatal $_[0];
1870 }; 1869 };
1871 1870
1872 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1871 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1873 CFClient::UI::set_layout ($::CFG->{layout}); 1872 CFClient::UI::set_layout ($::CFG->{layout});

Diff Legend

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