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.29 by root, Wed Jun 30 20:51:02 2010 UTC vs.
Revision 1.42 by root, Sat Jul 3 13:14:36 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_CASTLE,
92 LAYOUT_MULTIPLE,
99 NROFLAYOUTS, 93 NROFLAYOUTS,
100}; 94};
101 95
102/* 96/*
103 * 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
… …
139// 12 has been experimentally :( determined ot be a lot more stable 133// 12 has been experimentally :( determined ot be a lot more stable
140// than 11 or 10, leading to the assumption that something inherently 134// than 11 or 10, leading to the assumption that something inherently
141// needs a minimum size of at least 12 135// needs a minimum size of at least 12
142#define MIN_RANDOM_MAP_SIZE 12 136#define MIN_RANDOM_MAP_SIZE 12
143 137
138// we often use signed chars for coordinates (and U8 for distances)
139#define MAX_RANDOM_MAP_SIZE 120
140
144// reference 141// reference
145// 142//
146// \0 floor only 143// \0 floor only
147// # wall 144// # wall
148// D door 145// D door
149// < up 146// < up
150// > down 147// > down
151// C "center" (of onion layout) 148// C "center" (of onion maze)
152// . ?? (rogue) 149// . ?? (rogue)
153// 150//
154 151
152// use this in new code
153INTERFACE_CLASS(layout)
155struct LayoutData 154struct layout
156{ 155{
157 char **col; 156 typedef char cell;
157
158 cell **data;
158 int w, h; 159 int w, h;
159 160
160 LayoutData (int w, int h); 161 layout (int w, int h);
162 layout (layout &copy);
163
164 // reference rect in other layout - will not keep the data alive,
165 // so never swap with it's orig, or free the orig when in use.
166 layout (layout &orig, int x1, int y1, int x2, int y2);
167
161 ~LayoutData (); 168 ~layout ();
162 169
163 operator char **() 170 operator cell **() const
164 { 171 {
165 return col; 172 return data;
166 } 173 }
167 174
175 void swap (layout &maze)
176 {
177 ::swap (maze.data, data);
178 ::swap (maze.w , w );
179 ::swap (maze.h , h );
180 ::swap (maze.size, size);
181 }
182
183 MTH void swap (layout *maze) { swap (*maze); }
184
185 // for debugging, print maze to stdout
186 MTH void print () const;
187
188 // simple inpainting
168 void fill (char fill); 189 MTH void fill (char fill);
169 void clear () { fill (0); } 190 MTH void clear () { fill (0); }
170 void border (char fill = '#'); 191 MTH void border (char fill = '#');
171 void rect (int x1, int y1, int x2, int y2, char fill); // x2, y2 exclusive 192 MTH void rect (int x1, int y1, int x2, int y2, char fill); // x2, y2 exclusive
193 MTH void fill_rect (int x1, int y1, int x2, int y2, char fill); // x2, y2 exclusive
172 194
173 // makes sure all areas are connected. dirty=true carves rounder but also 195 MTH void fill_rand (int perc);
174 // mroe walls, dirty=false carves narrow corridors. 196
197 // makes sure all areas are connected
198 // perturb = 0 - very horz/vert tunnels
199 // perturb = 1 - straight but round
200 // perturb = 2 - snaky tunnels
175 void isolation_remover (bool dirty = 0); 201 MTH void isolation_remover (int perturb = 2);
176};
177 202
178struct Layout 203 // generates a cave, subtype 0 is a rough cave, randomly open or closed
179{ 204 MTH void gen_cave (int subtype);
180 LayoutData *ptr; 205 MTH void gen_castle (); // generates straightish structures
181 206
182 Layout () 207 // helper functions to modify the maze
183 { 208 MTH void erode_1_2 (int c1, int c2 = -1, int repeat = 1);
184 } 209 MTH void doorify ();
210 MTH void roomify (); // make some rooms in it, works best on onions
211 MTH void expand2x ();
212 MTH void symmetrize (int symmetry);
213 MTH void rotate (int rotation); // rotate by 1=90, 2=180, 3=270 degrees
185 214
186 Layout (int xsize, int ysize)
187 : ptr (new LayoutData (xsize, ysize))
188 {
189 }
190
191 Layout (random_map_params *RP) 215 void generate (random_map_params *RP);
192 : ptr (new LayoutData (RP->Xsize, RP->Ysize)) 216private:
193 { 217 int size;
194 } 218 void alloc (int w, int h);
195
196 void free ()
197 {
198 delete ptr;
199 }
200
201 LayoutData *operator ->() const
202 {
203 return ptr;
204 }
205
206 operator char **() const
207 {
208 return *ptr;
209 }
210
211 void swap (const Layout &layout) const
212 {
213 ::swap (layout.ptr->col, ptr->col);
214 ::swap (layout.ptr->w , ptr->w );
215 ::swap (layout.ptr->h , ptr->h );
216 }
217
218 // for debugging, print layout to stdout
219 void print ();
220}; 219};
221 220
222// utility functions, to use rmg_rndm instead of rndm. 221// utility functions, to use rmg_rndm instead of rndm.
223static inline int 222static inline int
224rmg_find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 223rmg_find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
… …
227 int i = find_free_spot (ob, m, x, y, start, stop); 226 int i = find_free_spot (ob, m, x, y, start, stop);
228 swap (rmg_rndm, rndm); 227 swap (rmg_rndm, rndm);
229 return i; 228 return i;
230} 229}
231 230
231// a simple point helper struct
232struct point 232struct point
233{ 233{
234 short x; 234 short x;
235 short y; 235 short y;
236 236
… …
242 : x(x), y(y) 242 : x(x), y(y)
243 { 243 {
244 } 244 }
245}; 245};
246 246
247// something like a vector or stack, but without
248// out of bounds checking
247template<typename T> 249template<typename T>
248struct fixed_stack 250struct fixed_stack
249{ 251{
250 T *data; 252 T *data;
251 int size; 253 int size;

Diff Legend

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