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.28 by root, Wed Jun 30 01:32:57 2010 UTC vs.
Revision 1.39 by root, Sat Jul 3 01:49:18 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,
… …
94 LAYOUT_MAZE, 85 LAYOUT_MAZE,
95 LAYOUT_SPIRAL, 86 LAYOUT_SPIRAL,
96 LAYOUT_ROGUELIKE, 87 LAYOUT_ROGUELIKE,
97 LAYOUT_SNAKE, 88 LAYOUT_SNAKE,
98 LAYOUT_SQUARE_SPIRAL, 89 LAYOUT_SQUARE_SPIRAL,
90 LAYOUT_CAVE,
99 NROFLAYOUTS, 91 NROFLAYOUTS,
100}; 92};
101 93
102/* 94/*
103 * Move these defines out of room_gen_onion.c to here, as 95 * Move these defines out of room_gen_onion.c to here, as
… …
139// 12 has been experimentally :( determined ot be a lot more stable 131// 12 has been experimentally :( determined ot be a lot more stable
140// than 11 or 10, leading to the assumption that something inherently 132// than 11 or 10, leading to the assumption that something inherently
141// needs a minimum size of at least 12 133// needs a minimum size of at least 12
142#define MIN_RANDOM_MAP_SIZE 12 134#define MIN_RANDOM_MAP_SIZE 12
143 135
136// we often use signed chars for coordinates (and U8 for distances)
137#define MAX_RANDOM_MAP_SIZE 120
138
144// reference 139// reference
145// 140//
146// \0 floor only 141// \0 floor only
147// # wall 142// # wall
148// D door 143// D door
149// < up 144// < up
150// > down 145// > down
151// C "center" (of onion layout) 146// C "center" (of onion maze)
152// . ?? (rogue) 147// . ?? (rogue)
153// 148//
154 149
155struct LayoutData : zero_initialised 150// use this in new code
151INTERFACE_CLASS(layout)
152struct layout
156{ 153{
157 char **col; 154 typedef char cell;
155
156 cell **data;
158 int w, h; 157 int w, h;
159 158
160 LayoutData (int w, int h); 159 layout (int w, int h);
160 layout (layout &copy);
161 ~LayoutData (); 161 ~layout ();
162 162
163 operator char **() 163 operator cell **() const
164 { 164 {
165 return col; 165 return data;
166 } 166 }
167 167
168 void clear (char fill = 0); 168 void swap (layout &maze)
169 {
170 ::swap (maze.data, data);
171 ::swap (maze.w , w );
172 ::swap (maze.h , h );
173 }
174
175 MTH void swap (layout *maze) { swap (*maze); }
176
177 // for debugging, print maze to stdout
178 MTH void print () const;
179
180 // simple inpainting
181 MTH void fill (char fill);
182 MTH void clear () { fill (0); }
169 void border (char fill = '#'); 183 MTH void border (char fill = '#');
170}; 184 MTH void rect (int x1, int y1, int x2, int y2, char fill); // x2, y2 exclusive
185 MTH void fill_rect (int x1, int y1, int x2, int y2, char fill); // x2, y2 exclusive
171 186
172struct Layout 187 MTH void fill_rand (int perc);
173{
174 LayoutData *ptr;
175 188
176 Layout () 189 // makes sure all areas are connected
177 { 190 MTH void isolation_remover ();
178 }
179 191
180 Layout (int xsize, int ysize) 192 // generates a cave, subtype 0 is a rough cave, randomly open or closed
181 : ptr (new LayoutData (xsize, ysize)) 193 MTH void gen_cave (int subtype);
182 {
183 }
184 194
195 // helper functions to modify the maze
196 MTH void erode_1_2 (int c1, int c2 = -1, int repeat = 1);
197 MTH void doorify ();
198 MTH void roomify (); // make some rooms in it, works best on onions
199 MTH void expand2x ();
200 MTH void symmetrize (int symmetry);
201 MTH void rotate (int rotation); // rotate by 1=90, 2=180, 3=270 degrees
202
185 Layout (random_map_params *RP) 203 void generate (random_map_params *RP);
186 : ptr (new LayoutData (RP->Xsize, RP->Ysize)) 204private:
187 { 205 void alloc (int w, int h);
188 }
189
190 void free ()
191 {
192 delete ptr;
193 }
194
195 LayoutData *operator ->() const
196 {
197 return ptr;
198 }
199
200 operator char **() const
201 {
202 return *ptr;
203 }
204
205 void swap (const Layout &layout) const
206 {
207 ::swap (layout.ptr->col, ptr->col);
208 ::swap (layout.ptr->w , ptr->w );
209 ::swap (layout.ptr->h , ptr->h );
210 }
211
212 // for debugging, print layout to stdout
213 void print ();
214}; 206};
215 207
216// utility functions, to use rmg_rndm instead of rndm. 208// utility functions, to use rmg_rndm instead of rndm.
217static inline int 209static inline int
218rmg_find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 210rmg_find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
… …
221 int i = find_free_spot (ob, m, x, y, start, stop); 213 int i = find_free_spot (ob, m, x, y, start, stop);
222 swap (rmg_rndm, rndm); 214 swap (rmg_rndm, rndm);
223 return i; 215 return i;
224} 216}
225 217
218// a simple point helper struct
219struct point
220{
221 short x;
222 short y;
223
224 point ()
225 {
226 }
227
228 point (int x, int y)
229 : x(x), y(y)
230 {
231 }
232};
233
234// something like a vector or stack, but without
235// out of bounds checking
236template<typename T>
237struct fixed_stack
238{
239 T *data;
240 int size;
241 int max;
242
243 fixed_stack ()
244 : size (0), data (0)
245 {
246 }
247
248 fixed_stack (int max)
249 : size (0), max (max)
250 {
251 data = salloc<T> (max);
252 }
253
254 void reset (int new_max)
255 {
256 sfree (data, max);
257 size = 0;
258 max = new_max;
259 data = salloc<T> (max);
260 }
261
262 void free ()
263 {
264 sfree (data, max);
265 data = 0;
266 }
267
268 ~fixed_stack ()
269 {
270 sfree (data, max);
271 }
272
273 T &operator[](int idx)
274 {
275 return data [idx];
276 }
277
278 void push (T v)
279 {
280 data [size++] = v;
281 }
282
283 T &pop ()
284 {
285 return data [--size];
286 }
287
288 T remove (int idx)
289 {
290 T v = data [idx];
291
292 data [idx] = data [--size];
293
294 return v;
295 }
296};
297
226#endif 298#endif
227 299

Diff Legend

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