ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/cfperl.xs
(Generate patch)

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.134 by root, Tue Jan 9 21:32:42 2007 UTC vs.
Revision 1.158 by root, Mon Jan 29 14:46:01 2007 UTC

… …
102unordered_vector<attachable *> attachable::mortals; 102unordered_vector<attachable *> attachable::mortals;
103 103
104attachable::~attachable () 104attachable::~attachable ()
105{ 105{
106 assert (!self); 106 assert (!self);
107 assert (!cb);
107} 108}
108 109
109int 110int
110attachable::refcnt_cnt () const 111attachable::refcnt_cnt () const
111{ 112{
112 return refcnt + (self ? SvREFCNT (self) : 0); 113 return refcnt + (self ? SvREFCNT (self) - 1 : 0);
114}
115
116void
117attachable::sever_self ()
118{
119 if (HV *self = this->self)
120 {
121 // keep a refcount because sv_unmagic might call attachable_free,
122 // which might clear self, causing sv_unmagic to crash on a now
123 // invalid object.
124 SvREFCNT_inc (self);
125 hv_clear (self);
126 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
127 SvREFCNT_dec (self);
128
129 // self *must* be null now because thats sv_unmagic's job.
130 assert (!this->self);
131 }
113} 132}
114 133
115void 134void
116attachable::optimise () 135attachable::optimise ()
117{ 136{
118 if (self 137 if (self
119 && SvREFCNT (self) == 1 138 && SvREFCNT (self) == 1
120 && !HvTOTALKEYS (self)) 139 && !HvTOTALKEYS (self))
140 sever_self ();
141}
142
143// check wether the object really is dead
144void
145attachable::do_check ()
146{
147 if (refcnt_cnt () > 0)
148 return;
149
150 destroy ();
151}
152
153void
154attachable::do_destroy ()
155{
156 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
157
158 if (cb)
121 { 159 {
122 refcnt_inc ();
123 SvREFCNT_dec ((SV *)self); 160 SvREFCNT_dec (cb);
161 cb = 0;
124 } 162 }
125}
126
127// check wether the object really is dead
128void
129attachable::do_check ()
130{
131 if (refcnt > 0 || refcnt_cnt () > 0)
132 return;
133
134 destroy ();
135 163
136 if (self) 164 if (self)
137 { 165 sever_self ();
138 hv_clear (self);
139 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
140 SvREFCNT_dec (self);
141 self = 0;
142 }
143}
144
145void
146attachable::do_destroy ()
147{
148 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
149
150 if (self)
151 hv_clear (self);
152 166
153 mortals.push_back (this); 167 mortals.push_back (this);
154} 168}
155 169
156void 170void
… …
164} 178}
165 179
166void 180void
167attachable::check_mortals () 181attachable::check_mortals ()
168{ 182{
169 for (int i = 0; i < mortals.size (); ) 183 static int i = 0;
184
185 for (;;)
170 { 186 {
187 if (i >= mortals.size ())
188 {
189 i = 0;
190
191 if (mortals.size () > 1000)
192 fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ());
193
194 break;
195 }
196
171 attachable *obj = mortals [i]; 197 attachable *obj = mortals [i];
172 198
173 obj->refcnt_chk (); // unborrow from perl, if necessary 199 obj->refcnt_chk (); // unborrow from perl, if necessary
174 200
201 //if (obj->refcnt > 0 || obj->self)
175 if (obj->refcnt || obj->self) 202 if (obj->refcnt || obj->self)
176 { 203 {
177#if 0 204//printf ("%p rc %d\n", obj, obj->refcnt_cnt ());//D
178 if (mortals.size() > 5)fprintf (stderr, "%d delaying %d:%p:%s %d (self %p:%d)\n", time(0),i, obj, typeid (*obj).name (),
179 obj->refcnt, obj->self, obj->self ? SvREFCNT(obj->self): - 1);//D
180#endif
181
182 ++i; // further delay freeing 205 ++i; // further delay freeing
206
207 if (!(i & 0x3ff))
208 break;
183 }//D 209 }
184 else 210 else
185 { 211 {
186 //Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D
187 mortals.erase (i); 212 mortals.erase (i);
188 delete obj; 213 delete obj;
189 } 214 }
190 } 215 }
191} 216}
… …
216 241
217static int 242static int
218attachable_free (pTHX_ SV *sv, MAGIC *mg) 243attachable_free (pTHX_ SV *sv, MAGIC *mg)
219{ 244{
220 attachable *at = (attachable *)mg->mg_ptr; 245 attachable *at = (attachable *)mg->mg_ptr;
246
247 //TODO: check if transaction behaviour is really required here
248 if (SV *self = (SV *)at->self)
249 {
221 at->self = 0; 250 at->self = 0;
251 SvREFCNT_dec (self);
252 }
253
222 // next line makes sense, but most objects still have refcnt 0 by default 254 // next line makes sense, but most objects still have refcnt 0 by default
223 //at->refcnt_chk (); 255 //at->refcnt_chk ();
224 return 0; 256 return 0;
225} 257}
226 258
… …
235 if (!obj->self) 267 if (!obj->self)
236 { 268 {
237 obj->self = newHV (); 269 obj->self = newHV ();
238 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); 270 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0);
239 271
240 // borrow the refcnt from the object
241 // it is important thta no refcnt_chk is being executed here
242 obj->refcnt_dec ();
243
244 // now bless the object _once_ 272 // now bless the object _once_
245 return sv_bless (newRV_inc ((SV *)obj->self), stash); 273 return sv_bless (newRV_inc ((SV *)obj->self), stash);
246 } 274 }
247 else 275 else
276 {
248 return newRV_inc ((SV *)obj->self); 277 SV *sv = newRV_inc ((SV *)obj->self);
278
279 if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
280 SvAMAGIC_on (sv);
281
282 return sv;
283 }
249} 284}
250 285
251static void 286static void
252clearSVptr (SV *sv) 287clearSVptr (SV *sv)
253{ 288{
… …
306inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 341inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
307 342
308inline SV *to_sv (object & v) { return to_sv (&v); } 343inline SV *to_sv (object & v) { return to_sv (&v); }
309inline SV *to_sv (living & v) { return to_sv (&v); } 344inline SV *to_sv (living & v) { return to_sv (&v); }
310 345
311//TODO:
312inline SV *to_sv (New_Face * v) { return to_sv (v->name); } 346inline SV *to_sv (facetile * v) { return to_sv (v->name); }
313inline SV *to_sv (treasurelist * v) { return to_sv (v->name); } 347inline SV *to_sv (treasurelist * v) { return to_sv (v->name); }
314 348
315inline SV *to_sv (UUID v) 349inline SV *to_sv (UUID v)
316{ 350{
317 char buf[128]; 351 char buf[128];
… …
342inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 376inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
343inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 377inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
344inline void sv_to (SV *sv, region * &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); } 378inline void sv_to (SV *sv, region * &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }
345inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 379inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
346 380
347inline void sv_to (SV *sv, New_Face * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO 381inline void sv_to (SV *sv, facetile * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; }
348inline void sv_to (SV *sv, treasurelist * &v) { v = find_treasurelist (SvPV_nolen (sv)); } // TODO 382inline void sv_to (SV *sv, treasurelist * &v) { v = find_treasurelist (SvPV_nolen (sv)); }
349 383
350template<class T> 384template<class T>
351inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 385inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
352 386
353template<int N> 387template<int N>
… …
489 if (!ext->cb) 523 if (!ext->cb)
490 ext->cb = newAV (); 524 ext->cb = newAV ();
491 525
492 return newRV_inc ((SV *)ext->cb); 526 return newRV_inc ((SV *)ext->cb);
493} 527}
494
495#if 0
496void attachable::clear ()
497{
498 if (self)
499 {
500 // disconnect Perl from C, to avoid crashes
501 sv_unmagic (SvRV ((SV *)self), PERL_MAGIC_ext);
502
503 // clear the perl hash, might or might not be a good idea
504 hv_clear ((HV *)SvRV ((SV *)self));
505
506 SvREFCNT_dec (self);
507 self = 0;
508 }
509
510 if (cb)
511 {
512 SvREFCNT_dec (cb);
513 cb = 0;
514 }
515
516 attach = 0;
517}
518#endif
519 528
520///////////////////////////////////////////////////////////////////////////// 529/////////////////////////////////////////////////////////////////////////////
521 530
522extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) 531extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
523{ 532{
… …
845 CALL_END; 854 CALL_END;
846 855
847 return retval; 856 return retval;
848} 857}
849 858
859maptile *
860maptile::find_async (const char *path, maptile *origin)
861{
862 CALL_BEGIN (2);
863 CALL_ARG (path);
864 CALL_ARG (origin);
865 CALL_CALL ("cf::map::find_async", G_SCALAR);
866
867 maptile *retval;
868
869 if (count)
870 sv_to (POPs, retval);
871 else
872 retval = 0;
873
874 CALL_END;
875
876 return retval;
877}
878
850void 879void
851maptile::do_load_sync () 880maptile::do_load_sync ()
852{ 881{
853 CALL_BEGIN (1); 882 CALL_BEGIN (1);
854 CALL_ARG (this); 883 CALL_ARG (this);
… …
894void 923void
895iw::alloc () 924iw::alloc ()
896{ 925{
897 pe = GEventAPI->new_idle (0, 0); 926 pe = GEventAPI->new_idle (0, 0);
898 927
928 WaREENTRANT_off (pe);
899 pe->base.callback = (void *)iw_dispatch; 929 pe->base.callback = (void *)iw_dispatch;
900 pe->base.ext_data = (void *)this; 930 pe->base.ext_data = (void *)this;
901} 931}
902 932
903static void iow_dispatch (pe_event *ev) 933static void iow_dispatch (pe_event *ev)
… …
909void 939void
910iow::alloc () 940iow::alloc ()
911{ 941{
912 pe = GEventAPI->new_io (0, 0); 942 pe = GEventAPI->new_io (0, 0);
913 943
944 WaREENTRANT_off (pe);
914 pe->base.callback = (void *)iow_dispatch; 945 pe->base.callback = (void *)iow_dispatch;
915 pe->base.ext_data = (void *)this; 946 pe->base.ext_data = (void *)this;
916 947
917 pe->fd = -1; 948 pe->fd = -1;
918 pe->poll = 0; 949 pe->poll = 0;
… …
1246 const_iv (FLAG_ACTIVATE_ON_RELEASE) 1277 const_iv (FLAG_ACTIVATE_ON_RELEASE)
1247 const_iv (FLAG_IS_WATER) 1278 const_iv (FLAG_IS_WATER)
1248 const_iv (FLAG_CONTENT_ON_GEN) 1279 const_iv (FLAG_CONTENT_ON_GEN)
1249 const_iv (FLAG_IS_A_TEMPLATE) 1280 const_iv (FLAG_IS_A_TEMPLATE)
1250 const_iv (FLAG_IS_BUILDABLE) 1281 const_iv (FLAG_IS_BUILDABLE)
1282 const_iv (FLAG_DESTROY_ON_DEATH)
1283 const_iv (FLAG_NO_MAP_SAVE)
1251 1284
1252 const_iv (NDI_BLACK) 1285 const_iv (NDI_BLACK)
1253 const_iv (NDI_WHITE) 1286 const_iv (NDI_WHITE)
1254 const_iv (NDI_NAVY) 1287 const_iv (NDI_NAVY)
1255 const_iv (NDI_RED) 1288 const_iv (NDI_RED)
… …
1440 const_iv (ATNR_BLIND) 1473 const_iv (ATNR_BLIND)
1441 const_iv (ATNR_INTERNAL) 1474 const_iv (ATNR_INTERNAL)
1442 const_iv (ATNR_LIFE_STEALING) 1475 const_iv (ATNR_LIFE_STEALING)
1443 const_iv (ATNR_DISEASE) 1476 const_iv (ATNR_DISEASE)
1444 1477
1445 const_iv (MAP_FLUSH)
1446 const_iv (MAP_PLAYER_UNIQUE)
1447 const_iv (MAP_BLOCK)
1448 const_iv (MAP_STYLE)
1449 const_iv (MAP_OVERLAY)
1450
1451 const_iv (MAP_IN_MEMORY) 1478 const_iv (MAP_IN_MEMORY)
1452 const_iv (MAP_SWAPPED) 1479 const_iv (MAP_SWAPPED)
1453 const_iv (MAP_LOADING) 1480 const_iv (MAP_LOADING)
1454 const_iv (MAP_SAVING) 1481 const_iv (MAP_SAVING)
1455 1482
… …
1548} 1575}
1549 1576
1550NV floor (NV x) 1577NV floor (NV x)
1551 1578
1552NV ceil (NV x) 1579NV ceil (NV x)
1580
1581NV rndm (...)
1582 CODE:
1583 switch (items)
1584 {
1585 case 0: RETVAL = rndm (); break;
1586 case 1: RETVAL = rndm (SvUV (ST (0))); break;
1587 case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
1588 default: croak ("cf::rndm requires none, one or two parameters."); break;
1589 }
1590 OUTPUT:
1591 RETVAL
1553 1592
1554void server_tick () 1593void server_tick ()
1555 CODE: 1594 CODE:
1556 runtime = SvNVx (sv_runtime); 1595 runtime = SvNVx (sv_runtime);
1557 server_tick (); 1596 server_tick ();
… …
1604 } 1643 }
1605 OUTPUT: RETVAL 1644 OUTPUT: RETVAL
1606 1645
1607void abort () 1646void abort ()
1608 1647
1648void fork_abort (char *cause = "cf::fork_abort")
1649
1609void cleanup (const char *cause, bool make_core = false) 1650void cleanup (const char *cause, bool make_core = false)
1610 1651
1611void emergency_save () 1652void emergency_save ()
1612 1653
1613void _exit (int status = 0) 1654void _exit (int status = EXIT_SUCCESS)
1655
1656UV sv_2watcher (SV *w)
1657 CODE:
1658 RETVAL = (UV)GEventAPI->sv_2watcher (w);
1659 OUTPUT:
1660 RETVAL
1614 1661
1615#if _POSIX_MEMLOCK 1662#if _POSIX_MEMLOCK
1616 1663
1617int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1664int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1618 1665
… …
1673 CODE: 1720 CODE:
1674 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1721 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1675 OUTPUT: 1722 OUTPUT:
1676 RETVAL 1723 RETVAL
1677 1724
1725int mortals_size ()
1726 CODE:
1727 RETVAL = attachable::mortals.size ();
1728 OUTPUT: RETVAL
1729
1730#object *mortals (U32 index)
1731# CODE:
1732# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
1733# OUTPUT: RETVAL
1734
1678INCLUDE: $PERL genacc attachable ../include/cfperl.h | 1735INCLUDE: $PERL genacc attachable ../include/cfperl.h |
1679 1736
1680MODULE = cf PACKAGE = cf::global 1737MODULE = cf PACKAGE = cf::global
1681 1738
1682int invoke (SV *klass, int event, ...) 1739int invoke (SV *klass, int event, ...)
… …
1698 for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i))); 1755 for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
1699 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END); 1756 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1700 OUTPUT: RETVAL 1757 OUTPUT: RETVAL
1701 1758
1702SV *registry (object *op) 1759SV *registry (object *op)
1703
1704void mortals ()
1705 PPCODE:
1706 EXTEND (SP, object::mortals.size ());
1707 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1708 PUSHs (to_sv (*i));
1709 1760
1710int objects_size () 1761int objects_size ()
1711 CODE: 1762 CODE:
1712 RETVAL = objects.size (); 1763 RETVAL = objects.size ();
1713 OUTPUT: RETVAL 1764 OUTPUT: RETVAL
… …
1837 1888
1838void drop (object *who, object *op) 1889void drop (object *who, object *op)
1839 1890
1840void pick_up (object *who, object *op) 1891void pick_up (object *who, object *op)
1841 1892
1842object *cf_object_insert_object (object *op, object *container)
1843
1844object *cf_object_insert_in_ob (object *ob, object *where)
1845
1846int cf_object_teleport (object *op, maptile *map, int x, int y) 1893int cf_object_teleport (object *op, maptile *map, int x, int y)
1847 1894
1848void update_object (object *op, int action) 1895void update_object (object *op, int action)
1849 1896
1850object *cf_create_object_by_name (const char *name) 1897object *cf_create_object_by_name (const char *name)
… …
1968 2015
1969void esrv_update_item (object *op, int what, object *item) 2016void esrv_update_item (object *op, int what, object *item)
1970 C_ARGS: what, op, item 2017 C_ARGS: what, op, item
1971 2018
1972void clear_los (object *op) 2019void clear_los (object *op)
1973
1974int command_teleport (object *op, char *params)
1975 2020
1976int command_summon (object *op, char *params) 2021int command_summon (object *op, char *params)
1977 2022
1978int command_arrest (object *op, char *params) 2023int command_arrest (object *op, char *params)
1979 2024
… …
2097 for_all_players (pl) 2142 for_all_players (pl)
2098 if (pl->ob && pl->ob->map == THIS) 2143 if (pl->ob && pl->ob->map == THIS)
2099 PUSHs (sv_2mortal (to_sv (pl->ob))); 2144 PUSHs (sv_2mortal (to_sv (pl->ob)));
2100 } 2145 }
2101 2146
2147void
2148maptile::set_regiondata (SV *data, SV *plt)
2149 CODE:
2150{
2151 if (!SvROK (plt) || SvTYPE (SvRV (plt)) != SVt_PVAV)
2152 croak ("maptile::set_regiondata needs arrayref as plt arg");
2153
2154 AV *av = (AV *)SvRV (plt);
2155
2156 region **regionmap = (region **)malloc ((av_len (av) + 1) * sizeof (region *));
2157
2158 for (int i = av_len (av) + 1; i--; )
2159 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch (av, i, 1)));
2160
2161 THIS->regions = salloc<uint8_t> (THIS->size (), (uint8_t *)SvPVbyte_nolen (data));
2162 THIS->regionmap = regionmap;
2163}
2164
2102void play_sound_map (maptile *map, int x, int y, int sound_num) 2165void play_sound_map (maptile *map, int x, int y, int sound_num)
2103 2166
2104int out_of_map (maptile *map, int x, int y) 2167int out_of_map (maptile *map, int x, int y)
2105 2168
2106void 2169void
… …
2122 2185
2123object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny) 2186object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny)
2124 C_ARGS: str, map, nx, ny 2187 C_ARGS: str, map, nx, ny
2125 2188
2126void 2189void
2127cf_map_normalise (maptile *map, int x, int y) 2190get_map_flags (maptile *map, int x, int y)
2128 PPCODE: 2191 PPCODE:
2129{ 2192{
2130 maptile *nmap = 0; 2193 maptile *nmap = 0;
2131 I16 nx = 0, ny = 0; 2194 I16 nx = 0, ny = 0;
2132 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2195 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
… …
2187 2250
2188void fix_walls (maptile *map, int x, int y) 2251void fix_walls (maptile *map, int x, int y)
2189 2252
2190void fix_walls_around (maptile *map, int x, int y) 2253void fix_walls_around (maptile *map, int x, int y)
2191 2254
2192const char *
2193region_name (maptile *m)
2194 CODE:
2195 RETVAL = get_name_of_region_for_map (m);
2196 OUTPUT: RETVAL
2197
2198# worst xs function of my life 2255# worst xs function of my life
2199maptile * 2256bool
2200_create_random_map (\ 2257_create_random_map (\
2201 char *path,\ 2258 maptile *self,\
2202 char *wallstyle,\ 2259 char *wallstyle,\
2203 char *wall_name,\ 2260 char *wall_name,\
2204 char *floorstyle,\ 2261 char *floorstyle,\
2205 char *monsterstyle,\ 2262 char *monsterstyle,\
2206 char *treasurestyle,\ 2263 char *treasurestyle,\
… …
2210 char *origin_map,\ 2267 char *origin_map,\
2211 char *final_map,\ 2268 char *final_map,\
2212 char *exitstyle,\ 2269 char *exitstyle,\
2213 char *this_map,\ 2270 char *this_map,\
2214 char *exit_on_final_map,\ 2271 char *exit_on_final_map,\
2215 int Xsize,\ 2272 int xsize,\
2216 int Ysize,\ 2273 int ysize,\
2217 int expand2x,\ 2274 int expand2x,\
2218 int layoutoptions1,\ 2275 int layoutoptions1,\
2219 int layoutoptions2,\ 2276 int layoutoptions2,\
2220 int layoutoptions3,\ 2277 int layoutoptions3,\
2221 int symmetry,\ 2278 int symmetry,\
… …
2226 int dungeon_depth,\ 2283 int dungeon_depth,\
2227 int decoroptions,\ 2284 int decoroptions,\
2228 int orientation,\ 2285 int orientation,\
2229 int origin_y,\ 2286 int origin_y,\
2230 int origin_x,\ 2287 int origin_x,\
2231 int random_seed,\ 2288 U32 random_seed,\
2232 val64 total_map_hp,\ 2289 val64 total_map_hp,\
2233 int map_layout_style,\ 2290 int map_layout_style,\
2234 int treasureoptions,\ 2291 int treasureoptions,\
2235 int symmetry_used,\ 2292 int symmetry_used,\
2236 region *region\ 2293 region *region,\
2294 char *custom\
2237) 2295)
2238 CODE: 2296 CODE:
2239{ 2297{
2240 random_map_params rmp; 2298 random_map_params rmp;
2241 2299
… …
2251 assign (rmp.exit_on_final_map, exit_on_final_map); 2309 assign (rmp.exit_on_final_map, exit_on_final_map);
2252 2310
2253 rmp.origin_map = origin_map; 2311 rmp.origin_map = origin_map;
2254 rmp.final_map = final_map; 2312 rmp.final_map = final_map;
2255 rmp.this_map = this_map; 2313 rmp.this_map = this_map;
2256 rmp.Xsize = Xsize; 2314 rmp.xsize = xsize;
2257 rmp.Ysize = Ysize; 2315 rmp.ysize = ysize;
2258 rmp.expand2x = expand2x; 2316 rmp.expand2x = expand2x;
2259 rmp.layoutoptions1 = layoutoptions1; 2317 rmp.layoutoptions1 = layoutoptions1;
2260 rmp.layoutoptions2 = layoutoptions2; 2318 rmp.layoutoptions2 = layoutoptions2;
2261 rmp.layoutoptions3 = layoutoptions3; 2319 rmp.layoutoptions3 = layoutoptions3;
2262 rmp.symmetry = symmetry; 2320 rmp.symmetry = symmetry;
… …
2273 rmp.total_map_hp = total_map_hp; 2331 rmp.total_map_hp = total_map_hp;
2274 rmp.map_layout_style = map_layout_style; 2332 rmp.map_layout_style = map_layout_style;
2275 rmp.treasureoptions = treasureoptions; 2333 rmp.treasureoptions = treasureoptions;
2276 rmp.symmetry_used = symmetry_used; 2334 rmp.symmetry_used = symmetry_used;
2277 rmp.region = region; 2335 rmp.region = region;
2336 rmp.custom = custom;
2278 2337
2279 RETVAL = generate_random_map (path, &rmp); 2338 RETVAL = self->generate_random_map (&rmp);
2280} 2339}
2281 OUTPUT: 2340 OUTPUT:
2282 RETVAL 2341 RETVAL
2283 2342
2284MODULE = cf PACKAGE = cf::arch 2343MODULE = cf PACKAGE = cf::arch
… …
2316 OUTPUT: RETVAL 2375 OUTPUT: RETVAL
2317 2376
2318region *find (char *name) 2377region *find (char *name)
2319 PROTOTYPE: $ 2378 PROTOTYPE: $
2320 CODE: 2379 CODE:
2321 RETVAL = get_region_by_name (name); 2380 RETVAL = region::find (name);
2322 OUTPUT: RETVAL 2381 OUTPUT: RETVAL
2323 2382
2324INCLUDE: $PERL genacc region ../include/map.h | 2383INCLUDE: $PERL genacc region ../include/map.h |
2325 2384
2326MODULE = cf PACKAGE = cf::living 2385MODULE = cf PACKAGE = cf::living

Diff Legend

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