ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/random_maps/random_map.h
(Generate patch)

Comparing deliantra/server/random_maps/random_map.h (file contents):
Revision 1.33 by root, Fri Jul 2 03:40:14 2010 UTC vs.
Revision 1.40 by root, Sat Jul 3 02:19:10 2010 UTC

… …
28#include "util.h" 28#include "util.h"
29 29
30struct random_map_params : zero_initialised 30struct random_map_params : zero_initialised
31{ 31{
32 char wall_name[512]; 32 char wall_name[512];
33 char monsterstyle[512];
34 char layoutstyle[512];
35 char doorstyle[512];
36 shstr origin_map;
37 shstr final_map;
38 shstr this_map;
39 char exit_on_final_map[512];
40 33
41 int xsize, ysize; 34 int xsize, ysize;
42 int expand2x; 35 int expand2x;
43 int layoutoptions1; 36 int layoutoptions1;
44 int layoutoptions2; 37 int layoutoptions2;
… …
50 43
51 int dungeon_level; 44 int dungeon_level;
52 int dungeon_depth; 45 int dungeon_depth;
53 46
54 int orientation; 47 int orientation;
55 int origin_x;
56 int origin_y;
57 uint32_t random_seed; 48 uint32_t random_seed;
58 uint64_t total_map_hp; 49 uint64_t total_map_hp;
59 int map_layout_style; 50 int map_layout_style;
60 int symmetry_used; 51 int symmetry_used;
61
62 struct region *region;
63 52
64 HV *hv; 53 HV *hv;
65 void hv_clone (); // replaces the hv by a clone'd copy (%new_hv = { %hv }) 54 void hv_clone (); // replaces the hv by a clone'd copy (%new_hv = { %hv })
66 55
67 shstr_tmp as_shstr () const; 56 shstr_tmp as_shstr () const;
… …
83 72
84 // "private", adjusted sizes 73 // "private", adjusted sizes
85 int Xsize; 74 int Xsize;
86 int Ysize; 75 int Ysize;
87 76
77 random_map_params ();
78 random_map_params (HV *hv);
88 ~random_map_params (); 79 ~random_map_params ();
89}; 80};
90 81
91enum { 82enum {
92 LAYOUT_NONE, 83 LAYOUT_NONE,
… …
150// \0 floor only 141// \0 floor only
151// # wall 142// # wall
152// D door 143// D door
153// < up 144// < up
154// > down 145// > down
155// C "center" (of onion layout) 146// C "center" (of onion maze)
156// . ?? (rogue) 147// . ?? (rogue)
157// 148//
158 149
159// use this in new code 150// use this in new code
151INTERFACE_CLASS(layout)
160struct Layout 152struct layout
161{ 153{
162 char **col; 154 typedef char cell;
155
156 cell **data;
163 int w, h; 157 int w, h;
164 158
165 Layout (int w, int h); 159 layout (int w, int h);
160 layout (layout &copy);
161 layout (layout &orig, int x1, int y1, int x2, int y2); // reference rect in other layout
166 ~Layout (); 162 ~layout ();
167 163
168 operator char **() const 164 operator cell **() const
169 { 165 {
170 return col; 166 return data;
171 } 167 }
172 168
173 void swap (Layout &layout) 169 void swap (layout &maze)
174 { 170 {
175 ::swap (layout.col, col); 171 ::swap (maze.data, data);
176 ::swap (layout.w , w ); 172 ::swap (maze.w , w );
177 ::swap (layout.h , h ); 173 ::swap (maze.h , h );
174 ::swap (maze.size, size);
178 } 175 }
179 176
177 MTH void swap (layout *maze) { swap (*maze); }
178
180 // for debugging, print layout to stdout 179 // for debugging, print maze to stdout
181 void print () const; 180 MTH void print () const;
182 181
183 // simple inpainting 182 // simple inpainting
184 void fill (char fill); 183 MTH void fill (char fill);
185 void clear () { fill (0); } 184 MTH void clear () { fill (0); }
186 void border (char fill = '#'); 185 MTH void border (char fill = '#');
187 void rect (int x1, int y1, int x2, int y2, char fill); // x2, y2 exclusive 186 MTH void rect (int x1, int y1, int x2, int y2, char fill); // x2, y2 exclusive
187 MTH void fill_rect (int x1, int y1, int x2, int y2, char fill); // x2, y2 exclusive
188 188
189 void fill_rand (int perc); 189 MTH void fill_rand (int perc);
190 190
191 // makes sure all areas are connected. dirty=true carves rounder but also 191 // makes sure all areas are connected
192 // more walls, dirty=false carves narrow corridors.
193 void isolation_remover (bool dirty = 0); 192 MTH void isolation_remover ();
194 193
195 // generates a cave, subtype 0 is a rough cave, randomly open or closed 194 // generates a cave, subtype 0 is a rough cave, randomly open or closed
196 void gen_cave (int subtype); 195 MTH void gen_cave (int subtype);
197 196
198 // helper functions to modify the layout 197 // helper functions to modify the maze
199 void erode_1_2 (int c1, int c2 = -1, int repeat = 1); 198 MTH void erode_1_2 (int c1, int c2 = -1, int repeat = 1);
200 void doorify (); 199 MTH void doorify ();
201 void roomify (); // make some rooms in it, works best on onions 200 MTH void roomify (); // make some rooms in it, works best on onions
202 void expand2x (); 201 MTH void expand2x ();
203 void symmetrize (int symmetry); 202 MTH void symmetrize (int symmetry);
204 void rotate (int rotation); // rotate by 1=90, 2=180, 3=270 degrees 203 MTH void rotate (int rotation); // rotate by 1=90, 2=180, 3=270 degrees
205 204
206 void generate (random_map_params *RP); 205 void generate (random_map_params *RP);
206private:
207 int size;
208 void alloc (int w, int h);
207}; 209};
208 210
209// utility functions, to use rmg_rndm instead of rndm. 211// utility functions, to use rmg_rndm instead of rndm.
210static inline int 212static inline int
211rmg_find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 213rmg_find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)

Diff Legend

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