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

Comparing deliantra/server/common/los.C (file contents):
Revision 1.47 by root, Tue Dec 23 01:51:27 2008 UTC vs.
Revision 1.48 by root, Tue Dec 23 06:58:23 2008 UTC

 // this is a variant of a spiral los algorithm taken from
 // http://www.geocities.com/temerra/los_rays.html
 // which has been simplified and changed considerably, but
 // still is basically the same algorithm.
 static void
-do_los (object *op)
+calculate_los (player *pl)
 {
-  player *pl = op->contr;
   int max_radius = max (pl->ns->mapx, pl->ns->mapy) / 2;
   memset (los, 0, sizeof (los));
   q1 = 0; q2 = 0; // initialise queue, not strictly required
 		    }
                 }
             }
           // check whether this space blocks the view
-          maptile *m = op->map;
+          maptile *m = pl->observe->map;
-          sint16 nx = op->x + dx;
+          sint16 nx = pl->observe->x + dx;
-          sint16 ny = op->y + dy;
+          sint16 ny = pl->observe->y + dy;
           if (expect_true (!xy_normalise (m, nx, ny))
               || expect_false (m->at (nx, ny).flags () & P_BLOCKSVIEW))
             {
               l.xo = l.xe = abs (dx);
   return max (b, l);
 }
 template<sint8 change_it (sint8, sint8)>
 static void
-apply_light (object *op, int dx, int dy, int light, const sint8 *atten_table)
+apply_light (player *pl, int dx, int dy, int light, const sint8 *atten_table)
 {
   // min or max the circular area around basex, basey
-  player *pl = op->contr;
   dx += LOS_X0;
   dy += LOS_Y0;
-  int hx = op->contr->ns->mapx / 2;
+  int hx = pl->ns->mapx / 2;
-  int hy = op->contr->ns->mapy / 2;
+  int hy = pl->ns->mapy / 2;
   int ax0 = max (LOS_X0 - hx, dx - light);
   int ay0 = max (LOS_Y0 - hy, dy - light);
   int ax1 = min (dx + light, LOS_X0 + hx);
   int ay1 = min (dy + light, LOS_Y0 + hy);
 /* add light, by finding all (non-null) nearby light sources, then
  * mark those squares specially.
  */
 static void
-apply_lights (object *op)
+apply_lights (player *pl)
 {
-  int darklevel, mflags, light, x1, y1;
+  object *op = pl->observe;
-  maptile *m = op->map;
-  sint16 nx, ny;
-  darklevel = m->darklevel ();
+  int darklevel = op->map->darklevel ();
   /* If the player can see in the dark, lower the darklevel for him */
-  if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
+  if (op->flag [FLAG_SEE_IN_DARK])
-    darklevel -= 2;
+    darklevel = max (0, darklevel - 2);
-  /* Do a sanity check.  If not valid, some code below may do odd
-   * things.
-   */
-  if (darklevel > MAX_DARKNESS)
-    {
-      LOG (llevError, "Map darkness for %s on %s is too high (%d)\n", &op->name, &op->map->path, darklevel);
-      darklevel = MAX_DARKNESS;
-    }
-  int half_x = op->contr->ns->mapx / 2;
+  int half_x = pl->ns->mapx / 2;
-  int half_y = op->contr->ns->mapy / 2;
+  int half_y = pl->ns->mapy / 2;
   int min_x = op->x - half_x - MAX_LIGHT_RADIUS;
   int min_y = op->y - half_y - MAX_LIGHT_RADIUS;
   int max_x = op->x + half_x + MAX_LIGHT_RADIUS;
   int max_y = op->y + half_y + MAX_LIGHT_RADIUS;
   int pass2 = 0; // negative lights have an extra pass
-  if (darklevel < 1)
+  if (!darklevel)
     pass2 = 1;
   else
     {
       /* first, make everything totally dark */
       for (int dx = -half_x; dx <= half_x; dx++)
         for (int dy = -half_x; dy <= half_y; dy++)
-          if (op->contr->los[dx + LOS_X0][dy + LOS_Y0] != LOS_BLOCKED)
+          if (pl->los[dx + LOS_X0][dy + LOS_Y0] != LOS_BLOCKED)
-            op->contr->los[dx + LOS_X0][dy + LOS_Y0] = LOS_MAX;
+            pl->los[dx + LOS_X0][dy + LOS_Y0] = LOS_MAX;
       /*
        * Only process the area of interest.
        * the basex, basey values represent the position in the op->contr->los
        * array. Its easier to just increment them here (and start with the right
        * value) than to recalculate them down below.
        */
       for (int x = min_x; x <= max_x; x++)
         for (int y = min_y; y <= max_y; y++)
           {
-            maptile *m = op->map;
+            maptile *m = pl->observe->map;
             sint16 nx = x;
             sint16 ny = y;
             if (!xy_normalise (m, nx, ny))
               continue;
             if (expect_false (light))
               if (light < 0)
                 pass2 = 1;
               else
-                apply_light<los_brighten> (op, x - op->x, y - op->y, light, light_atten [light + MAX_LIGHT_RADIUS]);
+                apply_light<los_brighten> (pl, x - op->x, y - op->y, light, light_atten [light + MAX_LIGHT_RADIUS]);
           }
       /* grant some vision to the player, based on the darklevel */
       {
         int light = clamp (MAX_DARKNESS - darklevel, 0, MAX_DARKNESS);
-        apply_light<los_brighten> (op, 0, 0, light, vision_atten [light]);
+        apply_light<los_brighten> (pl, 0, 0, light, vision_atten [light]);
       }
     }
   // possibly do 2nd pass for rare negative glow radii
   // for effect, those are always considered to be stronger than anything else
   // but they can't darken a place completely
   if (pass2)
     for (int x = min_x; x <= max_x; x++)
       for (int y = min_y; y <= max_y; y++)
         {
-          maptile *m = op->map;
+          maptile *m = pl->observe->map;
           sint16 nx = x;
           sint16 ny = y;
           if (!xy_normalise (m, nx, ny))
             continue;
           mapspace &ms = m->at (nx, ny);
           ms.update ();
           sint8 light = ms.light;
           if (expect_false (light < 0))
-            apply_light<los_darken> (op, x - op->x, y - op->y, -light, light_atten [light + MAX_LIGHT_RADIUS]);
+            apply_light<los_darken> (pl, x - op->x, y - op->y, -light, light_atten [light + MAX_LIGHT_RADIUS]);
         }
 }
 /* blinded_sight() - sets all viewable squares to blocked except
  * for the one the central one that the player occupies.  A little
  * odd that you can see yourself (and what your standing on), but
  * really need for any reasonable game play.
  */
 static void
-blinded_sight (object *op)
+blinded_sight (player *pl)
 {
-  op->contr->los[LOS_X0][LOS_Y0] = 1;
+  pl->los[LOS_X0][LOS_Y0] = 1;
 }
 /*
  * update_los() recalculates the array which specifies what is
  * visible for the given player-object.
  */
 void
-update_los (object *op)
+player::update_los ()
 {
-  if (QUERY_FLAG (op, FLAG_REMOVED))
+  if (ob->flag [FLAG_REMOVED])//D really needed?
     return;
-  op->contr->clear_los ();
+  clear_los ();
-  if (QUERY_FLAG (op, FLAG_WIZ) /* ||XRAYS(op) */ )
+  if (ob->flag [FLAG_WIZLOOK])
-    memset (op->contr->los, 0, sizeof (op->contr->los));
+    memset (los, 0, sizeof (los));
-  else if (QUERY_FLAG (op, FLAG_BLIND))      /* player is blind */
+  else if (observe->flag [FLAG_BLIND])      /* player is blind */
-    blinded_sight (op);
+    blinded_sight (this);
   else
     {
-      do_los (op);
+      calculate_los (this);
-      apply_lights (op);
+      apply_lights (this);
     }
-  if (QUERY_FLAG (op, FLAG_XRAYS))
+  if (observe->flag [FLAG_XRAYS])
     for (int dx = -2; dx <= 2; dx++)
       for (int dy = -2; dy <= 2; dy++)
-        min_it (op->contr->los[dx + LOS_X0][dy + LOS_X0], 1);
+        min_it (los[dx + LOS_X0][dy + LOS_X0], 1);
 }
 /* update all_map_los is like update_all_los below,
  * but updates everyone on the map, no matter where they
  * are. This generally should not be used, as a per
             pl->do_los = 1;
         }
     }
 }
-static const int season_timechange[5][HOURS_PER_DAY] = {
+static const int season_darkness[5][HOURS_PER_DAY] = {
-  /* 0  1   2   3   4   5   6   7   8   9  10  11  12  13  14   1   2   3   4   5   6   7   8   9  10  11  12  13 */
+  /*0  1  2  3  4  5  6  7  8  9 10 11 12 13 14  1  2  3  4  5  6  7  8  9 10 11 12 13 */
-  { 0,  0,  0,  0,  0,  0,  0, -1, -1, -1, -1, -1, -1, -1, -1,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1,  1,  1},
+  { 5, 5, 4, 4, 4, 4, 4, 3, 3, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 1, 2, 2, 2, 3, 3, 4, 4, 5 },
-  { 0,  0,  0,  0,  0,  0, -1, -1, -1, -1, -1, -1, -1,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1,  1,  0},
+  { 5, 5, 4, 4, 4, 4, 3, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4 },
-  { 0,  0,  0,  0,  0, -1, -1, -1, -1, -1, -1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1,  0},
+  { 5, 4, 4, 4, 4, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 3, 4, 4 },
-  { 0,  0,  0,  0,  0, -1, -1, -1, -1, -1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  0},
+  { 4, 4, 4, 4, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 3, 4 },
-  { 0,  0,  0,  0,  0,  0, -1, -1, -1, -1, -1, -1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1,  0}
+  { 5, 5, 4, 4, 4, 3, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4 }
 };
+/*
+ * Tell players the time and compute the darkness level for all maps in the game.
+ * MUST be called exactly once per hour.
+ */
 void
-maptile::set_darkness_map ()
+maptile::adjust_daylight ()
 {
   timeofday_t tod;
-  if (!outdoor)
-    return;
   get_tod (&tod);
-  darkness = 0;
-  for (int i = HOURS_PER_DAY / 2; i < HOURS_PER_DAY; i++)
+  // log the time to log-1 every hour, and to chat every day
-    change_map_light (season_timechange[tod.season][i]);
+  {
+    char todbuf[512];
-  for (int i = 0; i <= tod.hour; i++)
+    format_tod (todbuf, sizeof (todbuf), &tod);
-    change_map_light (season_timechange[tod.season][i]);
-}
-/*
+    for_all_players (pl)
- * Compute the darkness level for all maps in the game.  Requires the
+      pl->ns->send_msg (NDI_GREY, tod.hour == 15 ? CHAT_CHANNEL : LOG_CHANNEL, todbuf);
- * time of day as an argument.
+  }
- */
-static void
-dawn_to_dusk (const timeofday_t * tod)
-{
   /* If the light level isn't changing, no reason to do all
    * the work below.
    */
-  if (season_timechange[tod->season][tod->hour] == 0)
+  sint8 new_darkness = season_darkness[tod.season][tod.hour];
+  if (new_darkness == maptile::outdoor_darkness)
     return;
-  maptile::change_all_map_light (season_timechange[tod->season][tod->hour]);
+  new_draw_info (NDI_GREY | NDI_UNIQUE | NDI_ALL, 1, 0,
-}
+                 new_darkness > maptile::outdoor_darkness
+                 ? "It becomes darker."
+                 : "It becomes brighter.");
-void
+  maptile::outdoor_darkness = new_darkness;
-adjust_daylight ()
-{
-  timeofday_t tod;
-  get_tod (&tod);
+  // we simply update the los for all players, which is unnecessarily
-  dawn_to_dusk (&tod);
+  // costly, but should do for the moment.
+  for_all_players (pl)
+    pl->do_los = 1;
 }
 /*
  * make_sure_seen: The object is supposed to be visible through walls, thus
  * check if any players are nearby, and edit their LOS array.

Diff Legend

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

Comparing deliantra/server/common/los.C (file contents): Revision 1.47 by root, Tue Dec 23 01:51:27 2008 UTC vs. Revision 1.48 by root, Tue Dec 23 06:58:23 2008 UTC

Diff Legend

Comparing deliantra/server/common/los.C (file contents):
Revision 1.47 by root, Tue Dec 23 01:51:27 2008 UTC vs.
Revision 1.48 by root, Tue Dec 23 06:58:23 2008 UTC