[ViewVC] Diff of: cvs/deliantra/server/common/readable.C

Comparing deliantra/server/common/readable.C (file contents):
Revision 1.37 by root, Mon Sep 29 10:32:50 2008 UTC vs.
Revision 1.38 by root, Sat Dec 27 02:31:19 2008 UTC

                   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;
-                  if (RANDOM () % 4)
+                  if (rndm (4))
                     {
                       /* Lets give the book a description to individualize it some */
                       char new_name[MAX_BUF];
                       snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
     return (object *) NULL;
   if (!level)
     {
       /* lets get a random monster from the mon_info linked list */
-      monnr = RANDOM () % nrofmon;
+      monnr = rndm (nrofmon);
       for (mon = first_mon_info, i = 0; mon; mon = mon->next)
         if (i++ == monnr)
           break;
     {
       LOG (llevError, "get_random_mon() couldn't return monster for level %d\n", level);
       return NULL;
     }
-  monnr = RANDOM () % i;
+  monnr = rndm (i);
   for (mon = first_mon_info; mon; mon = mon->next)
     if (mon->ob->level >= level && monnr-- == 0)
       return mon->ob;
   if (!mon)
 artifact_msg (int level, int booksize)
 {
   artifactlist *al = NULL;
   artifact *art;
   int chance, i, type, index;
-  int book_entries = level > 5 ? RANDOM () % 3 + RANDOM () % 3 + 2 : RANDOM () % level + 1;
+  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];
   object *tmp = NULL;
    * for that type exists!
    */
   i = 0;
   do
     {
-      index = RANDOM () % (sizeof (art_name_array) / sizeof (arttypename));
+      index = rndm (sizeof (art_name_array) / sizeof (arttypename));
       type = art_name_array[index].type;
       al = find_artifactlist (type);
       i++;
     }
   while ((al == NULL) && (i < 10));
     return "None";
   /* There is no reason to start on the artifact list at the begining. Lets
    * take our starting position randomly... */
   art = al->items;
-  for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--)
+  for (i = rndm (level) + rndm (2) + 1; i > 0; i--)
     {
-      if (art == NULL)
+      if (!art)
         art = al->items;        /* hmm, out of stuff, loop back around */
       art = art->next;
     }
   /* the base 'generic' name for our artifact */
   assign (name, art_name_array[index].name);
           do
             {
               temp = next;
               next = next->next;
             }
-          while (next && !RANDOM () % 2);
+          while (next && rndm (2));
           sprintf (buf, "%s A %s of %s", buf, &temp->name, &art->item->name);
         }
       else                      /* default name is used */
         sprintf (buf, "%s The %s of %s", buf, name, &art->item->name);
       /* value of artifact */
       sprintf (buf, "%s item with a value that is %d times normal.\n", buf, art->item->value);
       /* include the message about the artifact, if exists, and book
        * level is kinda high */
-      if (art->item->msg && (RANDOM () % 4 + 1) < level && !((strlen (art->item->msg) + strlen (buf)) > BOOK_BUF))
+      if (art->item->msg
+          && rndm (4) + 1 < level
+          && !(strlen (art->item->msg) + strlen (buf) > BOOK_BUF))
         strcat (buf, art->item->msg);
       /* properties of the artifact */
       tmp = object::create ();
       add_abilities (tmp, art->item);
 char *
 spellpath_msg (int level, int booksize)
 {
   static char retbuf[BOOK_BUF];
   char tmpbuf[BOOK_BUF];
-  int path = RANDOM () % NRSPELLPATHS, prayers = RANDOM () % 2;
+  int path = rndm (NRSPELLPATHS), prayers = rndm (2);
   int did_first_sp = 0;
   uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path];
   archetype *at;
   /* Preamble */
         }
     }
   /* Geez, no spells were generated. */
   if (!did_first_sp)
     {
-      if (RANDOM () % 4)        /* usually, lets make a recursive call... */
+      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
   int chance;
   /* the higher the book level, the more complex (ie number of
    * ingredients) the formula can be.
    */
-  fl = get_formulalist (((RANDOM () % level) / 3) + 1);
+  fl = get_formulalist (rndm (level) / 3 + 1);
   if (!fl)
     fl = get_formulalist (1);   /* safety */
   if (fl->total_chance == 0)
       add_author (book, 4);
       return;
     }
   /* get a random formula, weighted by its bookchance */
-  chance = RANDOM () % fl->total_chance;
+  chance = rndm (fl->total_chance);
-  for (formula = fl->items; formula != NULL; formula = formula->next)
+  for (formula = fl->items; formula; formula = formula->next)
     {
       chance -= formula->chance;
       if (chance <= 0)
         break;
     }
     {
       /* looks like a formula was found. Base the amount
        * of information on the booklevel and the spellevel
        * of the formula. */
-      const char *op_name = formula->arch_name[RANDOM () % formula->arch_names];
+      const char *op_name = formula->arch_name [rndm (formula->arch_names)];
       archetype *at;
       /* preamble */
       sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill");
            * while philo. sulfur may look better, without this,
            * you get things like 'the wise' because its missing the
            * water of section.
            */
           sprintf (title, "%s: %s of %s",
-                   formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
+                   formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
         }
       else
         {
           sprintf (retbuf, "%sThe %s", retbuf, op_name);
-          sprintf (title, "%s: %s", formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name);
+          sprintf (title, "%s: %s", formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name);
           if (at->title)
             {
               strcat (retbuf, " ");
               strcat (retbuf, at->title);
               strcat (title, " ");
    * this ...
    */
   while (level > 0)
     {
       sprintf (buf, " ");
-      if (level == 2 && RANDOM () % 2)
+      if (level == 2 && rndm (2))
         {                       /* enemy god */
           const char *enemy = god->title;
           if (enemy)
             sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy);
         }
-      if (level == 3 && RANDOM () % 2)
+      if (level == 3 && rndm (2))
         {                       /* enemy race, what the god's holy word effects */
           const char *enemy = god->slaying;
           if (enemy && !(god->path_denied & PATH_TURNING))
             if ((i = nstrtok (enemy, ",")) > 0)
                   sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ","));
                 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
               }
         }
-      if (level == 4 && RANDOM () % 2)
+      if (level == 4 && rndm (2))
         {                       /* Priest of god gets these protect,vulnerable... */
           char tmpbuf[MAX_BUF];
           if (const char *cp = describe_resistance (god, 1))
             {                   /* This god does have protections */
             }
           else
             sprintf (buf, " ");
         }
-      if (level == 5 && RANDOM () % 2)
+      if (level == 5 && rndm (2))
         {                       /* aligned race, summoning  */
           const char *race = god->race; /* aligned race */
           if (race && !(god->path_denied & PATH_SUMMON))
             if ((i = nstrtok (race, ",")) > 0)
                   sprintf (tmpbuf, "race of%s", strtoktolin (race, ","));
                 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
               }
         }
-      if (level == 6 && RANDOM () % 2)
+      if (level == 6 && rndm (2))
         {                       /* blessing,curse properties of the god */
           char tmpbuf[MAX_BUF];
           if (const char *cp = describe_resistance (god, 1))
             {                   /* This god does have protections */
           else
             sprintf (buf, " ");
         }
-      if (level == 8 && RANDOM () % 2)
+      if (level == 8 && rndm (2))
         {                       /* immunity, holy possession */
           int has_effect = 0, tmpvar;
           char tmpbuf[MAX_BUF];
           sprintf (tmpbuf, "\n");
             }
           else
             sprintf (buf, " ");
         }
-      if (level == 12 && RANDOM () % 2)
+      if (level == 12 && rndm (2))
         {                       /* spell paths */
           int has_effect = 0, tmpvar;
           char tmpbuf[MAX_BUF];
           sprintf (tmpbuf, "\n");
  */
 void
 tailor_readable_ob (object *book, int msg_type)
 {
   char msgbuf[BOOK_BUF];
-  int level = book->level ? (RANDOM () % book->level) + 1 : 1;
+  int level = book->level ? rndm (book->level) + 1 : 1;
   int book_buf_size;
   /* safety */
   if (book->type != BOOK)
     return;
    * 2) make sure there is an entry in max_titles[] array.
    * 3) make sure there are entries for your case in new_text_title()
    *    and add_authour().
    * 4) you may want separate authour/book name arrays in read.h
    */
-  msg_type = msg_type > 0 ? msg_type : (RANDOM () % 8);
+  msg_type = msg_type > 0 ? msg_type : rndm (8);
   switch (msg_type)
     {
       case 1:                /* monster attrib */
         strcpy (msgbuf, mon_info_msg (level, book_buf_size));
         break;

Diff Legend

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

Comparing deliantra/server/common/readable.C (file contents): Revision 1.37 by root, Mon Sep 29 10:32:50 2008 UTC vs. Revision 1.38 by root, Sat Dec 27 02:31:19 2008 UTC

Diff Legend

Comparing deliantra/server/common/readable.C (file contents):
Revision 1.37 by root, Mon Sep 29 10:32:50 2008 UTC vs.
Revision 1.38 by root, Sat Dec 27 02:31:19 2008 UTC