--- deliantra/server/random_maps/random_map.h 2006/12/15 20:07:02 1.4
+++ deliantra/server/random_maps/random_map.h 2010/03/26 00:59:21 1.22
@@ -1,35 +1,34 @@
/*
- * static char *rcsid_map_c =
- * "$Id$";
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ *
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
+ *
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * .
+ *
+ * The authors can be reached via e-mail to
*/
-/*
- CrossFire, A Multiplayer game for X-windows
-
- Copyright (C) 2001 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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- The authors can be reached via e-mail at crossfire.de
-*/
-
#ifndef RANDOM_MAP_H
#define RANDOM_MAP_H
-typedef struct {
+#include "util.h"
+
+struct random_map_params
+{
char wallstyle[512];
char wall_name[512];
char floorstyle[512];
@@ -38,14 +37,14 @@
char layoutstyle[512];
char doorstyle[512];
char decorstyle[512];
- char origin_map[512];
- char final_map[512];
+ shstr origin_map;
+ shstr final_map;
char exitstyle[512];
- char this_map[512];
+ shstr this_map;
char exit_on_final_map[512];
+ char *custom;
- int Xsize;
- int Ysize;
+ int xsize, ysize;
int expand2x;
int layoutoptions1;
int layoutoptions2;
@@ -54,30 +53,37 @@
int difficulty;
int difficulty_given;
float difficulty_increase;
+
int dungeon_level;
int dungeon_depth;
+
int decoroptions;
int orientation;
int origin_y;
int origin_x;
- int random_seed;
- long unsigned int total_map_hp;
+ uint32_t random_seed;
+ uint64_t total_map_hp;
int map_layout_style;
int treasureoptions;
int symmetry_used;
- struct region *region;
-} RMParms;
-int load_parameters(FILE *fp, int bufstate,RMParms *RP);
+ struct region *region;
+ // "private", adjusted sizes
+ int Xsize;
+ int Ysize;
+};
-#define ONION_LAYOUT 1
-#define MAZE_LAYOUT 2
-#define SPIRAL_LAYOUT 3
-#define ROGUELIKE_LAYOUT 4
-#define SNAKE_LAYOUT 5
-#define SQUARE_SPIRAL_LAYOUT 6
-#define NROFLAYOUTS 6
+enum {
+ LAYOUT_NONE,
+ LAYOUT_ONION,
+ LAYOUT_MAZE,
+ LAYOUT_SPIRAL,
+ LAYOUT_ROGUELIKE,
+ LAYOUT_SNAKE,
+ LAYOUT_SQUARE_SPIRAL,
+ NROFLAYOUTS,
+};
/*
* Move these defines out of room_gen_onion.c to here, as
@@ -94,32 +100,101 @@
*/
-#define OPT_RANDOM 0
-#define OPT_CENTERED 1
-#define OPT_LINEAR 2
-#define OPT_BOTTOM_C 4
-#define OPT_BOTTOM_R 8
-#define OPT_IRR_SPACE 16
-#define OPT_WALL_OFF 32
-#define OPT_WALLS_ONLY 64
-#define OPT_NO_DOORS 256 /* Place walls insead of doors. Produces broken map. */
-
-
+enum {
+ RMOPT_RANDOM = 0,
+ RMOPT_CENTERED = 1,
+ RMOPT_LINEAR = 2,
+ RMOPT_BOTTOM_C = 4,
+ RMOPT_BOTTOM_R = 8,
+ RMOPT_IRR_SPACE = 16,
+ RMOPT_WALL_OFF = 32,
+ RMOPT_WALLS_ONLY = 64,
+ RMOPT_NO_DOORS = 256, /* Place walls insead of doors. Produces broken map. */
+};
/* symmetry definitions--used in this file AND in treasure.c:
the numerical values matter so don't change them. */
-#define RANDOM_SYM 0
-#define NO_SYM 1
-#define X_SYM 2
-#define Y_SYM 3
-#define XY_SYM 4
-
-#define MIN_RANDOM_MAP_SIZE 10
-
-/* a macro to get a strongly centered random distribution,
- from 0 to x, centered at x/2 */
-#define BC_RANDOM(x) ((int) ((RANDOM() % (x)+RANDOM()%(x)+RANDOM()%(x))/3.))
-
-int set_random_map_variable(RMParms *rp,const char *buf);
+enum {
+ SYMMETRY_RANDOM,
+ SYMMETRY_NONE,
+ SYMMETRY_X,
+ SYMMETRY_Y,
+ SYMMETRY_XY,
+};
+
+// 12 has been experimentally :( determined ot be a lot more stable
+// than 11 or 10, leading to the assumption that something inherently
+// needs a minimum size of at least 12
+#define MIN_RANDOM_MAP_SIZE 12
+
+// reference
+//
+// \0 floor only
+// # wall
+// D door
+// < up
+// > down
+// C "center" (of onion layout)
+// . ?? (rogue)
+//
+
+struct LayoutData : zero_initialised
+{
+ char **col;
+ int w, h;
+
+ LayoutData (int w, int h);
+ ~LayoutData ();
+
+ operator char **()
+ {
+ return col;
+ }
+
+ void clear (char fill = 0);
+ void border (char fill = '#');
+};
+
+struct Layout
+{
+ LayoutData *ptr;
+
+ Layout ()
+ {
+ }
+
+ Layout (int xsize, int ysize)
+ : ptr (new LayoutData (xsize, ysize))
+ {
+ }
+
+ Layout (random_map_params *RP)
+ : ptr (new LayoutData (RP->Xsize, RP->Ysize))
+ {
+ }
+
+ void free ()
+ {
+ delete ptr;
+ }
+
+ LayoutData *operator ->() const
+ {
+ return ptr;
+ }
+
+ operator char **() const
+ {
+ return *ptr;
+ }
+
+ void swap (const Layout &layout) const
+ {
+ ::swap (layout.ptr->col, ptr->col);
+ ::swap (layout.ptr->w , ptr->w );
+ ::swap (layout.ptr->h , ptr->h );
+ }
+};
#endif
+