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.41 by root, Sat Jul 3 03:09:27 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_MULTIPLE,
100 NROFLAYOUTS, 92 NROFLAYOUTS,
101}; 93};
102 94
103/* 95/*
104 * Move these defines out of room_gen_onion.c to here, as 96 * Move these defines out of room_gen_onion.c to here, as
… …
140// 12 has been experimentally :( determined ot be a lot more stable 132// 12 has been experimentally :( determined ot be a lot more stable
141// than 11 or 10, leading to the assumption that something inherently 133// than 11 or 10, leading to the assumption that something inherently
142// needs a minimum size of at least 12 134// needs a minimum size of at least 12
143#define MIN_RANDOM_MAP_SIZE 12 135#define MIN_RANDOM_MAP_SIZE 12
144 136
137// we often use signed chars for coordinates (and U8 for distances)
138#define MAX_RANDOM_MAP_SIZE 120
139
145// reference 140// reference
146// 141//
147// \0 floor only 142// \0 floor only
148// # wall 143// # wall
149// D door 144// D door
150// < up 145// < up
151// > down 146// > down
152// C "center" (of onion layout) 147// C "center" (of onion maze)
153// . ?? (rogue) 148// . ?? (rogue)
154// 149//
155 150
156// use this in new code 151// use this in new code
152INTERFACE_CLASS(layout)
157struct LayoutData 153struct layout
158{ 154{
159 char **col; 155 typedef char cell;
156
157 cell **data;
160 int w, h; 158 int w, h;
161 159
162 LayoutData (int w, int h); 160 layout (int w, int h);
161 layout (layout &copy);
162
163 // reference rect in other layout - will not keep the data alive,
164 // so never swap with it's orig, or free the orig when in use.
165 layout (layout &orig, int x1, int y1, int x2, int y2);
166
163 ~LayoutData (); 167 ~layout ();
164 168
165 operator char **() 169 operator cell **() const
166 { 170 {
167 return col; 171 return data;
168 } 172 }
169 173
174 void swap (layout &maze)
175 {
176 ::swap (maze.data, data);
177 ::swap (maze.w , w );
178 ::swap (maze.h , h );
179 ::swap (maze.size, size);
180 }
181
182 MTH void swap (layout *maze) { swap (*maze); }
183
170 // for debugging, print layout to stdout 184 // for debugging, print maze to stdout
171 void print (); 185 MTH void print () const;
172 186
173 // simple inpainting 187 // simple inpainting
174 void fill (char fill); 188 MTH void fill (char fill);
175 void clear () { fill (0); } 189 MTH void clear () { fill (0); }
176 void border (char fill = '#'); 190 MTH void border (char fill = '#');
177 void rect (int x1, int y1, int x2, int y2, char fill); // x2, y2 exclusive 191 MTH void rect (int x1, int y1, int x2, int y2, char fill); // x2, y2 exclusive
192 MTH void fill_rect (int x1, int y1, int x2, int y2, char fill); // x2, y2 exclusive
178 193
179 void fill_rand (int perc); 194 MTH void fill_rand (int perc);
180 195
181 // makes sure all areas are connected. dirty=true carves rounder but also 196 // makes sure all areas are connected
182 // more walls, dirty=false carves narrow corridors.
183 void isolation_remover (bool dirty = 0); 197 MTH void isolation_remover ();
184 198
185 // generates a cave, subtype 0 is a rough cave, randomly open or closed 199 // generates a cave, subtype 0 is a rough cave, randomly open or closed
186 void gen_cave (int subtype); 200 MTH void gen_cave (int subtype);
201
202 // helper functions to modify the maze
187 void erode_1_2 (int c1, int c2 = -1, int repeat = 1); 203 MTH void erode_1_2 (int c1, int c2 = -1, int repeat = 1);
204 MTH void doorify ();
205 MTH void roomify (); // make some rooms in it, works best on onions
206 MTH void expand2x ();
207 MTH void symmetrize (int symmetry);
208 MTH void rotate (int rotation); // rotate by 1=90, 2=180, 3=270 degrees
188 209
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) 210 void generate (random_map_params *RP);
212 : ptr (new LayoutData (RP->Xsize, RP->Ysize)) 211private:
213 { 212 int size;
214 } 213 void alloc (int w, int h);
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}; 214};
236 215
237// utility functions, to use rmg_rndm instead of rndm. 216// utility functions, to use rmg_rndm instead of rndm.
238static inline int 217static inline int
239rmg_find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 218rmg_find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)

Diff Legend

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