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

Comparing deliantra/server/common/los.C (file contents):
Revision 1.44 by root, Sun Dec 21 21:20:35 2008 UTC vs.
Revision 1.47 by root, Tue Dec 23 01:51:27 2008 UTC

   return 0;
 }
 /* radius, distance => lightness adjust */
 static sint8 light_atten[MAX_LIGHT_RADIUS * 2 + 1][MAX_LIGHT_RADIUS * 3 / 2 + 1];
+static sint8 vision_atten[MAX_DARKNESS + 1][MAX_DARKNESS * 3 / 2 + 1];
 static struct los_init
 {
   los_init ()
   {
+    /* for lights */
     for (int radius = -MAX_LIGHT_RADIUS; radius <= MAX_LIGHT_RADIUS; ++radius)
       for (int distance = 0; distance <= MAX_LIGHT_RADIUS * 3 / 2; ++distance)
         {
           // max intensity
           int intensity = min (LOS_MAX, abs (radius) + 1);
           intensity = max (0, lerp_rd (distance, 0, abs (radius) + 1, intensity, 0));
           light_atten [radius + MAX_LIGHT_RADIUS][distance] = radius < 0
             ? min (3, intensity)
             : LOS_MAX - intensity;
+        }
+    /* for general vision */
+    for (int radius = 0; radius <= MAX_DARKNESS; ++radius)
+      for (int distance = 0; distance <= MAX_DARKNESS * 3 / 2; ++distance)
+        {
+          vision_atten [radius][distance] = distance <= radius ? 3 : 4;
         }
   }
 } los_init;
 sint8
 {
   int darklevel, mflags, light, x1, y1;
   maptile *m = op->map;
   sint16 nx, ny;
-  darklevel = m->darkness;
+  darklevel = m->darklevel ();
   /* If the player can see in the dark, lower the darklevel for him */
   if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
-    darklevel -= LOS_MAX / 2;
+    darklevel -= 2;
   /* Do a sanity check.  If not valid, some code below may do odd
    * things.
    */
   if (darklevel > MAX_DARKNESS)
                 apply_light<los_brighten> (op, 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_LIGHT_RADIUS);
+        int light = clamp (MAX_DARKNESS - darklevel, 0, MAX_DARKNESS);
-        apply_light<los_brighten> (op, 0, 0, light, light_atten [light + MAX_LIGHT_RADIUS]);
+        apply_light<los_brighten> (op, 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
  * really need for any reasonable game play.
  */
 static void
 blinded_sight (object *op)
 {
-  op->contr->los[LOS_X0][LOS_Y0] = 3;
+  op->contr->los[LOS_X0][LOS_Y0] = 1;
 }
 /*
  * update_los() recalculates the array which specifies what is
  * visible for the given player-object.
     }
   if (QUERY_FLAG (op, FLAG_XRAYS))
     for (int dx = -2; dx <= 2; dx++)
       for (int dy = -2; dy <= 2; dy++)
-        op->contr->los[dx + LOS_X0][dy + LOS_X0] = 0;
+        min_it (op->contr->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
  * change_map_light function
  */
 void
 update_all_map_los (maptile *map)
 {
-  for_all_players (pl)
+  for_all_players_on_map (pl, map)
-    if (pl->ob && pl->ob->map == map)
-      pl->do_los = 1;
+    pl->do_los = 1;
 }
 /*
  * This function makes sure that update_los() will be called for all
  * players on the given map within the next frame.
  * map is the map that changed, x and y are the coordinates.
  */
 void
 update_all_los (const maptile *map, int x, int y)
 {
+  map->at (x, y).invalidate ();
   for_all_players (pl)
     {
       /* Player should not have a null map, but do this
        * check as a safety
        */
             pl->do_los = 1;
         }
     }
 }
+static const int season_timechange[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,  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},
+  { 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},
+  { 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},
+  { 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},
+  { 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}
+};
+void
+maptile::set_darkness_map ()
+{
+  timeofday_t tod;
+  if (!outdoor)
+    return;
+  get_tod (&tod);
+  darkness = 0;
+  for (int i = HOURS_PER_DAY / 2; i < HOURS_PER_DAY; i++)
+    change_map_light (season_timechange[tod.season][i]);
+  for (int i = 0; i <= tod.hour; i++)
+    change_map_light (season_timechange[tod.season][i]);
+}
+/*
+ * Compute the darkness level for all maps in the game.  Requires the
+ * 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)
+    return;
+  maptile::change_all_map_light (season_timechange[tod->season][tod->hour]);
+}
+void
+adjust_daylight ()
+{
+  timeofday_t tod;
+  get_tod (&tod);
+  dawn_to_dusk (&tod);
+}
 /*
  * make_sure_seen: The object is supposed to be visible through walls, thus
  * check if any players are nearby, and edit their LOS array.
  */
 void

Diff Legend

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

Comparing deliantra/server/common/los.C (file contents): Revision 1.44 by root, Sun Dec 21 21:20:35 2008 UTC vs. Revision 1.47 by root, Tue Dec 23 01:51:27 2008 UTC

Diff Legend

Comparing deliantra/server/common/los.C (file contents):
Revision 1.44 by root, Sun Dec 21 21:20:35 2008 UTC vs.
Revision 1.47 by root, Tue Dec 23 01:51:27 2008 UTC