[ViewVC] Diff of: cvs/deliantra/server/server/c

Comparing deliantra/server/server/c_misc.C (file contents):
Revision 1.31 by root, Wed Dec 27 09:28:02 2006 UTC vs.
Revision 1.35 by root, Sun Jan 7 02:39:14 2007 UTC

 /*
     CrossFire, A Multiplayer game for X-windows
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 #include <loader.h>
 #include <sproto.h>
 #include <dirent.h>
-extern weathermap_t **weathermap;
 /* Handles misc. input request - things like hash table, malloc, maps,
  * who, etc.
  */
+//TODO
+#if 0
 void
 map_info (object *op, char *search)
 {
   maptile *m;
-  char buf[MAX_BUF], map_path[MAX_BUF];
+  char buf[MAX_BUF], map_path[31];
   long sec = time (0);
   new_draw_info_format (NDI_UNIQUE, 0, op, "Current time is: %02ld:%02ld:%02ld.", (sec % 86400) / 3600, (sec % 3600) / 60, sec % 60);
-  new_draw_info (NDI_UNIQUE, 0, op, "Path               Pl PlM IM   TO Dif Reset");
+  new_draw_info (NDI_UNIQUE, 0, op, "Path                           Pl PlM IM   TO Dif Reset");
-  for_all_maps (m)
+  for (maps_container::iterator i = maps.begin (); i != maps.end (); ++i)
     {
+      maptile *m = i->second;
       if (search && !strstr (m->path, search))
         continue;               /* Skip unwanted maps */
-      /* Print out the last 18 characters of the map name... */
+      /* Print out the last 30 characters of the map name... */
-      if (strlen (m->path) <= 18)
-        strcpy (map_path, m->path);
-      else
-        strcpy (map_path, m->path + strlen (m->path) - 18);
+      strcpy (map_path, m->path + max (0, (int)strlen (m->path) - 30));
-      sprintf (buf, "%-18.18s %2d %2d   %1d %4d %2d  %02d:%02d:%02d",
+      sprintf (buf, "%-30.30s %2d %2d   %1d %4d %2d  %02d:%02d:%02d",
                map_path, m->players, players_on_map (m, FALSE),
                m->in_memory, m->timeout, m->difficulty,
                (m->reset_time % 86400) / 3600, (m->reset_time % 3600) / 60, m->reset_time % 60);
       new_draw_info (NDI_UNIQUE, 0, op, buf);
     }
 }
+int
+command_style_map_info (object *op, char *params)
+{
+  extern maptile *styles;
+  maptile *mp;
+  int maps_used = 0, mapmem = 0, objects_used = 0, x, y;
+  object *tmp;
+  for (mp = styles; mp != NULL; mp = mp->next)
+    {
+      maps_used++;
+      mapmem += mp->width * mp->height * (sizeof (object *) + sizeof (mapspace)) + sizeof (maptile);
+      for (x = 0; x < mp->width; x++)
+        {
+          for (y = 0; y < mp->height; y++)
+            {
+              for (tmp = GET_MAP_OB (mp, x, y); tmp != NULL; tmp = tmp->above)
+                objects_used++;
+            }
+        }
+    }
+  new_draw_info_format (NDI_UNIQUE, 0, op, "Style maps loaded:    %d", maps_used);
+  new_draw_info (NDI_UNIQUE, 0, op, "Memory used, not");
+  new_draw_info_format (NDI_UNIQUE, 0, op, "including objects:    %d", mapmem);
+  new_draw_info_format (NDI_UNIQUE, 0, op, "Style objects:        %d", objects_used);
+  new_draw_info_format (NDI_UNIQUE, 0, op, "Mem for objects:      %d", objects_used * sizeof (object));
+  return 0;
+}
+#endif
 /* This command dumps the body information for object *op.
  * it doesn't care what the params are.
  * This is mostly meant as a debug command.
  */
   maptile *m = op->map;
   if (!m)
     return;
-  new_draw_info_format (NDI_UNIQUE, 0, op, "%s (%s) in %s", m->name, m->path, get_name_of_region_for_map (m));
+  new_draw_info_format (NDI_UNIQUE, 0, op, "%s (%s) in %s", &m->name, &m->path, get_name_of_region_for_map (m));
   if (QUERY_FLAG (op, FLAG_WIZ))
     {
       new_draw_info_format (NDI_UNIQUE, 0, op,
                             "players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld",
   current_region_info (op);
   return 1;
 }
 int
-command_maps (object *op, char *params)
-{
-  map_info (op, params);
-  return 1;
-}
-int
 command_time (object *op, char *params)
 {
   print_tod (op);
   return 1;
 }
 int
 command_weather (object *op, char *params)
 {
+#if 0
   int wx, wy, temp, sky;
   char buf[MAX_BUF];
   if (settings.dynamiclevel < 1)
     return 1;
           break;
         case SKY_BLIZZARD:
           new_draw_info (NDI_UNIQUE, 0, op, "A full blown blizzard is in effect.  You might want to take cover!");
           break;
     }
+#endif
   return 1;
 }
 int
 command_archs (object *op, char *params)
   dump_friendly_objects ();
   return 0;
 }
 int
-command_dumpmap (object *op, char *params)
-{
-  if (op)
-    dump_map (op->map);
-  return 0;
-}
-int
-command_dumpallmaps (object *op, char *params)
-{
-  dump_all_maps ();
-  return 0;
-}
-int
 command_printlos (object *op, char *params)
 {
   if (op)
     print_los (op);
   return 0;
 command_version (object *op, char *params)
 {
   version (op);
   return 0;
 }
 #ifndef BUG_LOG
 # define BUG_LOG "bug_log"
 #endif
 void
           return 0;
     }
 }
 int
-command_quit (object *op, char *params)
-{
-  new_draw_info (NDI_UNIQUE, 0, op,
-                 "Quitting will delete your character PERMANENTLY. If you are sure you want to do this, then use the quit_character command instead of quit.");
-  return 1;
-}
-int
-command_real_quit (object *op, char *params)
-{
-  send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Quitting will delete your character.\nAre you sure you want to quit (y/n):");
-  op->contr->ns->state = ST_CONFIRM_QUIT;
-  return 1;
-}
-/*
- * don't allow people to exit explore mode.  It otherwise becomes
- * really easy to abuse this.
- */
-int
-command_explore (object *op, char *params)
-{
-  if (settings.explore_mode == FALSE)
-    return 1;
-  /*
-   * I guess this is the best way to see if we are solo or not.  Actually,
-   * are there any cases when first_player->next==NULL and we are not solo?
-   */
-  if ((first_player != op->contr) || (first_player->next != NULL))
-    {
-      new_draw_info (NDI_UNIQUE, 0, op, "You can not enter explore mode if you are in a party");
-    }
-  else if (op->contr->explore)
-    new_draw_info (NDI_UNIQUE, 0, op, "There is no return from explore mode");
-  else
-    {
-      op->contr->explore = 1;
-      new_draw_info (NDI_UNIQUE, 0, op, "You are now in explore mode");
-    }
-  return 1;
-}
-int
 command_sound (object *op, char *params)
 {
   if (op->contr->ns->sound)
     {
       op->contr->ns->sound = 0;
       op->contr->ns->sound = 1;
       new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled.");
     }
   return 1;
-}
-int
-explore_mode (void)
-{
-  player *pl;
-  if (settings.explore_mode == TRUE)
-    {
-      for (pl = first_player; pl != (player *) NULL; pl = pl->next)
-        if (pl->explore)
-          return 1;
-    }
-  return 0;
 }
 int
 command_title (object *op, char *params)
 {
   strcpy (op->contr->own_title, params);
   return 1;
 }
 int
-command_save (object *op, char *params)
-{
-  if (!op->stats.exp)
-    new_draw_info (NDI_UNIQUE, 0, op, "You don't deserve to save yet.");
-  else
-    {
-      op->contr->save ();
-      new_draw_info (NDI_UNIQUE, 0, op, "You have been saved.");
-    }
-  return 1;
-}
-int
 command_peaceful (object *op, char *params)
 {
   new_draw_info (NDI_UNIQUE, 0, op,
                  "You cannot change your peaceful setting with this command."
                  " Please speak to the priest in the temple of Gorokh"
     new_draw_info (NDI_UNIQUE, 0, op, "You are braced.");
   else
     new_draw_info (NDI_UNIQUE, 0, op, "Not braced.");
   op->update_stats ();
-  return 0;
-}
-int
-command_style_map_info (object *op, char *params)
-{
-  extern maptile *styles;
-  maptile *mp;
-  int maps_used = 0, mapmem = 0, objects_used = 0, x, y;
-  object *tmp;
-  for (mp = styles; mp != NULL; mp = mp->next)
-    {
-      maps_used++;
-      mapmem += mp->width * mp->height * (sizeof (object *) + sizeof (mapspace)) + sizeof (maptile);
-      for (x = 0; x < mp->width; x++)
-        {
-          for (y = 0; y < mp->height; y++)
-            {
-              for (tmp = GET_MAP_OB (mp, x, y); tmp != NULL; tmp = tmp->above)
-                objects_used++;
-            }
-        }
-    }
-  new_draw_info_format (NDI_UNIQUE, 0, op, "Style maps loaded:    %d", maps_used);
-  new_draw_info (NDI_UNIQUE, 0, op, "Memory used, not");
-  new_draw_info_format (NDI_UNIQUE, 0, op, "including objects:    %d", mapmem);
-  new_draw_info_format (NDI_UNIQUE, 0, op, "Style objects:        %d", objects_used);
-  new_draw_info_format (NDI_UNIQUE, 0, op, "Mem for objects:      %d", objects_used * sizeof (object));
   return 0;
 }
 int
 command_kill_pets (object *op, char *params)

Diff Legend

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

Comparing deliantra/server/server/c_misc.C (file contents): Revision 1.31 by root, Wed Dec 27 09:28:02 2006 UTC vs. Revision 1.35 by root, Sun Jan 7 02:39:14 2007 UTC

Diff Legend

Comparing deliantra/server/server/c_misc.C (file contents):
Revision 1.31 by root, Wed Dec 27 09:28:02 2006 UTC vs.
Revision 1.35 by root, Sun Jan 7 02:39:14 2007 UTC