… | |
… | |
102 | unordered_vector<attachable *> attachable::mortals; |
102 | unordered_vector<attachable *> attachable::mortals; |
103 | |
103 | |
104 | attachable::~attachable () |
104 | attachable::~attachable () |
105 | { |
105 | { |
106 | assert (!self); |
106 | assert (!self); |
|
|
107 | assert (!cb); |
107 | } |
108 | } |
108 | |
109 | |
109 | int |
110 | int |
110 | attachable::refcnt_cnt () const |
111 | attachable::refcnt_cnt () const |
111 | { |
112 | { |
112 | return refcnt + (self ? SvREFCNT (self) : 0); |
113 | return refcnt + (self ? SvREFCNT (self) - 1 : 0); |
113 | } |
114 | } |
114 | |
115 | |
115 | void |
116 | void |
116 | attachable::optimise () |
117 | attachable::optimise () |
117 | { |
118 | { |
118 | if (self |
119 | if (self |
119 | && SvREFCNT (self) == 1 |
120 | && SvREFCNT (self) == 1 |
120 | && !HvTOTALKEYS (self)) |
121 | && !HvTOTALKEYS (self)) |
121 | { |
122 | { |
122 | refcnt_inc (); |
123 | sv_unmagic ((SV *)self, PERL_MAGIC_ext); |
123 | SvREFCNT_dec ((SV *)self); |
124 | assert (!self); |
124 | } |
125 | } |
125 | } |
126 | } |
126 | |
127 | |
127 | // check wether the object really is dead |
128 | // check wether the object really is dead |
128 | void |
129 | void |
129 | attachable::do_check () |
130 | attachable::do_check () |
130 | { |
131 | { |
131 | if (refcnt > 0 || refcnt_cnt () > 0) |
132 | if (refcnt_cnt () > 0) |
132 | return; |
133 | return; |
133 | |
134 | |
134 | destroy (); |
135 | destroy (); |
|
|
136 | } |
|
|
137 | |
|
|
138 | void |
|
|
139 | attachable::do_destroy () |
|
|
140 | { |
|
|
141 | invoke (EVENT_ATTACHABLE_DESTROY, DT_END); |
|
|
142 | |
|
|
143 | if (cb) |
|
|
144 | { |
|
|
145 | SvREFCNT_dec (cb); |
|
|
146 | cb = 0; |
|
|
147 | } |
135 | |
148 | |
136 | if (self) |
149 | if (self) |
137 | { |
150 | { |
138 | hv_clear (self); |
151 | hv_clear (self); |
139 | sv_unmagic ((SV *)self, PERL_MAGIC_ext); |
152 | sv_unmagic ((SV *)self, PERL_MAGIC_ext); |
140 | SvREFCNT_dec (self); |
153 | // self is now 0 |
141 | self = 0; |
154 | assert (!self);//D//TODO remove soon |
142 | } |
155 | } |
143 | } |
|
|
144 | |
|
|
145 | void |
|
|
146 | attachable::do_destroy () |
|
|
147 | { |
|
|
148 | invoke (EVENT_ATTACHABLE_DESTROY, DT_END); |
|
|
149 | |
|
|
150 | if (self) |
|
|
151 | hv_clear (self); |
|
|
152 | |
156 | |
153 | mortals.push_back (this); |
157 | mortals.push_back (this); |
154 | } |
158 | } |
155 | |
159 | |
156 | void |
160 | void |
… | |
… | |
164 | } |
168 | } |
165 | |
169 | |
166 | void |
170 | void |
167 | attachable::check_mortals () |
171 | attachable::check_mortals () |
168 | { |
172 | { |
169 | for (int i = 0; i < mortals.size (); ) |
173 | static int i = 0; |
|
|
174 | |
|
|
175 | for (;;) |
170 | { |
176 | { |
|
|
177 | if (i >= mortals.size ()) |
|
|
178 | { |
|
|
179 | i = 0; |
|
|
180 | |
|
|
181 | if (mortals.size () > 1000) |
|
|
182 | fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ()); |
|
|
183 | |
|
|
184 | break; |
|
|
185 | } |
|
|
186 | |
171 | attachable *obj = mortals [i]; |
187 | attachable *obj = mortals [i]; |
172 | |
188 | |
173 | obj->refcnt_chk (); // unborrow from perl, if necessary |
189 | obj->refcnt_chk (); // unborrow from perl, if necessary |
174 | |
190 | |
|
|
191 | //if (obj->refcnt > 0 || obj->self) |
175 | if (obj->refcnt || obj->self) |
192 | if (obj->refcnt || obj->self) |
176 | { |
193 | { |
177 | #if 0 |
194 | //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 |
195 | ++i; // further delay freeing |
|
|
196 | |
|
|
197 | if (!(i & 0x3ff)) |
|
|
198 | break; |
183 | }//D |
199 | } |
184 | else |
200 | else |
185 | { |
201 | { |
186 | //Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D |
|
|
187 | mortals.erase (i); |
202 | mortals.erase (i); |
188 | delete obj; |
203 | delete obj; |
189 | } |
204 | } |
190 | } |
205 | } |
191 | } |
206 | } |
… | |
… | |
216 | |
231 | |
217 | static int |
232 | static int |
218 | attachable_free (pTHX_ SV *sv, MAGIC *mg) |
233 | attachable_free (pTHX_ SV *sv, MAGIC *mg) |
219 | { |
234 | { |
220 | attachable *at = (attachable *)mg->mg_ptr; |
235 | attachable *at = (attachable *)mg->mg_ptr; |
|
|
236 | |
|
|
237 | //TODO: check if transaction behaviour is really required here |
|
|
238 | if (SV *self = (SV *)at->self) |
|
|
239 | { |
221 | at->self = 0; |
240 | at->self = 0; |
|
|
241 | SvREFCNT_dec (self); |
|
|
242 | } |
|
|
243 | |
222 | // next line makes sense, but most objects still have refcnt 0 by default |
244 | // next line makes sense, but most objects still have refcnt 0 by default |
223 | //at->refcnt_chk (); |
245 | //at->refcnt_chk (); |
224 | return 0; |
246 | return 0; |
225 | } |
247 | } |
226 | |
248 | |
… | |
… | |
235 | if (!obj->self) |
257 | if (!obj->self) |
236 | { |
258 | { |
237 | obj->self = newHV (); |
259 | obj->self = newHV (); |
238 | sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); |
260 | sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); |
239 | |
261 | |
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_ |
262 | // now bless the object _once_ |
245 | return sv_bless (newRV_inc ((SV *)obj->self), stash); |
263 | return sv_bless (newRV_inc ((SV *)obj->self), stash); |
246 | } |
264 | } |
247 | else |
265 | else |
|
|
266 | { |
248 | return newRV_inc ((SV *)obj->self); |
267 | SV *sv = newRV_inc ((SV *)obj->self); |
|
|
268 | |
|
|
269 | if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not |
|
|
270 | SvAMAGIC_on (sv); |
|
|
271 | |
|
|
272 | return sv; |
|
|
273 | } |
249 | } |
274 | } |
250 | |
275 | |
251 | static void |
276 | static void |
252 | clearSVptr (SV *sv) |
277 | clearSVptr (SV *sv) |
253 | { |
278 | { |
… | |
… | |
306 | inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } |
331 | inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } |
307 | |
332 | |
308 | inline SV *to_sv (object & v) { return to_sv (&v); } |
333 | inline SV *to_sv (object & v) { return to_sv (&v); } |
309 | inline SV *to_sv (living & v) { return to_sv (&v); } |
334 | inline SV *to_sv (living & v) { return to_sv (&v); } |
310 | |
335 | |
311 | //TODO: |
|
|
312 | inline SV *to_sv (New_Face * v) { return to_sv (v->name); } |
336 | inline SV *to_sv (facetile * v) { return to_sv (v->name); } |
313 | inline SV *to_sv (treasurelist * v) { return to_sv (v->name); } |
337 | inline SV *to_sv (treasurelist * v) { return to_sv (v->name); } |
314 | |
338 | |
315 | inline SV *to_sv (UUID v) |
339 | inline SV *to_sv (UUID v) |
316 | { |
340 | { |
317 | char buf[128]; |
341 | char buf[128]; |
… | |
… | |
342 | inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } |
366 | inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } |
343 | inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } |
367 | inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } |
344 | inline void sv_to (SV *sv, region * &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); } |
368 | inline void sv_to (SV *sv, region * &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); } |
345 | inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } |
369 | inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } |
346 | |
370 | |
347 | inline void sv_to (SV *sv, New_Face * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO |
371 | inline void sv_to (SV *sv, facetile * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } |
348 | inline void sv_to (SV *sv, treasurelist * &v) { v = find_treasurelist (SvPV_nolen (sv)); } // TODO |
372 | inline void sv_to (SV *sv, treasurelist * &v) { v = find_treasurelist (SvPV_nolen (sv)); } |
349 | |
373 | |
350 | template<class T> |
374 | template<class T> |
351 | inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } |
375 | inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } |
352 | |
376 | |
353 | template<int N> |
377 | template<int N> |
… | |
… | |
489 | if (!ext->cb) |
513 | if (!ext->cb) |
490 | ext->cb = newAV (); |
514 | ext->cb = newAV (); |
491 | |
515 | |
492 | return newRV_inc ((SV *)ext->cb); |
516 | return newRV_inc ((SV *)ext->cb); |
493 | } |
517 | } |
494 | |
|
|
495 | #if 0 |
|
|
496 | void 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 | |
518 | |
520 | ///////////////////////////////////////////////////////////////////////////// |
519 | ///////////////////////////////////////////////////////////////////////////// |
521 | |
520 | |
522 | extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) |
521 | extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) |
523 | { |
522 | { |
… | |
… | |
845 | CALL_END; |
844 | CALL_END; |
846 | |
845 | |
847 | return retval; |
846 | return retval; |
848 | } |
847 | } |
849 | |
848 | |
|
|
849 | maptile * |
|
|
850 | maptile::find_async (const char *path, maptile *origin) |
|
|
851 | { |
|
|
852 | CALL_BEGIN (2); |
|
|
853 | CALL_ARG (path); |
|
|
854 | CALL_ARG (origin); |
|
|
855 | CALL_CALL ("cf::map::find_async", G_SCALAR); |
|
|
856 | |
|
|
857 | maptile *retval; |
|
|
858 | |
|
|
859 | if (count) |
|
|
860 | sv_to (POPs, retval); |
|
|
861 | else |
|
|
862 | retval = 0; |
|
|
863 | |
|
|
864 | CALL_END; |
|
|
865 | |
|
|
866 | return retval; |
|
|
867 | } |
|
|
868 | |
850 | void |
869 | void |
851 | maptile::do_load_sync () |
870 | maptile::do_load_sync () |
852 | { |
871 | { |
853 | CALL_BEGIN (1); |
872 | CALL_BEGIN (1); |
854 | CALL_ARG (this); |
873 | CALL_ARG (this); |
… | |
… | |
894 | void |
913 | void |
895 | iw::alloc () |
914 | iw::alloc () |
896 | { |
915 | { |
897 | pe = GEventAPI->new_idle (0, 0); |
916 | pe = GEventAPI->new_idle (0, 0); |
898 | |
917 | |
|
|
918 | WaREENTRANT_off (pe); |
899 | pe->base.callback = (void *)iw_dispatch; |
919 | pe->base.callback = (void *)iw_dispatch; |
900 | pe->base.ext_data = (void *)this; |
920 | pe->base.ext_data = (void *)this; |
901 | } |
921 | } |
902 | |
922 | |
903 | static void iow_dispatch (pe_event *ev) |
923 | static void iow_dispatch (pe_event *ev) |
… | |
… | |
909 | void |
929 | void |
910 | iow::alloc () |
930 | iow::alloc () |
911 | { |
931 | { |
912 | pe = GEventAPI->new_io (0, 0); |
932 | pe = GEventAPI->new_io (0, 0); |
913 | |
933 | |
|
|
934 | WaREENTRANT_off (pe); |
914 | pe->base.callback = (void *)iow_dispatch; |
935 | pe->base.callback = (void *)iow_dispatch; |
915 | pe->base.ext_data = (void *)this; |
936 | pe->base.ext_data = (void *)this; |
916 | |
937 | |
917 | pe->fd = -1; |
938 | pe->fd = -1; |
918 | pe->poll = 0; |
939 | pe->poll = 0; |
… | |
… | |
1246 | const_iv (FLAG_ACTIVATE_ON_RELEASE) |
1267 | const_iv (FLAG_ACTIVATE_ON_RELEASE) |
1247 | const_iv (FLAG_IS_WATER) |
1268 | const_iv (FLAG_IS_WATER) |
1248 | const_iv (FLAG_CONTENT_ON_GEN) |
1269 | const_iv (FLAG_CONTENT_ON_GEN) |
1249 | const_iv (FLAG_IS_A_TEMPLATE) |
1270 | const_iv (FLAG_IS_A_TEMPLATE) |
1250 | const_iv (FLAG_IS_BUILDABLE) |
1271 | const_iv (FLAG_IS_BUILDABLE) |
|
|
1272 | const_iv (FLAG_DESTROY_ON_DEATH) |
|
|
1273 | const_iv (FLAG_NO_MAP_SAVE) |
1251 | |
1274 | |
1252 | const_iv (NDI_BLACK) |
1275 | const_iv (NDI_BLACK) |
1253 | const_iv (NDI_WHITE) |
1276 | const_iv (NDI_WHITE) |
1254 | const_iv (NDI_NAVY) |
1277 | const_iv (NDI_NAVY) |
1255 | const_iv (NDI_RED) |
1278 | const_iv (NDI_RED) |
… | |
… | |
1440 | const_iv (ATNR_BLIND) |
1463 | const_iv (ATNR_BLIND) |
1441 | const_iv (ATNR_INTERNAL) |
1464 | const_iv (ATNR_INTERNAL) |
1442 | const_iv (ATNR_LIFE_STEALING) |
1465 | const_iv (ATNR_LIFE_STEALING) |
1443 | const_iv (ATNR_DISEASE) |
1466 | const_iv (ATNR_DISEASE) |
1444 | |
1467 | |
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) |
1468 | const_iv (MAP_IN_MEMORY) |
1452 | const_iv (MAP_SWAPPED) |
1469 | const_iv (MAP_SWAPPED) |
1453 | const_iv (MAP_LOADING) |
1470 | const_iv (MAP_LOADING) |
1454 | const_iv (MAP_SAVING) |
1471 | const_iv (MAP_SAVING) |
1455 | |
1472 | |
… | |
… | |
1548 | } |
1565 | } |
1549 | |
1566 | |
1550 | NV floor (NV x) |
1567 | NV floor (NV x) |
1551 | |
1568 | |
1552 | NV ceil (NV x) |
1569 | NV ceil (NV x) |
|
|
1570 | |
|
|
1571 | NV rndm (...) |
|
|
1572 | CODE: |
|
|
1573 | switch (items) |
|
|
1574 | { |
|
|
1575 | case 0: RETVAL = rndm (); break; |
|
|
1576 | case 1: RETVAL = rndm (SvUV (ST (0))); break; |
|
|
1577 | case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break; |
|
|
1578 | default: croak ("cf::rndm requires none, one or two parameters."); break; |
|
|
1579 | } |
|
|
1580 | OUTPUT: |
|
|
1581 | RETVAL |
1553 | |
1582 | |
1554 | void server_tick () |
1583 | void server_tick () |
1555 | CODE: |
1584 | CODE: |
1556 | runtime = SvNVx (sv_runtime); |
1585 | runtime = SvNVx (sv_runtime); |
1557 | server_tick (); |
1586 | server_tick (); |
… | |
… | |
1604 | } |
1633 | } |
1605 | OUTPUT: RETVAL |
1634 | OUTPUT: RETVAL |
1606 | |
1635 | |
1607 | void abort () |
1636 | void abort () |
1608 | |
1637 | |
|
|
1638 | void fork_abort (char *cause = "cf::fork_abort") |
|
|
1639 | |
1609 | void cleanup (const char *cause, bool make_core = false) |
1640 | void cleanup (const char *cause, bool make_core = false) |
1610 | |
1641 | |
1611 | void emergency_save () |
1642 | void emergency_save () |
|
|
1643 | |
|
|
1644 | UV sv_2watcher (SV *w) |
|
|
1645 | CODE: |
|
|
1646 | RETVAL = (UV)GEventAPI->sv_2watcher (w); |
|
|
1647 | OUTPUT: |
|
|
1648 | RETVAL |
1612 | |
1649 | |
1613 | void _exit (int status = 0) |
1650 | void _exit (int status = 0) |
1614 | |
1651 | |
1615 | #if _POSIX_MEMLOCK |
1652 | #if _POSIX_MEMLOCK |
1616 | |
1653 | |
… | |
… | |
1673 | CODE: |
1710 | CODE: |
1674 | RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); |
1711 | RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); |
1675 | OUTPUT: |
1712 | OUTPUT: |
1676 | RETVAL |
1713 | RETVAL |
1677 | |
1714 | |
|
|
1715 | int mortals_size () |
|
|
1716 | CODE: |
|
|
1717 | RETVAL = attachable::mortals.size (); |
|
|
1718 | OUTPUT: RETVAL |
|
|
1719 | |
|
|
1720 | #object *mortals (U32 index) |
|
|
1721 | # CODE: |
|
|
1722 | # RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0; |
|
|
1723 | # OUTPUT: RETVAL |
|
|
1724 | |
1678 | INCLUDE: $PERL genacc attachable ../include/cfperl.h | |
1725 | INCLUDE: $PERL genacc attachable ../include/cfperl.h | |
1679 | |
1726 | |
1680 | MODULE = cf PACKAGE = cf::global |
1727 | MODULE = cf PACKAGE = cf::global |
1681 | |
1728 | |
1682 | int invoke (SV *klass, int event, ...) |
1729 | int invoke (SV *klass, int event, ...) |
… | |
… | |
1698 | for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i))); |
1745 | 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); |
1746 | RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END); |
1700 | OUTPUT: RETVAL |
1747 | OUTPUT: RETVAL |
1701 | |
1748 | |
1702 | SV *registry (object *op) |
1749 | SV *registry (object *op) |
1703 | |
|
|
1704 | void 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 | |
1750 | |
1710 | int objects_size () |
1751 | int objects_size () |
1711 | CODE: |
1752 | CODE: |
1712 | RETVAL = objects.size (); |
1753 | RETVAL = objects.size (); |
1713 | OUTPUT: RETVAL |
1754 | OUTPUT: RETVAL |
… | |
… | |
1837 | |
1878 | |
1838 | void drop (object *who, object *op) |
1879 | void drop (object *who, object *op) |
1839 | |
1880 | |
1840 | void pick_up (object *who, object *op) |
1881 | void pick_up (object *who, object *op) |
1841 | |
1882 | |
1842 | object *cf_object_insert_object (object *op, object *container) |
|
|
1843 | |
|
|
1844 | object *cf_object_insert_in_ob (object *ob, object *where) |
|
|
1845 | |
|
|
1846 | int cf_object_teleport (object *op, maptile *map, int x, int y) |
1883 | int cf_object_teleport (object *op, maptile *map, int x, int y) |
1847 | |
1884 | |
1848 | void update_object (object *op, int action) |
1885 | void update_object (object *op, int action) |
1849 | |
1886 | |
1850 | object *cf_create_object_by_name (const char *name) |
1887 | object *cf_create_object_by_name (const char *name) |
… | |
… | |
1968 | |
2005 | |
1969 | void esrv_update_item (object *op, int what, object *item) |
2006 | void esrv_update_item (object *op, int what, object *item) |
1970 | C_ARGS: what, op, item |
2007 | C_ARGS: what, op, item |
1971 | |
2008 | |
1972 | void clear_los (object *op) |
2009 | void clear_los (object *op) |
1973 | |
|
|
1974 | int command_teleport (object *op, char *params) |
|
|
1975 | |
2010 | |
1976 | int command_summon (object *op, char *params) |
2011 | int command_summon (object *op, char *params) |
1977 | |
2012 | |
1978 | int command_arrest (object *op, char *params) |
2013 | int command_arrest (object *op, char *params) |
1979 | |
2014 | |
… | |
… | |
2122 | |
2157 | |
2123 | object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny) |
2158 | object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny) |
2124 | C_ARGS: str, map, nx, ny |
2159 | C_ARGS: str, map, nx, ny |
2125 | |
2160 | |
2126 | void |
2161 | void |
2127 | cf_map_normalise (maptile *map, int x, int y) |
2162 | get_map_flags (maptile *map, int x, int y) |
2128 | PPCODE: |
2163 | PPCODE: |
2129 | { |
2164 | { |
2130 | maptile *nmap = 0; |
2165 | maptile *nmap = 0; |
2131 | I16 nx = 0, ny = 0; |
2166 | I16 nx = 0, ny = 0; |
2132 | int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); |
2167 | int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); |
… | |
… | |
2194 | CODE: |
2229 | CODE: |
2195 | RETVAL = get_name_of_region_for_map (m); |
2230 | RETVAL = get_name_of_region_for_map (m); |
2196 | OUTPUT: RETVAL |
2231 | OUTPUT: RETVAL |
2197 | |
2232 | |
2198 | # worst xs function of my life |
2233 | # worst xs function of my life |
2199 | maptile * |
2234 | bool |
2200 | _create_random_map (\ |
2235 | _create_random_map (\ |
2201 | char *path,\ |
2236 | maptile *self,\ |
2202 | char *wallstyle,\ |
2237 | char *wallstyle,\ |
2203 | char *wall_name,\ |
2238 | char *wall_name,\ |
2204 | char *floorstyle,\ |
2239 | char *floorstyle,\ |
2205 | char *monsterstyle,\ |
2240 | char *monsterstyle,\ |
2206 | char *treasurestyle,\ |
2241 | char *treasurestyle,\ |
… | |
… | |
2210 | char *origin_map,\ |
2245 | char *origin_map,\ |
2211 | char *final_map,\ |
2246 | char *final_map,\ |
2212 | char *exitstyle,\ |
2247 | char *exitstyle,\ |
2213 | char *this_map,\ |
2248 | char *this_map,\ |
2214 | char *exit_on_final_map,\ |
2249 | char *exit_on_final_map,\ |
2215 | int Xsize,\ |
2250 | int xsize,\ |
2216 | int Ysize,\ |
2251 | int ysize,\ |
2217 | int expand2x,\ |
2252 | int expand2x,\ |
2218 | int layoutoptions1,\ |
2253 | int layoutoptions1,\ |
2219 | int layoutoptions2,\ |
2254 | int layoutoptions2,\ |
2220 | int layoutoptions3,\ |
2255 | int layoutoptions3,\ |
2221 | int symmetry,\ |
2256 | int symmetry,\ |
… | |
… | |
2226 | int dungeon_depth,\ |
2261 | int dungeon_depth,\ |
2227 | int decoroptions,\ |
2262 | int decoroptions,\ |
2228 | int orientation,\ |
2263 | int orientation,\ |
2229 | int origin_y,\ |
2264 | int origin_y,\ |
2230 | int origin_x,\ |
2265 | int origin_x,\ |
2231 | int random_seed,\ |
2266 | U32 random_seed,\ |
2232 | val64 total_map_hp,\ |
2267 | val64 total_map_hp,\ |
2233 | int map_layout_style,\ |
2268 | int map_layout_style,\ |
2234 | int treasureoptions,\ |
2269 | int treasureoptions,\ |
2235 | int symmetry_used,\ |
2270 | int symmetry_used,\ |
2236 | region *region\ |
2271 | region *region,\ |
|
|
2272 | char *custom\ |
2237 | ) |
2273 | ) |
2238 | CODE: |
2274 | CODE: |
2239 | { |
2275 | { |
2240 | random_map_params rmp; |
2276 | random_map_params rmp; |
2241 | |
2277 | |
… | |
… | |
2251 | assign (rmp.exit_on_final_map, exit_on_final_map); |
2287 | assign (rmp.exit_on_final_map, exit_on_final_map); |
2252 | |
2288 | |
2253 | rmp.origin_map = origin_map; |
2289 | rmp.origin_map = origin_map; |
2254 | rmp.final_map = final_map; |
2290 | rmp.final_map = final_map; |
2255 | rmp.this_map = this_map; |
2291 | rmp.this_map = this_map; |
2256 | rmp.Xsize = Xsize; |
2292 | rmp.xsize = xsize; |
2257 | rmp.Ysize = Ysize; |
2293 | rmp.ysize = ysize; |
2258 | rmp.expand2x = expand2x; |
2294 | rmp.expand2x = expand2x; |
2259 | rmp.layoutoptions1 = layoutoptions1; |
2295 | rmp.layoutoptions1 = layoutoptions1; |
2260 | rmp.layoutoptions2 = layoutoptions2; |
2296 | rmp.layoutoptions2 = layoutoptions2; |
2261 | rmp.layoutoptions3 = layoutoptions3; |
2297 | rmp.layoutoptions3 = layoutoptions3; |
2262 | rmp.symmetry = symmetry; |
2298 | rmp.symmetry = symmetry; |
… | |
… | |
2273 | rmp.total_map_hp = total_map_hp; |
2309 | rmp.total_map_hp = total_map_hp; |
2274 | rmp.map_layout_style = map_layout_style; |
2310 | rmp.map_layout_style = map_layout_style; |
2275 | rmp.treasureoptions = treasureoptions; |
2311 | rmp.treasureoptions = treasureoptions; |
2276 | rmp.symmetry_used = symmetry_used; |
2312 | rmp.symmetry_used = symmetry_used; |
2277 | rmp.region = region; |
2313 | rmp.region = region; |
|
|
2314 | rmp.custom = custom; |
2278 | |
2315 | |
2279 | RETVAL = generate_random_map (path, &rmp); |
2316 | RETVAL = self->generate_random_map (&rmp); |
2280 | } |
2317 | } |
2281 | OUTPUT: |
2318 | OUTPUT: |
2282 | RETVAL |
2319 | RETVAL |
2283 | |
2320 | |
2284 | MODULE = cf PACKAGE = cf::arch |
2321 | MODULE = cf PACKAGE = cf::arch |