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.123 by root, Mon Oct 9 01:06:36 2006 UTC vs.
Revision 1.147 by root, Fri Apr 6 07:45:35 2007 UTC

… …
21 } 21 }
22} 22}
23 23
24use strict; 24use strict;
25use utf8; 25use utf8;
26
27use Carp 'verbose';
26 28
27# do things only needed for single-binary version (par) 29# do things only needed for single-binary version (par)
28BEGIN { 30BEGIN {
29 if (%PAR::LibCache) { 31 if (%PAR::LibCache) {
30 @INC = grep ref, @INC; # weed out all paths except pars loader refs 32 @INC = grep ref, @INC; # weed out all paths except pars loader refs
… …
56use Compress::LZF; 58use Compress::LZF;
57 59
58use CFPlus; 60use CFPlus;
59use CFPlus::OpenGL (); 61use CFPlus::OpenGL ();
60use CFPlus::Protocol; 62use CFPlus::Protocol;
63use CFPlus::DB;
61use CFPlus::UI; 64use CFPlus::UI;
65use CFPlus::UI::Inventory;
66use CFPlus::UI::SpellList;
62use CFPlus::Pod; 67use CFPlus::Pod;
63use CFPlus::BindingEditor;
64use CFPlus::MapWidget; 68use CFPlus::MapWidget;
69use CFPlus::Macro;
65 70
66$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 71$SIG{QUIT} = sub { Carp::cluck "QUIT" };
67$SIG{PIPE} = 'IGNORE'; 72$SIG{PIPE} = 'IGNORE';
68 73
69$Event::Eval = 0; 74$Event::Eval = 1;
70$Event::DIED = sub { 75$Event::DIED = sub {
71 # TODO: display dialog box or so 76 CFPlus::fatal Carp::longmess $_[1]
72 Carp::cluck $_[1];#d#TODO: remove when stable
73 return;#d#
74 CFPlus::fatal ($_[1]);
75}; 77};
76 78
77my $MAX_FPS = 60; 79my $MAX_FPS = 60;
78my $MIN_FPS = 5; # unused as of yet 80my $MIN_FPS = 5; # unused as of yet
79 81
80our $META_SERVER = "crossfire.real-time.com:13326"; 82our $META_SERVER = "http://metaserver.schmorp.de/current.json";
81 83
82our $LAST_REFRESH; 84our $LAST_REFRESH;
83our $NOW; 85our $NOW;
84 86
85our $CFG; 87our $CFG;
… …
123 125
124our $INVENTORY_PAGE; 126our $INVENTORY_PAGE;
125our $STATS_PAGE; 127our $STATS_PAGE;
126our $SKILL_PAGE; 128our $SKILL_PAGE;
127our $SPELL_PAGE; 129our $SPELL_PAGE;
130our $SPELL_LIST;
128 131
129our $HELP_WINDOW; 132our $HELP_WINDOW;
130our $MESSAGE_WINDOW; 133our $MESSAGE_WINDOW;
131our $FLOORBOX; 134our $FLOORBOX;
132our $GAUGES; 135our $GAUGES;
… …
145 148
146our $INV; 149our $INV;
147our $INVR; 150our $INVR;
148our $INV_RIGHT_HB; 151our $INV_RIGHT_HB;
149 152
150our $BIND_EDITOR;
151our $BIND_UPD_CB;
152
153our $PICKUP_CFG; 153our $PICKUP_CFG;
154
155our $IN_BUILD_MODE;
156our $BUILD_BUTTON;
154 157
155sub status { 158sub status {
156 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 159 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
157} 160}
158 161
… …
174sub destroy_query_dialog { 177sub destroy_query_dialog {
175 (delete $_[0]{query_dialog})->destroy 178 (delete $_[0]{query_dialog})->destroy
176 if $_[0]{query_dialog}; 179 if $_[0]{query_dialog};
177} 180}
178 181
182# FIXME: a very ugly hack to wait for stat update look below! #d#
183our $QUERY_TIMER; #d#
184
179# server query dialog 185# server query dialog
180sub server_query { 186sub server_query {
181 my ($conn, $flags, $prompt) = @_; 187 my ($conn, $flags, $prompt) = @_;
188
189 # FIXME: a very ugly hack to wait for stat update #d#
190 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
191 unless ($QUERY_TIMER) {
192 $QUERY_TIMER =
193 Event->timer (
194 after => 1,
195 cb => sub {
196 server_query ($conn, $flags, $prompt, 1);
197 $QUERY_TIMER = undef
198 }
199 );
200 return;
201 }
202 }
182 203
183 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 204 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
184 x => "center", 205 x => "center",
185 y => "center", 206 y => "center",
186 title => "Server Query", 207 title => "Server Query",
… …
375 status "logging in..."; 396 status "logging in...";
376 397
377 $LOGIN_BUTTON->set_text ("Logout"); 398 $LOGIN_BUTTON->set_text ("Logout");
378 $SETUP_DIALOG->hide; 399 $SETUP_DIALOG->hide;
379 400
380 $PROFILE = $CFG->{profile}{default};
381
382 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 401 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
383 402
384 my ($host, $port) = split /:/, $PROFILE->{host}; 403 my ($host, $port) = split /:/, $PROFILE->{host};
385 404
386 $MAP = new CFPlus::Map $mapsize, $mapsize; 405 $MAP = new CFPlus::Map;
387 406
388 $CONN = eval { 407 $CONN = eval {
389 new CFPlus::Protocol 408 new CFPlus::Protocol
390 host => $host, 409 host => $host,
391 port => $port || 13327, 410 port => $port || 13327,
… …
429sub stop_game { 448sub stop_game {
430 $LOGIN_BUTTON->set_text ("Login"); 449 $LOGIN_BUTTON->set_text ("Login");
431 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 450 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
432 $SETUP_DIALOG->show; 451 $SETUP_DIALOG->show;
433 $PL_WINDOW->hide; 452 $PL_WINDOW->hide;
434 $SPELL_PAGE->clear_spells; 453 $SPELL_LIST->clear_spells;
435 454
436 return unless $CONN; 455 return unless $CONN;
437 456
438 status "connection closed"; 457 status "connection closed";
439 458
… …
447sub graphics_setup { 466sub graphics_setup {
448 my $vbox = new CFPlus::UI::VBox; 467 my $vbox = new CFPlus::UI::VBox;
449 468
450 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 469 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
451 470
471 my $row = 0;
472
473 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
474 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
475 can_events => 1,
476 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
477
452 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 478 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
453 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 479 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
454 480
455 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 481 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
456 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 482 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
457 483
458 $mode_slider->connect (changed => sub { 484 $mode_slider->connect (changed => sub {
… …
460 486
461 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 487 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
462 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 488 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
463 }); 489 });
464 $mode_slider->emit (changed => $mode_slider->{range}[0]); 490 $mode_slider->emit (changed => $mode_slider->{range}[0]);
465
466 my $row = 1;
467 491
468 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 492 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
469 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 493 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
470 state => $CFG->{fullscreen}, 494 state => $CFG->{fullscreen},
471 tooltip => "Bring the client into fullscreen mode.", 495 tooltip => "Bring the client into fullscreen mode.",
… …
666 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 690 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
667 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 691 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
668 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 692 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
669 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 693 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
670 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 694 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
695 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
671 696
672 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 697 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
673 698
674 for my $x (0..2) { 699 for my $x (0..2) {
675 for my $y (0 .. 2) { 700 for my $y (0 .. 2) {
… …
679 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 704 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
680 ); 705 );
681 } 706 }
682 } 707 }
683 708
709 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
684 710
685 $table 711 $table
686} 712}
687 713
688sub stats_window { 714sub stats_window {
… …
857 883
858 my $table = $METASERVER->{table}; 884 my $table = $METASERVER->{table};
859 $table->clear; 885 $table->clear;
860 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 886 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
861 887
862 my $buf; 888 my $ok = 0;
863 889
864 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 890 CFPlus::background {
891 my $ua = CFPlus::lwp_useragent;
865 892
866 unless ($fh) { 893 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
867 $label->set_text ("unable to contact metaserver: $!"); 894 } sub {
868 return; 895 my ($msg) = @_;
869 } 896 if ($msg) {
870
871 Event->io (fd => $fh, poll => 'r', cb => sub {
872 my $res = sysread $fh, $buf, 8192, length $buf;
873
874 if (!defined $res) {
875 $_[0]->w->cancel;
876 $label->set_text ("error while retrieving server list: $!");
877 } elsif ($res == 0) {
878 $_[0]->w->cancel;
879 status "server list retrieved";
880
881 utf8::decode $buf if utf8::valid $buf;
882
883 $table->clear; 897 $table->clear;
884 898
885 my @tip = ( 899 my @tip = (
886 "The current number of users logged in on the server.", 900 "The current number of users logged in on the server.",
887 "The hostname of the server.", 901 "The hostname of the server.",
… …
897 for 0 .. $#col; 911 for 0 .. $#col;
898 912
899 my @align = qw(1 0 1 1 -1); 913 my @align = qw(1 0 1 1 -1);
900 914
901 my $y = 0; 915 my $y = 0;
902 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 916 for my $m (@{ $msg->{servers} }) {
903 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 917 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
918 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
904 919
905 for ($desc) { 920 for ($desc) {
906 s/<br>/\n/gi; 921 s/<br>/\n/gi;
907 s/<li>/\n· /gi; 922 s/<li>/\n· /gi;
908 s/<.*?>//sgi; 923 s/<.*?>//sgi;
909 s/&/&amp;/g; 924 s/&amp;/&/g;
910 s/</&lt;/g; 925 s/&lt;/</g;
911 s/>/&gt;/g; 926 s/&gt;/>/g;
912 } 927 }
913 928
914 $uptime = sprintf "%dd %02d:%02d:%02d", 929 $uptime = sprintf "%dd %02d:%02d:%02d",
915 (int $m->[8] / 86400), 930 (int $uptime / 86400),
916 (int $m->[8] / 3600) % 24, 931 (int $uptime / 3600) % 24,
917 (int $m->[8] / 60) % 60, 932 (int $uptime / 60) % 60,
918 $m->[8] % 60; 933 $uptime % 60;
919 934
920 $m = [$users, $host, $uptime, $version, $desc]; 935 $m = [$users, $host, $uptime, $version, $desc];
921 936
922 $y++; 937 $y++;
923 938
… …
933 ), 948 ),
934 (new CFPlus::UI::Empty expand => 1), 949 (new CFPlus::UI::Empty expand => 1),
935 ]); 950 ]);
936 951
937 $table->add ($_, $y, new CFPlus::UI::Label 952 $table->add ($_, $y, new CFPlus::UI::Label
953 max_w => $::WIDTH * 0.4,
938 ellipsise => 0, 954 ellipsise => 0,
939 align => $align[$_], 955 align => $align[$_],
940 text => $m->[$_], 956 text => $m->[$_],
941 tooltip => $tip[$_], 957 tooltip => $tip[$_],
958 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
942 can_hover => 1, 959 can_hover => 1,
943 can_events => 1, 960 can_events => 1,
944 fontsize => 0.8) 961 fontsize => 0.8)
945 for 0 .. $#$m; 962 for 0 .. $#$m;
946 } 963 }
964 } else {
965 $ok or $label->set_text ("error while contacting metaserver");
947 } 966 }
948 }); 967 };
968
949} 969}
950 970
951sub metaserver_dialog { 971sub metaserver_dialog {
952 my $vbox = new CFPlus::UI::VBox; 972 my $vbox = new CFPlus::UI::VBox;
953 my $table = new CFPlus::UI::Table; 973 my $table = new CFPlus::UI::Table;
… …
957 title => "Server List", 977 title => "Server List",
958 name => 'metaserver_dialog', 978 name => 'metaserver_dialog',
959 x => 'center', 979 x => 'center',
960 y => 'center', 980 y => 'center',
961 z => 3, 981 z => 3,
982 force_w => $::WIDTH * 0.9,
962 force_h => $::HEIGHT * 0.4, 983 force_h => $::HEIGHT * 0.7,
963 child => $vbox, 984 child => $vbox,
964 has_close_button => 1, 985 has_close_button => 1,
965 table => $table, 986 table => $table,
966 on_visibility_change => sub { 987 on_visibility_change => sub {
967 update_metaserver ($_[0]) if $_[1]; 988 update_metaserver ($_[0]) if $_[1];
… …
1043 . "so only set it if you really need to prefetch images. " 1064 . "so only set it if you really need to prefetch images. "
1044 . "This option can be set and unset any time.", 1065 . "This option can be set and unset any time.",
1045 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1066 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1046 ); 1067 );
1047 1068
1048 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1069 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1049 $table->add (1, 9, new CFPlus::UI::Entry 1070 $table->add (1, 9, new CFPlus::UI::Entry
1071 text => $CFG->{output_rate},
1072 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1073 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1074 . "default will be used, which is usually around 100kb/s.",
1075 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1076 );
1077
1078 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1079 $table->add (1, 10, new CFPlus::UI::Entry
1050 text => $CFG->{output_count}, 1080 text => $CFG->{output_count},
1051 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1081 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1052 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1082 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1053 ); 1083 );
1054 1084
1055 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1085 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1056 $table->add (1, 10, new CFPlus::UI::Entry 1086 $table->add (1, 11, new CFPlus::UI::Entry
1057 text => $CFG->{output_sync}, 1087 text => $CFG->{output_sync},
1058 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1088 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1059 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1089 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1060 ); 1090 );
1061 1091
1062 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1092 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1063 expand => 1, 1093 expand => 1,
1064 align => 0, 1094 align => 0,
1065 text => "Login", 1095 text => "Login",
1066 on_activate => sub { 1096 on_activate => sub {
1067 $CONN ? stop_game 1097 $CONN ? stop_game
1068 : start_game; 1098 : start_game;
1069 0 1099 0
1070 }, 1100 },
1071 ); 1101 );
1072 1102
1073 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1103 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1074 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1104 $table->add (1, 13, my $saycmd = new CFPlus::UI::Entry
1075 text => $CFG->{say_command}, 1105 text => $CFG->{say_command},
1076 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 1106 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1077 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1107 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1078 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1108 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1079 on_changed => sub { 1109 on_changed => sub {
… …
1081 $CFG->{say_command} = $value; 1111 $CFG->{say_command} = $value;
1082 0 1112 0
1083 } 1113 }
1084 ); 1114 );
1085 1115
1086 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1116 $table->add (0, 14, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1087 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1117 $table->add (1, 14, my $saycmd = new CFPlus::UI::CheckBox
1088 state => $CFG->{show_tips}, 1118 state => $CFG->{show_tips},
1089 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1119 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1090 on_changed => sub { 1120 on_changed => sub {
1091 my ($self, $value) = @_; 1121 my ($self, $value) = @_;
1092 $CFG->{show_tips} = $value; 1122 $CFG->{show_tips} = $value;
… …
1188 ["Boots" => PICKUP_BOOTS], 1218 ["Boots" => PICKUP_BOOTS],
1189 ["Gloves" => PICKUP_GLOVES], 1219 ["Gloves" => PICKUP_GLOVES],
1190 ["Cloaks" => PICKUP_CLOAK], 1220 ["Cloaks" => PICKUP_CLOAK],
1191 ], 1221 ],
1192 1222
1193 ["Readables", 2, 2, 1223 ["Readables", 2, 0,
1194 ["Spellbooks" => PICKUP_SPELLBOOK], 1224 ["Spellbooks" => PICKUP_SPELLBOOK],
1195 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1225 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1196 ["Normal Books/Scrolls" => PICKUP_READABLES], 1226 ["Normal Books/Scrolls" => PICKUP_READABLES],
1197 ], 1227 ],
1198 ["Misc", 2, 7, 1228 ["Misc", 2, 5,
1199 ["Food" => PICKUP_FOOD], 1229 ["Food" => PICKUP_FOOD],
1200 ["Drinks" => PICKUP_DRINK], 1230 ["Drinks" => PICKUP_DRINK],
1201 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1231 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1202 ["Keys" => PICKUP_KEY], 1232 ["Keys" => PICKUP_KEY],
1203 ["Magical Items" => PICKUP_MAGICAL], 1233 ["Magical Items" => PICKUP_MAGICAL],
1204 ["Potions" => PICKUP_POTION], 1234 ["Potions" => PICKUP_POTION],
1205 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1235 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1206 ["Ignore cursed" => PICKUP_NOT_CURSED], 1236 ["Ignore cursed" => PICKUP_NOT_CURSED],
1207 ["Jewelery" => PICKUP_JEWELS], 1237 ["Jewelery" => PICKUP_JEWELS],
1238 ["Flesh" => PICKUP_FLESH],
1208 ], 1239 ],
1209 ["Weight/Value ratio", 2, 17] 1240 ["Weight/Value ratio", 2, 17]
1210 ) 1241 )
1211 { 1242 {
1212 my ($title, $x, $y, @bits) = @$_; 1243 my ($title, $x, $y, @bits) = @$_;
… …
1262 $table 1293 $table
1263} 1294}
1264 1295
1265my %SORT_ORDER = ( 1296my %SORT_ORDER = (
1266 type => undef, 1297 type => undef,
1267 mtime => sub { sort { 1298 mtime => sub {
1299 my $NOW = time;
1300 sort {
1301 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1302 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1303
1268 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1304 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1269 or $b->{mtime} <=> $a->{mtime} 1305 or $btime <=> $atime
1270 or $a->{type} <=> $b->{type} 1306 or $a->{type} <=> $b->{type}
1307 } @_
1271 } @_ }, 1308 },
1272 weight => sub { sort { 1309 weight => sub { sort {
1273 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1310 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1274 or $a->{type} <=> $b->{type} 1311 or $a->{type} <=> $b->{type}
1275 } @_ }, 1312 } @_ },
1276); 1313);
… …
1301 #TODO# update to weigh/maxweight 1338 #TODO# update to weigh/maxweight
1302 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1339 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1303 1340
1304 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1341 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1305 $sw1->add ($INV = new CFPlus::UI::Inventory); 1342 $sw1->add ($INV = new CFPlus::UI::Inventory);
1343 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1306 1344
1307 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1345 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1308 1346
1309 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1347 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1310 1348
… …
1350 $ntb->add ( 1388 $ntb->add (
1351 "Skills (F3)" => $SKILL_PAGE = skill_window, 1389 "Skills (F3)" => $SKILL_PAGE = skill_window,
1352 "Shows all your Skills." 1390 "Shows all your Skills."
1353 ); 1391 );
1354 1392
1355 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1393 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1356 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1394 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1357 $ntb->add ( 1395 $ntb->add (
1358 "Spellbook (F4)" => $spellsw, 1396 "Spellbook (F4)" => $spellsw,
1359 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1397 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1360 ); 1398 );
1361 $ntb->add ( 1399 $ntb->add (
… …
1368 1406
1369 $plwin->add ($ntb); 1407 $plwin->add ($ntb);
1370 $plwin 1408 $plwin
1371} 1409}
1372 1410
1373sub update_bindings {
1374 $BIND_UPD_CB->() if $BIND_UPD_CB;
1375}
1376
1377sub keyboard_setup { 1411sub keyboard_setup {
1378 my $binding_list = new CFPlus::UI::VBox; 1412 CFPlus::Macro::keyboard_setup
1379
1380 my $refresh;
1381 $refresh = $BIND_UPD_CB = sub {
1382 $binding_list->clear ();
1383
1384 return unless $PROFILE;
1385
1386 for my $mod (keys %{$PROFILE->{bindings}}) {
1387 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1388 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1389 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1390
1391 my $lbl = join "; ", @$cmds;
1392 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1393 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1394 $hb->add (new CFPlus::UI::Button
1395 text => "delete",
1396 tooltip => "Deletes the binding",
1397 on_activate => sub {
1398 $binding_list->remove ($hb);
1399 delete $PROFILE->{bindings}{$mod}{$sym};
1400 0
1401 });
1402
1403 $hb->add (new CFPlus::UI::Button
1404 text => "edit",
1405 tooltip => "Edits the binding",
1406 on_activate => sub {
1407 $::BIND_EDITOR->set_binding (
1408 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1409 sub {
1410 my ($nmod, $nsym, $ncmds) = @_;
1411 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1412 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1413 $refresh->();
1414 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1415 $SETUP_DIALOG->show;
1416 },
1417 sub {
1418 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1419 $SETUP_DIALOG->show;
1420 });
1421 $::BIND_EDITOR->show;
1422 $SETUP_DIALOG->hide;
1423 0
1424 });
1425
1426 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1427 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1428 }
1429 }
1430 };
1431
1432 my $vb = new CFPlus::UI::VBox;
1433 $vb->add (new CFPlus::UI::FancyFrame
1434 label => "Options",
1435 child => (my $hb = new CFPlus::UI::HBox),
1436 );
1437 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1438 $hb->add (new CFPlus::UI::CheckBox
1439 expand => 1,
1440 state => $CFG->{shift_fire_stop},
1441 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1442 on_changed => sub {
1443 my ($cbox, $value) = @_;
1444 $CFG->{shift_fire_stop} = $value;
1445 0
1446 });
1447
1448 $vb->add (new CFPlus::UI::FancyFrame
1449 label => "Bindings",
1450 child => $binding_list);
1451 $vb->add (my $hb = new CFPlus::UI::HBox);
1452
1453 $hb->add (new CFPlus::UI::Button
1454 text => "record new",
1455 expand => 1,
1456 tooltip => "This button opens the binding editor with an empty binding.",
1457 on_activate => sub {
1458 $::BIND_EDITOR->set_binding (undef, undef, [],
1459 sub {
1460 my ($mod, $sym, $cmds) = @_;
1461 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1462 $refresh->();
1463 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1464 $SETUP_DIALOG->show;
1465 },
1466 sub {
1467 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1468 $SETUP_DIALOG->show;
1469 },
1470 );
1471 $SETUP_DIALOG->hide;
1472 $::BIND_EDITOR->show;
1473 0
1474 },
1475 );
1476
1477 $hb->add (new CFPlus::UI::Button
1478 text => "close",
1479 tooltip => "Closes the binding window",
1480 expand => 1,
1481 on_activate => sub {
1482 $SETUP_DIALOG->hide;
1483 0
1484 }
1485 );
1486
1487 $refresh->();
1488
1489 $vb
1490} 1413}
1491 1414
1492sub help_window { 1415sub help_window {
1493 my $win = new CFPlus::UI::Toplevel 1416 my $win = new CFPlus::UI::Toplevel
1494 x => 'center', 1417 x => 'center',
… …
1679 1602
1680 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1603 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1681 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1604 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1682 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1605 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1683 1606
1684 $vbox->add (my $table = new CFPlus::UI::Table); 1607 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1685 1608
1686 $table->add (0, 0, new CFPlus::UI::Button 1609 $table->add (0, 0, new CFPlus::UI::Button
1687 text => "Close", 1610 text => "Close",
1688 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.", 1611 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1689 on_activate => $close, 1612 on_activate => $close,
1690 ); 1613 );
1691 1614
1692 $table->add (2, 0, new CFPlus::UI::Button 1615 $table->add (2, 0, new CFPlus::UI::Button
1693 text => "Next", 1616 text => "Next",
1694 tooltip => "Show the next <b>Tip of the day</b>.", 1617 tooltip => "Show the next <b>Tip of the day</b>.",
1695 on_activate => sub { 1618 on_activate => sub {
1696 $close->(); 1619 $close->();
1697 &show_tip_of_the_day; 1620 &show_tip_of_the_day;
1698 }, 1621 },
… …
1740 padding => 0, 1663 padding => 0,
1741 z => 100, 1664 z => 100,
1742 force_x => "max", 1665 force_x => "max",
1743 force_y => 0; 1666 force_y => 0;
1744 $DEBUG_STATUS->show; 1667 $DEBUG_STATUS->show;
1745
1746 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1747 1668
1748 $STATUSBOX = new CFPlus::UI::Statusbox; 1669 $STATUSBOX = new CFPlus::UI::Statusbox;
1749 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1670 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1750 1671
1751 (new CFPlus::UI::Frame 1672 (new CFPlus::UI::Frame
… …
1852 ); 1773 );
1853 1774
1854 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1775 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1855 tooltip => "View Documentation"); 1776 tooltip => "View Documentation");
1856 1777
1778
1857 $BUTTONBAR->add (new CFPlus::UI::Button 1779 $BUTTONBAR->add (new CFPlus::UI::Button
1858 text => "Quit", 1780 text => "Quit",
1859 tooltip => "Terminates the program", 1781 tooltip => "Terminates the program",
1860 on_activate => sub { 1782 on_activate => sub {
1861 if ($CONN) { 1783 if ($CONN) {
… …
1872 } 1794 }
1873 1795
1874 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1796 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1875} 1797}
1876 1798
1799sub setup_build_button {
1800 my ($enabled) = @_;
1801 if ($enabled) {
1802 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1803 $BUILD_BUTTON ||= new CFPlus::UI::Button
1804 text => "Build",
1805 tooltip => "Opens the ingame builder",
1806 on_activate => sub {
1807 if ($CONN) {
1808 $CONN->send_ext_req (builder_player_items => sub {
1809 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1810 });
1811 }
1812 0
1813 };
1814 $BUTTONBAR->add ($BUILD_BUTTON);
1815 } else {
1816 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1817 }
1818}
1819
1820sub open_ingame_editor {
1821 my ($msg) = @_;
1822
1823 my $win = new CFPlus::UI::Toplevel
1824 x => 0,
1825 y => 'center',
1826 z => 4,
1827 name => 'builder_window',
1828 force_w => int $WIDTH * 1/4,
1829 force_h => int $HEIGHT * 3/4,
1830 title => "In game builder",
1831 has_close_button => 1;
1832
1833 my $r = new CFPlus::UI::ScrolledWindow (
1834 expand => 1,
1835 scroll_y => 1
1836 );
1837 $r->add (my $vb = new CFPlus::UI::VBox);
1838 $win->add ($r);
1839
1840
1841 $vb->add (
1842 new CFPlus::UI::Button
1843 text => "Disable build mode",
1844 on_activate => sub { $::IN_BUILD_MODE = undef }
1845 );
1846 $vb->add (
1847 new CFPlus::UI::Button
1848 text => "ERASE",
1849 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1850 );
1851
1852 for my $itemarchname (
1853 sort {
1854 $msg->{items}->{$a}->{build_arch_name}
1855 cmp $msg->{items}->{$b}->{build_arch_name}
1856 } keys %{$msg->{items}}
1857 ) {
1858 my $info = $msg->{items}->{$itemarchname};
1859 $vb->add (
1860 new CFPlus::UI::Button text => $info->{build_arch_name},
1861 on_activate => sub {
1862 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1863
1864 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1865 build_mode_query_arch_info ();
1866 }
1867 }
1868 );
1869 }
1870
1871 $win->show;
1872}
1873
1874sub build_mode_query_arch_info {
1875 my ($iteminfo) = $::IN_BUILD_MODE;
1876 my $itemarchname = $iteminfo->{item};
1877 my $info = $iteminfo->{info};
1878
1879 my $dialog = new CFPlus::UI::Toplevel
1880 x => "center",
1881 y => "center",
1882 z => 50,
1883 force_w => int $WIDTH * 1/2,
1884 title => "Enter information for placement of '$itemarchname'",
1885 has_close_button => 1;
1886
1887 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1888
1889 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1890 my $row = 0;
1891 if ($info->{has_name}) {
1892 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1893 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1894 }
1895 if ($info->{has_text}) {
1896 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1897 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1898 }
1899 if ($info->{has_connection}) {
1900 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1901 $table->add (1, $row++,
1902 new CFPlus::UI::Entry
1903 expand => 1,
1904 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1905 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1906 );
1907 }
1908
1909 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1910 $hb->add (new CFPlus::UI::Button
1911 text => "Close",
1912 expand => 1,
1913 on_activate => sub { $dialog->hide; 0 },
1914 );
1915 $dialog->show;
1916}
1917
1877sub video_shutdown { 1918sub video_shutdown {
1878 CFPlus::OpenGL::shutdown; 1919 CFPlus::OpenGL::shutdown;
1879 1920
1880 undef $SDL_ACTIVE; 1921 undef $SDL_ACTIVE;
1881} 1922}
… …
1912 CFPlus::Mix_AllocateChannels 8; 1953 CFPlus::Mix_AllocateChannels 8;
1913 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1954 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1914 1955
1915 audio_music_finished; 1956 audio_music_finished;
1916 1957
1958 local $_;
1917 while (<$fh>) { 1959 while (<$fh>) {
1918 next if /^\s*#/; 1960 next if /^\s*#/;
1919 next if /^\s*$/; 1961 next if /^\s*$/;
1920 1962
1921 my ($file, $volume, $event) = split /\s+/, $_, 3; 1963 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
2006 }, 2048 },
2007 CFPlus::SDL_VIDEOEXPOSE => sub { 2049 CFPlus::SDL_VIDEOEXPOSE => sub {
2008 CFPlus::UI::full_refresh; 2050 CFPlus::UI::full_refresh;
2009 }, 2051 },
2010 CFPlus::SDL_ACTIVEEVENT => sub { 2052 CFPlus::SDL_ACTIVEEVENT => sub {
2011# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2053# not useful, as APPACTIVE include sonly iconified state, not unmapped
2054# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2055# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2056# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2057# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2012 }, 2058 },
2013 CFPlus::SDL_KEYDOWN => sub { 2059 CFPlus::SDL_KEYDOWN => sub {
2014 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2060 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2015 # alt-enter 2061 # alt-enter
2016 $FULLSCREEN_ENABLE->toggle; 2062 $FULLSCREEN_ENABLE->toggle;
… …
2037 2083
2038$SIG{INT} = $SIG{TERM} = sub { exit }; 2084$SIG{INT} = $SIG{TERM} = sub { exit };
2039 2085
2040{ 2086{
2041 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2087 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2088 CFPlus::DB::Server::run;
2089
2042 CFPlus::UI::set_layout ($::CFG->{layout}); 2090 CFPlus::UI::set_layout ($::CFG->{layout});
2043 2091
2044 my %DEF_CFG = ( 2092 my %DEF_CFG = (
2045 sdl_mode => 0, 2093 sdl_mode => 0,
2046 width => 640, 2094 width => 640,
… …
2055 log_fontsize => 0.7, 2103 log_fontsize => 0.7,
2056 gauge_fontsize => 1, 2104 gauge_fontsize => 1,
2057 gauge_size => 0.35, 2105 gauge_size => 0.35,
2058 stat_fontsize => 0.7, 2106 stat_fontsize => 0.7,
2059 mapsize => 100, 2107 mapsize => 100,
2060 say_command => 'say', 2108 say_command => 'chat',
2061 audio_enable => 1, 2109 audio_enable => 1,
2062 bgm_enable => 1, 2110 bgm_enable => 1,
2063 bgm_volume => 0.25, 2111 bgm_volume => 0.25,
2064 face_prefetch => 0, 2112 face_prefetch => 0,
2065 output_sync => 1, 2113 output_sync => 1,
2066 output_count => 1, 2114 output_count => 1,
2115 output_rate => "",
2067 pickup => 0, 2116 pickup => 0,
2068 inv_sort => "mtime", 2117 inv_sort => "mtime",
2069 default => "profile", # default profile 2118 default => "profile", # default profile
2070 show_tips => 1, 2119 show_tips => 1,
2071 ); 2120 );
… …
2073 while (my ($k, $v) = each %DEF_CFG) { 2122 while (my ($k, $v) = each %DEF_CFG) {
2074 $CFG->{$k} = $v unless exists $CFG->{$k}; 2123 $CFG->{$k} = $v unless exists $CFG->{$k};
2075 } 2124 }
2076 2125
2077 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2126 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2127 $PROFILE = $CFG->{profile}{default};
2128
2129 # convert old bindings (only default profile matters)
2130 if (my $bindings = delete $PROFILE->{bindings}) {
2131 while (my ($mod, $syms) = each %$bindings) {
2132 while (my ($sym, $cmds) = each %$syms) {
2133 push @{ $PROFILE->{macro} }, {
2134 accelkey => [$mod*1, $sym*1],
2135 action => $cmds,
2136 };
2137 }
2138 }
2139 }
2078 2140
2079 sdl_init; 2141 sdl_init;
2080 2142
2081 @SDL_MODES = reverse 2143 @SDL_MODES = reverse
2082 grep $_->[0] >= 640 && $_->[1] >= 480, 2144 grep $_->[0] >= 640 && $_->[1] >= 480,

Diff Legend

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