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.29 by root, Wed Jun 30 20:51:02 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
… …
143// > down 150// > down
144// C "center" (of onion layout) 151// C "center" (of onion layout)
145// . ?? (rogue) 152// . ?? (rogue)
146// 153//
147 154
148struct LayoutData : zero_initialised 155struct LayoutData
149{ 156{
150 char **col; 157 char **col;
151 int w, h; 158 int w, h;
152 159
153 LayoutData (int w, int h); 160 LayoutData (int w, int h);
… …
156 operator char **() 163 operator char **()
157 { 164 {
158 return col; 165 return col;
159 } 166 }
160 167
168 void fill (char fill);
161 void clear (char fill = 0); 169 void clear () { fill (0); }
162 void border (char fill = '#'); 170 void border (char fill = '#');
171 void rect (int x1, int y1, int x2, int y2, char fill); // x2, y2 exclusive
172
173 // makes sure all areas are connected. dirty=true carves rounder but also
174 // mroe walls, dirty=false carves narrow corridors.
175 void isolation_remover (bool dirty = 0);
163}; 176};
164 177
165struct Layout 178struct Layout
166{ 179{
167 LayoutData *ptr; 180 LayoutData *ptr;
… …
199 { 212 {
200 ::swap (layout.ptr->col, ptr->col); 213 ::swap (layout.ptr->col, ptr->col);
201 ::swap (layout.ptr->w , ptr->w ); 214 ::swap (layout.ptr->w , ptr->w );
202 ::swap (layout.ptr->h , ptr->h ); 215 ::swap (layout.ptr->h , ptr->h );
203 } 216 }
217
218 // for debugging, print layout to stdout
219 void print ();
204}; 220};
205 221
206// utility functions, to use rmg_rndm instead of rndm. 222// utility functions, to use rmg_rndm instead of rndm.
207static inline int 223static inline int
208rmg_find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 224rmg_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); 227 int i = find_free_spot (ob, m, x, y, start, stop);
212 swap (rmg_rndm, rndm); 228 swap (rmg_rndm, rndm);
213 return i; 229 return i;
214} 230}
215 231
232struct point
233{
234 short x;
235 short y;
236
237 point ()
238 {
239 }
240
241 point (int x, int y)
242 : x(x), y(y)
243 {
244 }
245};
246
247template<typename T>
248struct fixed_stack
249{
250 T *data;
251 int size;
252 int max;
253
254 fixed_stack ()
255 : size (0), data (0)
256 {
257 }
258
259 fixed_stack (int max)
260 : size (0), max (max)
261 {
262 data = salloc<T> (max);
263 }
264
265 void reset (int new_max)
266 {
267 sfree (data, max);
268 size = 0;
269 max = new_max;
270 data = salloc<T> (max);
271 }
272
273 void free ()
274 {
275 sfree (data, max);
276 data = 0;
277 }
278
279 ~fixed_stack ()
280 {
281 sfree (data, max);
282 }
283
284 T &operator[](int idx)
285 {
286 return data [idx];
287 }
288
289 void push (T v)
290 {
291 data [size++] = v;
292 }
293
294 T &pop ()
295 {
296 return data [--size];
297 }
298
299 T remove (int idx)
300 {
301 T v = data [idx];
302
303 data [idx] = data [--size];
304
305 return v;
306 }
307};
308
216#endif 309#endif
217 310

Diff Legend

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