ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/player.C
(Generate patch)

Comparing deliantra/server/common/player.C (file contents):
Revision 1.14 by root, Sun Jan 7 02:39:13 2007 UTC vs.
Revision 1.57 by root, Thu Nov 5 15:43:21 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <funcpoint.h> 26
27//+GPL
27 28
28/* Determine if the attacktype represented by the 29/* Determine if the attacktype represented by the
29 * specified attack-number is enabled for dragon players. 30 * specified attack-number is enabled for dragon players.
30 * A dragon player (quetzal) can gain resistances for 31 * A dragon player (quetzal) can gain resistances for
31 * all enabled attacktypes. 32 * all enabled attacktypes.
45 * of the dragon race. 46 * of the dragon race.
46 */ 47 */
47int 48int
48is_dragon_pl (const object *op) 49is_dragon_pl (const object *op)
49{ 50{
50 if (op != NULL && op->type == PLAYER && op->arch != NULL && op->arch->clone.race != NULL && strcmp (op->arch->clone.race, "dragon") == 0) 51 if (op
52 && op->type == PLAYER
53 && op->arch
54 && op->arch->race == shstr_dragon)
51 return 1; 55 return 1;
56
52 return 0; 57 return 0;
53} 58}
54 59
55/* 60/*
56 * If final is set, it a clean/final save, not a backup, ie dont remove objects from inventory 61 * If final is set, it a clean/final save, not a backup, ie dont remove objects from inventory
61 INVOKE_PLAYER (SAVE, ob->contr); 66 INVOKE_PLAYER (SAVE, ob->contr);
62 67
63 int wiz = ob->flag [FLAG_WIZ]; 68 int wiz = ob->flag [FLAG_WIZ];
64 69
65 /* Eneq(@csd.uu.se): If we have an open container hide it. */ 70 /* Eneq(@csd.uu.se): If we have an open container hide it. */
66 object *container = ob->container; 71 object *container = ob->container_ ();
67 ob->container = 0; 72 ob->container = 0;
73
74 if (ob->map)
75 maplevel = ob->map->path;
68 76
69#define PL_OUT(k) freezer.put (KW_ ## k, k) 77#define PL_OUT(k) freezer.put (KW_ ## k, k)
70#define PL_OUT2(k,v) freezer.put (KW_ ## k, v) 78#define PL_OUT2(k,v) freezer.put (KW_ ## k, v)
71 79
72 PL_OUT (password); 80 PL_OUT (password);
73 PL_OUT2 (title, own_title); 81 PL_OUT2 (title, own_title);
82 PL_OUT (gender);
83 PL_OUT (hintmode);
74 PL_OUT (gen_hp); 84 PL_OUT (gen_hp);
75 PL_OUT (gen_sp); 85 PL_OUT (gen_sp);
76 PL_OUT (gen_grace); 86 PL_OUT (gen_grace);
77 PL_OUT (listening);
78 PL_OUT (shoottype);
79 PL_OUT (bowtype); 87 PL_OUT (bowtype);
80 PL_OUT (petmode); 88 PL_OUT (petmode);
81 PL_OUT (peaceful); 89 PL_OUT (peaceful);
82 PL_OUT (digestion); 90 PL_OUT (digestion);
83 PL_OUT2 (pickup, mode); 91 PL_OUT2 (pickup, mode);
84 PL_OUT (outputs_sync); 92 PL_OUT (outputs_sync);
85 PL_OUT (outputs_count); 93 PL_OUT (outputs_count);
86 94
87 freezer.put (KW_usekeys, usekeys == key_inventory ? "key_inventory" : (usekeys == keyrings ? "keyrings" : "containers")); 95 freezer.put (KW_usekeys, usekeys == key_inventory ? "key_inventory" : (usekeys == keyrings ? "keyrings" : "containers"));
88 freezer.put (KW_unapply, unapply == unapply_nochoice ? "unapply_nochoice" : (unapply == unapply_never ? "unapply_never" : "unapply_always")); 96 freezer.put (KW_unapply, unapply == unapply_nochoice ? "unapply_nochoice" : (unapply == unapply_never ? "unapply_never" : "unapply_always"));
89 97
90 if (ob->map) PL_OUT2 (map, ob->map->path); 98 PL_OUT2 (map, maplevel);
91
92 PL_OUT (savebed_map); 99 PL_OUT (savebed_map);
93 PL_OUT (bed_x); 100 PL_OUT (bed_x);
94 PL_OUT (bed_y); 101 PL_OUT (bed_y);
95 PL_OUT (weapon_sp); 102 PL_OUT (weapon_sp);
103 PL_OUT (weapon_sp_left);
96 PL_OUT2 (Str, orig_stats.Str); 104 PL_OUT2 (Str, orig_stats.Str);
97 PL_OUT2 (Dex, orig_stats.Dex); 105 PL_OUT2 (Dex, orig_stats.Dex);
98 PL_OUT2 (Con, orig_stats.Con); 106 PL_OUT2 (Con, orig_stats.Con);
99 PL_OUT2 (Int, orig_stats.Int); 107 PL_OUT2 (Int, orig_stats.Int);
100 PL_OUT2 (Pow, orig_stats.Pow); 108 PL_OUT2 (Pow, orig_stats.Pow);
101 PL_OUT2 (Wis, orig_stats.Wis); 109 PL_OUT2 (Wis, orig_stats.Wis);
102 PL_OUT2 (Cha, orig_stats.Cha); 110 PL_OUT2 (Cha, orig_stats.Cha);
103 111
104 PL_OUT2 (lev_array, min (ob->level, 10)); 112 PL_OUT2 (lev_array, 10);
105 113
106 for (int i = 1; i <= last_level && i <= 10; i++) 114 for (int i = 1; i <= 10; i++)
107 { 115 {
108 fprintf (freezer, "%d\n", levhp[i]); 116 freezer.add (levhp [i]); freezer.add ('\n');
109 fprintf (freezer, "%d\n", levsp[i]); 117 freezer.add (levsp [i]); freezer.add ('\n');
110 fprintf (freezer, "%d\n", levgrace[i]); 118 freezer.add (levgrace[i]); freezer.add ('\n');
111 } 119 }
112 120
113 freezer.put (ob->contr); 121 freezer.put (ob->contr);
114 freezer.put (KW_endplst); 122 freezer.put (KW_endplst);
115 123
116 SET_FLAG (ob, FLAG_NO_FIX_PLAYER); 124 SET_FLAG (ob, FLAG_NO_FIX_PLAYER);
117 CLEAR_FLAG (ob, FLAG_WIZ); 125 CLEAR_FLAG (ob, FLAG_WIZ);
118 save_object (freezer, ob, 1); /* don't check and don't remove */ 126 ob->write (freezer);
119 127
120 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 128 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
121 129
122 /* Eneq(@csd.uu.se): Reveal the container if we have one. */ 130 /* Eneq(@csd.uu.se): Reveal the container if we have one. */
123 ob->container = container; 131 ob->container = container;
127 INVOKE_PLAYER (SAVE_DONE, ob->contr); 135 INVOKE_PLAYER (SAVE_DONE, ob->contr);
128 136
129 return true; 137 return true;
130} 138}
131 139
140//-GPL
141
132bool 142bool
133player::save_pl (const char *path) 143player::save_pl (const char *path)
134{ 144{
135 object_freezer freezer; 145 object_freezer freezer;
136 146
139 149
140 return freezer.save (path); 150 return freezer.save (path);
141} 151}
142 152
143player * 153player *
144player::load_pl (object_thawer &thawer) 154player::load_pl (object_thawer &f)
145{ 155{
156 int maxerrs = 20;
157
146 player *pl = new player; 158 player *pl = new player;
147 159
148 pl->last_save_time = time (0);
149 pl->savebed_map = first_map_path; 160 pl->savebed_map = first_map_path;
150 161
151 /* Loop through the file, loading the rest of the values */ 162 /* Loop through the file, loading the rest of the values */
152 for (;;) 163 for (;;)
153 { 164 {
154 keyword kw = thawer.get_kv ();
155
156 switch (kw) 165 switch (f.kw)
157 { 166 {
158 case KW_EOF: 167 case KW_EOF:
159 LOG (llevError, "%s: unexpected EOF while reading player header\n", thawer.name); 168 LOG (llevError, "%s: unexpected EOF while reading player header\n", f.name);
160 delete pl; 169 goto failure;
170
171 default:
172 LOG (llevError, "%s: skipping unknown key in player header: %s\n", f.name, f.kw_str);
173 if (!--maxerrs) goto failure;
161 return 0; 174 break;
162 175
163 case KW_ERROR: 176 case KW_ERROR:
164 LOG (llevError, "%s: error while reading player header, skipping (%s,%s)\n", thawer.name, thawer.last_keyword, thawer.last_value); 177 LOG (llevError, "%s: parse error while reading player header, skipping (%s,%s).\n", f.name, f.kw_str, f.value);
178 if (!--maxerrs) goto failure;
165 break; 179 break;
166 180
167 case KW_endplst: 181 case KW_endplst:
182 f.next ();
183
184 if (object *op = pl->ob->read (f))
185 pl->set_object (op);
186 else
168 goto done; 187 goto failure;
169 188
189 INVOKE_PLAYER (LOAD, pl);
190
191 return pl;
192
170 case KW_oid: thawer.get (pl, thawer.get_sint32 ()); break; 193 case KW_oid: f.get (pl, f.get_sint32 ()); break;
171 case KW_password: assign (pl->password , thawer.get_str ()); break; 194 case KW_password: assign (pl->password , f.get_str ()); break;
172 case KW_title: assign (pl->own_title, thawer.get_str ()); break; 195 case KW_title: assign (pl->own_title, f.get_str ()); break;
173 case KW_shoottype: pl->shoottype = (rangetype) thawer.get_sint32 (); break;
174 case KW_bowtype: pl->bowtype = (bowtype_t) thawer.get_sint32 (); break; 196 case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break;
175 case KW_petmode: pl->petmode = (petmode_t) thawer.get_sint32 (); break; 197 case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break;
176 case KW_listening: thawer.get (pl->listening); break; 198 case KW_gender: f.get (pl->gender); break;
199 case KW_hintmode: f.get (pl->hintmode); break;
200 case KW_listening: /*TODO*/; break;
177 case KW_peaceful: thawer.get (pl->peaceful); break; 201 case KW_peaceful: f.get (pl->peaceful); break;
178 case KW_digestion: thawer.get (pl->digestion); break; 202 case KW_digestion: f.get (pl->digestion); break;
179 case KW_pickup: thawer.get (pl->mode); break; 203 case KW_pickup: f.get (pl->mode); break;
180 case KW_outputs_sync: thawer.get (pl->outputs_sync); break; 204 case KW_outputs_sync: f.get (pl->outputs_sync); break;
181 case KW_outputs_count: thawer.get (pl->outputs_count); break; 205 case KW_outputs_count: f.get (pl->outputs_count); break;
182 case KW_map: thawer.get (pl->maplevel); break; 206 case KW_map: f.get (pl->maplevel); break;
183 case KW_savebed_map: thawer.get (pl->savebed_map); break; 207 case KW_savebed_map: f.get (pl->savebed_map); break;
184 case KW_bed_x: thawer.get (pl->bed_x); break; 208 case KW_bed_x: f.get (pl->bed_x); break;
185 case KW_bed_y: thawer.get (pl->bed_y); break; 209 case KW_bed_y: f.get (pl->bed_y); break;
186 case KW_weapon_sp: thawer.get (pl->weapon_sp); break; 210 case KW_weapon_sp: f.get (pl->weapon_sp); break;
211 case KW_weapon_sp_left:f.get (pl->weapon_sp_left); break;
187 case KW_Str: thawer.get (pl->orig_stats.Str); break; 212 case KW_Str: f.get (pl->orig_stats.Str); break;
188 case KW_Dex: thawer.get (pl->orig_stats.Dex); break; 213 case KW_Dex: f.get (pl->orig_stats.Dex); break;
189 case KW_Con: thawer.get (pl->orig_stats.Con); break; 214 case KW_Con: f.get (pl->orig_stats.Con); break;
190 case KW_Int: thawer.get (pl->orig_stats.Int); break; 215 case KW_Int: f.get (pl->orig_stats.Int); break;
191 case KW_Pow: thawer.get (pl->orig_stats.Pow); break; 216 case KW_Pow: f.get (pl->orig_stats.Pow); break;
192 case KW_Wis: thawer.get (pl->orig_stats.Wis); break; 217 case KW_Wis: f.get (pl->orig_stats.Wis); break;
193 case KW_Cha: thawer.get (pl->orig_stats.Cha); break; 218 case KW_Cha: f.get (pl->orig_stats.Cha); break;
194 case KW_gen_hp: thawer.get (pl->gen_hp); break; 219 case KW_gen_hp: f.get (pl->gen_hp); break;
195 case KW_gen_sp: thawer.get (pl->gen_sp); break; 220 case KW_gen_sp: f.get (pl->gen_sp); break;
196 case KW_gen_grace: thawer.get (pl->gen_grace); break; 221 case KW_gen_grace: f.get (pl->gen_grace); break;
197 222
198 case KW_usekeys: 223 case KW_usekeys:
199 if (!strcmp (thawer.get_str (), "key_inventory")) 224 if (!strcmp (f.get_str (), "key_inventory"))
200 pl->usekeys = key_inventory; 225 pl->usekeys = key_inventory;
201 else if (!strcmp (thawer.get_str (), "keyrings")) 226 else if (!strcmp (f.get_str (), "keyrings"))
202 pl->usekeys = keyrings; 227 pl->usekeys = keyrings;
203 else if (!strcmp (thawer.get_str (), "containers")) 228 else if (!strcmp (f.get_str (), "containers"))
204 pl->usekeys = containers; 229 pl->usekeys = containers;
205 else 230 else
206 LOG (llevDebug, "load_player: got unknown usekeys type: %s\n", thawer.get_str ()); 231 LOG (llevDebug, "load_player: got unknown usekeys type: %s\n", f.get_str ());
207 break; 232 break;
208 233
209 case KW_unapply: 234 case KW_unapply:
210 if (!strcmp (thawer.get_str (), "unapply_nochoice")) 235 if (!strcmp (f.get_str (), "unapply_nochoice"))
211 pl->unapply = unapply_nochoice; 236 pl->unapply = unapply_nochoice;
212 else if (!strcmp (thawer.get_str (), "unapply_never")) 237 else if (!strcmp (f.get_str (), "unapply_never"))
213 pl->unapply = unapply_never; 238 pl->unapply = unapply_never;
214 else if (!strcmp (thawer.get_str (), "unapply_always")) 239 else if (!strcmp (f.get_str (), "unapply_always"))
215 pl->unapply = unapply_always; 240 pl->unapply = unapply_always;
216 else 241 else
217 LOG (llevDebug, "load_player: got unknown unapply type: %s\n", thawer.get_str ()); 242 LOG (llevDebug, "load_player: got unknown unapply type: %s\n", f.get_str ());
218 break; 243 break;
219 244
220 case KW_lev_array: 245 case KW_lev_array:
221 { 246 {
222 int count = thawer.get_sint32 (); 247 int count = f.get_sint32 ();
223 248
224 for (int i = 1; i <= count; i++) 249 for (int i = 1; i <= count; i++)
225 { 250 {
226 char line[128]; 251 char line [32];
227 252
228 fgets (line, 128, thawer); pl->levhp [i] = atoi (line); 253 fgets (line, 32, f); pl->levhp [i] = atoi (line);
229 fgets (line, 128, thawer); pl->levsp [i] = atoi (line); 254 fgets (line, 32, f); pl->levsp [i] = atoi (line);
230 fgets (line, 128, thawer); pl->levgrace[i] = atoi (line); 255 fgets (line, 32, f); pl->levgrace[i] = atoi (line);
231 } 256 }
232 } 257 }
233 break; 258 break;
234
235 default:
236 LOG (llevError, "%s: skipping unknown key in player header: %s\n", thawer.name, keyword_str [kw]);
237 break;
238 } 259 }
260
261 f.next ();
239 } 262 }
240 263
241done: 264failure:
242 /* this loads the standard objects values. */ 265 LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", f.name);
243 pl->set_object (object::create ());
244 266
245 if (!load_object (thawer, pl->ob, 0)) 267 if (pl->ob)
246 {
247 pl->ob->destroy (); 268 pl->ob->destroy ();
248 delete pl;
249 return 0;
250 }
251 269
252 INVOKE_PLAYER (LOAD, pl); 270 pl->destroy ();
253 271
254 return pl;
255}
256
257player *
258player::load_pl (const char *path)
259{
260 object_thawer thawer (path);
261
262 if (!thawer)
263 return 0; 272 return 0;
264
265 return load_pl (thawer);
266} 273}
267 274
275const char *
276player::killer_name () const
277{
278 static char buf [2048];
279
280 if (!killer)
281 return "a dungeon collapse";
282 else if (killer->contr)
283 snprintf (buf, sizeof (buf), "%s the %s", &killer->name,
284 *killer->contr->own_title ? killer->contr->own_title : killer->contr->title);
285 else if (killer->type == DEEP_SWAMP)
286 snprintf (buf, sizeof (buf), "drowning in a %s", &killer->name);
287 else if (killer->owner)
288 snprintf (buf, sizeof (buf), "%s's %s", &killer->outer_owner ()->name, &killer->name);
289 else
290 return &killer->name;
291
292 return buf;
293}
294
295// expand one level of cfpod
296// end == -2, till '\n'
297// end == -1, till '>'
298// end == 0, till eos
299// end >= 1, levels of " >>>"
300static const char *
301expand_cfpod (const player *pl, dynbuf_text &buf, const char *cfpod, int end = 0)
302{
303 static dynbuf_text nest(128, 128);
304
305 for (;;)
306 switch (char ch = *cfpod++)
307 {
308 case 0:
309 return cfpod - 1;
310
311 case ' ':
312 // verbatim block?
313 if (!buf.size () && !end)
314 {
315 --cfpod;
316 goto verbatim;
317 }
318
319 if (end < 1)
320 goto passthrough;
321
322 for (int i = 0; i < end; ++i)
323 if (cfpod [i] != '>')
324 goto passthrough;
325
326 return cfpod + end;
327
328 case '>':
329 if (end != -1)
330 {
331 buf << "&gt;";
332 break;
333 }
334
335 return cfpod;
336
337 case '&':
338 buf << "&amp;";
339 break;
340
341 case '<':
342 buf << "&lt;";
343 break;
344
345 case '\r':
346 buf << '\n';
347 /* \r\n+ becomes one or more newlines */
348 while (*cfpod == '\n')
349 buf << *cfpod++;
350 break;
351
352 case '\n':
353 if (end == -2)
354 return cfpod;
355
356 // \n\ => newline, tt
357 // \n\n => \n\n
358 // \n => single space
359
360 // two or more newlines will be copied verbatim, one is replaced by space
361 if (*cfpod == '\n')
362 {
363 --cfpod;
364 do
365 buf << *cfpod++;
366 while (*cfpod == '\n');
367 }
368 else if (*cfpod == ' ')
369 buf << '\n';
370 else
371 buf << ' ';
372
373 // verbatim block?
374 if (*cfpod == ' ')
375 goto verbatim;
376
377 break;
378
379 case 'B': case 'C': case 'E': case 'G':
380 case 'H': case 'I': case 'T': case 'U':
381 case 'Z':
382 {
383 int end = 0;
384
385 while (cfpod [end] == '<')
386 ++end;
387
388 if (!end)
389 goto passthrough;
390
391 if (end == 1 || cfpod [end] != ' ')
392 {
393 end = -1;
394 ++cfpod;
395 }
396 else
397 cfpod += end + 1;
398
399 const char *pfx, *sfx;
400
401 switch (ch)
402 {
403 case 'B': pfx = "<b>" ; sfx = "</b>" ; break;
404 case 'C': pfx = "<tt>" ; sfx = "</tt>" ; break;
405 case 'E': pfx = "&" ; sfx = ";" ; break;
406 case 'I': pfx = "<i>" ; sfx = "</i>" ; break;
407 case 'U': pfx = "<u>" ; sfx = "</u>" ; break;
408 case 'T': pfx = "<big><b>"; sfx = "</b></big>"; break;
409 case 'Z': pfx = "" ; sfx = "" ; break;
410
411 case 'H': // hint
412 {
413 if (pl->hintmode)
414 {
415 cfpod = expand_cfpod (pl, nest, cfpod, end);
416 nest.clear ();
417
418 if (pl->hintmode == 1)
419 buf << "<fg name=\"lightblue\">[Hint available]</fg>";
420 else
421 while (*cfpod <= ' '&& *cfpod) // eat trailing whitespace
422 ++cfpod;
423
424 goto skip;
425 }
426 else
427 {
428 pfx = "<fg name=\"lightblue\">[Hint: ";
429 sfx = "]</fg>";
430 }
431 }
432 break;
433
434 case 'G': // gender
435 {
436 cfpod = expand_cfpod (pl, nest, cfpod, end);
437 nest << '\0'; // zero-terminate
438
439 const char *str = nest.linearise ();
440 const char *sep = strchr (str, '|');
441
442 if (sep)
443 {
444 if (pl->gender)
445 buf.add (sep + 1, nest.size () - (sep - str) - 2);
446 else
447 buf.add (str, sep - str);
448 }
449
450 nest.clear ();
451
452 goto skip;
453 }
454 }
455
456 buf << pfx;
457 cfpod = expand_cfpod (pl, buf, cfpod, end);
458 buf << sfx;
459 }
460
461 break;
462
463 default:
464 passthrough:
465 buf << ch;
466 skip:
467 break;
468
469 verbatim:
470 // elements cannot currently span multiple lines
471 do
472 {
473 buf << "<tt>";
474 cfpod = expand_cfpod (pl, buf, cfpod, -2);
475 buf << "</tt>\n";
476
477 while (*cfpod == '\n')
478 buf << *cfpod++;
479 }
480 while (*cfpod == ' ');
481
482 break;
483 }
484}
485
486dynbuf_text *
487player::expand_cfpod (const char *cfpod) const
488{
489 static dynbuf_text buf(1024, 1024);
490 buf.clear ();
491
492 ::expand_cfpod (this, buf, cfpod);
493
494 return &buf;
495}
496

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines