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.7 by root, Thu Sep 7 13:34:56 2006 UTC vs.
Revision 1.21 by pippijn, Wed Jan 3 00:21:35 2007 UTC

1/*
2 * static char *rcsid_init_c =
3 * "$Id: init.C,v 1.7 2006/09/07 13:34:56 root Exp $";
4 */
5
6/* 1/*
7 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
8 3
9 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
21 16
22 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
23 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25 20
26 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>
27*/ 22*/
28 23
29#define EXTERN // horrible hack 24#define EXTERN // horrible hack
30 25
31#include <global.h> 26#include <global.h>
32#include <object.h> 27#include <object.h>
33 28
34extern const char* const attacktype_desc[NROFATTACKS] = { 29extern const char *const attacktype_desc[NROFATTACKS] = {
35# define def(uc, name, lc, plus, change) # name, 30# define def(uc, lc, name, plus, change) # name,
36# include "attackinc.h" 31# include "attackinc.h"
37# undef def 32# undef def
38}; 33};
39 34
40extern const keyword resist_save[NROFATTACKS] = { 35extern const char *const resist_plus[NROFATTACKS] = {
41# define def(uc, name, lc, plus, change) KW_resist_ ## lc, 36# define def(uc, lc, name, plus, change) # plus,
42# include "attackinc.h" 37# include "attackinc.h"
43# undef def 38# undef def
44}; 39};
45 40
46extern const char* const resist_plus[NROFATTACKS] = { 41extern const char *const change_resist_msg[NROFATTACKS] = {
47# define def(uc, name, lc, plus, change) # plus 42# define def(uc, lc, name, plus, change) # change,
48# include "attackinc.h" 43# include "attackinc.h"
49# undef def 44# undef def
50}; 45};
51 46
52extern const char* const change_resist_msg[NROFATTACKS] = { 47int resist_table[NROFATTACKS] = {
53# define def(uc, name, lc, plus, change) # change 48# define def(uc, lc, name, plus, change) ATNR_ ## uc,
54# include "attackinc.h" 49# include "attackinc.h"
55# undef def 50# undef def
56}; 51};
57 52
58int resist_table[NROFATTACKS] = {
59# define def(uc, name, lc, plus, change) ATNR_ ## uc,
60# include "attackinc.h"
61# undef def
62};
63
64/* You unforunately need to looking in include/global.h to see what these 53/* You unforunately need to looking in include/global.h to see what these
65 * correspond to. 54 * correspond to.
66 */ 55 */
67struct Settings settings = { 56struct Settings settings = {
68LOGFILE, /* Logfile */ 57 LOGFILE, /* Logfile */
69CSPORT, /* Client/server port */ 58 CSPORT, /* Client/server port */
70 59
71/* Debug level */ 60/* Debug level */
72#ifdef DEBUG 61#ifdef DEBUG
73 llevDebug, 62 llevDebug,
74#else 63#else
75 llevInfo, 64 llevInfo,
76#endif 65#endif
77 66
780, NULL, 0, /* dumpvalues, dumparg, daemonmode */ 67 0, NULL, 0, /* dumpvalues, dumparg, daemonmode */
790, /* argc */ 68 0, /* argc */
80NULL, /* argv */ 69 NULL, /* argv */
81CONFDIR, 70 CONFDIR,
82DATADIR, 71 DATADIR,
83LOCALDIR, 72 LOCALDIR,
84PLAYERDIR, MAPDIR, ARCHETYPES,REGIONS,TREASURES, 73 PLAYERDIR, MAPDIR, ARCHETYPES, REGIONS, TREASURES,
85UNIQUE_DIR, TEMPLATE_DIR, 74 UNIQUE_DIR, TEMPLATE_DIR,
86TMPDIR, 75 TMPDIR,
87STAT_LOSS_ON_DEATH, 76 STAT_LOSS_ON_DEATH,
88PK_LUCK_PENALTY, 77 PK_LUCK_PENALTY,
89PERMANENT_EXPERIENCE_RATIO, 78 PERMANENT_EXPERIENCE_RATIO,
90DEATH_PENALTY_RATIO, 79 DEATH_PENALTY_RATIO,
91DEATH_PENALTY_LEVEL, 80 DEATH_PENALTY_LEVEL,
92BALANCED_STAT_LOSS, 81 BALANCED_STAT_LOSS,
93NOT_PERMADETH, 82 NOT_PERMADETH,
94SIMPLE_EXP, 83 SIMPLE_EXP,
95RESET_LOCATION_TIME, 84 RESET_LOCATION_TIME,
96SET_TITLE, 85 SET_TITLE,
97RESURRECTION, 86 RESURRECTION,
98SEARCH_ITEMS, 87 SEARCH_ITEMS,
99SPELL_ENCUMBRANCE, 88 SPELL_ENCUMBRANCE,
100SPELL_FAILURE_EFFECTS, 89 SPELL_FAILURE_EFFECTS,
101CASTING_TIME, 90 CASTING_TIME,
102REAL_WIZ, 91 REAL_WIZ,
103RECYCLE_TMP_MAPS,
104EXPLORE_MODE, 92 EXPLORE_MODE,
105SPELLPOINT_LEVEL_DEPEND, 93 SPELLPOINT_LEVEL_DEPEND,
106SET_FRIENDLY_FIRE, 94 SET_FRIENDLY_FIRE,
107"", /* Who format specifier */
108"", /* who wiz format specifier */
109MOTD, 95 MOTD,
110"rules", 96 "rules",
111"news", 97 "news",
112"", /* DM_MAIL */ 98 "", /* DM_MAIL */
1130, /* This and the next 3 values are metaserver values */
114"",
115"",
1160,
117"",
1180,0,0,0,0,0,0,0, /* worldmap settings*/ 99 0, 0, 0, 0, 0, 0, 0, 0, /* worldmap settings */
119EMERGENCY_MAPPATH, EMERGENCY_X, EMERGENCY_Y, 100 0,
1200,
1211.0, 101 1.0,
102
122/* Armor enchantment stuff */ 103/* Armor enchantment stuff */
123ARMOR_MAX_ENCHANT, 104 ARMOR_MAX_ENCHANT,
124ARMOR_WEIGHT_REDUCTION, 105 ARMOR_WEIGHT_REDUCTION,
125ARMOR_WEIGHT_LINEAR, 106 ARMOR_WEIGHT_LINEAR,
126ARMOR_SPEED_IMPROVEMENT, 107 ARMOR_SPEED_IMPROVEMENT,
127ARMOR_SPEED_LINEAR, 108 ARMOR_SPEED_LINEAR,
1281, /* no_player_stealing */ 109 1, /* no_player_stealing */
1291, /* create_home_portals */ 110 1, /* create_home_portals */
130}; 111};
131 112
132/* perhaps not the best place for this, but needs to be 113/* perhaps not the best place for this, but needs to be
133 * in some file in the common area so that standalone 114 * in some file in the common area so that standalone
134 * programs, like the random map generator, can be built. 115 * programs, like the random map generator, can be built.
135 */ 116 */
136const char* const spellpathnames[NRSPELLPATHS] = { 117const char *const spellpathnames[NRSPELLPATHS] = {
137 "Protection", 118 "Protection",
138 "Fire", 119 "Fire",
139 "Frost", 120 "Frost",
140 "Electricity", 121 "Electricity",
141 "Missiles", 122 "Missiles",
142 "Self", 123 "Self",
143 "Summoning", 124 "Summoning",
144 "Abjuration", 125 "Abjuration",
145 "Restoration", 126 "Restoration",
146 "Detonation", 127 "Detonation",
147 "Mind", 128 "Mind",
148 "Creation", 129 "Creation",
149 "Teleportation", 130 "Teleportation",
150 "Information", 131 "Information",
151 "Transmutation", 132 "Transmutation",
152 "Transferrence", 133 "Transferrence",
153 "Turning", 134 "Turning",
154 "Wounding", 135 "Wounding",
155 "Death", 136 "Death",
156 "Light" 137 "Light"
157}; 138};
158
159
160/* This loads the emergency map information from a
161 * .emergency file in the map directory. Doing this makes
162 * it easier to switch between map distributions (don't need
163 * to recompile. Note that there is no reason I see that
164 * this could not be re-loaded during play, but it seems
165 * like there should be little reason to do that.
166 */
167static void init_emergency_mappath(void)
168{
169 char filename[MAX_BUF], tmpbuf[MAX_BUF];
170 FILE *fp;
171 int online=0;
172
173 /* If this file doesn't exist, not a big deal */
174 sprintf(filename,"%s/%s/.emergency",settings.datadir, settings.mapdir);
175 if ((fp = fopen(filename, "r"))!=NULL) {
176 while (fgets(tmpbuf, MAX_BUF-1, fp)) {
177 if (tmpbuf[0] == '#') continue; /* ignore comments */
178
179 if (online == 0) {
180 tmpbuf[strlen(tmpbuf)-1] = 0; /* kill newline */
181 settings.emergency_mapname = strdup_local(tmpbuf);
182 }
183 else if (online == 1) {
184 settings.emergency_x = atoi(tmpbuf);
185 }
186
187 else if (online == 2) {
188 settings.emergency_y = atoi(tmpbuf);
189 }
190 online++;
191 if (online>2) break;
192 }
193 fclose(fp);
194 if (online<=2)
195 LOG(llevError,"Online read partial data from %s\n", filename);
196 LOG(llevDebug,"Emergency mappath reset to %s (%d, %d)\n", settings.emergency_mapname,
197 settings.emergency_x, settings.emergency_y);
198 }
199}
200
201 139
202/* 140/*
203 * It is vital that init_library() is called by any functions 141 * It is vital that init_library() is called by any functions
204 * using this library. 142 * using this library.
205 * If you want to lessen the size of the program using the library, 143 * If you want to lessen the size of the program using the library,
206 * you can replace the call to init_library() with init_globals() and 144 * you can replace the call to init_library() with init_globals() and
207 * init_function_pointers(). Good idea to also call init_vars and 145 * init_function_pointers(). Good idea to also call init_vars and
208 * init_hash_table if you are doing any object loading. 146 * init_hash_table if you are doing any object loading.
209 */ 147 */
210 148void
211void init_library(void) { 149init_library (void)
150{
212 init_environ(); 151 init_environ ();
213 init_globals(); 152 init_globals ();
214 init_objects();
215 init_vars(); 153 init_vars ();
216 init_block(); 154 init_block ();
217 ReadBmapNames (); 155 ReadBmapNames ();
218 ReadSmooth(); 156 ReadSmooth ();
219 init_anim(); /* Must be after we read in the bitmaps */ 157 init_anim (); /* Must be after we read in the bitmaps */
220 init_archetypes(); /* Reads all archetypes from file */ 158 init_archetypes (); /* Reads all archetypes from file */
221 init_dynamic (); 159 init_dynamic ();
222 init_attackmess(); 160 init_attackmess ();
223 init_clocks(); 161 init_clocks ();
224 init_emergency_mappath();
225 init_experience(); 162 init_experience ();
226} 163}
227 164
228 165
229/* init_environ initializes values from the environmental variables. 166/* init_environ initialises values from the environmental variables.
230 * it needs to be called very early, since command line options should 167 * it needs to be called very early, since command line options should
231 * overwrite these if specified. 168 * overwrite these if specified.
232 */ 169 */
170void
233void init_environ(void) { 171init_environ (void)
172{
234 char *cp; 173 char *cp;
235 174
236 cp=getenv("CROSSFIRE_LIBDIR"); 175 cp = getenv ("CROSSFIRE_LIBDIR");
176 if (cp)
237 if (cp) settings.datadir=cp; 177 settings.datadir = cp;
238 cp=getenv("CROSSFIRE_LOCALDIR"); 178 cp = getenv ("CROSSFIRE_LOCALDIR");
179 if (cp)
239 if (cp) settings.localdir=cp; 180 settings.localdir = cp;
240 cp=getenv("CROSSFIRE_PLAYERDIR"); 181 cp = getenv ("CROSSFIRE_PLAYERDIR");
182 if (cp)
241 if (cp) settings.playerdir=cp; 183 settings.playerdir = cp;
242 cp=getenv("CROSSFIRE_MAPDIR"); 184 cp = getenv ("CROSSFIRE_MAPDIR");
185 if (cp)
243 if (cp) settings.mapdir=cp; 186 settings.mapdir = cp;
244 cp=getenv("CROSSFIRE_ARCHETYPES"); 187 cp = getenv ("CROSSFIRE_ARCHETYPES");
188 if (cp)
245 if (cp) settings.archetypes=cp; 189 settings.archetypes = cp;
246 cp=getenv("CROSSFIRE_TREASURES"); 190 cp = getenv ("CROSSFIRE_TREASURES");
191 if (cp)
247 if (cp) settings.treasures=cp; 192 settings.treasures = cp;
248 cp=getenv("CROSSFIRE_UNIQUEDIR"); 193 cp = getenv ("CROSSFIRE_UNIQUEDIR");
194 if (cp)
249 if (cp) settings.uniquedir=cp; 195 settings.uniquedir = cp;
250 cp=getenv("CROSSFIRE_TEMPLATEDIR"); 196 cp = getenv ("CROSSFIRE_TEMPLATEDIR");
197 if (cp)
251 if (cp) settings.templatedir=cp; 198 settings.templatedir = cp;
252 cp=getenv("CROSSFIRE_TMPDIR"); 199 cp = getenv ("CROSSFIRE_TMPDIR");
200 if (cp)
253 if (cp) settings.tmpdir=cp; 201 settings.tmpdir = cp;
254} 202}
255 203
256 204
257/* 205/*
258 * Initialises all global variables. 206 * Initialises all global variables.
259 * Might use environment-variables as default for some of them. 207 * Might use environment-variables as default for some of them.
260 */ 208 */
261 209
210void
262void init_globals(void) { 211init_globals (void)
212{
263 if (settings.logfilename[0] == 0) { 213 if (settings.logfilename[0] == 0)
214 logfile = stderr;
215 else if ((logfile = fopen (settings.logfilename, "a")) == NULL)
216 {
217 fprintf (stderr, "Unable to open %s as the logfile - will use stderr instead\n", settings.logfilename);
264 logfile = stderr; 218 logfile = stderr;
265 } 219 }
266 else if ((logfile=fopen(settings.logfilename, "a"))==NULL) {
267 fprintf(stderr,"Unable to open %s as the logfile - will use stderr instead\n",
268 settings.logfilename);
269 logfile = stderr;
270 }
271 else { 220 else
272 setvbuf(logfile, NULL, _IOLBF, 0); 221 setvbuf (logfile, NULL, _IOLBF, 0);
273 }
274 exiting = 0;
275 first_player=NULL;
276 first_friendly_object=NULL;
277 first_map=NULL;
278 first_treasurelist=NULL;
279 first_artifactlist=NULL;
280 first_archetype=NULL;
281 *first_map_ext_path=0;
282 warn_archetypes=0;
283 nroftreasures = 0;
284 nrofartifacts = 0;
285 nrofallowedstr=0;
286 ring_arch = NULL;
287 amulet_arch = NULL;
288 staff_arch = NULL;
289 trying_emergency_save = 0;
290 num_animations=0;
291 animations_allocated=0;
292 init_defaults();
293} 222}
294 223
295/*
296 * Sets up and initialises the linked list of free and used objects.
297 * Allocates a certain chunk of objects and puts them on the free list.
298 * Called by init_library();
299 */
300
301void 224void
302init_objects(void)
303{
304 /* Initialize all objects: */
305 objects = NULL;
306 active_objects = NULL;
307}
308
309/*
310 * Initialises global variables which can be changed by options.
311 * Called by init_library().
312 */
313
314void init_defaults(void) {
315 editor=0;
316 nroferrors=0;
317}
318
319
320void init_dynamic (void) { 225init_dynamic (void)
226{
321 archetype *at = first_archetype; 227 archetype *at = first_archetype;
228
322 while (at) { 229 while (at)
230 {
323 if (at->clone.type == MAP) { 231 if (at->clone.type == MAP)
232 {
324 if (at->clone.race) { 233 if (at->clone.race)
325 strcpy (first_map_ext_path, at->clone.race); 234 first_map_ext_path = at->clone.race;
326 } 235
327 if (EXIT_PATH (&at->clone)) { 236 if (EXIT_PATH (&at->clone))
237 {
328 strcpy (first_map_path, EXIT_PATH (&at->clone)); 238 first_map_path = EXIT_PATH (&at->clone);
329 return; 239 return;
330 } 240 }
331 } 241 }
242
332 at = at->next; 243 at = at->next;
333 } 244 }
245
334 LOG(llevDebug,"You Need a archetype called 'map' and it have to contain start map\n"); 246 LOG (llevDebug, "You Need a archetype called 'map' and it have to contain start map\n");
335 exit (-1); 247 exit (-1);
336} 248}
337 249
338unsigned long todtick; 250unsigned long todtick;
339 251
340/* 252/*
341 * Write out the current time to the file so time does not 253 * Write out the current time to the file so time does not
342 * reset every time the server reboots. 254 * reset every time the server reboots.
343 */ 255 */
344 256
257void
345void write_todclock(void) 258write_todclock (void)
346{ 259{
347 char filename[MAX_BUF]; 260 char filename[MAX_BUF];
348 FILE *fp; 261 FILE *fp;
349 262
350 sprintf(filename, "%s/clockdata", settings.localdir); 263 sprintf (filename, "%s/clockdata", settings.localdir);
351 if ((fp = fopen(filename, "w")) == NULL) { 264 if ((fp = fopen (filename, "w")) == NULL)
265 {
352 LOG(llevError, "Cannot open %s for writing\n", filename); 266 LOG (llevError, "Cannot open %s for writing\n", filename);
353 return; 267 return;
354 } 268 }
355 fprintf(fp, "%lu", todtick); 269 fprintf (fp, "%lu", todtick);
356 fclose(fp); 270 fclose (fp);
357} 271}
358 272
359/* 273/*
360 * Initializes the gametime and TOD counters 274 * initialises the gametime and TOD counters
361 * Called by init_library(). 275 * Called by init_library().
362 */ 276 */
363 277
278void
364void init_clocks(void) 279init_clocks (void)
365{ 280{
366 char filename[MAX_BUF]; 281 char filename[MAX_BUF];
367 FILE *fp; 282 FILE *fp;
368 static int has_been_done=0; 283 static int has_been_done = 0;
369 284
370 if (has_been_done) 285 if (has_been_done)
371 return; 286 return;
372 else 287 else
373 has_been_done = 1; 288 has_been_done = 1;
374 289
375 sprintf(filename, "%s/clockdata", settings.localdir); 290 sprintf (filename, "%s/clockdata", settings.localdir);
376 LOG(llevDebug, "Reading clockdata from %s...", filename); 291 LOG (llevDebug, "Reading clockdata from %s...\n", filename);
377 if ((fp = fopen(filename, "r")) == NULL) { 292 if ((fp = fopen (filename, "r")) == NULL)
293 {
378 LOG(llevError, "Can't open %s.\n", filename); 294 LOG (llevError, "Can't open %s.\n", filename);
379 todtick = 0; 295 todtick = 0;
380 write_todclock(); 296 write_todclock ();
381 return; 297 return;
382 } 298 }
383 fscanf(fp, "%lu", &todtick); 299 fscanf (fp, "%lu", &todtick);
384 LOG(llevDebug, "todtick=%lu\n", todtick); 300 LOG (llevDebug, "todtick=%lu\n", todtick);
385 fclose(fp); 301 fclose (fp);
386} 302}
387 303
388/* 304/*
389 * Initializes the attack messages. 305 * initialises the attack messages.
390 * Called by init_library(). 306 * Called by init_library().
391 */ 307 */
392 308
393//attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS]; 309//attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS];
394 310
311void
395void init_attackmess(void){ 312init_attackmess (void)
313{
396 char buf[MAX_BUF]; 314 char buf[MAX_BUF];
397 char filename[MAX_BUF]; 315 char filename[MAX_BUF];
398 char *cp, *p; 316 char *cp, *p;
399 FILE *fp; 317 FILE *fp;
400 static int has_been_done=0; 318 static int has_been_done = 0;
401 int mess, level, comp; 319 int mess, level, comp;
402 int mode=0, total=0; 320 int mode = 0, total = 0;
403 321
404 if (has_been_done) 322 if (has_been_done)
405 return; 323 return;
406 else 324 else
407 has_been_done = 1; 325 has_been_done = 1;
408 326
409 sprintf(filename, "%s/attackmess", settings.datadir); 327 sprintf (filename, "%s/attackmess", settings.datadir);
410 LOG(llevDebug, "Reading attack messages from %s...", filename); 328 LOG (llevDebug, "Reading attack messages from %s...\n", filename);
411 if ((fp = open_and_uncompress(filename, 0, &comp)) == NULL) { 329 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)
330 {
412 LOG(llevError, "Can't open %s.\n", filename); 331 LOG (llevError, "Can't open %s.\n", filename);
413 return; 332 return;
414 } 333 }
415 334
416 level = 0; 335 level = 0;
417 while (fgets(buf, MAX_BUF, fp)!=NULL) { 336 while (fgets (buf, MAX_BUF, fp) != NULL)
418 if (*buf=='#') continue; 337 {
338 if (*buf == '#')
339 continue;
419 if((cp=strchr(buf,'\n'))!=NULL) 340 if ((cp = strchr (buf, '\n')) != NULL)
420 *cp='\0'; 341 *cp = '\0';
421 cp=buf; 342 cp = buf;
422 while(*cp==' ') /* Skip blanks */ 343 while (*cp == ' ') /* Skip blanks */
423 cp++; 344 cp++;
424 345
425 if (strncmp(cp, "TYPE:", 5)==0) { 346 if (strncmp (cp, "TYPE:", 5) == 0)
347 {
426 p = strtok(buf, ":"); 348 p = strtok (buf, ":");
427 p = strtok(NULL, ":"); 349 p = strtok (NULL, ":");
428 if (mode == 1) { 350 if (mode == 1)
351 {
429 attack_mess[mess][level].level = -1; 352 attack_mess[mess][level].level = -1;
430 attack_mess[mess][level].buf1 = NULL; 353 attack_mess[mess][level].buf1 = NULL;
431 attack_mess[mess][level].buf2 = NULL; 354 attack_mess[mess][level].buf2 = NULL;
432 attack_mess[mess][level].buf3 = NULL; 355 attack_mess[mess][level].buf3 = NULL;
433 } 356 }
434 level = 0; 357 level = 0;
435 mess = atoi(p); 358 mess = atoi (p);
436 mode = 1; 359 mode = 1;
437 continue; 360 continue;
438 } 361 }
439 if (mode==1) { 362 if (mode == 1)
363 {
440 p = strtok(buf, "="); 364 p = strtok (buf, "=");
441 attack_mess[mess][level].level = atoi(buf); 365 attack_mess[mess][level].level = atoi (buf);
442 p = strtok(NULL, "="); 366 p = strtok (NULL, "=");
443 if (p != NULL) 367 if (p != NULL)
444 attack_mess[mess][level].buf1 = strdup_local(p); 368 attack_mess[mess][level].buf1 = strdup (p);
445 else 369 else
446 attack_mess[mess][level].buf1 = strdup_local(""); 370 attack_mess[mess][level].buf1 = strdup ("");
447 mode = 2; 371 mode = 2;
448 continue; 372 continue;
449 } else if (mode==2) {
450 p = strtok(buf, "=");
451 attack_mess[mess][level].level = atoi(buf);
452 p = strtok(NULL, "=");
453 if (p != NULL)
454 attack_mess[mess][level].buf2 = strdup_local(p);
455 else
456 attack_mess[mess][level].buf2 = strdup_local("");
457 mode = 3;
458 continue;
459 } else if (mode==3) {
460 p = strtok(buf, "=");
461 attack_mess[mess][level].level = atoi(buf);
462 p = strtok(NULL, "=");
463 if (p != NULL)
464 attack_mess[mess][level].buf3 = strdup_local(p);
465 else
466 attack_mess[mess][level].buf3 = strdup_local("");
467 mode = 1;
468 level++;
469 total++;
470 continue;
471 } 373 }
374 else if (mode == 2)
375 {
376 p = strtok (buf, "=");
377 attack_mess[mess][level].level = atoi (buf);
378 p = strtok (NULL, "=");
379 if (p != NULL)
380 attack_mess[mess][level].buf2 = strdup (p);
381 else
382 attack_mess[mess][level].buf2 = strdup ("");
383 mode = 3;
384 continue;
385 }
386 else if (mode == 3)
387 {
388 p = strtok (buf, "=");
389 attack_mess[mess][level].level = atoi (buf);
390 p = strtok (NULL, "=");
391 if (p != NULL)
392 attack_mess[mess][level].buf3 = strdup (p);
393 else
394 attack_mess[mess][level].buf3 = strdup ("");
395 mode = 1;
396 level++;
397 total++;
398 continue;
399 }
472 } 400 }
473 LOG(llevDebug, "got %d messages in %d categories.\n", total, mess+1); 401 LOG (llevDebug, "got %d messages in %d categories.\n", total, mess + 1);
474 close_and_delete(fp, comp); 402 close_and_delete (fp, comp);
475} 403}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines