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.16 by root, Thu Dec 14 22:45:40 2006 UTC

164 continue; /* ignore comments */ 164 continue; /* ignore comments */
165 165
166 if (online == 0) 166 if (online == 0)
167 { 167 {
168 tmpbuf[strlen (tmpbuf) - 1] = 0; /* kill newline */ 168 tmpbuf[strlen (tmpbuf) - 1] = 0; /* kill newline */
169 settings.emergency_mapname = strdup_local (tmpbuf); 169 settings.emergency_mapname = strdup (tmpbuf);
170 } 170 }
171 else if (online == 1) 171 else if (online == 1)
172 { 172 {
173 settings.emergency_x = atoi (tmpbuf); 173 settings.emergency_x = atoi (tmpbuf);
174 } 174 }
417 { 417 {
418 p = strtok (buf, "="); 418 p = strtok (buf, "=");
419 attack_mess[mess][level].level = atoi (buf); 419 attack_mess[mess][level].level = atoi (buf);
420 p = strtok (NULL, "="); 420 p = strtok (NULL, "=");
421 if (p != NULL) 421 if (p != NULL)
422 attack_mess[mess][level].buf1 = strdup_local (p); 422 attack_mess[mess][level].buf1 = strdup (p);
423 else 423 else
424 attack_mess[mess][level].buf1 = strdup_local (""); 424 attack_mess[mess][level].buf1 = strdup ("");
425 mode = 2; 425 mode = 2;
426 continue; 426 continue;
427 } 427 }
428 else if (mode == 2) 428 else if (mode == 2)
429 { 429 {
430 p = strtok (buf, "="); 430 p = strtok (buf, "=");
431 attack_mess[mess][level].level = atoi (buf); 431 attack_mess[mess][level].level = atoi (buf);
432 p = strtok (NULL, "="); 432 p = strtok (NULL, "=");
433 if (p != NULL) 433 if (p != NULL)
434 attack_mess[mess][level].buf2 = strdup_local (p); 434 attack_mess[mess][level].buf2 = strdup (p);
435 else 435 else
436 attack_mess[mess][level].buf2 = strdup_local (""); 436 attack_mess[mess][level].buf2 = strdup ("");
437 mode = 3; 437 mode = 3;
438 continue; 438 continue;
439 } 439 }
440 else if (mode == 3) 440 else if (mode == 3)
441 { 441 {
442 p = strtok (buf, "="); 442 p = strtok (buf, "=");
443 attack_mess[mess][level].level = atoi (buf); 443 attack_mess[mess][level].level = atoi (buf);
444 p = strtok (NULL, "="); 444 p = strtok (NULL, "=");
445 if (p != NULL) 445 if (p != NULL)
446 attack_mess[mess][level].buf3 = strdup_local (p); 446 attack_mess[mess][level].buf3 = strdup (p);
447 else 447 else
448 attack_mess[mess][level].buf3 = strdup_local (""); 448 attack_mess[mess][level].buf3 = strdup ("");
449 mode = 1; 449 mode = 1;
450 level++; 450 level++;
451 total++; 451 total++;
452 continue; 452 continue;
453 } 453 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines