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.4 by root, Sun Sep 3 07:57:54 2006 UTC vs.
Revision 1.20 by pippijn, Tue Jan 2 23:39:21 2007 UTC

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

Diff Legend

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