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.9 by root, Sat Sep 9 23:49:06 2006 UTC vs.
Revision 1.16 by root, Thu Dec 14 22:45:40 2006 UTC

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

Diff Legend

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