--- deliantra/server/common/readable.C 2009/01/01 11:41:17 1.40
+++ deliantra/server/common/readable.C 2009/10/15 22:50:41 1.45
@@ -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 (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
* Copyright (©) 1992,2007 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
*/
@@ -32,7 +33,6 @@
#include
#include
-
/* Define this if you want to archive book titles by contents.
* This option should enforce UNIQUE combinations of titles,authors and
* msg contents during and *between* game sessions.
@@ -571,8 +571,7 @@
/* nstrtok() - simple routine to return the number of list
* items in buf1 as separated by the value of buf2
*/
-
-int
+static int
nstrtok (const char *buf1, const char *buf2)
{
char *tbuf, sbuf[12], buf[MAX_BUF];
@@ -595,8 +594,7 @@
* a list of strings delimited by buf2. Then returns a comma
* separated string w/ decent punctuation.
*/
-
-char *
+static char *
strtoktolin (const char *buf1, const char *buf2)
{
int maxi, i = nstrtok (buf1, buf2);
@@ -623,16 +621,14 @@
return (char *) rbuf;
}
-int
+static int
book_overflow (const char *buf1, const char *buf2, int booksize)
{
-
if (buf_overflow (buf1, buf2, BOOK_BUF - 2) /* 2 less so always room for trailing \n */
|| buf_overflow (buf1, buf2, booksize))
return 1;
- return 0;
-
+ return 0;
}
/*****************************************************************************
@@ -819,7 +815,7 @@
#ifdef ARCHIVE_DEBUG
if (t)
- LOG (llevDebug, "Found title match (list %d): %s %s (%d)\n", msgtype, t->name, t->authour, t->msg_index);
+ LOG (llevDebug, "Found title match (list %d): %s %s (%d)\n", msgtype, &t->name, &t->authour, t->msg_index);
#endif
return t;
@@ -831,7 +827,6 @@
* this sets book book->name based on msgtype given. What name
* is given is based on various criteria
*/
-
static void
new_text_name (object *book, int msgtype)
{
@@ -977,7 +972,7 @@
need_to_write_bookarchive = 1;
#ifdef ARCHIVE_DEBUG
- LOG (llevDebug, "Archiving new title: %s %s (%d)\n", book->name, book->title, msgtype);
+ LOG (llevDebug, "Archiving new title: %s %s (%d)\n", &book->name, &book->title, msgtype);
#endif
}
@@ -993,7 +988,7 @@
#define MAX_TITLE_CHECK 20
-void
+static void
change_book (object *book, int msgtype)
{
int nbr = sizeof (book_descrpt) / sizeof (char *);
@@ -1053,7 +1048,6 @@
#ifdef ARCHIVE_DEBUG
LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames);
#endif
- break;
}
/* shouldnt change map-maker books */
else if (!book->title)
@@ -1078,7 +1072,7 @@
if (tries == MAX_TITLE_CHECK || numb == maxnames)
{ /* got to check maxnames again */
#ifdef ARCHIVE_DEBUG
- LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", book->name, book->title, numb, maxnames);
+ LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", &book->name, &book->title, numb, maxnames);
#endif
/* restore old book properties here */
book->title = old_title;
@@ -1128,7 +1122,6 @@
* Changed 971225 to be greater than equal to level passed. Also
* made choosing by level more random.
*/
-
object *
get_random_mon (int level)
{
@@ -1196,16 +1189,15 @@
* Returns a description of the monster. This really needs to be
* redone, as describe_item really gives a pretty internal description.
*/
-
-char *
+static const char *
mon_desc (const object *mon)
{
- static char retbuf[HUGE_BUF];
+ static dynbuf_text buf; buf.clear ();
- sprintf (retbuf, " *** %s ***\n", &mon->name);
- strcat (retbuf, describe_item (mon, NULL));
+ buf.printf ("B<< %s >>\r", &mon->name);
+ buf << describe_item (mon, 0);
- return retbuf;
+ return buf;
}
@@ -1213,8 +1205,7 @@
* found, it returns NULL (changed 0.94.3 to do this, since the
* calling function (mon_info_msg) seems to expect that.
*/
-
-object *
+static object *
get_next_mon (object *tmp)
{
objectlink *mon;
@@ -1233,21 +1224,16 @@
}
-
-
/* mon_info_msg() - generate a message detailing the properties
* of a randomly selected monster.
*/
-
-char *
+static const char *
mon_info_msg (int level, int booksize)
{
- static char retbuf[BOOK_BUF];
- char tmpbuf[HUGE_BUF];
- object *tmp;
+ static dynbuf_text buf; buf.clear ();
/*preamble */
- strcpy (retbuf, "This beastiary contains:");
+ buf << "This beastiary contains:\n";
/* lets print info on as many monsters as will fit in our
* document.
@@ -1256,27 +1242,17 @@
* of text! (and flood out the available number of titles
* in the archive in a snap!) -b.t.
*/
- tmp = get_random_mon (level * 3);
- while (tmp)
+ object *tmp = get_random_mon (level * 3);
+ while (tmp && buf.size () < BOOK_BUF)
{
/* monster description */
- sprintf (tmpbuf, "\n---\n%s", mon_desc (tmp));
-
- if (!book_overflow (retbuf, tmpbuf, booksize))
- strcat (retbuf, tmpbuf);
- else
- break;
+ buf.printf ("\n%s\n", mon_desc (tmp));
/* Note that the value this returns is not based on level */
tmp = get_next_mon (tmp);
}
-#ifdef BOOK_MSG_DEBUG
- LOG (llevDebug, "\n mon_info_msg() created strng: %d\n", strlen (retbuf));
- fprintf (logfile, " MADE THIS:\n%s\n", retbuf);
-#endif
-
- return retbuf;
+ return buf;
}
@@ -1287,7 +1263,7 @@
/* artifact_msg() - generate a message detailing the properties
* of 1-6 artifacts drawn sequentially from the artifact list.
*/
-const char *
+static const char *
artifact_msg (int level, int booksize)
{
artifactlist *al = NULL;
@@ -1295,10 +1271,11 @@
int chance, i, type, index;
int book_entries = level > 5 ? rndm (3) + rndm (3) + 2 : rndm (level) + 1;
const char *ch;
- char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF];
- static char retbuf[BOOK_BUF];
+ char name[MAX_BUF];
object *tmp = NULL;
+ static dynbuf_text buf; buf.clear ();
+
/* values greater than 5 create msg buffers that are too big! */
if (book_entries > 5)
book_entries = 5;
@@ -1336,19 +1313,20 @@
assign (name, art_name_array[index].name);
/* Ok, lets print out the contents */
- sprintf (retbuf, "Herein %s detailed %s...\n", book_entries > 1 ? "are" : "is", book_entries > 1 ? "some artifacts" : "an artifact");
+ buf.printf ("Herein %s detailed %s...\n",
+ book_entries > 1 ? "are" : "is",
+ book_entries > 1 ? "some artifacts" : "an artifact");
/* artifact msg attributes loop. Lets keep adding entries to the 'book'
* as long as we have space up to the allowed max # (book_entires)
*/
- while (book_entries > 0)
+ while (book_entries > 0 && buf.size () < BOOK_BUF)
{
- if (art == NULL)
+ if (!art)
art = al->items;
- /* separator of items */
- strcpy (buf, "--- \n");
+ buf << '\n';
/* Name */
if (art->allowed && art->allowed->name != shstr_All)
@@ -1361,56 +1339,49 @@
next = next->next;
}
while (next && rndm (2));
- sprintf (buf, "%s A %s of %s", buf, &temp->name, &art->item->name);
+
+ buf.printf ("A B<< %s of %s >>", &temp->name, &art->item->name);
}
else /* default name is used */
- sprintf (buf, "%s The %s of %s", buf, name, &art->item->name);
+ buf.printf ("The B<< %s of %s >>", name, &art->item->name);
+
+ buf << " is ";
/* chance of finding */
chance = (int) (100 * ((float) art->chance / al->total_chance));
if (chance >= 20)
- sprintf (sbuf, "an uncommon");
+ buf << "an uncommon";
else if (chance >= 10)
- sprintf (sbuf, "an unusual");
+ buf << "an unusual";
else if (chance >= 5)
- sprintf (sbuf, "a rare");
+ buf << "a rare";
else
- sprintf (sbuf, "a very rare");
- sprintf (buf, "%s is %s\n", buf, sbuf);
+ buf << "a very rare";
/* value of artifact */
- sprintf (buf, "%s item with a value that is %d times normal.\n", buf, art->item->value);
+ buf << " item with a value that is " << art->item->value << " times normal.\n";
/* include the message about the artifact, if exists, and book
* level is kinda high */
if (art->item->msg
- && rndm (4) + 1 < level
- && !(strlen (art->item->msg) + strlen (buf) > BOOK_BUF))
- strcat (buf, art->item->msg);
+ && rndm (4) + 1 < level)
+ buf << art->item->msg;
/* properties of the artifact */
tmp = object::create ();
add_abilities (tmp, art->item);
tmp->type = type;
SET_FLAG (tmp, FLAG_IDENTIFIED);
- if ((ch = describe_item (tmp, NULL)) != NULL && strlen (ch) > 1)
- sprintf (buf, "%s Properties of this artifact include: \n %s \n", buf, ch);
+ if ((ch = describe_item (tmp, 0)) && strlen (ch) > 1)
+ buf << "\rProperties of this artifact include:\r" << ch << "\n";
+
tmp->destroy ();
- /* add the buf if it will fit */
- if (!book_overflow (retbuf, buf, booksize))
- strcat (retbuf, buf);
- else
- break;
art = art->next;
book_entries--;
}
-#ifdef BOOK_MSG_DEBUG
- LOG (llevDebug, "artifact_msg() created strng: %d\n", strlen (retbuf));
- fprintf (logfile, " MADE THIS:\n%s", retbuf);
-#endif
- return retbuf;
+ return buf;
}
/*****************************************************************************
@@ -1421,66 +1392,54 @@
* incantations/prayers (and some of their properties) belonging to
* a given spellpath.
*/
-
-char *
+static char *
spellpath_msg (int level, int booksize)
{
+ static dynbuf_text buf; buf.clear ();
+
static char retbuf[BOOK_BUF];
char tmpbuf[BOOK_BUF];
int path = rndm (NRSPELLPATHS), prayers = rndm (2);
- int did_first_sp = 0;
uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path];
archetype *at;
/* Preamble */
- sprintf (retbuf, "Herein are detailed the names of %s\n", prayers ? "prayers" : "incantations");
+ buf << "Herein are detailed the names of "
+ << (prayers ? "prayers" : "incantations");
if (path == -1)
- strcat (retbuf, "having no known spell path.\n");
+ buf << " having no known spell path.\n";
else
- sprintf (retbuf, "%sbelonging to the path of %s:\n", retbuf, spellpathnames[path]);
+ buf << " belonging to the path of B<< " << spellpathnames[path] << " >>:\n\n";
+
+ int seen = 0;
for_all_archetypes (at)
- {
- /* Determine if this is an appropriate spell. Must
- * be of matching path, must be of appropriate type (prayer
- * or not), and must be within the valid level range.
- */
- if (at->type == SPELL && at->path_attuned & pnum &&
- ((at->stats.grace && prayers) || (at->stats.sp && !prayers)) && (at->level < (level * 8)))
- {
- assign (tmpbuf, at->object::name);
+ /* Determine if this is an appropriate spell. Must
+ * be of matching path, must be of appropriate type (prayer
+ * or not), and must be within the valid level range.
+ */
+ if (at->type == SPELL && at->path_attuned & pnum &&
+ ((at->stats.grace && prayers) || (at->stats.sp && !prayers)) && (at->level < (level * 8)))
+ {
+ seen = 1;
+ buf << at->object::name << '\r';
+ }
- if (book_overflow (retbuf, tmpbuf, booksize))
- break;
- else
- {
- if (did_first_sp)
- strcat (retbuf, ",\n");
- did_first_sp = 1;
- strcat (retbuf, tmpbuf);
- }
- }
- }
/* Geez, no spells were generated. */
- if (!did_first_sp)
- {
- if (rndm (4)) /* usually, lets make a recursive call... */
- spellpath_msg (level, booksize);
- else /* give up, cause knowing no spells exist for path is info too. */
- strcat (retbuf, "\n - no known spells exist -\n");
- }
- else
- {
- strcat (retbuf, "\n");
- }
- return retbuf;
+ if (!seen)
+ if (rndm (4)) /* usually, lets make a recursive call... */
+ return spellpath_msg (level, booksize);
+ else /* give up, cause knowing no spells exist for path is info too. */
+ buf << "- no known spells exist.\n";
+
+ return buf;
}
/* formula_msg() - generate a message detailing the properties
* of a randomly selected alchemical formula.
*/
-void
+static void
make_formula_book (object *book, int level)
{
char retbuf[BOOK_BUF], title[MAX_BUF];
@@ -1610,7 +1569,7 @@
/* god_info_msg() - generate a message detailing the properties
* of a random god. Used by the book hack. b.t.
*/
-const char *
+static const char *
god_info_msg (int level, int booksize)
{
static char retbuf[BOOK_BUF];
@@ -1807,8 +1766,8 @@
strcat (retbuf, " hopelessly garbled!]\n ---\n");
}
#ifdef BOOK_MSG_DEBUG
- LOG (llevDebug, "\n god_info_msg() created strng: %d\n", strlen (retbuf));
- fprintf (logfile, " MADE THIS:\n%s", retbuf);
+ LOG (llevDebug, "\n god_info_msg() created string: %d\n", strlen (retbuf));
+ LOG (llevDebug, " MADE THIS:\n%s", retbuf);
#endif
return retbuf;
}
@@ -1858,7 +1817,7 @@
* 4) you may want separate authour/book name arrays in read.h
*/
msg_type = msg_type > 0 ? msg_type : rndm (8);
- switch (msg_type)
+ switch (msg_type*0+2)//D
{
case 1: /* monster attrib */
strcpy (msgbuf, mon_info_msg (level, book_buf_size));