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

Diff Legend

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