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.26 by root, Sat Jun 26 22:10:18 2010 UTC vs.
Revision 1.32 by root, Thu Jul 1 01:22:44 2010 UTC

… …
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]; 33 char monsterstyle[512];
34 char treasurestyle[512];
35 char layoutstyle[512]; 34 char layoutstyle[512];
36 char doorstyle[512]; 35 char doorstyle[512];
37 char decorstyle[512];
38 shstr origin_map; 36 shstr origin_map;
39 shstr final_map; 37 shstr final_map;
40 shstr this_map; 38 shstr this_map;
41 char exit_on_final_map[512]; 39 char exit_on_final_map[512];
42 40
… …
51 float difficulty_increase; 49 float difficulty_increase;
52 50
53 int dungeon_level; 51 int dungeon_level;
54 int dungeon_depth; 52 int dungeon_depth;
55 53
56 int decoroptions;
57 int orientation; 54 int orientation;
55 int origin_x;
58 int origin_y; 56 int origin_y;
59 int origin_x;
60 uint32_t random_seed; 57 uint32_t random_seed;
61 uint64_t total_map_hp; 58 uint64_t total_map_hp;
62 int map_layout_style; 59 int map_layout_style;
63 int treasureoptions;
64 int symmetry_used; 60 int symmetry_used;
65 61
66 struct region *region; 62 struct region *region;
67 63
68 HV *hv; 64 HV *hv;
65 void hv_clone (); // replaces the hv by a clone'd copy (%new_hv = { %hv })
66
67 shstr_tmp as_shstr () const;
69 68
70 // fetch something from the options hash 69 // fetch something from the options hash
71 const_utf8_string get_str (const_utf8_string option, const_utf8_string fallback = "") const; 70 SV *get_sv (const char *option) const;
71 const_utf8_string get_str (const char *option, const_utf8_string fallback = "") const;
72 IV get_iv (const_utf8_string option, IV fallback = 0) const; 72 IV get_iv (const char *option, IV fallback = 0) const;
73 UV get_uv (const char *option, UV fallback = 0) const;
74 NV get_nv (const char *option, NV fallback = 0) const;
73 75
74 void set (const_utf8_string option, const_utf8_string value); 76 void set (const char *option, SV *value) const;
77 void set (const char *option, const_utf8_string value) const;
75 void set (const_utf8_string option, IV value); 78 void set (const char *option, IV value) const;
79 void set (const char *option, UV value) const;
80 void set (const char *option, NV value) const;
81
82 void set (const char *option, int value) const { set (option, (IV)value); }
76 83
77 // "private", adjusted sizes 84 // "private", adjusted sizes
78 int Xsize; 85 int Xsize;
79 int Ysize; 86 int Ysize;
80 87
… …
87 LAYOUT_MAZE, 94 LAYOUT_MAZE,
88 LAYOUT_SPIRAL, 95 LAYOUT_SPIRAL,
89 LAYOUT_ROGUELIKE, 96 LAYOUT_ROGUELIKE,
90 LAYOUT_SNAKE, 97 LAYOUT_SNAKE,
91 LAYOUT_SQUARE_SPIRAL, 98 LAYOUT_SQUARE_SPIRAL,
99 LAYOUT_CAVE,
92 NROFLAYOUTS, 100 NROFLAYOUTS,
93}; 101};
94 102
95/* 103/*
96 * Move these defines out of room_gen_onion.c to here, as 104 * Move these defines out of room_gen_onion.c to here, as
… …
132// 12 has been experimentally :( determined ot be a lot more stable 140// 12 has been experimentally :( determined ot be a lot more stable
133// than 11 or 10, leading to the assumption that something inherently 141// than 11 or 10, leading to the assumption that something inherently
134// needs a minimum size of at least 12 142// needs a minimum size of at least 12
135#define MIN_RANDOM_MAP_SIZE 12 143#define MIN_RANDOM_MAP_SIZE 12
136 144
145// we often use signed chars for coordinates (and U8 for distances)
146#define MAX_RANDOM_MAP_SIZE 120
147
137// reference 148// reference
138// 149//
139// \0 floor only 150// \0 floor only
140// # wall 151// # wall
141// D door 152// D door
… …
143// > down 154// > down
144// C "center" (of onion layout) 155// C "center" (of onion layout)
145// . ?? (rogue) 156// . ?? (rogue)
146// 157//
147 158
148struct LayoutData : zero_initialised 159// use this in new code
160struct Layout
149{ 161{
150 char **col; 162 char **col;
151 int w, h; 163 int w, h;
152 164
153 LayoutData (int w, int h); 165 Layout (int w, int h);
154 ~LayoutData (); 166 ~Layout ();
155 167
156 operator char **() 168 operator char **()
157 { 169 {
158 return col; 170 return col;
159 } 171 }
160 172
173 void swap (Layout &layout)
174 {
175 ::swap (layout.col, col);
176 ::swap (layout.w , w );
177 ::swap (layout.h , h );
178 }
179
180 // for debugging, print layout to stdout
181 void print ();
182
183 // simple inpainting
184 void fill (char fill);
161 void clear (char fill = 0); 185 void clear () { fill (0); }
162 void border (char fill = '#'); 186 void border (char fill = '#');
163}; 187 void rect (int x1, int y1, int x2, int y2, char fill); // x2, y2 exclusive
164 188
165struct Layout 189 void fill_rand (int perc);
166{
167 LayoutData *ptr;
168 190
169 Layout () 191 // makes sure all areas are connected. dirty=true carves rounder but also
170 { 192 // more walls, dirty=false carves narrow corridors.
171 } 193 void isolation_remover (bool dirty = 0);
172 194
173 Layout (int xsize, int ysize) 195 // generates a cave, subtype 0 is a rough cave, randomly open or closed
174 : ptr (new LayoutData (xsize, ysize)) 196 void gen_cave (int subtype);
175 { 197 void erode_1_2 (int c1, int c2 = -1, int repeat = 1);
176 }
177 198
178 Layout (random_map_params *RP) 199 void generate (random_map_params *RP);
179 : ptr (new LayoutData (RP->Xsize, RP->Ysize))
180 {
181 }
182
183 void free ()
184 {
185 delete ptr;
186 }
187
188 LayoutData *operator ->() const
189 {
190 return ptr;
191 }
192
193 operator char **() const
194 {
195 return *ptr;
196 }
197
198 void swap (const Layout &layout) const
199 {
200 ::swap (layout.ptr->col, ptr->col);
201 ::swap (layout.ptr->w , ptr->w );
202 ::swap (layout.ptr->h , ptr->h );
203 }
204}; 200};
205 201
206// utility functions, to use rmg_rndm instead of rndm. 202// utility functions, to use rmg_rndm instead of rndm.
207static inline int 203static inline int
208rmg_find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 204rmg_find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
… …
211 int i = find_free_spot (ob, m, x, y, start, stop); 207 int i = find_free_spot (ob, m, x, y, start, stop);
212 swap (rmg_rndm, rndm); 208 swap (rmg_rndm, rndm);
213 return i; 209 return i;
214} 210}
215 211
212// a simple point helper struct
213struct point
214{
215 short x;
216 short y;
217
218 point ()
219 {
220 }
221
222 point (int x, int y)
223 : x(x), y(y)
224 {
225 }
226};
227
228// something like a vector or stack, but without
229// out of bounds checking
230template<typename T>
231struct fixed_stack
232{
233 T *data;
234 int size;
235 int max;
236
237 fixed_stack ()
238 : size (0), data (0)
239 {
240 }
241
242 fixed_stack (int max)
243 : size (0), max (max)
244 {
245 data = salloc<T> (max);
246 }
247
248 void reset (int new_max)
249 {
250 sfree (data, max);
251 size = 0;
252 max = new_max;
253 data = salloc<T> (max);
254 }
255
256 void free ()
257 {
258 sfree (data, max);
259 data = 0;
260 }
261
262 ~fixed_stack ()
263 {
264 sfree (data, max);
265 }
266
267 T &operator[](int idx)
268 {
269 return data [idx];
270 }
271
272 void push (T v)
273 {
274 data [size++] = v;
275 }
276
277 T &pop ()
278 {
279 return data [--size];
280 }
281
282 T remove (int idx)
283 {
284 T v = data [idx];
285
286 data [idx] = data [--size];
287
288 return v;
289 }
290};
291
216#endif 292#endif
217 293

Diff Legend

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