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.15 by root, Wed Dec 13 02:55:49 2006 UTC vs.
Revision 1.17 by root, Mon Dec 18 02:35:00 2006 UTC

… …
87 SEARCH_ITEMS, 87 SEARCH_ITEMS,
88 SPELL_ENCUMBRANCE, 88 SPELL_ENCUMBRANCE,
89 SPELL_FAILURE_EFFECTS, 89 SPELL_FAILURE_EFFECTS,
90 CASTING_TIME, 90 CASTING_TIME,
91 REAL_WIZ, 91 REAL_WIZ,
92 RECYCLE_TMP_MAPS,
93 EXPLORE_MODE, 92 EXPLORE_MODE,
94 SPELLPOINT_LEVEL_DEPEND, 93 SPELLPOINT_LEVEL_DEPEND,
95 SET_FRIENDLY_FIRE, 94 SET_FRIENDLY_FIRE,
96 MOTD, 95 MOTD,
97 "rules", 96 "rules",
… …
164 continue; /* ignore comments */ 163 continue; /* ignore comments */
165 164
166 if (online == 0) 165 if (online == 0)
167 { 166 {
168 tmpbuf[strlen (tmpbuf) - 1] = 0; /* kill newline */ 167 tmpbuf[strlen (tmpbuf) - 1] = 0; /* kill newline */
169 settings.emergency_mapname = strdup_local (tmpbuf); 168 settings.emergency_mapname = strdup (tmpbuf);
170 } 169 }
171 else if (online == 1) 170 else if (online == 1)
172 { 171 {
173 settings.emergency_x = atoi (tmpbuf); 172 settings.emergency_x = atoi (tmpbuf);
174 } 173 }
… …
417 { 416 {
418 p = strtok (buf, "="); 417 p = strtok (buf, "=");
419 attack_mess[mess][level].level = atoi (buf); 418 attack_mess[mess][level].level = atoi (buf);
420 p = strtok (NULL, "="); 419 p = strtok (NULL, "=");
421 if (p != NULL) 420 if (p != NULL)
422 attack_mess[mess][level].buf1 = strdup_local (p); 421 attack_mess[mess][level].buf1 = strdup (p);
423 else 422 else
424 attack_mess[mess][level].buf1 = strdup_local (""); 423 attack_mess[mess][level].buf1 = strdup ("");
425 mode = 2; 424 mode = 2;
426 continue; 425 continue;
427 } 426 }
428 else if (mode == 2) 427 else if (mode == 2)
429 { 428 {
430 p = strtok (buf, "="); 429 p = strtok (buf, "=");
431 attack_mess[mess][level].level = atoi (buf); 430 attack_mess[mess][level].level = atoi (buf);
432 p = strtok (NULL, "="); 431 p = strtok (NULL, "=");
433 if (p != NULL) 432 if (p != NULL)
434 attack_mess[mess][level].buf2 = strdup_local (p); 433 attack_mess[mess][level].buf2 = strdup (p);
435 else 434 else
436 attack_mess[mess][level].buf2 = strdup_local (""); 435 attack_mess[mess][level].buf2 = strdup ("");
437 mode = 3; 436 mode = 3;
438 continue; 437 continue;
439 } 438 }
440 else if (mode == 3) 439 else if (mode == 3)
441 { 440 {
442 p = strtok (buf, "="); 441 p = strtok (buf, "=");
443 attack_mess[mess][level].level = atoi (buf); 442 attack_mess[mess][level].level = atoi (buf);
444 p = strtok (NULL, "="); 443 p = strtok (NULL, "=");
445 if (p != NULL) 444 if (p != NULL)
446 attack_mess[mess][level].buf3 = strdup_local (p); 445 attack_mess[mess][level].buf3 = strdup (p);
447 else 446 else
448 attack_mess[mess][level].buf3 = strdup_local (""); 447 attack_mess[mess][level].buf3 = strdup ("");
449 mode = 1; 448 mode = 1;
450 level++; 449 level++;
451 total++; 450 total++;
452 continue; 451 continue;
453 } 452 }

Diff Legend

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