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

Comparing deliantra/server/server/main.C (file contents):
Revision 1.27 by root, Thu Sep 14 22:34:04 2006 UTC vs.
Revision 1.30 by root, Sat Sep 16 22:24:13 2006 UTC

  * goes someplace.
  */
 void
 enter_player_savebed (object *op)
 {
-  mapstruct *oldmap = op->map;
+  maptile *oldmap = op->map;
   object *tmp;
   tmp = get_object ();
   EXIT_PATH (tmp) = op->contr->savebed_map;
  * the counts on the map if needed.
  */
 void
 leave_map (object *op)
 {
-  mapstruct *oldmap = op->map;
+  maptile *oldmap = op->map;
   remove_ob (op);
   if (oldmap)
     {
  * player to - it could be the map he just came from if the load failed for
  * whatever reason.  If default map coordinates are to be used, then
  * the function that calls this should figure them out.
  */
 static void
-enter_map (object *op, mapstruct *newmap, int x, int y)
+enter_map (object *op, maptile *newmap, int x, int y)
 {
-  mapstruct *oldmap = op->map;
+  maptile *oldmap = op->map;
   if (out_of_map (newmap, x, y))
     {
       LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", newmap->path, x, y);
       x = MAP_ENTER_X (newmap);
         }
     }
 }
 void
-set_map_timeout (mapstruct *oldmap)
+set_map_timeout (maptile *oldmap)
 {
 #if MAP_MAXTIMEOUT
   oldmap->timeout = MAP_TIMEOUT (oldmap);
   /* Do MINTIMEOUT first, so that MAXTIMEOUT is used if that is
    * lower than the min value.
  */
 static void
 enter_random_map (object *pl, object *exit_ob)
 {
-  mapstruct *new_map;
+  maptile *new_map;
   char newmap_name[HUGE_BUF], *cp;
   static int reference_number = 0;
   RMParms rp;
   memset (&rp, 0, sizeof (RMParms));
  */
 static void
 enter_fixed_template_map (object *pl, object *exit_ob)
 {
-  mapstruct *new_map;
+  maptile *new_map;
   char tmpnum[32], exitpath[HUGE_BUF], resultname[HUGE_BUF], tmpstring[HUGE_BUF], *sourcemap;
   const char *new_map_name;
   /* Split the exit path string into two parts, one
    * for where to store the map, and one for were
  */
 static void
 enter_random_template_map (object *pl, object *exit_ob)
 {
-  mapstruct *new_map;
+  maptile *new_map;
   char tmpnum[32], resultname[HUGE_BUF], tmpstring[HUGE_BUF];
   const char *new_map_name;
   RMParms rp;
   /* Do replacement of %x, %y, and %n to the x coord of the exit, the y coord
  */
 static void
 enter_unique_map (object *op, object *exit_ob)
 {
   char apartment[HUGE_BUF];
-  mapstruct *newmap;
+  maptile *newmap;
   if (EXIT_PATH (exit_ob)[0] == '/')
     {
       sprintf (apartment, "%s/%s/%s/%s", settings.localdir, settings.playerdir, &op->name, clean_path (EXIT_PATH (exit_ob)));
       newmap = ready_map_name (apartment, MAP_PLAYER_UNIQUE);
           int x = EXIT_X (exit_ob), y = EXIT_Y (exit_ob);
           /* 'Normal' exits that do not do anything special
            * Simple enough we don't need another routine for it.
            */
-          mapstruct *newmap;
+          maptile *newmap;
           if (exit_ob->map)
             {
               newmap = ready_map_name (path_combine_and_normalize (exit_ob->map->path, EXIT_PATH (exit_ob)), 0);
               /* Random map was previously generated, but is no longer about.  Lets generate a new
         hit_player (op, exit_ob->stats.dam, exit_ob, exit_ob->attacktype, 1);
     }
   else
     {
       int flags = 0;
-      mapstruct *newmap;
+      maptile *newmap;
       /* Hypothetically, I guess its possible that a standard map matches
        * the localdir, but that seems pretty unlikely - unlikely enough that
        * I'm not going to attempt to try to deal with that possibility.
 #if 0                           // dead code, schmorp
 void
 process_active_maps ()
 {
-  for (mapstruct *map = first_map; map != NULL; map = map->next)
+  for (maptile *map = first_map; map != NULL; map = map->next)
     if (map->in_memory == MAP_IN_MEMORY)
       if (players_on_map (map, TRUE))
         process_events (map);
 }
 #endif
  * objects have been updated, process_players2() does the processing that
  * is needed after the players have been updated.
  */
 void
-process_players1 (mapstruct *map)
+process_players1 (maptile *map)
 {
   int flag;
   player *pl, *plnext;
   /* Basically, we keep looping until all the players have done their actions. */
       /*        draw(pl->ob); *//* updated in socket code */
     }
 }
 void
-process_players2 (mapstruct *map)
+process_players2 (maptile *map)
 {
   player *pl;
   /* Then check if any players should use weapon-speed instead of speed */
   for (pl = first_player; pl != NULL; pl = pl->next)
         pl->ob->speed_left = pl->ob->speed;
     }
 }
 void
-process_events (mapstruct *map)
+process_events (maptile *map)
 {
   object *op;
-  tag_t tag;
   static object *marker;
   if (!marker)
     marker = get_object ();
   process_players1 (map);
   active_objects = marker;
   while (marker->active_next)
     {
       op = marker->active_next;
-      tag = op->count;
       /* Move marker forward - swap op and marker */
       op->active_prev = marker->active_prev;
       if (op->active_prev)
               LOG (llevDebug, "process_events: calling process_object with removed object %s\n", op->name ? op->name : "null");
             }
 #endif
           --op->speed_left;
           process_object (op);
-          if (was_destroyed (op, tag))
+          if (op->destroyed ())
             continue;
         }
       if (settings.casting_time == TRUE && op->casting_time > 0)
         op->casting_time--;
       if (op->speed_left <= 0)
         op->speed_left += FABS (op->speed);
     }
   /* Remove marker object from active list */
 }
 void
 clean_tmp_files (void)
 {
-  mapstruct *m, *next;
+  maptile *m, *next;
   LOG (llevInfo, "Cleaning up...\n");
   /* We save the maps - it may not be intuitive why, but if there are unique
    * items, we need to save the map so they get saved off.  Perhaps we should
 /* clean up everything before exiting */
 void
 cleanup (void)
 {
   LOG (llevDebug, "Cleanup called.\n");
+  for (player *pl = first_player; pl != NULL; pl = pl->next)
+    save_player (pl->ob, 0);
+  for (player *pl = first_player; pl != NULL; pl = pl->next)
+    if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
+      leave_map (pl->ob);
+  clean_tmp_files ();
   write_book_archive ();
   INVOKE_GLOBAL (CLEANUP);
   _exit (0);

Diff Legend

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

Comparing deliantra/server/server/main.C (file contents): Revision 1.27 by root, Thu Sep 14 22:34:04 2006 UTC vs. Revision 1.30 by root, Sat Sep 16 22:24:13 2006 UTC

Diff Legend

Comparing deliantra/server/server/main.C (file contents):
Revision 1.27 by root, Thu Sep 14 22:34:04 2006 UTC vs.
Revision 1.30 by root, Sat Sep 16 22:24:13 2006 UTC