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.17 by root, Mon Dec 18 02:35:00 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] = {
… …
93 SEARCH_ITEMS, 87 SEARCH_ITEMS,
94 SPELL_ENCUMBRANCE, 88 SPELL_ENCUMBRANCE,
95 SPELL_FAILURE_EFFECTS, 89 SPELL_FAILURE_EFFECTS,
96 CASTING_TIME, 90 CASTING_TIME,
97 REAL_WIZ, 91 REAL_WIZ,
98 RECYCLE_TMP_MAPS,
99 EXPLORE_MODE, 92 EXPLORE_MODE,
100 SPELLPOINT_LEVEL_DEPEND, 93 SPELLPOINT_LEVEL_DEPEND,
101 SET_FRIENDLY_FIRE, 94 SET_FRIENDLY_FIRE,
102 "", /* Who format specifier */
103 "", /* who wiz format specifier */
104 MOTD, 95 MOTD,
105 "rules", 96 "rules",
106 "news", 97 "news",
107 "", /* DM_MAIL */ 98 "", /* 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 */ 99 0, 0, 0, 0, 0, 0, 0, 0, /* worldmap settings */
114 EMERGENCY_MAPPATH, EMERGENCY_X, EMERGENCY_Y, 100 EMERGENCY_MAPPATH, EMERGENCY_X, EMERGENCY_Y,
115 0, 101 0,
116 1.0, 102 1.0,
117 103
… …
177 continue; /* ignore comments */ 163 continue; /* ignore comments */
178 164
179 if (online == 0) 165 if (online == 0)
180 { 166 {
181 tmpbuf[strlen (tmpbuf) - 1] = 0; /* kill newline */ 167 tmpbuf[strlen (tmpbuf) - 1] = 0; /* kill newline */
182 settings.emergency_mapname = strdup_local (tmpbuf); 168 settings.emergency_mapname = strdup (tmpbuf);
183 } 169 }
184 else if (online == 1) 170 else if (online == 1)
185 { 171 {
186 settings.emergency_x = atoi (tmpbuf); 172 settings.emergency_x = atoi (tmpbuf);
187 } 173 }
… …
430 { 416 {
431 p = strtok (buf, "="); 417 p = strtok (buf, "=");
432 attack_mess[mess][level].level = atoi (buf); 418 attack_mess[mess][level].level = atoi (buf);
433 p = strtok (NULL, "="); 419 p = strtok (NULL, "=");
434 if (p != NULL) 420 if (p != NULL)
435 attack_mess[mess][level].buf1 = strdup_local (p); 421 attack_mess[mess][level].buf1 = strdup (p);
436 else 422 else
437 attack_mess[mess][level].buf1 = strdup_local (""); 423 attack_mess[mess][level].buf1 = strdup ("");
438 mode = 2; 424 mode = 2;
439 continue; 425 continue;
440 } 426 }
441 else if (mode == 2) 427 else if (mode == 2)
442 { 428 {
443 p = strtok (buf, "="); 429 p = strtok (buf, "=");
444 attack_mess[mess][level].level = atoi (buf); 430 attack_mess[mess][level].level = atoi (buf);
445 p = strtok (NULL, "="); 431 p = strtok (NULL, "=");
446 if (p != NULL) 432 if (p != NULL)
447 attack_mess[mess][level].buf2 = strdup_local (p); 433 attack_mess[mess][level].buf2 = strdup (p);
448 else 434 else
449 attack_mess[mess][level].buf2 = strdup_local (""); 435 attack_mess[mess][level].buf2 = strdup ("");
450 mode = 3; 436 mode = 3;
451 continue; 437 continue;
452 } 438 }
453 else if (mode == 3) 439 else if (mode == 3)
454 { 440 {
455 p = strtok (buf, "="); 441 p = strtok (buf, "=");
456 attack_mess[mess][level].level = atoi (buf); 442 attack_mess[mess][level].level = atoi (buf);
457 p = strtok (NULL, "="); 443 p = strtok (NULL, "=");
458 if (p != NULL) 444 if (p != NULL)
459 attack_mess[mess][level].buf3 = strdup_local (p); 445 attack_mess[mess][level].buf3 = strdup (p);
460 else 446 else
461 attack_mess[mess][level].buf3 = strdup_local (""); 447 attack_mess[mess][level].buf3 = strdup ("");
462 mode = 1; 448 mode = 1;
463 level++; 449 level++;
464 total++; 450 total++;
465 continue; 451 continue;
466 } 452 }

Diff Legend

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