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.34 by root, Fri Jul 2 15:03:57 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
… …
158 150
159// use this in new code 151// use this in new code
160INTERFACE_CLASS(layout) 152INTERFACE_CLASS(layout)
161struct layout 153struct layout
162{ 154{
163 char **col; 155 typedef char cell;
156
157 cell **data;
164 int w, h; 158 int w, h;
165 159
166 layout (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
167 ~layout (); 167 ~layout ();
168 168
169 operator char **() const 169 operator cell **() const
170 { 170 {
171 return col; 171 return data;
172 } 172 }
173 173
174 void swap (layout &maze) 174 void swap (layout &maze)
175 { 175 {
176 ::swap (maze.col, col); 176 ::swap (maze.data, data);
177 ::swap (maze.w , w ); 177 ::swap (maze.w , w );
178 ::swap (maze.h , h ); 178 ::swap (maze.h , h );
179 ::swap (maze.size, size);
179 } 180 }
181
182 MTH void swap (layout *maze) { swap (*maze); }
180 183
181 // for debugging, print maze to stdout 184 // for debugging, print maze to stdout
182 MTH void print () const; 185 MTH void print () const;
183 186
184 // simple inpainting 187 // simple inpainting
185 MTH void fill (char fill); 188 MTH void fill (char fill);
186 MTH void clear () { fill (0); } 189 MTH void clear () { fill (0); }
187 MTH void border (char fill = '#'); 190 MTH void border (char fill = '#');
188 MTH 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
189 193
190 MTH void fill_rand (int perc); 194 MTH void fill_rand (int perc);
191 195
192 // makes sure all areas are connected. dirty=true carves rounder but also 196 // makes sure all areas are connected
193 // more walls, dirty=false carves narrow corridors.
194 MTH void isolation_remover (bool dirty = 0); 197 MTH void isolation_remover ();
195 198
196 // 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
197 MTH void gen_cave (int subtype); 200 MTH void gen_cave (int subtype);
198 201
199 // helper functions to modify the maze 202 // helper functions to modify the maze
… …
203 MTH void expand2x (); 206 MTH void expand2x ();
204 MTH void symmetrize (int symmetry); 207 MTH void symmetrize (int symmetry);
205 MTH void rotate (int rotation); // rotate by 1=90, 2=180, 3=270 degrees 208 MTH void rotate (int rotation); // rotate by 1=90, 2=180, 3=270 degrees
206 209
207 void generate (random_map_params *RP); 210 void generate (random_map_params *RP);
211private:
212 int size;
213 void alloc (int w, int h);
208}; 214};
209 215
210// utility functions, to use rmg_rndm instead of rndm. 216// utility functions, to use rmg_rndm instead of rndm.
211static inline int 217static inline int
212rmg_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