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.14 by root, Thu Sep 21 00:05:24 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 "", /* Who format specifier */
97 "", /* who wiz format specifier */
98 MOTD, 95 MOTD,
99 "rules", 96 "rules",
100 "news", 97 "news",
101 "", /* DM_MAIL */ 98 "", /* DM_MAIL */
102 0, /* This and the next 3 values are metaserver values */
103 "",
104 "",
105 0,
106 "",
107 0, 0, 0, 0, 0, 0, 0, 0, /* worldmap settings */ 99 0, 0, 0, 0, 0, 0, 0, 0, /* worldmap settings */
108 EMERGENCY_MAPPATH, EMERGENCY_X, EMERGENCY_Y, 100 EMERGENCY_MAPPATH, EMERGENCY_X, EMERGENCY_Y,
109 0, 101 0,
110 1.0, 102 1.0,
111 103
171 continue; /* ignore comments */ 163 continue; /* ignore comments */
172 164
173 if (online == 0) 165 if (online == 0)
174 { 166 {
175 tmpbuf[strlen (tmpbuf) - 1] = 0; /* kill newline */ 167 tmpbuf[strlen (tmpbuf) - 1] = 0; /* kill newline */
176 settings.emergency_mapname = strdup_local (tmpbuf); 168 settings.emergency_mapname = strdup (tmpbuf);
177 } 169 }
178 else if (online == 1) 170 else if (online == 1)
179 { 171 {
180 settings.emergency_x = atoi (tmpbuf); 172 settings.emergency_x = atoi (tmpbuf);
181 } 173 }
424 { 416 {
425 p = strtok (buf, "="); 417 p = strtok (buf, "=");
426 attack_mess[mess][level].level = atoi (buf); 418 attack_mess[mess][level].level = atoi (buf);
427 p = strtok (NULL, "="); 419 p = strtok (NULL, "=");
428 if (p != NULL) 420 if (p != NULL)
429 attack_mess[mess][level].buf1 = strdup_local (p); 421 attack_mess[mess][level].buf1 = strdup (p);
430 else 422 else
431 attack_mess[mess][level].buf1 = strdup_local (""); 423 attack_mess[mess][level].buf1 = strdup ("");
432 mode = 2; 424 mode = 2;
433 continue; 425 continue;
434 } 426 }
435 else if (mode == 2) 427 else if (mode == 2)
436 { 428 {
437 p = strtok (buf, "="); 429 p = strtok (buf, "=");
438 attack_mess[mess][level].level = atoi (buf); 430 attack_mess[mess][level].level = atoi (buf);
439 p = strtok (NULL, "="); 431 p = strtok (NULL, "=");
440 if (p != NULL) 432 if (p != NULL)
441 attack_mess[mess][level].buf2 = strdup_local (p); 433 attack_mess[mess][level].buf2 = strdup (p);
442 else 434 else
443 attack_mess[mess][level].buf2 = strdup_local (""); 435 attack_mess[mess][level].buf2 = strdup ("");
444 mode = 3; 436 mode = 3;
445 continue; 437 continue;
446 } 438 }
447 else if (mode == 3) 439 else if (mode == 3)
448 { 440 {
449 p = strtok (buf, "="); 441 p = strtok (buf, "=");
450 attack_mess[mess][level].level = atoi (buf); 442 attack_mess[mess][level].level = atoi (buf);
451 p = strtok (NULL, "="); 443 p = strtok (NULL, "=");
452 if (p != NULL) 444 if (p != NULL)
453 attack_mess[mess][level].buf3 = strdup_local (p); 445 attack_mess[mess][level].buf3 = strdup (p);
454 else 446 else
455 attack_mess[mess][level].buf3 = strdup_local (""); 447 attack_mess[mess][level].buf3 = strdup ("");
456 mode = 1; 448 mode = 1;
457 level++; 449 level++;
458 total++; 450 total++;
459 continue; 451 continue;
460 } 452 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines