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.33 by root, Tue May 30 07:13:09 2006 UTC vs.
Revision 1.45 by elmex, Fri Jun 2 16:52:49 2006 UTC

81our $LOGVIEW; 81our $LOGVIEW;
82our $CONSOLE; 82our $CONSOLE;
83our $METASERVER; 83our $METASERVER;
84our $LOGIN_BUTTON; 84our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 85our $QUIT_DIALOG;
86our $HOST_ENTRY;
86our $SERVER_SETUP; 87our $SERVER_SETUP;
87 88
88our $FLOORBOX; 89our $FLOORBOX;
89our $GAUGES; 90our $GAUGES;
90our $STATWIDS; 91our $STATWIDS;
104our $INV; 105our $INV;
105our $INVR; 106our $INVR;
106our $INV_RIGHT_HB; 107our $INV_RIGHT_HB;
107 108
108our $BIND_WINDOW; 109our $BIND_WINDOW;
110our $BIND_EDITOR;
111
112our $SPELL_LIST;
113our $PICKUP_CFG;
109 114
110sub status { 115sub status {
111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 116 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
112} 117}
113 118
625 630
626 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 631 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
627 for keys %tbl; 632 for keys %tbl;
628} 633}
629 634
630sub metaserver_dialog {
631 my $dialog = new CFClient::UI::FancyFrame
632 title => "Server List",
633 child => (my $vbox = new CFClient::UI::VBox);
634
635 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
636
637 $dialog
638}
639
640my $METASERVER_ATIME; 635my $METASERVER_ATIME;
641 636
642sub update_metaserver { 637sub update_metaserver {
643 my ($HOST) = @_;
644
645 return if $METASERVER_ATIME > time; 638 return if $METASERVER_ATIME > time;
646 $METASERVER_ATIME = time + 60; 639 $METASERVER_ATIME = time + 60;
647 640
648 my $table = $METASERVER->{table}; 641 my $table = $METASERVER->{table};
649 $table->clear; 642 $table->clear;
701 694
702 $y++; 695 $y++;
703 696
704 $table->add (0, $y, new CFClient::UI::VBox children => [ 697 $table->add (0, $y, new CFClient::UI::VBox children => [
705 (new CFClient::UI::Button text => "Use", on_activate => sub { 698 (new CFClient::UI::Button text => "Use", on_activate => sub {
706 $HOST->set_text ($CFG->{host} = $host); 699 $HOST_ENTRY->set_text ($CFG->{host} = $host);
700 $METASERVER->toggle_visibility;
707 }), 701 }),
708 (new CFClient::UI::Empty expand => 1), 702 (new CFClient::UI::Empty expand => 1),
709 ]); 703 ]);
710 704
711 $table->add ($_ + 1, $y, new CFClient::UI::Label 705 $table->add ($_ + 1, $y, new CFClient::UI::Label
714 } 708 }
715 } 709 }
716 }); 710 });
717} 711}
718 712
713sub metaserver_dialog {
714 my $dialog = new CFClient::UI::FancyFrame
715 title => "Server List",
716 name => 'metaserver_dialog',
717 x => 'center',
718 y => 'center',
719 child => (my $vbox = new CFClient::UI::VBox),
720 on_visibility_change => sub {
721 update_metaserver if $_[1];
722 },
723 ;
724
725 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
726
727 $dialog
728}
729
719sub server_setup { 730sub server_setup {
720 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame 731 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
721 x => "center", 732 x => "center",
722 y => "center", 733 y => "center",
723 name => "server_setup", 734 name => "server_setup",
730 741
731 { 742 {
732 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 743 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
733 744
734 $vbox->add ( 745 $vbox->add (
735 my $HOST = new CFClient::UI::Entry 746 $HOST_ENTRY = new CFClient::UI::Entry
736 expand => 1, 747 expand => 1,
737 text => $CFG->{host}, 748 text => $CFG->{host},
738 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 749 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
739 on_changed => sub { 750 on_changed => sub {
740 my ($self, $value) = @_; 751 my ($self, $value) = @_;
742 } 753 }
743 ); 754 );
744 755
745 $METASERVER = metaserver_dialog; 756 $METASERVER = metaserver_dialog;
746 757
747 $vbox->add (new CFClient::UI::Flopper 758 $vbox->add (new CFClient::UI::Button
748 expand => 1, 759 expand => 1,
749 text => "Server List", 760 text => "Server List",
750 other => $METASERVER, 761 other => $METASERVER,
751 tooltip => "Show a list of available crossfire servers", 762 tooltip => "Show a list of available crossfire servers",
752 on_open => sub { 763 on_activate => sub { $METASERVER->toggle_visibility },
753 update_metaserver $HOST;
754 }
755 ); 764 );
756 } 765 }
757 766
758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 767 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
759 $table->add (1, 4, new CFClient::UI::Entry 768 $table->add (1, 4, new CFClient::UI::Entry
863 on_activate => sub { 872 on_activate => sub {
864 my ($input, $text) = @_; 873 my ($input, $text) = @_;
865 $input->set_text (''); 874 $input->set_text ('');
866 875
867 if ($text =~ /^\/bind\s+(.*)$/) { 876 if ($text =~ /^\/bind\s+(.*)$/) {
868 CFClient::Recorder::open_binding_dialog ([$1]); 877 CFClient::Binder::open_binding_dialog (sub {
878 my ($mod, $sym) = @_;
879 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
880 });
869 } elsif ($text =~ /^\/(.*)/) { 881 } elsif ($text =~ /^\/(.*)/) {
870 $::CONN->user_send ($1); 882 $::CONN->user_send ($1);
871 } else { 883 } else {
872 my $say_cmd = $::CFG->{say_command} || 'say'; 884 my $say_cmd = $::CFG->{say_command} || 'say';
873 $::CONN->user_send ("$say_cmd $text"); 885 $::CONN->user_send ("$say_cmd $text");
919 } 931 }
920 932
921 $QUIT_DIALOG->show; 933 $QUIT_DIALOG->show;
922} 934}
923 935
936sub make_pickup_cfg_window {
937 $PICKUP_CFG = new CFClient::UI::FancyFrame
938 title => "Autopickup configuration",
939 x => "center",
940 y => "center",
941 force_w => $WIDTH * 6/10,
942 force_h => $HEIGHT * 9/10;
943
944
945 $PICKUP_CFG->add (my $vb = new CFClient::UI::VBox);
946 $vb->add (my $gen_tbl = new CFClient::UI::Table expand => 1);
947 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
948 $hb->add (my $ltbl = new CFClient::UI::Table expand => 1);
949 $hb->add (my $rtbl = new CFClient::UI::Table expand => 1);
950
951 my $tbl = 0;
952 my $tblrow = 0;
953
954 for (
955 ["General", $gen_tbl],
956 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],
957 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
958 ["Stop before pickup" => CFClient::Pickup::PU_STOP],
959 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
960 ["Weapons", $ltbl],
961 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
962 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
963 ["Bows" => CFClient::Pickup::PU_BOW],
964 ["Arrows" => CFClient::Pickup::PU_ARROW],
965 ["Armour"],
966 ["Helmets" => CFClient::Pickup::PU_HELMET],
967 ["Shields" => CFClient::Pickup::PU_SHIELD],
968 ["Body Armour" => CFClient::Pickup::PU_ARMOUR],
969 ["Boots" => CFClient::Pickup::PU_BOOTS],
970 ["Gloves" => CFClient::Pickup::PU_GLOVES],
971 ["Cloaks" => CFClient::Pickup::PU_CLOAK],
972 ["Readables", $rtbl],
973 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
974 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
975 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
976 ["Misc"],
977 ["Food" => CFClient::Pickup::PU_FOOD],
978 ["Drinks" => CFClient::Pickup::PU_DRINK],
979 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
980 ["Keys" => CFClient::Pickup::PU_KEY],
981 ["Magical Items" => CFClient::Pickup::PU_MAGICAL],
982 ["Potions" => CFClient::Pickup::PU_POTION],
983 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
984 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
985 ["Jewelery" => CFClient::Pickup::PU_JEWELS],
986 )
987 {
988 if (ref $_->[1]) {
989 $tbl = $_->[1];
990 $tblrow = 0;
991 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);
992 } elsif (not defined $_->[1]) {
993 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);
994 } else {
995 my $mask = $_->[1];
996 $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
997 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox
998 state => $CFG->{pickup} & $mask,
999 on_changed => sub {
1000 my ($box, $value) = @_;
1001 if ($value) {
1002 $::CFG->{pickup} |= $mask;
1003 } else {
1004 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
1005 }
1006 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
1007 if defined $::CONN;
1008 });
1009 }
1010 }
1011
1012 $PICKUP_CFG
1013}
1014
924sub make_inventory_window { 1015sub make_inventory_window {
925 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1016 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
926 x => "center", 1017 x => "center",
927 y => "center", 1018 y => "center",
928 force_w => $WIDTH * 9/10, 1019 force_w => $WIDTH * 9/10,
929 force_h => $HEIGHT * 9/10, 1020 force_h => $HEIGHT * 9/10,
930 title => "Inventory", 1021 title => "Inventory",
931 name => "inventory_window",
932 ; 1022 ;
933 1023
934 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1024 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
935 1025
936 $hb->add (my $vb1 = new CFClient::UI::VBox); 1026 $hb->add (my $vb1 = new CFClient::UI::VBox);
947 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1037 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
948 1038
949 $invwin 1039 $invwin
950} 1040}
951 1041
1042sub make_spell_list {
1043 $SPELL_LIST = new CFClient::UI::SpellList
1044 force_w => $WIDTH * (9/10),
1045 force_h => $HEIGHT * (9/10);
1046 $SPELL_LIST
1047}
1048
952sub make_binding_window { 1049sub make_binding_window {
953 my $binding_list = new CFClient::UI::VBox; 1050 my $binding_list = new CFClient::UI::VBox;
954 1051
1052 my $refresh;
955 my $refresh = sub { 1053 $refresh = sub {
956 $binding_list->clear (); 1054 $binding_list->clear ();
957 1055
958 for my $mod (keys %{$::CFG->{bindings}}) { 1056 for my $mod (keys %{$::CFG->{bindings}}) {
959 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1057 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
960 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1058 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
961 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1059 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
962 1060
963 my $lbl = join "; ", @$cmds; 1061 my $lbl = join "; ", @$cmds;
964 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym); 1062 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
965 $binding_list->add (my $hb = new CFClient::UI::HBox); 1063 $binding_list->add (my $hb = new CFClient::UI::HBox);
966 $hb->add (new CFClient::UI::Button 1064 $hb->add (new CFClient::UI::Button
967 text => "delete", 1065 text => "delete",
1066 tooltip => "Deletes the binding",
968 on_activate => sub { 1067 on_activate => sub {
969 $binding_list->remove ($hb); 1068 $binding_list->remove ($hb);
970 delete $::CFG->{bindings}->{$mod}->{$sym}; 1069 delete $::CFG->{bindings}->{$mod}->{$sym};
971 }); 1070 });
1071
1072 $hb->add (new CFClient::UI::Button
1073 text => "edit",
1074 tooltip => "Edits the binding",
1075 on_activate => sub {
1076 $::BIND_EDITOR->set_binding (
1077 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1078 sub {
1079 my ($nmod, $nsym, $ncmds) = @_;
1080 delete $::CFG->{bindings}->{$mod}->{$sym};
1081 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1082 $refresh->();
1083 $::BIND_WINDOW->show;
1084 },
1085 sub {
1086 $::BIND_WINDOW->show;
1087 });
1088 $::BIND_EDITOR->show;
1089 $::BIND_WINDOW->hide;
1090 });
1091
972 $hb->add (new CFClient::UI::Label text => "($nam)"); 1092 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
973 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1093 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
974 } 1094 }
975 } 1095 }
976 }; 1096 };
977 1097
984 on_visibility_change => sub { 1104 on_visibility_change => sub {
985 my ($self, $visible) = @_; 1105 my ($self, $visible) = @_;
986 $refresh->() if $visible; 1106 $refresh->() if $visible;
987 }; 1107 };
988 1108
1109 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
989 $BIND_WINDOW->add ($binding_list); 1110 $vb->add ($binding_list);
1111 $vb->add (my $hb = new CFClient::UI::HBox);
1112 $hb->add (new CFClient::UI::Button
1113 text => "record new",
1114 expand => 1,
1115 tooltip => "This button opens the binding editor with an empty binding.",
1116 on_activate => sub {
1117 $::BIND_EDITOR->set_binding (undef, undef, [],
1118 sub {
1119 my ($mod, $sym, $cmds) = @_;
1120 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1121 $refresh->();
1122 $::BIND_WINDOW->show;
1123 },
1124 sub {
1125 $::BIND_WINDOW->show;
1126 });
1127 $::BIND_WINDOW->hide;
1128 $::BIND_EDITOR->show;
1129 },
1130 );
1131 $hb->add (new CFClient::UI::Button
1132 text => "close",
1133 tooltip => "Closes the binding window",
1134 expand => 1,
1135 on_activate => sub {
1136 $::BIND_WINDOW->hide;
1137 }
1138 );
1139
990 $refresh->(); 1140 $refresh->();
991 $BIND_WINDOW 1141 $BIND_WINDOW
992} 1142}
993 1143
994sub make_help_window { 1144sub make_help_window {
995 my $win = new CFClient::UI::FancyFrame 1145 my $win = new CFClient::UI::FancyFrame
1146 x => 'center',
1147 y => 'center',
1148 name => 'doc_browser',
996 def_w => int $WIDTH * 7/8, 1149 force_w => int $WIDTH * 7/8,
997 def_h => int $HEIGHT * 7/8, 1150 force_h => int $HEIGHT * 7/8,
998 title => "Documentation"; 1151 title => "Documentation";
999 1152
1000 $win->add (my $vbox = new CFClient::UI::VBox); 1153 $win->add (my $vbox = new CFClient::UI::VBox);
1001 1154
1002 $vbox->add (my $buttons = new CFClient::UI::HBox); 1155 $vbox->add (my $buttons = new CFClient::UI::HBox);
1003 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1156 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
1070 padding => 0, 1223 padding => 0,
1071 z => 100, 1224 z => 100,
1072 force_x => "max", 1225 force_x => "max",
1073 force_y => 0; 1226 force_y => 0;
1074 $DEBUG_STATUS->show; 1227 $DEBUG_STATUS->show;
1075 1228
1229 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1230
1076 $STATUSBOX = new CFClient::UI::Statusbox; 1231 $STATUSBOX = new CFClient::UI::Statusbox;
1077 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1232 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1078 1233
1079 (new CFClient::UI::Frame 1234 (new CFClient::UI::Frame
1080 bg => [0, 0, 0, 0.4], 1235 bg => [0, 0, 0, 0.4],
1082 force_y => "max", 1237 force_y => "max",
1083 child => $STATUSBOX, 1238 child => $STATUSBOX,
1084 )->show; 1239 )->show;
1085 1240
1086 CFClient::UI::FancyFrame->new ( 1241 CFClient::UI::FancyFrame->new (
1242 title => "Mini Map",
1243 name => "mapmap",
1087 x => 0, 1244 x => 0,
1088 y => $FONTSIZE + 8, 1245 y => $FONTSIZE + 8,
1089 border_bg => [1, 1, 1, 192/255], 1246 border_bg => [1, 1, 1, 192/255],
1090 bg => [1, 1, 1, 0], 1247 bg => [1, 1, 1, 0],
1091 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1248 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1130 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 1287 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
1131 1288
1132 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1289 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1133 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1290 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1134 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1291 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1135 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1292 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
1293 ."You can also hit the Tab-key to show/hide the Inventory.");
1136 1294
1137 $BUTTONBAR->add (new CFClient::UI::Button 1295 $BUTTONBAR->add (new CFClient::UI::Button
1138 text => "Save Config", 1296 text => "Save Config",
1139 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1297 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1140 on_activate => sub { 1298 on_activate => sub {
1148 tooltip => "View Documentation"); 1306 tooltip => "View Documentation");
1149 1307
1150 $BUTTONBAR->add (new CFClient::UI::Flopper 1308 $BUTTONBAR->add (new CFClient::UI::Flopper
1151 text => "Bindings", 1309 text => "Bindings",
1152 other => make_binding_window, 1310 other => make_binding_window,
1153 tooltip => "Lets you delete bindings you have made with the recorder" 1311 tooltip =>
1154 ); 1312 "Lets you define, edit and delete bindings."
1155 $BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window, 1313 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1156 tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys"); 1314 ."with nothing set and the recording started. After doing the actions you "
1315 ."want to record press Insert and you will be asked to press a key-combo."
1316 ."After pressing the combo the binding will be saved automatically and the "
1317 ."binding editor closes");
1318
1319 $BUTTONBAR->add (new CFClient::UI::Flopper
1320 text => "Spells",
1321 other => make_spell_list,
1322 tooltip => "The spell list");
1323
1324 $BUTTONBAR->add (new CFClient::UI::Flopper
1325 text => "Pickup",
1326 other => make_pickup_cfg_window,
1327 tooltip => "The pickup dialog");
1328
1157 1329
1158 $BUTTONBAR->add (new CFClient::UI::Button 1330 $BUTTONBAR->add (new CFClient::UI::Button
1159 text => "Quit", 1331 text => "Quit",
1160 tooltip => "Terminates the program", 1332 tooltip => "Terminates the program",
1161 on_activate => sub { 1333 on_activate => sub {
1489=head1 USAGE 1661=head1 USAGE
1490 1662
1491cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 1663cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1492fullscreen and interactively. 1664fullscreen and interactively.
1493 1665
1666=head1 DEBUGGING
1667
1668
1669CFPLUS_DEBUG - environment variable
1670
1671 1 draw borders around widgets
1672 2 add low-level widget info to tooltips
1673 4 show fps
1674 8 suppress tooltips
1675
1494=head1 AUTHOR 1676=head1 AUTHOR
1495 1677
1496Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1678Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1497 1679
1498 1680

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines