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.188 by root, Sun Jul 29 03:58:26 2007 UTC vs.
Revision 1.193 by root, Tue Jul 31 00:30:16 2007 UTC

… …
71unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
72 if %PAR::LibCache; 72 if %PAR::LibCache;
73 73
74use Time::HiRes 'time'; 74use Time::HiRes 'time';
75use Event; 75use Event;
76use List::Util qw(max min);
76 77
77use Crossfire; 78use Crossfire;
78use Crossfire::Protocol::Constants; 79use Crossfire::Protocol::Constants;
79 80
80use Compress::LZF; 81use Compress::LZF;
… …
162 163
163our $SDL_MIXER; 164our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg"; 165our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT; 166our @MUSIC_WANT;
166our $MUSIC_START; 167our $MUSIC_START;
167our $MUSIC_PLAYING; 168our $MUSIC_PLAYING_DATA;
169our $MUSIC_PLAYING_META;
168our $MUSIC_PLAYER; 170our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before 171our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
170our @SOUNDS; # event => file mapping 172our @SOUNDS; # event => file mapping
171our %AUDIO_CHUNKS; # audio files 173our %AUDIO_CHUNKS; # audio files
172 174
… …
458 mapmap => $MAPMAP, 460 mapmap => $MAPMAP,
459 query => \&server_query, 461 query => \&server_query,
460 462
461 setup_req => { 463 setup_req => {
462 smoothing => $CFG->{map_smoothing}*1, 464 smoothing => $CFG->{map_smoothing}*1,
463 },
464
465 sound_play => sub {
466 my ($x, $y, $soundnum, $type) = @_;
467
468 $SDL_MIXER
469 or return;
470
471 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
472 or return;
473
474 $chunk->play;
475 }, 465 },
476 }; 466 };
477 467
478 if ($CONN) { 468 if ($CONN) {
479 CFPlus::lowdelay fileno $CONN->{fh}; 469 CFPlus::lowdelay fileno $CONN->{fh};
… …
1081 text => $CFG->{profile}{default}{host}, 1071 text => $CFG->{profile}{default}{host},
1082 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1072 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1083 on_changed => sub { 1073 on_changed => sub {
1084 my ($self, $value) = @_; 1074 my ($self, $value) = @_;
1085 $CFG->{profile}{default}{host} = $value; 1075 $CFG->{profile}{default}{host} = $value;
1086 0 1076 1
1087 } 1077 }
1088 ); 1078 );
1089 1079
1090 $vbox->add (new CFPlus::UI::Button 1080 $vbox->add (new CFPlus::UI::Button
1091 expand => 1, 1081 expand => 1,
1092 text => "Server List", 1082 text => "Server List",
1093 other => $METASERVER, 1083 other => $METASERVER,
1094 tooltip => "Show a list of available crossfire servers", 1084 tooltip => "Show a list of available crossfire servers",
1095 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1085 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1096 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1086 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1097 ); 1087 );
1098 } 1088 }
1099 1089
1100 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1090 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1101 $table->add_at (1, 4, new CFPlus::UI::Entry 1091 $table->add_at (1, 4, new CFPlus::UI::Entry
1102 text => $CFG->{profile}{default}{user}, 1092 text => $CFG->{profile}{default}{user},
1103 tooltip => "The name of your character on the server", 1093 tooltip => "The name of your character on the server",
1104 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1094 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1105 ); 1095 );
1106 1096
1107 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1097 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1108 $table->add_at (1, 5, new CFPlus::UI::Entry 1098 $table->add_at (1, 5, new CFPlus::UI::Entry
1109 text => $CFG->{profile}{default}{password}, 1099 text => $CFG->{profile}{default}{password},
1110 hidden => 1, 1100 hidden => 1,
1111 tooltip => "The password for your character", 1101 tooltip => "The password for your character",
1112 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1102 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1113 ); 1103 );
1114 1104
1115 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1105 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1116 $table->add_at (1, 7, new CFPlus::UI::Slider 1106 $table->add_at (1, 7, new CFPlus::UI::Slider
1117 force_w => 100, 1107 force_w => 100,
1118 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1108 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1119 tooltip => "This is the size of the portion of the map update the server sends you. " 1109 tooltip => "This is the size of the portion of the map update the server sends you. "
1120 . "If you set this to a high value you will be able to see further, " 1110 . "If you set this to a high value you will be able to see further, "
1121 . "but you also increase bandwidth requirements and latency. " 1111 . "but you also increase bandwidth requirements and latency. "
1122 . "This option is only used once at log-in.", 1112 . "This option is only used once at log-in.",
1123 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1113 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1124 ); 1114 );
1125 1115
1126 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1127 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1128 state => $CFG->{face_prefetch},
1129 tooltip => "<b>Background Image Prefetch</b>\n\n"
1130 . "If enabled, the client automatically pre-fetches images from the server. "
1131 . "This might increase or create lag, but increases the chances "
1132 . "of faces being ready for display when you encounter them. "
1133 . "It also uses up server bandwidth on every connect, "
1134 . "so only set it if you really need to prefetch images. "
1135 . "This option can be set and unset any time.",
1136 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1137 );
1138
1139 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1116 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1117 $table->add_at (1, 8, new CFPlus::UI::Entry
1118 text => $CFG->{output_rate},
1119 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1120 . "when sending data. When 0 or unset, the server "
1121 . "default will be used, which is usually around 100kb/s. Most servers will "
1122 . "dynamically find an optimal rate, so adjust this only when necessary.",
1123 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1124 );
1125
1126 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1140 $table->add_at (1, 9, new CFPlus::UI::Entry 1127 $table->add_at (1, 9, new CFPlus::UI::Entry
1141 text => $CFG->{output_rate},
1142 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1143 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1144 . "default will be used, which is usually around 100kb/s.",
1145 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1146 );
1147
1148 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1149 $table->add_at (1, 10, new CFPlus::UI::Entry
1150 text => $CFG->{output_count}, 1128 text => $CFG->{output_count},
1151 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1129 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1152 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1130 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1153 ); 1131 );
1154 1132
1155 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1133 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1156 $table->add_at (1, 11, new CFPlus::UI::Entry 1134 $table->add_at (1, 10, new CFPlus::UI::Entry
1157 text => $CFG->{output_sync}, 1135 text => $CFG->{output_sync},
1158 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1136 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1159 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1137 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1160 ); 1138 );
1161 1139
1162 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1140 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1163 expand => 1, 1141 expand => 1,
1164 align => 0, 1142 align => 0,
1165 text => "Login", 1143 text => "Login",
1166 on_activate => sub { 1144 on_activate => sub {
1167 $CONN ? stop_game 1145 $CONN ? stop_game
1168 : start_game; 1146 : start_game;
1169 0 1147 1
1170 }, 1148 },
1171 ); 1149 );
1172 1150
1173 $vbox->add (new CFPlus::UI::FancyFrame 1151 $vbox->add (new CFPlus::UI::FancyFrame
1174 label => "Server Info", 1152 label => "Server Info",
… …
1812} 1790}
1813 1791
1814sub audio_channel_finished { 1792sub audio_channel_finished {
1815 my ($channel) = @_; 1793 my ($channel) = @_;
1816 1794
1817 #warn "channel $channel finished\n";#d# 1795# warn "channel $channel finished\n";#d#
1796}
1797
1798our %AUDIO_PLAY;
1799our %AUDIO_CHUNK;
1800
1801sub audio_sound_push($) {
1802 my ($face) = @_;
1803
1804 if (my $chunk = $AUDIO_CHUNK{$face}) {
1805 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
1806 my (undef, $dx, $dy, $vol) = @$_;
1807
1808 my $channel = $chunk->play
1809 or return;
1810
1811 $channel->volume (128 + $vol);
1812 $dx = $dx / 10 * 255;
1813 $channel->set_panning ((min 255, 255 - $dx), (min 255, 255 + $dx));
1814# my $angle = $dx ? : $dx < 0 ?
1815# my $distance = -$vol;
1816# $channel->set_position ($angle, $distance);
1817 }
1818 } else {
1819 # sound_meta not set means data is in flight either way
1820 my $meta = $CONN->{sound_meta}{$face}
1821 or return;
1822
1823 # fetch from database
1824 CFPlus::DB::get res_data => $meta->{name}, sub {
1825 my $vol = $meta->{meta}{volume} || 1;
1826 my $rwops = new CFPlus::RW $_[0];
1827 my $chunk = new CFPlus::MixChunk $rwops;
1828 $chunk->volume ($vol * 128);
1829 $AUDIO_CHUNK{$face} = $chunk;
1830
1831 audio_sound_push ($face);
1832 };
1833 }
1834}
1835
1836sub audio_sound_play {
1837 my ($face, $dx, $dy, $vol) = @_;
1838
1839 $SDL_MIXER
1840 or return;
1841
1842 my $queue = $AUDIO_PLAY{$face} ||= [];
1843 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
1844 audio_sound_push $face
1845 unless @$queue > 1;
1818} 1846}
1819 1847
1820sub audio_music_set { 1848sub audio_music_set {
1821 my ($songs) = @_; 1849 my ($songs) = @_;
1822 1850
… …
1830 &audio_music_changed (); 1858 &audio_music_changed ();
1831 } 1859 }
1832} 1860}
1833 1861
1834sub audio_music_start { 1862sub audio_music_start {
1835 my $path = $MUSIC_PLAYING->{path} 1863 my $meta = $MUSIC_PLAYING_META;
1836 or return;
1837 1864
1838 CFPlus::DB::prefetch_file $path, 1024_000, sub { 1865 CFPlus::DB::get res_data => $meta->{name}, sub {
1839 return unless $SDL_MIXER; 1866 return unless $SDL_MIXER;
1840 1867
1841 # music might have changed... 1868 # music might have changed...
1842 $path eq $MUSIC_PLAYING->{path} 1869 $meta eq $MUSIC_PLAYING_META
1843 or return &audio_music_start (); 1870 or return &audio_music_start ();
1844 1871
1845 my $rwops = new_from_file CFPlus::RW $path; 1872 $MUSIC_PLAYING_DATA = \$_[0];
1873
1874 my $rwops = $meta->{path}
1875 ? new_from_file CFPlus::RW $meta->{path}
1876 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
1877
1846 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops; 1878 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
1879 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
1847 1880
1848 my $NOW = time; 1881 my $NOW = time;
1849 1882
1850 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) { 1883 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
1851 my $pos = $MUSIC_PLAYING->{stop_pos}; 1884 my $pos = $MUSIC_PLAYING_META->{stop_pos};
1852 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos); 1885 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1853 $MUSIC_START = time - $pos; 1886 $MUSIC_START = time - $pos;
1854 } else { 1887 } else {
1855 $MUSIC_PLAYER->play (0); 1888 $MUSIC_PLAYER->play (0);
1856 $MUSIC_START = time; 1889 $MUSIC_START = time;
1857 } 1890 }
1858 1891
1859 delete $MUSIC_PLAYING->{stop_time}; 1892 delete $MUSIC_PLAYING_META->{stop_time};
1860 delete $MUSIC_PLAYING->{stop_pos}; 1893 delete $MUSIC_PLAYING_META->{stop_pos};
1861 } 1894 }
1862} 1895}
1863 1896
1864sub audio_music_changed { 1897sub audio_music_changed {
1865 return unless $CFG->{bgm_enable}; 1898 return unless $CFG->{bgm_enable};
… …
1867 1900
1868 # default MUSIC_WANT == MUSIC_DEFAULT 1901 # default MUSIC_WANT == MUSIC_DEFAULT
1869 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT; 1902 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
1870 1903
1871 # if the currently playing song is acceptable, let it continue 1904 # if the currently playing song is acceptable, let it continue
1872 return if $MUSIC_PLAYING 1905 return if $MUSIC_PLAYING_META
1873 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT; 1906 && grep $MUSIC_PLAYING_META == $_, @MUSIC_WANT;
1874 1907
1875 my $NOW = time; 1908 my $NOW = time;
1876 1909
1877 if ($MUSIC_PLAYING) { 1910 if ($MUSIC_PLAYING_META) {
1878 $MUSIC_PLAYING->{stop_time} = $NOW; 1911 $MUSIC_PLAYING_META->{stop_time} = $NOW;
1879 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START; 1912 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
1880 CFPlus::MixMusic::fade_out 1000; 1913 CFPlus::MixMusic::fade_out 1000;
1881 } else { 1914 } else {
1882 # sort by stop time, oldest first 1915 # sort by stop time, oldest first
1883 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT; 1916 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
1884 1917
1885 # if the most recently-played piece played very recently, 1918 # if the most recently-played piece played very recently,
1886 # resume it, else choose the oldest piece for rotation. 1919 # resume it, else choose the oldest piece for rotation.
1887 $MUSIC_PLAYING = 1920 $MUSIC_PLAYING_META =
1888 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME 1921 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
1889 ? $MUSIC_WANT[-1] 1922 ? $MUSIC_WANT[-1]
1890 : $MUSIC_WANT[0]; 1923 : $MUSIC_WANT[0];
1891 1924
1892 audio_music_start; 1925 audio_music_start;
1893 } 1926 }
1894} 1927}
1895 1928
1896sub audio_music_finished { 1929sub audio_music_finished {
1897 $MUSIC_PLAYING = undef;
1898 undef $MUSIC_PLAYER; 1930 undef $MUSIC_PLAYER;
1931 undef $MUSIC_PLAYING_META;
1932 undef $MUSIC_PLAYING_DATA;
1899 1933
1900 audio_music_changed; 1934 audio_music_changed;
1901} 1935}
1902 1936
1903sub audio_init { 1937sub audio_init {
1904 if ($CFG->{audio_enable}) { 1938 if ($CFG->{audio_enable}) {
1905 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1906 $ENV{MIX_EFFECTSMAXSPEED} = 1; 1939 $ENV{MIX_EFFECTSMAXSPEED} = 1;
1907 $SDL_MIXER = !CFPlus::Mix_OpenAudio; 1940 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1908 1941
1909 unless ($SDL_MIXER) { 1942 unless ($SDL_MIXER) {
1910 status "Unable to open sound device: there will be no sound"; 1943 status "Unable to open sound device: there will be no sound";
1911 return; 1944 return;
1912 }
1913
1914 CFPlus::Mix_AllocateChannels 8;
1915 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1916
1917 audio_music_finished;
1918
1919 local $_;
1920 while (<$fh>) {
1921 next if /^\s*#/;
1922 next if /^\s*$/;
1923
1924 my ($file, $volume, $event) = split /\s+/, $_, 3;
1925
1926 push @SOUNDS, "$volume,$file";
1927
1928 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1929 my $rwops = new_from_file CFPlus::RW CFPlus::find_rcfile "sounds/$file";
1930 my $chunk = new CFPlus::MixChunk $rwops;
1931 $chunk->volume ($volume * 128 / 100);
1932 $chunk
1933 };
1934 }
1935 } else {
1936 status "unable to open sound config: $!";
1937 } 1945 }
1946
1947 CFPlus::Mix_AllocateChannels 16;
1948 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1949
1950 audio_music_finished;
1938 } else { 1951 } else {
1939 undef $SDL_MIXER; 1952 undef $SDL_MIXER;
1940 } 1953 }
1941} 1954}
1942 1955
… …
1950my %animate_object; 1963my %animate_object;
1951my $animate_timer; 1964my $animate_timer;
1952 1965
1953my $fps = 9; 1966my $fps = 9;
1954 1967
1955my %demo;#d#
1956
1957sub force_refresh { 1968sub force_refresh {
1958 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1969 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1959 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1970 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1960 1971
1961 $CFPlus::UI::ROOT->draw; 1972 $CFPlus::UI::ROOT->draw;
… …
1992 2003
1993sub animation_stop { 2004sub animation_stop {
1994 my ($widget) = @_; 2005 my ($widget) = @_;
1995 delete $animate_object{$widget}; 2006 delete $animate_object{$widget};
1996} 2007}
1997
1998# check once/second for faces that need to be prefetched
1999# this should, of course, only run on demand, but
2000# SDL forces worse things on us....
2001
2002Event->timer (after => 1, interval => 0.25, cb => sub {
2003 $CONN->face_prefetch
2004 if $CONN;
2005});
2006 2008
2007%SDL_CB = ( 2009%SDL_CB = (
2008 CFPlus::SDL_QUIT => sub { 2010 CFPlus::SDL_QUIT => sub {
2009 exit; 2011 exit;
2010 }, 2012 },
… …
2054 2056
2055 CFPlus::UI::set_layout ($::CFG->{layout}); 2057 CFPlus::UI::set_layout ($::CFG->{layout});
2056 2058
2057 my %DEF_CFG = ( 2059 my %DEF_CFG = (
2058 sdl_mode => 0, 2060 sdl_mode => 0,
2059 width => 640,
2060 height => 480,
2061 fullscreen => 0, 2061 fullscreen => 0,
2062 fast => 0, 2062 fast => 0,
2063 map_scale => 1, 2063 map_scale => 1,
2064 fow_enable => 1, 2064 fow_enable => 1,
2065 fow_intensity => 0, 2065 fow_intensity => 0,
… …
2071 stat_fontsize => 0.7, 2071 stat_fontsize => 0.7,
2072 mapsize => 100, 2072 mapsize => 100,
2073 audio_enable => 1, 2073 audio_enable => 1,
2074 bgm_enable => 1, 2074 bgm_enable => 1,
2075 bgm_volume => 0.25, 2075 bgm_volume => 0.25,
2076 face_prefetch => 0,
2077 output_sync => 1, 2076 output_sync => 1,
2078 output_count => 1, 2077 output_count => 1,
2079 output_rate => "", 2078 output_rate => "",
2080 pickup => 0, 2079 pickup => 0,
2081 inv_sort => "mtime", 2080 inv_sort => "mtime",

Diff Legend

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