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.30 by root, Wed Jun 30 23:03:40 2010 UTC vs.
Revision 1.46 by root, Tue Jul 6 20:00:46 2010 UTC

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

Diff Legend

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