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.6 by pippijn, Thu Sep 7 09:37:11 2006 UTC vs.
Revision 1.14 by root, Thu Sep 21 00:05:24 2006 UTC

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

Diff Legend

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