ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.80 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.103 by root, Sun Apr 1 15:09:45 2007 UTC

… …
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::OpenGL; 9use CFPlus::OpenGL;
10use CFPlus::UI; 10use CFPlus::UI;
11use CFPlus::Macro;
11 12
12our @ISA = CFPlus::UI::Base::; 13our @ISA = CFPlus::UI::Base::;
14
15sub ::T() { 32 }
13 16
14my $magicmap_tex = 17my $magicmap_tex =
15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", 18 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
16 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 19 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
17 20
… …
32 @_ 35 @_
33 ); 36 );
34 37
35 $self->{completer} = new CFPlus::MapWidget::Command:: 38 $self->{completer} = new CFPlus::MapWidget::Command::
36 command => $self->{command}, 39 command => $self->{command},
37 tooltip => "<b>The Command Completer</b>\n\n" 40 tooltip => "#completer_help",
38 . "This is your central interface to send text commands to the server. "
39 . "To enter a verbatim command to send to the server, just type the command, "
40 . "followed by a space, and press return. "
41 . "Typing the initial letters of words (or just any letters) displays guesses "
42 . "for commands you might want to use.\n"
43 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
44 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
45 ; 41 ;
46 42
47 $self 43 $self
48} 44}
49 45
… …
66 62
67 $self->{completer}->hide 63 $self->{completer}->hide
68 if $self->{completer}; 64 if $self->{completer};
69} 65}
70 66
67sub server_login {
68 my ($server) = @_;
69
70 ::stop_game ();
71 local $::PROFILE->{host} = $server;
72 ::start_game ();
73}
74
75sub editor_invoke {
76 my $editsup = $::CONN && $::CONN->{editor_support}
77 or return;
78
79 CFPlus::background {
80 print "preparing editor startup...\n";
81
82 my $server = $editsup->{gameserver} || "default";
83 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
84
85 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
86 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
87
88 print "map directory is $mapdir\n";
89 print "lib directory is $libdir\n";
90
91 my $ua = CFPlus::lwp_useragent;
92
93 for my $file (qw(archetypes crossfire.0)) {
94 my $url = "$editsup->{lib_root}$file";
95 print "mirroring $url...\n";
96 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
97 printf "%s size %d octets\n", $file, -s "$libdir/$file";
98 }
99
100 if (1) { # upload a map
101 my $mapname = $::CONN->{map_info}[0];
102
103 my $mappath = "$mapdir/$mapname";
104
105 -e $mappath and die "$mappath already exists\n";
106
107 print "getting map revision for $mapname...\n";
108
109 # try to get the most recent head revision, what a hack,
110 # this should have been returned while downloading *sigh*
111 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
112
113 if ($log =~ /\?rev=(\d+\.\d+)"/) {
114 my $rev = $1;
115
116 print "downloading revision $rev...\n";
117
118 my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
119
120 my $meta = {
121 %$editsup,
122 path => $mapname,
123 revision => $rev,
124 cf_login => $::PROFILE->{user},
125 };
126
127 require File::Basename;
128 require File::Path;
129
130 File::Path::mkpath (File::Basename::dirname ($mappath));
131 open my $fh, ">:raw:perlio", "$mappath.meta"
132 or die "$mappath.meta: $!\n";
133 print $fh CFPlus::to_json $meta;
134 close $fh;
135 open my $fh, ">:raw:perlio:utf8", $mappath
136 or die "$mappath: $!\n";
137 print $fh $map;
138 close $fh;
139
140 print "saved as $mappath\n";
141
142 print "invoking editor...\n";
143 exec "/root/s2/gce $mappath";#d#
144
145 # now upload it
146# require HTTP::Request::Common;
147#
148# my $res = $ua->post (
149# $ENV{CFPLUS_UPLOAD},
150# Content_Type => 'multipart/form-data',
151# Content => [
152# path => $mapname,
153# mapdir => $ENV{CROSSFIRE_MAPDIR},
154# map => $map,
155# revision => $rev,
156# cf_login => $ENV{CFPLUS_LOGIN},
157# cf_password => $ENV{CFPLUS_PASSWORD},
158# comment => "",
159# ]
160# );
161#
162# if ($res->is_error) {
163# # fatal condition
164# warn $res->status_line;
165# } else {
166# # script replies are marked as {{..}}
167# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
168# warn map "$_\n", @msgs;
169# }
170 } else {
171 die "viewvc parse error, unable to detect revision\n";
172 }
173 }
174 }
175}
176
71sub invoke_button_down { 177sub invoke_button_down {
72 my ($self, $ev, $x, $y) = @_; 178 my ($self, $ev, $x, $y) = @_;
73 179
74 if ($ev->{button} == 1) { 180 if ($ev->{button} == 1) {
75 $self->grab_focus; 181 $self->grab_focus;
76 return unless $::CONN; 182 return unless $::CONN;
77 183
78 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 184 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};
79 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 185 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
80 186
81 $x -= int 0.5 * $self->{sw}; 187 $x -= CFPlus::floor $::MAP->w * 0.5;
82 $y -= int 0.5 * $self->{sh}; 188 $y -= CFPlus::floor $::MAP->h * 0.5;
83 189
190 if ($::CONN) {
191 if ($::IN_BUILD_MODE) {
192 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
193 } else {
84 $::CONN->lookat ($x, $y) 194 $::CONN->lookat ($x, $y)
85 if $::CONN; 195 }
196 }
86 197
87 } elsif ($ev->{button} == 2) { 198 } elsif ($ev->{button} == 2) {
88 $self->grab_focus; 199 $self->grab_focus;
89 return unless $::CONN; 200 return unless $::CONN;
90 201
… …
100 $::CFG->{map_shift_y} = $bh + $y - $oy; 211 $::CFG->{map_shift_y} = $bh + $y - $oy;
101 212
102 $self->update; 213 $self->update;
103 }; 214 };
104 } elsif ($ev->{button} == 3) { 215 } elsif ($ev->{button} == 3) {
105 (new CFPlus::UI::Menu 216 my @items = (
106 items => [
107 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 217 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
108 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 218 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
109 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 219 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
110 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 220 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
111 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 221 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
… …
115 $::PICKUP_ENABLE->{state} 225 $::PICKUP_ENABLE->{state}
116 ? "Disable automatic pickup" 226 ? "Disable automatic pickup"
117 : "Enable automatic pickup", 227 : "Enable automatic pickup",
118 sub { $::PICKUP_ENABLE->toggle } 228 sub { $::PICKUP_ENABLE->toggle }
119 ], 229 ],
230 );
231
232 if ($::CONN && $::CONN->{editor_support}) {
233 push @items, [
234 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
235 \&editor_invoke,
236 ];
237
238 for my $type (qw(test name)) {
239 $::CONN->{editor_support}{type} ne $type
240 or next;
241 my $server = $::CONN->{editor_support}{"${type}server"}
242 or next;
243
244 push @items, [
245 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
246 sub { server_login $server },
247 ];
248 }
249 }
250
251 push @items,
120 ["Quit", 252 ["Quit",
121 sub { 253 sub {
122 if ($::CONN) { 254 if ($::CONN) {
123 &::open_quit_dialog; 255 &::open_quit_dialog;
124 } else { 256 } else {
125 exit; 257 exit;
126 }
127 } 258 }
128 ], 259 }
129 ], 260 ],
261 ;
262
263 (new CFPlus::UI::Menu
264 items => \@items,
130 )->popup ($ev); 265 )->popup ($ev);
131 } 266 }
132 267
133 1 268 1
134} 269}
… …
153 1 288 1
154} 289}
155 290
156sub size_request { 291sub size_request {
157 ( 292 (
158 32 * CFPlus::ceil $::WIDTH / 32, 293 ::T * CFPlus::ceil $::WIDTH / ::T,
159 32 * CFPlus::ceil $::HEIGHT / 32, 294 ::T * CFPlus::ceil $::HEIGHT / ::T,
160 ) 295 )
161} 296}
162 297
163sub update { 298sub update {
164 my ($self) = @_; 299 my ($self) = @_;
… …
190 my $sym = $ev->{sym}; 325 my $sym = $ev->{sym};
191 my $uni = $ev->{unicode}; 326 my $uni = $ev->{unicode};
192 327
193 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 328 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
194 329
195 if ($uni == ord "\t") { 330 if ($sym == 9) {
196 $::PL_WINDOW->toggle_visibility; 331 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
197 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 332 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
198 $::HELP_WINDOW->toggle_visibility; 333 $::HELP_WINDOW->toggle_visibility;
199 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 334 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
200 ::toggle_player_page ($::STATS_PAGE); 335 ::toggle_player_page ($::STATS_PAGE);
201 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 336 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
204 ::toggle_player_page ($::SPELL_PAGE); 339 ::toggle_player_page ($::SPELL_PAGE);
205 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 340 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
206 ::toggle_player_page ($::INVENTORY_PAGE); 341 ::toggle_player_page ($::INVENTORY_PAGE);
207 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 342 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
208 $::SETUP_DIALOG->toggle_visibility; 343 $::SETUP_DIALOG->toggle_visibility;
209 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
210 $::BIND_EDITOR->set_binding (undef, undef, [],
211 sub {
212 my ($mod, $sym, $cmds) = @_;
213 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
214 });
215 $::BIND_EDITOR->start;
216 $::BIND_EDITOR->show;
217 } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
218 $::BIND_EDITOR->stop;
219 $::BIND_EDITOR->ask_for_bind_and_commit;
220 $::BIND_EDITOR->hide;
221 } elsif (!$::CONN) { 344 } elsif (!$::CONN) {
222 return 0; # bindings further down need a valid connection 345 return 0; # bindings further down need a valid connection
223 346
224 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { 347 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
225 $::CONN->user_send ("stay fire"); 348 $::CONN->user_send ("stay fire");
226 } elsif ($uni == ord ",") { 349 } elsif ($uni == ord ",") {
227 $::CONN->user_send ("take"); 350 $::CONN->user_send ("take");
228 } elsif ($uni == ord " ") { 351 } elsif ($uni == ord " ") {
229 $::CONN->user_send ("apply"); 352 $::CONN->user_send ("apply");
353 } elsif ($uni == 13) {
354 $::CONN->user_send ("examine");
230 } elsif ($uni == ord ".") { 355 } elsif ($uni == ord ".") {
231 $::CONN->user_send ($self->{completer}{last_command}) 356 $::CONN->user_send ($self->{completer}{last_command})
232 if exists $self->{completer}{last_command}; 357 if exists $self->{completer}{last_command};
233 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { 358 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
234 $::CONN->user_send ($_) for @$bind_cmd; 359 $::CONN->macro_send ($_) for @macros;
235 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 360 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
236 $::CONN->user_send ("rotateshoottype +"); 361 $::CONN->user_send ("rotateshoottype +");
237 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 362 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
238 $::CONN->user_send ("rotateshoottype -"); 363 $::CONN->user_send ("rotateshoottype -");
364 } elsif ($uni == ord '!') {
365 $self->{completer}->set_prefix ("shout ");
366 $self->{completer}->show;
239 } elsif ($uni == ord '"') { 367 } elsif ($uni == ord '"') {
240 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 368 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
241 $self->{completer}->show; 369 $self->{completer}->show;
242 } elsif ($uni == ord "'") { 370 } elsif ($uni == ord "'") {
243 $self->{completer}->set_prefix (""); 371 $self->{completer}->set_prefix ("");
… …
299} 427}
300 428
301sub set_magicmap { 429sub set_magicmap {
302 my ($self, $w, $h, $x, $y, $data) = @_; 430 my ($self, $w, $h, $x, $y, $data) = @_;
303 431
304 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 432 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
305 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 433 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
306 434
307 $self->{magicmap} = [$x, $y, $w, $h, $data]; 435 $self->{magicmap} = [$x, $y, $w, $h, $data];
308 436
309 $self->update; 437 $self->update;
310} 438}
… …
319 447
320 return 448 return
321 unless $focused || !$::FAST; 449 unless $focused || !$::FAST;
322 450
323 if (delete $self->{need_update}) { 451 if (delete $self->{need_update}) {
324 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 452 my $tilesize = $self->{tilesize} = int ::T * $::CFG->{map_scale};
325 453
454 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
455 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
456
326 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 457 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
327 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 458 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
328 459
329 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 460 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
330 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 461 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
331 462
332 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 463 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
333 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 464 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
334 465
335 if ($::CFG->{fow_enable}) { 466 if ($::CFG->{fow_enable}) {
336 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 467 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
337 468
338 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 469 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
339 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 470 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
340 glConvolutionFilter2D ( 471 glConvolutionFilter2D (
341 GL_CONVOLUTION_2D, 472 GL_CONVOLUTION_2D,
… …
363 494
364 glPushMatrix; 495 glPushMatrix;
365 glTranslate $sx0, $sy0; 496 glTranslate $sx0, $sy0;
366 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 497 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
367 498
368 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 499 $::MAP->draw ($dx, $dy, $sw, $sh, ::T);
369 500
370 glScale 32, 32; 501 glScale ::T, ::T;
371 502
372 if (my $tex = $self->{fow_texture}) { 503 if (my $tex = $self->{fow_texture}) {
373 glEnable GL_TEXTURE_2D; 504 glEnable GL_TEXTURE_2D;
374 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 505 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
375 506
… …
380 } 511 }
381 512
382 if ($self->{magicmap}) { 513 if ($self->{magicmap}) {
383 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 514 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
384 515
385 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 516 $x += $::MAP->ox + $self->{dx};
386 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 517 $y += $::MAP->oy + $self->{dy};
387 518
388 glTranslate - $x - 1, - $y - 1; 519 glTranslate - $x - 1, - $y - 1;
389 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 520 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
390 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 521 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
391 } 522 }
… …
450 581
451 $::MAP or return; 582 $::MAP or return;
452 583
453 my ($w, $h) = @$self{qw(w h)}; 584 my ($w, $h) = @$self{qw(w h)};
454 585
455 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 586 my $sw = int $::WIDTH / (::T * $::CFG->{map_scale}) + 0.99;
456 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 587 my $sh = int $::HEIGHT / (::T * $::CFG->{map_scale}) + 0.99;
457 588
458 my $sx = int $::CFG->{map_shift_x} / 32; 589 my $sx = int $::CFG->{map_shift_x} / ::T;
459 my $sy = int $::CFG->{map_shift_y} / 32; 590 my $sy = int $::CFG->{map_shift_y} / ::T;
460 591
461 my $ox = 0.5 * ($w - $sw); 592 my $ox = 0.5 * ($w - $sw);
462 my $oy = 0.5 * ($h - $sh); 593 my $oy = 0.5 * ($h - $sh);
463 594
464 glEnable GL_BLEND; 595 glEnable GL_BLEND;
… …
537 668
538 if ($ev->{button} == 3) { 669 if ($ev->{button} == 3) {
539 (new CFPlus::UI::Menu 670 (new CFPlus::UI::Menu
540 items => [ 671 items => [
541 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 672 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
542 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 673 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
543 ], 674 ],
544 )->popup ($ev); 675 )->popup ($ev);
545 return 1; 676 return 1;
546 } 677 }
547 0 678 0
… …
748 879
749 $self->SUPER::_draw; 880 $self->SUPER::_draw;
750} 881}
751 882
7521 8831
884

Diff Legend

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