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.35 by root, Fri Jul 2 15:43:37 2010 UTC vs.
Revision 1.43 by root, Sat Jul 3 19:22:21 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,
… …
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
… …
164 157
165 cell **data; 158 cell **data;
166 int w, h; 159 int w, h;
167 160
168 layout (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
169 ~layout (); 168 ~layout ();
170 169
171 operator cell **() const 170 operator cell **() const
172 { 171 {
173 return data; 172 return data;
174 } 173 }
175 174
176 void swap (layout &maze) 175 void swap (layout &maze)
177 { 176 {
178 ::swap (maze.data, data); 177 ::swap (maze.data, data);
179 ::swap (maze.w , w ); 178 ::swap (maze.w , w );
180 ::swap (maze.h , h ); 179 ::swap (maze.h , h );
180 ::swap (maze.size, size);
181 } 181 }
182 182
183 MTH void swap (layout *maze) { swap (*maze); } 183 MTH void swap (layout *maze) { swap (*maze); }
184 184
185 // for debugging, print maze to stdout 185 // for debugging, print maze to stdout
… …
188 // simple inpainting 188 // simple inpainting
189 MTH void fill (char fill); 189 MTH void fill (char fill);
190 MTH void clear () { fill (0); } 190 MTH void clear () { fill (0); }
191 MTH void border (char fill = '#'); 191 MTH void border (char fill = '#');
192 MTH 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
193 194
194 MTH void fill_rand (int perc); 195 MTH void fill_rand (int perc);
195 196
196 // makes sure all areas are connected. dirty=true carves rounder but also 197 // makes sure all areas are connected
197 // more walls, dirty=false carves narrow corridors. 198 // perturb = 0 - very horz/vert tunnels
199 // perturb = 1 - straight but round
200 // perturb = 2 - snaky tunnels
198 MTH void isolation_remover (bool dirty = 0); 201 MTH void isolation_remover (int perturb = 2);
199 202
200 // generates a cave, subtype 0 is a rough cave, randomly open or closed 203 // generates a cave, subtype 0 is a rough cave, randomly open or closed
201 MTH void gen_cave (int subtype); 204 MTH void gen_cave (int subtype);
205 MTH void gen_castle (); // generates straightish structures
202 206
203 // helper functions to modify the maze 207 // helper functions to modify the maze
204 MTH void erode_1_2 (int c1, int c2 = -1, int repeat = 1); 208 MTH void erode_1_2 (int c1, int c2 = -1, int repeat = 1);
205 MTH void doorify (); 209 MTH void doorify ();
206 MTH void roomify (); // make some rooms in it, works best on onions 210 MTH void roomify (); // make some rooms in it, works best on onions
207 MTH void expand2x (); 211 MTH void expand2x ();
208 MTH void symmetrize (int symmetry); 212 MTH void symmetrize (int symmetry);
209 MTH void rotate (int rotation); // rotate by 1=90, 2=180, 3=270 degrees 213 MTH void rotate (int rotation); // rotate by 1=90, 2=180, 3=270 degrees
210 214
211 void generate (random_map_params *RP); 215 void generate (random_map_params *RP);
216private:
217 int size;
218 void alloc (int w, int h);
212}; 219};
213 220
214// utility functions, to use rmg_rndm instead of rndm. 221// utility functions, to use rmg_rndm instead of rndm.
215static inline int 222static inline int
216rmg_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)
… …
222} 229}
223 230
224// a simple point helper struct 231// a simple point helper struct
225struct point 232struct point
226{ 233{
227 short x; 234 int x;
228 short y; 235 int y;
229 236
230 point () 237 point ()
231 { 238 {
232 } 239 }
233 240

Diff Legend

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