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.12 by root, Thu Sep 14 18:13:01 2006 UTC vs.
Revision 1.16 by root, Thu Dec 14 22:45:40 2006 UTC

… …
16 16
17 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 20
21 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22*/
23 23
24#define EXTERN // horrible hack 24#define EXTERN // horrible hack
25 25
26#include <global.h> 26#include <global.h>
27#include <object.h> 27#include <object.h>
28 28
29extern const char *const attacktype_desc[NROFATTACKS] = { 29extern const char *const attacktype_desc[NROFATTACKS] = {
30# define def(uc, lc, name, plus, change) # name, 30# define def(uc, lc, name, plus, change) # name,
31# include "attackinc.h"
32# undef def
33};
34
35extern const keyword resist_save[NROFATTACKS] = {
36# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
37# include "attackinc.h" 31# include "attackinc.h"
38# undef def 32# undef def
39}; 33};
40 34
41extern const char *const resist_plus[NROFATTACKS] = { 35extern const char *const resist_plus[NROFATTACKS] = {
… …
97 REAL_WIZ, 91 REAL_WIZ,
98 RECYCLE_TMP_MAPS, 92 RECYCLE_TMP_MAPS,
99 EXPLORE_MODE, 93 EXPLORE_MODE,
100 SPELLPOINT_LEVEL_DEPEND, 94 SPELLPOINT_LEVEL_DEPEND,
101 SET_FRIENDLY_FIRE, 95 SET_FRIENDLY_FIRE,
102 "", /* Who format specifier */
103 "", /* who wiz format specifier */
104 MOTD, 96 MOTD,
105 "rules", 97 "rules",
106 "news", 98 "news",
107 "", /* DM_MAIL */ 99 "", /* DM_MAIL */
108 0, /* This and the next 3 values are metaserver values */
109 "",
110 "",
111 0,
112 "",
113 0, 0, 0, 0, 0, 0, 0, 0, /* worldmap settings */ 100 0, 0, 0, 0, 0, 0, 0, 0, /* worldmap settings */
114 EMERGENCY_MAPPATH, EMERGENCY_X, EMERGENCY_Y, 101 EMERGENCY_MAPPATH, EMERGENCY_X, EMERGENCY_Y,
115 0, 102 0,
116 1.0, 103 1.0,
117 104
… …
177 continue; /* ignore comments */ 164 continue; /* ignore comments */
178 165
179 if (online == 0) 166 if (online == 0)
180 { 167 {
181 tmpbuf[strlen (tmpbuf) - 1] = 0; /* kill newline */ 168 tmpbuf[strlen (tmpbuf) - 1] = 0; /* kill newline */
182 settings.emergency_mapname = strdup_local (tmpbuf); 169 settings.emergency_mapname = strdup (tmpbuf);
183 } 170 }
184 else if (online == 1) 171 else if (online == 1)
185 { 172 {
186 settings.emergency_x = atoi (tmpbuf); 173 settings.emergency_x = atoi (tmpbuf);
187 } 174 }
… …
430 { 417 {
431 p = strtok (buf, "="); 418 p = strtok (buf, "=");
432 attack_mess[mess][level].level = atoi (buf); 419 attack_mess[mess][level].level = atoi (buf);
433 p = strtok (NULL, "="); 420 p = strtok (NULL, "=");
434 if (p != NULL) 421 if (p != NULL)
435 attack_mess[mess][level].buf1 = strdup_local (p); 422 attack_mess[mess][level].buf1 = strdup (p);
436 else 423 else
437 attack_mess[mess][level].buf1 = strdup_local (""); 424 attack_mess[mess][level].buf1 = strdup ("");
438 mode = 2; 425 mode = 2;
439 continue; 426 continue;
440 } 427 }
441 else if (mode == 2) 428 else if (mode == 2)
442 { 429 {
443 p = strtok (buf, "="); 430 p = strtok (buf, "=");
444 attack_mess[mess][level].level = atoi (buf); 431 attack_mess[mess][level].level = atoi (buf);
445 p = strtok (NULL, "="); 432 p = strtok (NULL, "=");
446 if (p != NULL) 433 if (p != NULL)
447 attack_mess[mess][level].buf2 = strdup_local (p); 434 attack_mess[mess][level].buf2 = strdup (p);
448 else 435 else
449 attack_mess[mess][level].buf2 = strdup_local (""); 436 attack_mess[mess][level].buf2 = strdup ("");
450 mode = 3; 437 mode = 3;
451 continue; 438 continue;
452 } 439 }
453 else if (mode == 3) 440 else if (mode == 3)
454 { 441 {
455 p = strtok (buf, "="); 442 p = strtok (buf, "=");
456 attack_mess[mess][level].level = atoi (buf); 443 attack_mess[mess][level].level = atoi (buf);
457 p = strtok (NULL, "="); 444 p = strtok (NULL, "=");
458 if (p != NULL) 445 if (p != NULL)
459 attack_mess[mess][level].buf3 = strdup_local (p); 446 attack_mess[mess][level].buf3 = strdup (p);
460 else 447 else
461 attack_mess[mess][level].buf3 = strdup_local (""); 448 attack_mess[mess][level].buf3 = strdup ("");
462 mode = 1; 449 mode = 1;
463 level++; 450 level++;
464 total++; 451 total++;
465 continue; 452 continue;
466 } 453 }

Diff Legend

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