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

Comparing deliantra/server/common/init.C (file contents):
Revision 1.9 by root, Sat Sep 9 23:49:06 2006 UTC vs.
Revision 1.39 by root, Mon Jul 16 09:07:12 2007 UTC

1/* 1/*
2 * static char *rcsid_init_c = 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * "$Id: init.C,v 1.9 2006/09/09 23:49:06 root Exp $"; 3 *
4 */ 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5
6/*
7 CrossFire, A Multiplayer game for X-windows
8
9 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
11 7 *
12 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
13 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
14 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
15 (at your option) any later version. 11 * (at your option) any later version.
16 12 *
17 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,
18 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 GNU General Public License for more details. 16 * GNU General Public License for more details.
21 17 *
22 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
23 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
25 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
26 The authors can be reached via e-mail at crossfire-devel@real-time.com
27*/ 22 */
28 23
29#define EXTERN // horrible hack 24#define EXTERN // horrible hack
30 25
31#include <global.h> 26#include <global.h>
32#include <object.h> 27#include <object.h>
33 28
34extern const char* const attacktype_desc[NROFATTACKS] = { 29extern const char *const attacktype_desc[NROFATTACKS] = {
35# define def(uc, lc, name, plus, change) # name, 30# define def(uc, lc, name, plus, change) # name,
36# include "attackinc.h" 31# include "attackinc.h"
37# undef def 32# undef def
38}; 33};
39 34
40extern const keyword resist_save[NROFATTACKS] = {
41# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
42# include "attackinc.h"
43# undef def
44};
45
46extern const char* const resist_plus[NROFATTACKS] = { 35extern const char *const resist_plus[NROFATTACKS] = {
47# define def(uc, lc, name, plus, change) # plus, 36# define def(uc, lc, name, plus, change) # plus,
48# include "attackinc.h" 37# include "attackinc.h"
49# undef def 38# undef def
50}; 39};
51 40
52extern const char* const change_resist_msg[NROFATTACKS] = { 41extern const char *const change_resist_msg[NROFATTACKS] = {
53# define def(uc, lc, name, plus, change) # change, 42# define def(uc, lc, name, plus, change) # change,
54# include "attackinc.h" 43# include "attackinc.h"
55# undef def 44# undef def
56}; 45};
57 46
63 52
64/* You unforunately need to looking in include/global.h to see what these 53/* You unforunately need to looking in include/global.h to see what these
65 * correspond to. 54 * correspond to.
66 */ 55 */
67struct Settings settings = { 56struct Settings settings = {
68LOGFILE, /* Logfile */ 57 LOGFILE, /* Logfile */
69CSPORT, /* Client/server port */ 58 CSPORT, /* Client/server port */
70 59
71/* Debug level */ 60/* Debug level */
72#ifdef DEBUG 61#ifdef DEBUG
73 llevDebug, 62 llevDebug,
74#else 63#else
75 llevInfo, 64 llevInfo,
76#endif 65#endif
77 66
780, NULL, 0, /* dumpvalues, dumparg, daemonmode */ 67 0, NULL, 0, /* dumpvalues, dumparg, daemonmode */
790, /* argc */ 68 0, /* argc */
80NULL, /* argv */ 69 NULL, /* argv */
81CONFDIR, 70 CONFDIR,
82DATADIR, 71 DATADIR,
83LOCALDIR, 72 LOCALDIR,
84PLAYERDIR, MAPDIR, ARCHETYPES,REGIONS,TREASURES, 73 PLAYERDIR, MAPDIR, ARCHETYPES, REGIONS, TREASURES,
85UNIQUE_DIR, TEMPLATE_DIR, 74 UNIQUE_DIR, TEMPLATE_DIR,
86TMPDIR, 75 TMPDIR,
76 PK_LUCK_PENALTY,
87STAT_LOSS_ON_DEATH, 77 STAT_LOSS_ON_DEATH,
88PK_LUCK_PENALTY,
89PERMANENT_EXPERIENCE_RATIO, 78 PERMANENT_EXPERIENCE_RATIO,
90DEATH_PENALTY_RATIO, 79 DEATH_PENALTY_RATIO,
91DEATH_PENALTY_LEVEL, 80 DEATH_PENALTY_LEVEL,
92BALANCED_STAT_LOSS, 81 BALANCED_STAT_LOSS,
93NOT_PERMADETH, 82 NOT_PERMADETH,
94SIMPLE_EXP, 83 SIMPLE_EXP,
95RESET_LOCATION_TIME,
96SET_TITLE, 84 SET_TITLE,
97RESURRECTION, 85 RESURRECTION,
98SEARCH_ITEMS, 86 SEARCH_ITEMS,
99SPELL_ENCUMBRANCE, 87 SPELL_ENCUMBRANCE,
100SPELL_FAILURE_EFFECTS, 88 SPELL_FAILURE_EFFECTS,
101CASTING_TIME, 89 SET_FRIENDLY_FIRE,
102REAL_WIZ, 90 0,
103RECYCLE_TMP_MAPS, 91 0,
104EXPLORE_MODE, 92 EXPLORE_MODE,
105SPELLPOINT_LEVEL_DEPEND, 93 SPELLPOINT_LEVEL_DEPEND,
106SET_FRIENDLY_FIRE,
107"", /* Who format specifier */
108"", /* who wiz format specifier */
109MOTD, 94 MOTD,
110"rules", 95 "rules",
111"news", 96 "news",
112"", /* DM_MAIL */ 97 "", /* DM_MAIL */
1130, /* This and the next 3 values are metaserver values */
114"",
115"",
1160,
117"",
1180,0,0,0,0,0,0,0, /* worldmap settings*/ 98 0, 0, 0, 0, 0, 0, 0, 0, /* worldmap settings */
119EMERGENCY_MAPPATH, EMERGENCY_X, EMERGENCY_Y, 99 0,
1200,
1211.0, 100 1.0,
101
122/* Armor enchantment stuff */ 102/* Armor enchantment stuff */
123ARMOR_MAX_ENCHANT, 103 ARMOR_MAX_ENCHANT,
124ARMOR_WEIGHT_REDUCTION, 104 ARMOR_WEIGHT_REDUCTION,
125ARMOR_WEIGHT_LINEAR, 105 ARMOR_WEIGHT_LINEAR,
126ARMOR_SPEED_IMPROVEMENT, 106 ARMOR_SPEED_IMPROVEMENT,
127ARMOR_SPEED_LINEAR, 107 ARMOR_SPEED_LINEAR,
1281, /* no_player_stealing */
1291, /* create_home_portals */
130}; 108};
131 109
132/* perhaps not the best place for this, but needs to be 110/* perhaps not the best place for this, but needs to be
133 * in some file in the common area so that standalone 111 * in some file in the common area so that standalone
134 * programs, like the random map generator, can be built. 112 * programs, like the random map generator, can be built.
135 */ 113 */
136const char* const spellpathnames[NRSPELLPATHS] = { 114const char *const spellpathnames[NRSPELLPATHS] = {
137 "Protection", 115 "Protection",
138 "Fire", 116 "Fire",
139 "Frost", 117 "Frost",
140 "Electricity", 118 "Electricity",
141 "Missiles", 119 "Missiles",
142 "Self", 120 "Self",
143 "Summoning", 121 "Summoning",
144 "Abjuration", 122 "Abjuration",
145 "Restoration", 123 "Restoration",
146 "Detonation", 124 "Detonation",
147 "Mind", 125 "Mind",
148 "Creation", 126 "Creation",
149 "Teleportation", 127 "Teleportation",
150 "Information", 128 "Information",
151 "Transmutation", 129 "Transmutation",
152 "Transferrence", 130 "Transferrence",
153 "Turning", 131 "Turning",
154 "Wounding", 132 "Wounding",
155 "Death", 133 "Death",
156 "Light" 134 "Light"
157}; 135};
158
159
160/* This loads the emergency map information from a
161 * .emergency file in the map directory. Doing this makes
162 * it easier to switch between map distributions (don't need
163 * to recompile. Note that there is no reason I see that
164 * this could not be re-loaded during play, but it seems
165 * like there should be little reason to do that.
166 */
167static void init_emergency_mappath(void)
168{
169 char filename[MAX_BUF], tmpbuf[MAX_BUF];
170 FILE *fp;
171 int online=0;
172
173 /* If this file doesn't exist, not a big deal */
174 sprintf(filename,"%s/%s/.emergency",settings.datadir, settings.mapdir);
175 if ((fp = fopen(filename, "r"))!=NULL) {
176 while (fgets(tmpbuf, MAX_BUF-1, fp)) {
177 if (tmpbuf[0] == '#') continue; /* ignore comments */
178
179 if (online == 0) {
180 tmpbuf[strlen(tmpbuf)-1] = 0; /* kill newline */
181 settings.emergency_mapname = strdup_local(tmpbuf);
182 }
183 else if (online == 1) {
184 settings.emergency_x = atoi(tmpbuf);
185 }
186
187 else if (online == 2) {
188 settings.emergency_y = atoi(tmpbuf);
189 }
190 online++;
191 if (online>2) break;
192 }
193 fclose(fp);
194 if (online<=2)
195 LOG(llevError,"Online read partial data from %s\n", filename);
196 LOG(llevDebug,"Emergency mappath reset to %s (%d, %d)\n", settings.emergency_mapname,
197 settings.emergency_x, settings.emergency_y);
198 }
199}
200
201 136
202/* 137/*
203 * It is vital that init_library() is called by any functions 138 * It is vital that init_library() is called by any functions
204 * using this library. 139 * using this library.
205 * If you want to lessen the size of the program using the library, 140 * If you want to lessen the size of the program using the library,
206 * you can replace the call to init_library() with init_globals() and 141 * you can replace the call to init_library() with init_globals() and
207 * init_function_pointers(). Good idea to also call init_vars and 142 * init_function_pointers(). Good idea to also call init_vars and
208 * init_hash_table if you are doing any object loading. 143 * init_hash_table if you are doing any object loading.
209 */ 144 */
210 145void
211void init_library(void) { 146init_library (void)
212 init_environ(); 147{
213 init_globals(); 148 init_globals ();
214 init_objects();
215 init_vars();
216 init_block(); 149 init_block ();
217 ReadBmapNames ();
218 ReadSmooth();
219 init_anim(); /* Must be after we read in the bitmaps */
220 init_archetypes(); /* Reads all archetypes from file */
221 init_dynamic (); 150 init_dynamic ();
222 init_attackmess(); 151 init_attackmess ();
223 init_clocks();
224 init_emergency_mappath();
225 init_experience(); 152 init_experience ();
226} 153}
227 154
228
229/* init_environ initializes values from the environmental variables. 155/* init_environ initialises values from the environmental variables.
230 * it needs to be called very early, since command line options should 156 * it needs to be called very early, since command line options should
231 * overwrite these if specified. 157 * overwrite these if specified.
232 */ 158 */
159void
233void init_environ(void) { 160init_environ (void)
161{
234 char *cp; 162 char *cp;
235 163
236 cp=getenv("CROSSFIRE_LIBDIR"); 164 cp = getenv ("CROSSFIRE_LIBDIR");
165 if (cp)
237 if (cp) settings.datadir=cp; 166 settings.datadir = cp;
167
238 cp=getenv("CROSSFIRE_LOCALDIR"); 168 cp = getenv ("CROSSFIRE_LOCALDIR");
169 if (cp)
239 if (cp) settings.localdir=cp; 170 settings.localdir = cp;
171
240 cp=getenv("CROSSFIRE_PLAYERDIR"); 172 cp = getenv ("CROSSFIRE_PLAYERDIR");
173 if (cp)
241 if (cp) settings.playerdir=cp; 174 settings.playerdir = cp;
175
242 cp=getenv("CROSSFIRE_MAPDIR"); 176 cp = getenv ("CROSSFIRE_MAPDIR");
177 if (cp)
243 if (cp) settings.mapdir=cp; 178 settings.mapdir = cp;
179
244 cp=getenv("CROSSFIRE_ARCHETYPES"); 180 cp = getenv ("CROSSFIRE_ARCHETYPES");
181 if (cp)
245 if (cp) settings.archetypes=cp; 182 settings.archetypes = cp;
183
246 cp=getenv("CROSSFIRE_TREASURES"); 184 cp = getenv ("CROSSFIRE_TREASURES");
185 if (cp)
247 if (cp) settings.treasures=cp; 186 settings.treasures = cp;
187
248 cp=getenv("CROSSFIRE_UNIQUEDIR"); 188 cp = getenv ("CROSSFIRE_UNIQUEDIR");
189 if (cp)
249 if (cp) settings.uniquedir=cp; 190 settings.uniquedir = cp;
191
250 cp=getenv("CROSSFIRE_TEMPLATEDIR"); 192 cp = getenv ("CROSSFIRE_TEMPLATEDIR");
193 if (cp)
251 if (cp) settings.templatedir=cp; 194 settings.templatedir = cp;
195
252 cp=getenv("CROSSFIRE_TMPDIR"); 196 cp = getenv ("CROSSFIRE_TMPDIR");
197 if (cp)
253 if (cp) settings.tmpdir=cp; 198 settings.tmpdir = cp;
254} 199}
255
256 200
257/* 201/*
258 * Initialises all global variables. 202 * Initialises all global variables.
259 * Might use environment-variables as default for some of them. 203 * Might use environment-variables as default for some of them.
260 */ 204 */
261 205void
262void init_globals(void) { 206init_globals (void)
207{
263 if (settings.logfilename[0] == 0) { 208 if (settings.logfilename[0] == 0)
209 logfile = stderr;
210 else if ((logfile = fopen (settings.logfilename, "a")) == NULL)
211 {
212 fprintf (stderr, "Unable to open %s as the logfile - will use stderr instead\n", settings.logfilename);
264 logfile = stderr; 213 logfile = stderr;
265 } 214 }
266 else if ((logfile=fopen(settings.logfilename, "a"))==NULL) { 215 else
267 fprintf(stderr,"Unable to open %s as the logfile - will use stderr instead\n", 216 setvbuf (logfile, NULL, _IOLBF, 0);
268 settings.logfilename); 217}
269 logfile = stderr; 218
219void
220init_dynamic (void)
221{
222 first_map_ext_path = "/start/HallsOfSelection";
223 first_map_path = "/HallOfSelection";
224}
225
226/*
227 * initialises the attack messages.
228 * Called by init_library().
229 */
230
231//attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS];
232
233void
234init_attackmess (void)
235{
236 char buf[MAX_BUF];
237 char filename[MAX_BUF];
238 char *cp, *p;
239 FILE *fp;
240 static int has_been_done = 0;
241 int mess, level, comp;
242 int mode = 0, total = 0;
243
244 if (has_been_done)
245 return;
246 else
247 has_been_done = 1;
248
249 sprintf (filename, "%s/attackmess", settings.datadir);
250 LOG (llevDebug, "Reading attack messages from %s...\n", filename);
251 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)
252 {
253 LOG (llevError, "Can't open %s.\n", filename);
254 return;
270 } 255 }
271 else { 256
272 setvbuf(logfile, NULL, _IOLBF, 0); 257 level = 0;
258 while (fgets (buf, MAX_BUF, fp) != NULL)
273 } 259 {
274 exiting = 0; 260 if (*buf == '#')
275 first_player=NULL; 261 continue;
276 first_friendly_object=NULL; 262 if ((cp = strchr (buf, '\n')) != NULL)
277 first_map=NULL; 263 *cp = '\0';
278 first_treasurelist=NULL; 264 cp = buf;
279 first_artifactlist=NULL; 265 while (*cp == ' ') /* Skip blanks */
280 first_archetype=NULL; 266 cp++;
281 *first_map_ext_path=0;
282 warn_archetypes=0;
283 nroftreasures = 0;
284 nrofartifacts = 0;
285 nrofallowedstr=0;
286 ring_arch = NULL;
287 amulet_arch = NULL;
288 staff_arch = NULL;
289 trying_emergency_save = 0;
290 num_animations=0;
291 animations_allocated=0;
292 init_defaults();
293}
294 267
295/* 268 if (strncmp (cp, "TYPE:", 5) == 0)
296 * Sets up and initialises the linked list of free and used objects. 269 {
297 * Allocates a certain chunk of objects and puts them on the free list. 270 p = strtok (buf, ":");
298 * Called by init_library(); 271 p = strtok (NULL, ":");
299 */ 272 if (mode == 1)
300 273 {
301void 274 attack_mess[mess][level].level = -1;
302init_objects(void) 275 attack_mess[mess][level].buf1 = NULL;
303{ 276 attack_mess[mess][level].buf2 = NULL;
304 /* Initialize all objects: */ 277 attack_mess[mess][level].buf3 = NULL;
305 objects = NULL;
306 active_objects = NULL;
307}
308
309/*
310 * Initialises global variables which can be changed by options.
311 * Called by init_library().
312 */
313
314void init_defaults(void) {
315 editor=0;
316 nroferrors=0;
317}
318
319
320void init_dynamic (void) {
321 archetype *at = first_archetype;
322 while (at) {
323 if (at->clone.type == MAP) {
324 if (at->clone.race) {
325 strcpy (first_map_ext_path, at->clone.race);
326 } 278 }
327 if (EXIT_PATH (&at->clone)) { 279 level = 0;
328 strcpy (first_map_path, EXIT_PATH (&at->clone)); 280 mess = atoi (p);
329 return; 281 mode = 1;
330 } 282 continue;
331 } 283 }
332 at = at->next; 284 if (mode == 1)
333 } 285 {
334 LOG(llevDebug,"You Need a archetype called 'map' and it have to contain start map\n");
335 exit (-1);
336}
337
338unsigned long todtick;
339
340/*
341 * Write out the current time to the file so time does not
342 * reset every time the server reboots.
343 */
344
345void write_todclock(void)
346{
347 char filename[MAX_BUF];
348 FILE *fp;
349
350 sprintf(filename, "%s/clockdata", settings.localdir);
351 if ((fp = fopen(filename, "w")) == NULL) {
352 LOG(llevError, "Cannot open %s for writing\n", filename);
353 return;
354 }
355 fprintf(fp, "%lu", todtick);
356 fclose(fp);
357}
358
359/*
360 * Initializes the gametime and TOD counters
361 * Called by init_library().
362 */
363
364void init_clocks(void)
365{
366 char filename[MAX_BUF];
367 FILE *fp;
368 static int has_been_done=0;
369
370 if (has_been_done)
371 return;
372 else
373 has_been_done = 1;
374
375 sprintf(filename, "%s/clockdata", settings.localdir);
376 LOG(llevDebug, "Reading clockdata from %s...", filename);
377 if ((fp = fopen(filename, "r")) == NULL) {
378 LOG(llevError, "Can't open %s.\n", filename);
379 todtick = 0;
380 write_todclock();
381 return;
382 }
383 fscanf(fp, "%lu", &todtick);
384 LOG(llevDebug, "todtick=%lu\n", todtick);
385 fclose(fp);
386}
387
388/*
389 * Initializes the attack messages.
390 * Called by init_library().
391 */
392
393//attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS];
394
395void init_attackmess(void){
396 char buf[MAX_BUF];
397 char filename[MAX_BUF];
398 char *cp, *p;
399 FILE *fp;
400 static int has_been_done=0;
401 int mess, level, comp;
402 int mode=0, total=0;
403
404 if (has_been_done)
405 return;
406 else
407 has_been_done = 1;
408
409 sprintf(filename, "%s/attackmess", settings.datadir);
410 LOG(llevDebug, "Reading attack messages from %s...", filename);
411 if ((fp = open_and_uncompress(filename, 0, &comp)) == NULL) {
412 LOG(llevError, "Can't open %s.\n", filename);
413 return;
414 }
415
416 level = 0;
417 while (fgets(buf, MAX_BUF, fp)!=NULL) {
418 if (*buf=='#') continue;
419 if((cp=strchr(buf,'\n'))!=NULL)
420 *cp='\0';
421 cp=buf;
422 while(*cp==' ') /* Skip blanks */
423 cp++;
424
425 if (strncmp(cp, "TYPE:", 5)==0) {
426 p = strtok(buf, ":"); 286 p = strtok (buf, "=");
287 attack_mess[mess][level].level = atoi (buf);
427 p = strtok(NULL, ":"); 288 p = strtok (NULL, "=");
428 if (mode == 1) { 289 if (p != NULL)
429 attack_mess[mess][level].level = -1;
430 attack_mess[mess][level].buf1 = NULL; 290 attack_mess[mess][level].buf1 = strdup (p);
291 else
431 attack_mess[mess][level].buf2 = NULL; 292 attack_mess[mess][level].buf1 = strdup ("");
432 attack_mess[mess][level].buf3 = NULL;
433 }
434 level = 0;
435 mess = atoi(p);
436 mode = 1; 293 mode = 2;
437 continue; 294 continue;
438 } 295 }
439 if (mode==1) { 296 else if (mode == 2)
297 {
440 p = strtok(buf, "="); 298 p = strtok (buf, "=");
441 attack_mess[mess][level].level = atoi(buf); 299 attack_mess[mess][level].level = atoi (buf);
442 p = strtok(NULL, "="); 300 p = strtok (NULL, "=");
443 if (p != NULL) 301 if (p != NULL)
444 attack_mess[mess][level].buf1 = strdup_local(p); 302 attack_mess[mess][level].buf2 = strdup (p);
445 else 303 else
446 attack_mess[mess][level].buf1 = strdup_local(""); 304 attack_mess[mess][level].buf2 = strdup ("");
447 mode = 2; 305 mode = 3;
448 continue; 306 continue;
307 }
449 } else if (mode==2) { 308 else if (mode == 3)
309 {
450 p = strtok(buf, "="); 310 p = strtok (buf, "=");
451 attack_mess[mess][level].level = atoi(buf); 311 attack_mess[mess][level].level = atoi (buf);
452 p = strtok(NULL, "="); 312 p = strtok (NULL, "=");
453 if (p != NULL) 313 if (p != NULL)
454 attack_mess[mess][level].buf2 = strdup_local(p); 314 attack_mess[mess][level].buf3 = strdup (p);
455 else 315 else
456 attack_mess[mess][level].buf2 = strdup_local("");
457 mode = 3;
458 continue;
459 } else if (mode==3) {
460 p = strtok(buf, "=");
461 attack_mess[mess][level].level = atoi(buf);
462 p = strtok(NULL, "=");
463 if (p != NULL)
464 attack_mess[mess][level].buf3 = strdup_local(p);
465 else
466 attack_mess[mess][level].buf3 = strdup_local(""); 316 attack_mess[mess][level].buf3 = strdup ("");
467 mode = 1; 317 mode = 1;
468 level++; 318 level++;
469 total++; 319 total++;
470 continue; 320 continue;
471 } 321 }
472 } 322 }
473 LOG(llevDebug, "got %d messages in %d categories.\n", total, mess+1); 323 LOG (llevDebug, "got %d messages in %d categories.\n", total, mess + 1);
474 close_and_delete(fp, comp); 324 close_and_delete (fp, comp);
475} 325}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines