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.5 by root, Mon Sep 4 11:07:59 2006 UTC vs.
Revision 1.29 by root, Wed Mar 14 00:04:58 2007 UTC

1/* 1/*
2 * static char *rcsid_init_c =
3 * "$Id: init.C,v 1.5 2006/09/04 11:07:59 root Exp $";
4 */
5
6/*
7 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
8 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
9 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
11 7 *
12 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
13 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
14 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
15 (at your option) any later version. 11 * (at your option) any later version.
16 12 *
17 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
18 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 GNU General Public License for more details. 16 * GNU General Public License for more details.
21 17 *
22 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
23 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25 21 *
26 The authors can be reached via e-mail at crossfire-devel@real-time.com 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
27*/ 23 */
28 24
29#define EXTERN 25#define EXTERN // horrible hack
30#define INIT_C 26
31#include <global.h> 27#include <global.h>
32#include <object.h> 28#include <object.h>
33 29
30extern const char *const attacktype_desc[NROFATTACKS] = {
31# define def(uc, lc, name, plus, change) # name,
32# include "attackinc.h"
33# undef def
34};
35
36extern const char *const resist_plus[NROFATTACKS] = {
37# define def(uc, lc, name, plus, change) # plus,
38# include "attackinc.h"
39# undef def
40};
41
42extern const char *const change_resist_msg[NROFATTACKS] = {
43# define def(uc, lc, name, plus, change) # change,
44# include "attackinc.h"
45# undef def
46};
47
48int resist_table[NROFATTACKS] = {
49# define def(uc, lc, name, plus, change) ATNR_ ## uc,
50# include "attackinc.h"
51# undef def
52};
53
34/* You unforunately need to looking in include/global.h to see what these 54/* You unforunately need to looking in include/global.h to see what these
35 * correspond to. 55 * correspond to.
36 */ 56 */
37struct Settings settings = { 57struct Settings settings = {
38LOGFILE, /* Logfile */ 58 LOGFILE, /* Logfile */
39CSPORT, /* Client/server port */ 59 CSPORT, /* Client/server port */
40 60
41/* Debug level */ 61/* Debug level */
42#ifdef DEBUG 62#ifdef DEBUG
43 llevDebug, 63 llevDebug,
44#else 64#else
45 llevInfo, 65 llevInfo,
46#endif 66#endif
47 67
480, NULL, 0, /* dumpvalues, dumparg, daemonmode */ 68 0, NULL, 0, /* dumpvalues, dumparg, daemonmode */
490, /* argc */ 69 0, /* argc */
50NULL, /* argv */ 70 NULL, /* argv */
51CONFDIR, 71 CONFDIR,
52DATADIR, 72 DATADIR,
53LOCALDIR, 73 LOCALDIR,
54PLAYERDIR, MAPDIR, ARCHETYPES,REGIONS,TREASURES, 74 PLAYERDIR, MAPDIR, ARCHETYPES, REGIONS, TREASURES,
55UNIQUE_DIR, TEMPLATE_DIR, 75 UNIQUE_DIR, TEMPLATE_DIR,
56TMPDIR, 76 TMPDIR,
57STAT_LOSS_ON_DEATH, 77 STAT_LOSS_ON_DEATH,
58PK_LUCK_PENALTY, 78 PK_LUCK_PENALTY,
59PERMANENT_EXPERIENCE_RATIO, 79 PERMANENT_EXPERIENCE_RATIO,
60DEATH_PENALTY_RATIO, 80 DEATH_PENALTY_RATIO,
61DEATH_PENALTY_LEVEL, 81 DEATH_PENALTY_LEVEL,
62BALANCED_STAT_LOSS, 82 BALANCED_STAT_LOSS,
63NOT_PERMADETH, 83 NOT_PERMADETH,
64SIMPLE_EXP, 84 SIMPLE_EXP,
65RESET_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)
182 init_environ(); 150{
183 init_globals(); 151 init_globals ();
184 init_objects();
185 init_vars();
186 init_block(); 152 init_block ();
187 ReadBmapNames ();
188 ReadSmooth();
189 init_anim(); /* Must be after we read in the bitmaps */ 153 init_anim (); /* Must be after we read in the bitmaps */
190 init_archetypes(); /* Reads all archetypes from file */ 154 init_archetypes (); /* Reads all archetypes from file */
191 init_dynamic (); 155 init_dynamic ();
192 init_attackmess(); 156 init_attackmess ();
193 init_clocks(); 157 init_clocks ();
194 init_emergency_mappath();
195 init_experience(); 158 init_experience ();
196} 159}
197 160
198 161
199/* init_environ initializes values from the environmental variables. 162/* init_environ initialises values from the environmental variables.
200 * it needs to be called very early, since command line options should 163 * it needs to be called very early, since command line options should
201 * overwrite these if specified. 164 * overwrite these if specified.
202 */ 165 */
166void
203void init_environ(void) { 167init_environ (void)
168{
204 char *cp; 169 char *cp;
205 170
206 cp=getenv("CROSSFIRE_LIBDIR"); 171 cp = getenv ("CROSSFIRE_LIBDIR");
172 if (cp)
207 if (cp) settings.datadir=cp; 173 settings.datadir = cp;
208 cp=getenv("CROSSFIRE_LOCALDIR"); 174 cp = getenv ("CROSSFIRE_LOCALDIR");
175 if (cp)
209 if (cp) settings.localdir=cp; 176 settings.localdir = cp;
210 cp=getenv("CROSSFIRE_PLAYERDIR"); 177 cp = getenv ("CROSSFIRE_PLAYERDIR");
178 if (cp)
211 if (cp) settings.playerdir=cp; 179 settings.playerdir = cp;
212 cp=getenv("CROSSFIRE_MAPDIR"); 180 cp = getenv ("CROSSFIRE_MAPDIR");
181 if (cp)
213 if (cp) settings.mapdir=cp; 182 settings.mapdir = cp;
214 cp=getenv("CROSSFIRE_ARCHETYPES"); 183 cp = getenv ("CROSSFIRE_ARCHETYPES");
184 if (cp)
215 if (cp) settings.archetypes=cp; 185 settings.archetypes = cp;
216 cp=getenv("CROSSFIRE_TREASURES"); 186 cp = getenv ("CROSSFIRE_TREASURES");
187 if (cp)
217 if (cp) settings.treasures=cp; 188 settings.treasures = cp;
218 cp=getenv("CROSSFIRE_UNIQUEDIR"); 189 cp = getenv ("CROSSFIRE_UNIQUEDIR");
190 if (cp)
219 if (cp) settings.uniquedir=cp; 191 settings.uniquedir = cp;
220 cp=getenv("CROSSFIRE_TEMPLATEDIR"); 192 cp = getenv ("CROSSFIRE_TEMPLATEDIR");
193 if (cp)
221 if (cp) settings.templatedir=cp; 194 settings.templatedir = cp;
222 cp=getenv("CROSSFIRE_TMPDIR"); 195 cp = getenv ("CROSSFIRE_TMPDIR");
196 if (cp)
223 if (cp) settings.tmpdir=cp; 197 settings.tmpdir = cp;
224} 198}
225
226 199
227/* 200/*
228 * Initialises all global variables. 201 * Initialises all global variables.
229 * Might use environment-variables as default for some of them. 202 * Might use environment-variables as default for some of them.
230 */ 203 */
231 204void
232void init_globals(void) { 205init_globals (void)
206{
233 if (settings.logfilename[0] == 0) { 207 if (settings.logfilename[0] == 0)
208 logfile = stderr;
209 else if ((logfile = fopen (settings.logfilename, "a")) == NULL)
210 {
211 fprintf (stderr, "Unable to open %s as the logfile - will use stderr instead\n", settings.logfilename);
234 logfile = stderr; 212 logfile = stderr;
235 } 213 }
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 { 214 else
242 setvbuf(logfile, NULL, _IOLBF, 0); 215 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} 216}
264 217
265/* 218void
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
278/*
279 * Initialises global variables which can be changed by options.
280 * Called by init_library().
281 */
282
283void init_defaults(void) {
284 editor=0;
285 nroferrors=0;
286}
287
288
289void init_dynamic (void) { 219init_dynamic (void)
220{
290 archetype *at = first_archetype; 221 archetype *at = first_archetype;
222
291 while (at) { 223 while (at)
224 {
292 if (at->clone.type == MAP) { 225 if (at->clone.type == MAP)
226 {
293 if (at->clone.race) { 227 if (at->clone.race)
294 strcpy (first_map_ext_path, at->clone.race); 228 first_map_ext_path = at->clone.race;
229
230 if (EXIT_PATH (&at->clone))
231 {
232 first_map_path = EXIT_PATH (&at->clone);
233 return;
295 } 234 }
296 if (EXIT_PATH (&at->clone)) {
297 strcpy (first_map_path, EXIT_PATH (&at->clone));
298 return;
299 } 235 }
300 } 236
301 at = at->next; 237 at = at->next;
302 } 238 }
239
303 LOG(llevDebug,"You Need a archetype called 'map' and it have to contain start map\n"); 240 LOG (llevDebug, "You Need a archetype called 'map' and it have to contain start map\n");
304 exit (-1); 241 exit (-1);
305} 242}
306 243
307unsigned long todtick; 244unsigned long todtick;
308 245
309/* 246/*
310 * Write out the current time to the file so time does not 247 * Write out the current time to the file so time does not
311 * reset every time the server reboots. 248 * reset every time the server reboots.
312 */ 249 */
313 250void
314void write_todclock(void) 251write_todclock (void)
315{ 252{
316 char filename[MAX_BUF]; 253 char filename[MAX_BUF];
317 FILE *fp; 254 FILE *fp;
318 255
319 sprintf(filename, "%s/clockdata", settings.localdir); 256 sprintf (filename, "%s/clockdata", settings.localdir);
320 if ((fp = fopen(filename, "w")) == NULL) { 257 if ((fp = fopen (filename, "w")) == NULL)
258 {
321 LOG(llevError, "Cannot open %s for writing\n", filename); 259 LOG (llevError, "Cannot open %s for writing\n", filename);
322 return; 260 return;
323 } 261 }
324 fprintf(fp, "%lu", todtick); 262 fprintf (fp, "%lu", todtick);
325 fclose(fp); 263 fclose (fp);
326} 264}
327 265
328/* 266/*
329 * Initializes the gametime and TOD counters 267 * initialises the gametime and TOD counters
330 * Called by init_library(). 268 * Called by init_library().
331 */ 269 */
332 270void
333void init_clocks(void) 271init_clocks (void)
334{ 272{
335 char filename[MAX_BUF]; 273 char filename[MAX_BUF];
336 FILE *fp; 274 FILE *fp;
337 static int has_been_done=0; 275 static int has_been_done = 0;
338 276
339 if (has_been_done) 277 if (has_been_done)
340 return; 278 return;
341 else 279 else
342 has_been_done = 1; 280 has_been_done = 1;
343 281
344 sprintf(filename, "%s/clockdata", settings.localdir); 282 sprintf (filename, "%s/clockdata", settings.localdir);
345 LOG(llevDebug, "Reading clockdata from %s...", filename); 283 LOG (llevDebug, "Reading clockdata from %s...\n", filename);
346 if ((fp = fopen(filename, "r")) == NULL) { 284 if ((fp = fopen (filename, "r")) == NULL)
285 {
347 LOG(llevError, "Can't open %s.\n", filename); 286 LOG (llevError, "Can't open %s.\n", filename);
348 todtick = 0; 287 todtick = 0;
349 write_todclock(); 288 write_todclock ();
350 return; 289 return;
351 } 290 }
291
352 fscanf(fp, "%lu", &todtick); 292 fscanf (fp, "%lu", &todtick);
353 LOG(llevDebug, "todtick=%lu\n", todtick); 293 LOG (llevDebug, "todtick=%lu\n", todtick);
354 fclose(fp); 294 fclose (fp);
355} 295}
356 296
357/* 297/*
358 * Initializes the attack messages. 298 * initialises the attack messages.
359 * Called by init_library(). 299 * Called by init_library().
360 */ 300 */
361 301
362//attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS]; 302//attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS];
363 303
304void
364void init_attackmess(void){ 305init_attackmess (void)
306{
365 char buf[MAX_BUF]; 307 char buf[MAX_BUF];
366 char filename[MAX_BUF]; 308 char filename[MAX_BUF];
367 char *cp, *p; 309 char *cp, *p;
368 FILE *fp; 310 FILE *fp;
369 static int has_been_done=0; 311 static int has_been_done = 0;
370 int mess, level, comp; 312 int mess, level, comp;
371 int mode=0, total=0; 313 int mode = 0, total = 0;
372 314
373 if (has_been_done) 315 if (has_been_done)
374 return; 316 return;
375 else 317 else
376 has_been_done = 1; 318 has_been_done = 1;
377 319
378 sprintf(filename, "%s/attackmess", settings.datadir); 320 sprintf (filename, "%s/attackmess", settings.datadir);
379 LOG(llevDebug, "Reading attack messages from %s...", filename); 321 LOG (llevDebug, "Reading attack messages from %s...\n", filename);
380 if ((fp = open_and_uncompress(filename, 0, &comp)) == NULL) { 322 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)
323 {
381 LOG(llevError, "Can't open %s.\n", filename); 324 LOG (llevError, "Can't open %s.\n", filename);
382 return; 325 return;
383 } 326 }
384 327
385 level = 0; 328 level = 0;
386 while (fgets(buf, MAX_BUF, fp)!=NULL) { 329 while (fgets (buf, MAX_BUF, fp) != NULL)
387 if (*buf=='#') continue; 330 {
331 if (*buf == '#')
332 continue;
388 if((cp=strchr(buf,'\n'))!=NULL) 333 if ((cp = strchr (buf, '\n')) != NULL)
389 *cp='\0'; 334 *cp = '\0';
390 cp=buf; 335 cp = buf;
391 while(*cp==' ') /* Skip blanks */ 336 while (*cp == ' ') /* Skip blanks */
392 cp++; 337 cp++;
393 338
394 if (strncmp(cp, "TYPE:", 5)==0) { 339 if (strncmp (cp, "TYPE:", 5) == 0)
340 {
395 p = strtok(buf, ":"); 341 p = strtok (buf, ":");
396 p = strtok(NULL, ":"); 342 p = strtok (NULL, ":");
397 if (mode == 1) { 343 if (mode == 1)
344 {
398 attack_mess[mess][level].level = -1; 345 attack_mess[mess][level].level = -1;
399 attack_mess[mess][level].buf1 = NULL; 346 attack_mess[mess][level].buf1 = NULL;
400 attack_mess[mess][level].buf2 = NULL; 347 attack_mess[mess][level].buf2 = NULL;
401 attack_mess[mess][level].buf3 = NULL; 348 attack_mess[mess][level].buf3 = NULL;
402 } 349 }
403 level = 0; 350 level = 0;
404 mess = atoi(p); 351 mess = atoi (p);
405 mode = 1; 352 mode = 1;
406 continue; 353 continue;
354 }
355 if (mode == 1)
407 } 356 {
408 if (mode==1) {
409 p = strtok(buf, "="); 357 p = strtok (buf, "=");
410 attack_mess[mess][level].level = atoi(buf); 358 attack_mess[mess][level].level = atoi (buf);
411 p = strtok(NULL, "="); 359 p = strtok (NULL, "=");
412 if (p != NULL) 360 if (p != NULL)
413 attack_mess[mess][level].buf1 = strdup_local(p); 361 attack_mess[mess][level].buf1 = strdup (p);
414 else 362 else
415 attack_mess[mess][level].buf1 = strdup_local(""); 363 attack_mess[mess][level].buf1 = strdup ("");
416 mode = 2; 364 mode = 2;
417 continue; 365 continue;
366 }
418 } else if (mode==2) { 367 else if (mode == 2)
368 {
419 p = strtok(buf, "="); 369 p = strtok (buf, "=");
420 attack_mess[mess][level].level = atoi(buf); 370 attack_mess[mess][level].level = atoi (buf);
421 p = strtok(NULL, "="); 371 p = strtok (NULL, "=");
422 if (p != NULL) 372 if (p != NULL)
423 attack_mess[mess][level].buf2 = strdup_local(p); 373 attack_mess[mess][level].buf2 = strdup (p);
424 else 374 else
425 attack_mess[mess][level].buf2 = strdup_local(""); 375 attack_mess[mess][level].buf2 = strdup ("");
426 mode = 3; 376 mode = 3;
427 continue; 377 continue;
378 }
428 } else if (mode==3) { 379 else if (mode == 3)
380 {
429 p = strtok(buf, "="); 381 p = strtok (buf, "=");
430 attack_mess[mess][level].level = atoi(buf); 382 attack_mess[mess][level].level = atoi (buf);
431 p = strtok(NULL, "="); 383 p = strtok (NULL, "=");
432 if (p != NULL) 384 if (p != NULL)
433 attack_mess[mess][level].buf3 = strdup_local(p); 385 attack_mess[mess][level].buf3 = strdup (p);
434 else 386 else
435 attack_mess[mess][level].buf3 = strdup_local(""); 387 attack_mess[mess][level].buf3 = strdup ("");
436 mode = 1; 388 mode = 1;
437 level++; 389 level++;
438 total++; 390 total++;
439 continue; 391 continue;
440 } 392 }
441 } 393 }
442 LOG(llevDebug, "got %d messages in %d categories.\n", total, mess+1); 394 LOG (llevDebug, "got %d messages in %d categories.\n", total, mess + 1);
443 close_and_delete(fp, comp); 395 close_and_delete (fp, comp);
444} 396}

Diff Legend

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