--- deliantra/server/common/init.C 2008/09/23 04:51:11 1.47
+++ deliantra/server/common/init.C 2010/06/18 17:31:01 1.60
@@ -1,22 +1,23 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
*
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * .
*
* The authors can be reached via e-mail to
*/
@@ -26,6 +27,8 @@
#include
#include
+dynbuf_text msg_dynbuf (65536, 65536);
+
extern const char *const attacktype_desc[NROFATTACKS] = {
# define def(uc, lc, name, plus, change) # name,
# include "attackinc.h"
@@ -56,14 +59,7 @@
struct Settings settings = {
LOGFILE, /* Logfile */
CSPORT, /* Client/server port */
-
-/* Debug level */
-#ifdef DEBUG
- llevDebug,
-#else
- llevInfo,
-#endif
-
+ llevTrace, /* Log level */
0, NULL, 0, /* dumpvalues, dumparg, daemonmode */
0, /* argc */
NULL, /* argv */
@@ -71,7 +67,7 @@
DATADIR,
LOCALDIR,
PLAYERDIR, MAPDIR, ARCHETYPES, REGIONS, TREASURES,
- UNIQUE_DIR, TEMPLATE_DIR,
+ UNIQUE_DIR, "",
TMPDIR,
PK_LUCK_PENALTY,
STAT_LOSS_ON_DEATH,
@@ -91,13 +87,8 @@
0,
EXPLORE_MODE,
SPELLPOINT_LEVEL_DEPEND,
- MOTD,
- "rules",
- "news",
- "", /* DM_MAIL */
- 0, 0, 0, 0, 0, 0, 0, 0, /* worldmap settings */
0,
- 1.0,
+ 1.25,
/* Armor enchantment stuff */
ARMOR_MAX_ENCHANT,
@@ -139,7 +130,7 @@
* overwrite these if specified.
*/
void
-init_environ (void)
+init_environ ()
{
const char *cp;
@@ -162,26 +153,26 @@
* Might use environment-variables as default for some of them.
*/
void
-init_globals (void)
+init_globals ()
{
if (settings.logfilename[0] == 0)
- set_logfd (-1);
+ log_setfd (-1);
else
{
int logfd = open (settings.logfilename, O_CREAT|O_WRONLY|O_APPEND, 0666);
if (logfd >= 0)
- set_logfd (logfd);
+ log_setfd (logfd);
else
{
- set_logfd (-1);
+ log_setfd (-1);
LOG (llevError, "Unable to open %s as the logfile - will use stderr instead", settings.logfilename);
}
}
}
void
-init_dynamic (void)
+init_dynamic ()
{
first_map_ext_path = "/start/HallsOfSelection";
first_map_path = "/HallOfSelection";
@@ -195,101 +186,64 @@
//attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS];
void
-init_attackmess (void)
+init_attackmess ()
{
- char buf[MAX_BUF];
- char filename[MAX_BUF];
- char *cp, *p;
- FILE *fp;
- static int has_been_done = 0;
- int mess, level, comp;
- int mode = 0, total = 0;
-
- if (has_been_done)
- return;
- else
- has_been_done = 1;
-
- sprintf (filename, "%s/attackmess", settings.datadir);
- LOG (llevDebug, "Reading attack messages from %s...\n", filename);
- if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)
+ object_thawer thawer (settings.datadir, "attackmess");
+
+ if (!thawer)
{
- LOG (llevError, "Can't open %s.\n", filename);
+ LOG (llevError, "Can't open %s.\n", thawer.name);
return;
}
- level = 0;
- while (fgets (buf, MAX_BUF, fp) != NULL)
+ int msgnum = -1;
+ int total = 0;
+
+ while (thawer.kw)
{
- if (*buf == '#')
- continue;
+ if (thawer.kw != KW_type)
+ if (!thawer.parse_error ("attackmess file"))
+ break;
- if ((cp = strchr (buf, '\n')) != NULL)
- *cp = '\0';
+ thawer.get (msgnum);
+ thawer.next ();
- cp = buf;
- while (*cp == ' ') /* Skip blanks */
- cp++;
+ int level = 0;
- if (strncmp (cp, "TYPE:", 5) == 0)
+ while (thawer.kw == KW_hp)
{
- p = strtok (buf, ":");
- p = strtok (NULL, ":");
- if (mode == 1)
+ // our old friend, dog-slow sscanf
+ int hp;
+ char buf1[1024];
+ char buf2[1024];
+ char buf3[1024];
+
+ if (4 != sscanf (thawer.value_nn, "%d %1023[^|]|%1023[^|]|%1023[^|]",
+ &hp, buf1, buf2, buf3))
+ thawer.parse_error ("attackmess file");
+ else
{
- attack_mess[mess][level].level = -1;
- attack_mess[mess][level].buf1 = NULL;
- attack_mess[mess][level].buf2 = NULL;
- attack_mess[mess][level].buf3 = NULL;
+ if (*buf2 == '-')
+ *buf2 = 0; // sscanf can't parse empty fields, so use "-" as marker
+
+ attack_mess[msgnum][level].level = hp;
+ attack_mess[msgnum][level].buf1 = strdup (buf1);
+ attack_mess[msgnum][level].buf2 = strdup (buf2);
+ attack_mess[msgnum][level].buf3 = strdup (buf3);
+
+ ++level;
+ ++total;
}
- level = 0;
- mess = atoi (p);
- mode = 1;
- continue;
+ thawer.next ();
}
- if (mode == 1)
- {
- p = strtok (buf, "=");
- attack_mess[mess][level].level = atoi (buf);
- p = strtok (NULL, "=");
- if (p != NULL)
- attack_mess[mess][level].buf1 = strdup (p);
- else
- attack_mess[mess][level].buf1 = strdup ("");
- mode = 2;
- continue;
- }
- else if (mode == 2)
- {
- p = strtok (buf, "=");
- attack_mess[mess][level].level = atoi (buf);
- p = strtok (NULL, "=");
- if (p != NULL)
- attack_mess[mess][level].buf2 = strdup (p);
- else
- attack_mess[mess][level].buf2 = strdup ("");
- mode = 3;
- continue;
- }
- else if (mode == 3)
- {
- p = strtok (buf, "=");
- attack_mess[mess][level].level = atoi (buf);
- p = strtok (NULL, "=");
- if (p != NULL)
- attack_mess[mess][level].buf3 = strdup (p);
- else
- attack_mess[mess][level].buf3 = strdup ("");
- mode = 1;
- level++;
- total++;
- continue;
- }
+ attack_mess[msgnum][level].level = -1;
+ attack_mess[msgnum][level].buf1 = 0;
+ attack_mess[msgnum][level].buf2 = 0;
+ attack_mess[msgnum][level].buf3 = 0;
}
- LOG (llevDebug, "got %d messages in %d categories.\n", total, mess + 1);
- close_and_delete (fp, comp);
+ LOG (llevDebug, "got %d messages in %d categories.\n", total, msgnum + 1);
}