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.137 by root, Thu Jan 11 00:41:08 2007 UTC vs.
Revision 1.160 by elmex, Wed Jan 31 14:11:02 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
311inline SV *to_sv (New_Face * v) { return to_sv (v->name); } 346inline SV *to_sv (facetile * v) { return to_sv (v->name); }
312inline SV *to_sv (treasurelist * v) { return to_sv (v->name); } 347inline SV *to_sv (treasurelist * v) { return to_sv (v->name); }
313 348
314inline SV *to_sv (UUID v) 349inline SV *to_sv (UUID v)
315{ 350{
316 char buf[128]; 351 char buf[128];
317 snprintf (buf, 128, "<1,%" PRIx64 ">", v.seq); 352 snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq);
318 return newSVpv (buf, 0); 353 return newSVpv (buf, 0);
319} 354}
320 355
321inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; } 356inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }
322inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 357inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
… …
341inline 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"); }
342inline 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"); }
343inline 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"); }
344inline 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"); }
345 380
346inline void sv_to (SV *sv, New_Face * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } 381inline void sv_to (SV *sv, facetile * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; }
347inline void sv_to (SV *sv, treasurelist * &v) { v = find_treasurelist (SvPV_nolen (sv)); } 382inline void sv_to (SV *sv, treasurelist * &v) { v = find_treasurelist (SvPV_nolen (sv)); }
348 383
349template<class T> 384template<class T>
350inline 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; }
351 386
… …
488 if (!ext->cb) 523 if (!ext->cb)
489 ext->cb = newAV (); 524 ext->cb = newAV ();
490 525
491 return newRV_inc ((SV *)ext->cb); 526 return newRV_inc ((SV *)ext->cb);
492} 527}
493
494#if 0
495void attachable::clear ()
496{
497 if (self)
498 {
499 // disconnect Perl from C, to avoid crashes
500 sv_unmagic (SvRV ((SV *)self), PERL_MAGIC_ext);
501
502 // clear the perl hash, might or might not be a good idea
503 hv_clear ((HV *)SvRV ((SV *)self));
504
505 SvREFCNT_dec (self);
506 self = 0;
507 }
508
509 if (cb)
510 {
511 SvREFCNT_dec (cb);
512 cb = 0;
513 }
514
515 attach = 0;
516}
517#endif
518 528
519///////////////////////////////////////////////////////////////////////////// 529/////////////////////////////////////////////////////////////////////////////
520 530
521extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) 531extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
522{ 532{
… …
913void 923void
914iw::alloc () 924iw::alloc ()
915{ 925{
916 pe = GEventAPI->new_idle (0, 0); 926 pe = GEventAPI->new_idle (0, 0);
917 927
928 WaREENTRANT_off (pe);
918 pe->base.callback = (void *)iw_dispatch; 929 pe->base.callback = (void *)iw_dispatch;
919 pe->base.ext_data = (void *)this; 930 pe->base.ext_data = (void *)this;
920} 931}
921 932
922static void iow_dispatch (pe_event *ev) 933static void iow_dispatch (pe_event *ev)
… …
928void 939void
929iow::alloc () 940iow::alloc ()
930{ 941{
931 pe = GEventAPI->new_io (0, 0); 942 pe = GEventAPI->new_io (0, 0);
932 943
944 WaREENTRANT_off (pe);
933 pe->base.callback = (void *)iow_dispatch; 945 pe->base.callback = (void *)iow_dispatch;
934 pe->base.ext_data = (void *)this; 946 pe->base.ext_data = (void *)this;
935 947
936 pe->fd = -1; 948 pe->fd = -1;
937 pe->poll = 0; 949 pe->poll = 0;
… …
1265 const_iv (FLAG_ACTIVATE_ON_RELEASE) 1277 const_iv (FLAG_ACTIVATE_ON_RELEASE)
1266 const_iv (FLAG_IS_WATER) 1278 const_iv (FLAG_IS_WATER)
1267 const_iv (FLAG_CONTENT_ON_GEN) 1279 const_iv (FLAG_CONTENT_ON_GEN)
1268 const_iv (FLAG_IS_A_TEMPLATE) 1280 const_iv (FLAG_IS_A_TEMPLATE)
1269 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)
1270 1284
1271 const_iv (NDI_BLACK) 1285 const_iv (NDI_BLACK)
1272 const_iv (NDI_WHITE) 1286 const_iv (NDI_WHITE)
1273 const_iv (NDI_NAVY) 1287 const_iv (NDI_NAVY)
1274 const_iv (NDI_RED) 1288 const_iv (NDI_RED)
… …
1459 const_iv (ATNR_BLIND) 1473 const_iv (ATNR_BLIND)
1460 const_iv (ATNR_INTERNAL) 1474 const_iv (ATNR_INTERNAL)
1461 const_iv (ATNR_LIFE_STEALING) 1475 const_iv (ATNR_LIFE_STEALING)
1462 const_iv (ATNR_DISEASE) 1476 const_iv (ATNR_DISEASE)
1463 1477
1464 const_iv (MAP_FLUSH)
1465 const_iv (MAP_PLAYER_UNIQUE)
1466 const_iv (MAP_BLOCK)
1467 const_iv (MAP_STYLE)
1468 const_iv (MAP_OVERLAY)
1469
1470 const_iv (MAP_IN_MEMORY) 1478 const_iv (MAP_IN_MEMORY)
1471 const_iv (MAP_SWAPPED) 1479 const_iv (MAP_SWAPPED)
1472 const_iv (MAP_LOADING) 1480 const_iv (MAP_LOADING)
1473 const_iv (MAP_SAVING) 1481 const_iv (MAP_SAVING)
1474 1482
… …
1567} 1575}
1568 1576
1569NV floor (NV x) 1577NV floor (NV x)
1570 1578
1571NV 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
1572 1592
1573void server_tick () 1593void server_tick ()
1574 CODE: 1594 CODE:
1575 runtime = SvNVx (sv_runtime); 1595 runtime = SvNVx (sv_runtime);
1576 server_tick (); 1596 server_tick ();
… …
1623 } 1643 }
1624 OUTPUT: RETVAL 1644 OUTPUT: RETVAL
1625 1645
1626void abort () 1646void abort ()
1627 1647
1648void fork_abort (char *cause = "cf::fork_abort")
1649
1628void cleanup (const char *cause, bool make_core = false) 1650void cleanup (const char *cause, bool make_core = false)
1629 1651
1630void emergency_save () 1652void emergency_save ()
1631 1653
1632void _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
1633 1661
1634#if _POSIX_MEMLOCK 1662#if _POSIX_MEMLOCK
1635 1663
1636int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1664int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1637 1665
… …
1692 CODE: 1720 CODE:
1693 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1721 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1694 OUTPUT: 1722 OUTPUT:
1695 RETVAL 1723 RETVAL
1696 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
1697INCLUDE: $PERL genacc attachable ../include/cfperl.h | 1735INCLUDE: $PERL genacc attachable ../include/cfperl.h |
1698 1736
1699MODULE = cf PACKAGE = cf::global 1737MODULE = cf PACKAGE = cf::global
1700 1738
1701int invoke (SV *klass, int event, ...) 1739int invoke (SV *klass, int event, ...)
… …
1718 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END); 1756 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1719 OUTPUT: RETVAL 1757 OUTPUT: RETVAL
1720 1758
1721SV *registry (object *op) 1759SV *registry (object *op)
1722 1760
1723void mortals ()
1724 PPCODE:
1725 EXTEND (SP, object::mortals.size ());
1726 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1727 PUSHs (to_sv (*i));
1728
1729int objects_size () 1761int objects_size ()
1730 CODE: 1762 CODE:
1731 RETVAL = objects.size (); 1763 RETVAL = objects.size ();
1732 OUTPUT: RETVAL 1764 OUTPUT: RETVAL
1733 1765
… …
1772 1804
1773void 1805void
1774set_animation (object *op, int idx) 1806set_animation (object *op, int idx)
1775 CODE: 1807 CODE:
1776 SET_ANIMATION (op, idx); 1808 SET_ANIMATION (op, idx);
1809
1810int
1811num_animations (object *op)
1812 CODE:
1813 RETVAL = NUM_ANIMATIONS (op);
1814 OUTPUT: RETVAL
1777 1815
1778object *find_best_object_match (object *op, const char *match) 1816object *find_best_object_match (object *op, const char *match)
1779 1817
1780object *find_marked_object (object *op) 1818object *find_marked_object (object *op)
1781 1819
… …
1856 1894
1857void drop (object *who, object *op) 1895void drop (object *who, object *op)
1858 1896
1859void pick_up (object *who, object *op) 1897void pick_up (object *who, object *op)
1860 1898
1861object *cf_object_insert_object (object *op, object *container)
1862
1863object *cf_object_insert_in_ob (object *ob, object *where)
1864
1865int cf_object_teleport (object *op, maptile *map, int x, int y) 1899int cf_object_teleport (object *op, maptile *map, int x, int y)
1866 1900
1867void update_object (object *op, int action) 1901void update_object (object *op, int action)
1868 1902
1869object *cf_create_object_by_name (const char *name) 1903object *cf_create_object_by_name (const char *name)
… …
1987 2021
1988void esrv_update_item (object *op, int what, object *item) 2022void esrv_update_item (object *op, int what, object *item)
1989 C_ARGS: what, op, item 2023 C_ARGS: what, op, item
1990 2024
1991void clear_los (object *op) 2025void clear_los (object *op)
1992
1993int command_teleport (object *op, char *params)
1994 2026
1995int command_summon (object *op, char *params) 2027int command_summon (object *op, char *params)
1996 2028
1997int command_arrest (object *op, char *params) 2029int command_arrest (object *op, char *params)
1998 2030
… …
2116 for_all_players (pl) 2148 for_all_players (pl)
2117 if (pl->ob && pl->ob->map == THIS) 2149 if (pl->ob && pl->ob->map == THIS)
2118 PUSHs (sv_2mortal (to_sv (pl->ob))); 2150 PUSHs (sv_2mortal (to_sv (pl->ob)));
2119 } 2151 }
2120 2152
2153void
2154maptile::set_regiondata (SV *data, SV *plt)
2155 CODE:
2156{
2157 if (!SvROK (plt) || SvTYPE (SvRV (plt)) != SVt_PVAV)
2158 croak ("maptile::set_regiondata needs arrayref as plt arg");
2159
2160 AV *av = (AV *)SvRV (plt);
2161
2162 region **regionmap = (region **)malloc ((av_len (av) + 1) * sizeof (region *));
2163
2164 for (int i = av_len (av) + 1; i--; )
2165 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch (av, i, 1)));
2166
2167 THIS->regions = salloc<uint8_t> (THIS->size (), (uint8_t *)SvPVbyte_nolen (data));
2168 THIS->regionmap = regionmap;
2169}
2170
2121void play_sound_map (maptile *map, int x, int y, int sound_num) 2171void play_sound_map (maptile *map, int x, int y, int sound_num)
2122 2172
2123int out_of_map (maptile *map, int x, int y) 2173int out_of_map (maptile *map, int x, int y)
2124 2174
2125void 2175void
… …
2141 2191
2142object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny) 2192object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny)
2143 C_ARGS: str, map, nx, ny 2193 C_ARGS: str, map, nx, ny
2144 2194
2145void 2195void
2146cf_map_normalise (maptile *map, int x, int y) 2196get_map_flags (maptile *map, int x, int y)
2147 PPCODE: 2197 PPCODE:
2148{ 2198{
2149 maptile *nmap = 0; 2199 maptile *nmap = 0;
2150 I16 nx = 0, ny = 0; 2200 I16 nx = 0, ny = 0;
2151 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2201 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
… …
2206 2256
2207void fix_walls (maptile *map, int x, int y) 2257void fix_walls (maptile *map, int x, int y)
2208 2258
2209void fix_walls_around (maptile *map, int x, int y) 2259void fix_walls_around (maptile *map, int x, int y)
2210 2260
2211const char *
2212region_name (maptile *m)
2213 CODE:
2214 RETVAL = get_name_of_region_for_map (m);
2215 OUTPUT: RETVAL
2216
2217# worst xs function of my life 2261# worst xs function of my life
2218maptile * 2262bool
2219_create_random_map (\ 2263_create_random_map (\
2220 char *path,\ 2264 maptile *self,\
2221 char *wallstyle,\ 2265 char *wallstyle,\
2222 char *wall_name,\ 2266 char *wall_name,\
2223 char *floorstyle,\ 2267 char *floorstyle,\
2224 char *monsterstyle,\ 2268 char *monsterstyle,\
2225 char *treasurestyle,\ 2269 char *treasurestyle,\
… …
2229 char *origin_map,\ 2273 char *origin_map,\
2230 char *final_map,\ 2274 char *final_map,\
2231 char *exitstyle,\ 2275 char *exitstyle,\
2232 char *this_map,\ 2276 char *this_map,\
2233 char *exit_on_final_map,\ 2277 char *exit_on_final_map,\
2234 int Xsize,\ 2278 int xsize,\
2235 int Ysize,\ 2279 int ysize,\
2236 int expand2x,\ 2280 int expand2x,\
2237 int layoutoptions1,\ 2281 int layoutoptions1,\
2238 int layoutoptions2,\ 2282 int layoutoptions2,\
2239 int layoutoptions3,\ 2283 int layoutoptions3,\
2240 int symmetry,\ 2284 int symmetry,\
… …
2245 int dungeon_depth,\ 2289 int dungeon_depth,\
2246 int decoroptions,\ 2290 int decoroptions,\
2247 int orientation,\ 2291 int orientation,\
2248 int origin_y,\ 2292 int origin_y,\
2249 int origin_x,\ 2293 int origin_x,\
2250 int random_seed,\ 2294 U32 random_seed,\
2251 val64 total_map_hp,\ 2295 val64 total_map_hp,\
2252 int map_layout_style,\ 2296 int map_layout_style,\
2253 int treasureoptions,\ 2297 int treasureoptions,\
2254 int symmetry_used,\ 2298 int symmetry_used,\
2255 region *region,\ 2299 region *region,\
… …
2271 assign (rmp.exit_on_final_map, exit_on_final_map); 2315 assign (rmp.exit_on_final_map, exit_on_final_map);
2272 2316
2273 rmp.origin_map = origin_map; 2317 rmp.origin_map = origin_map;
2274 rmp.final_map = final_map; 2318 rmp.final_map = final_map;
2275 rmp.this_map = this_map; 2319 rmp.this_map = this_map;
2276 rmp.Xsize = Xsize; 2320 rmp.xsize = xsize;
2277 rmp.Ysize = Ysize; 2321 rmp.ysize = ysize;
2278 rmp.expand2x = expand2x; 2322 rmp.expand2x = expand2x;
2279 rmp.layoutoptions1 = layoutoptions1; 2323 rmp.layoutoptions1 = layoutoptions1;
2280 rmp.layoutoptions2 = layoutoptions2; 2324 rmp.layoutoptions2 = layoutoptions2;
2281 rmp.layoutoptions3 = layoutoptions3; 2325 rmp.layoutoptions3 = layoutoptions3;
2282 rmp.symmetry = symmetry; 2326 rmp.symmetry = symmetry;
… …
2295 rmp.treasureoptions = treasureoptions; 2339 rmp.treasureoptions = treasureoptions;
2296 rmp.symmetry_used = symmetry_used; 2340 rmp.symmetry_used = symmetry_used;
2297 rmp.region = region; 2341 rmp.region = region;
2298 rmp.custom = custom; 2342 rmp.custom = custom;
2299 2343
2300 RETVAL = generate_random_map (path, &rmp); 2344 RETVAL = self->generate_random_map (&rmp);
2301} 2345}
2302 OUTPUT: 2346 OUTPUT:
2303 RETVAL 2347 RETVAL
2304 2348
2305MODULE = cf PACKAGE = cf::arch 2349MODULE = cf PACKAGE = cf::arch
… …
2337 OUTPUT: RETVAL 2381 OUTPUT: RETVAL
2338 2382
2339region *find (char *name) 2383region *find (char *name)
2340 PROTOTYPE: $ 2384 PROTOTYPE: $
2341 CODE: 2385 CODE:
2342 RETVAL = get_region_by_name (name); 2386 RETVAL = region::find (name);
2343 OUTPUT: RETVAL 2387 OUTPUT: RETVAL
2344 2388
2345INCLUDE: $PERL genacc region ../include/map.h | 2389INCLUDE: $PERL genacc region ../include/map.h |
2346 2390
2347MODULE = cf PACKAGE = cf::living 2391MODULE = cf PACKAGE = cf::living

Diff Legend

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