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.315 by root, Thu Jan 8 03:03:24 2009 UTC vs.
Revision 1.326 by root, Mon Oct 12 21:27:55 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2005,2007 by Chachkoff Yann 5 * Copyright (©) 2001-2005,2007 by Chachkoff Yann
6 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de> 6 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de>
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include "autoconf.h" 25#include "autoconf.h"
… …
71static int tick_pending; 72static int tick_pending;
72 73
73global gbl_ev; 74global gbl_ev;
74static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map; 75static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map;
75static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now; 76static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now;
77static AV *av_reflect;
76 78
77bitset<NUM_EVENT_TYPES> ev_want_event; 79bitset<NUM_EVENT_TYPES> ev_want_event;
78bitset<NUM_TYPES> ev_want_type; 80bitset<NUM_TYPES> ev_want_type;
79 81
80static HV 82static HV
… …
88 *stash_cf_arch_wrap, 90 *stash_cf_arch_wrap,
89 *stash_cf_party_wrap, 91 *stash_cf_party_wrap,
90 *stash_cf_region_wrap, 92 *stash_cf_region_wrap,
91 *stash_cf_living_wrap; 93 *stash_cf_living_wrap;
92 94
95static SV
96 *cv_cf_do_invoke,
97 *cv_cf__can_merge,
98 *cv_cf_client_send_msg,
99 *cv_cf_tick,
100 *cv_cf_match_match;
101
93#ifndef newSVpv_utf8 102#ifndef newSVpv_utf8
94static inline SV * 103static inline SV *
95newSVpv_utf8 (const char *s) 104newSVpv_utf8 (const char *s)
96{ 105{
97 if (!s) 106 if (!s)
… …
317 fprintf (stderr, "P %p\n", pl); 326 fprintf (stderr, "P %p\n", pl);
318 327
319 for_all_clients (ns) 328 for_all_clients (ns)
320 if (find_backref (ptr, ns)) 329 if (find_backref (ptr, ns))
321 fprintf (stderr, "C %p\n", ns); 330 fprintf (stderr, "C %p\n", ns);
322
323} 331}
324 332
325////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 333//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
326 334
327static SV * 335static SV *
… …
919 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 927 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
920 } 928 }
921 929
922 va_end (ap); 930 va_end (ap);
923 931
924 CALL_CALL ("cf::do_invoke", G_SCALAR); 932 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
925 count = count > 0 ? POPi : 0; 933 count = count > 0 ? POPi : 0;
926 934
927 CALL_END; 935 CALL_END;
928 936
929 return count; 937 return count;
… …
970 978
971 dSP; 979 dSP;
972 980
973 PUSHMARK (SP); 981 PUSHMARK (SP);
974 PUTBACK; 982 PUTBACK;
975 call_pv ("cf::tick", G_DISCARD | G_VOID); 983 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
976 984
977 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick); 985 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
978} 986}
979 987
980void 988void
… …
1010 CALL_BEGIN (4); 1018 CALL_BEGIN (4);
1011 CALL_ARG (ns); 1019 CALL_ARG (ns);
1012 CALL_ARG (type); 1020 CALL_ARG (type);
1013 CALL_ARG_SV (newSVpv_utf8 (msg)); 1021 CALL_ARG_SV (newSVpv_utf8 (msg));
1014 CALL_ARG (color); 1022 CALL_ARG (color);
1015 CALL_CALL ("cf::client::send_msg", G_VOID); 1023 CALL_CALL (cv_cf_client_send_msg, G_VOID);
1016 CALL_END; 1024 CALL_END;
1017} 1025}
1018 1026
1019int 1027int
1020cfperl_can_merge (object *ob1, object *ob2) 1028cfperl_can_merge (object *ob1, object *ob2)
… …
1022 int can; 1030 int can;
1023 1031
1024 CALL_BEGIN (2); 1032 CALL_BEGIN (2);
1025 CALL_ARG (ob1); 1033 CALL_ARG (ob1);
1026 CALL_ARG (ob2); 1034 CALL_ARG (ob2);
1027 CALL_CALL ("cf::_can_merge", G_SCALAR); 1035 CALL_CALL (cv_cf__can_merge, G_SCALAR);
1028 can = count && SvTRUE (TOPs); 1036 can = count && SvTRUE (TOPs);
1029 CALL_END; 1037 CALL_END;
1030 1038
1031 return can; 1039 return can;
1032} 1040}
1033 1041
1034void 1042void
1035cfperl_mapscript_activate (object *ob, object *activator, int state) 1043cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator)
1036{ 1044{
1037 CALL_BEGIN (3); 1045 CALL_BEGIN (4);
1038 CALL_ARG (ob); 1046 CALL_ARG (ob);
1047 CALL_ARG (state);
1039 CALL_ARG (activator); 1048 CALL_ARG (activator);
1040 CALL_ARG (state); 1049 CALL_ARG (originator);
1041 CALL_CALL ("cf::mapscript::activate", G_VOID); 1050 CALL_CALL ("cf::mapscript::activate", G_VOID);
1042 CALL_END; 1051 CALL_END;
1043} 1052}
1044 1053
1045player * 1054player *
… …
1187 CALL_CALL ("cf::_log_backtrace", G_VOID); 1196 CALL_CALL ("cf::_log_backtrace", G_VOID);
1188 CALL_END; 1197 CALL_END;
1189#endif 1198#endif
1190} 1199}
1191 1200
1201bool
1202is_match_expr (const char *expr)
1203{
1204 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1205}
1206
1207bool
1208match (const char *expr, object *ob, object *self, object *source, object *originator)
1209{
1210 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1211 expr += sizeof ("match ") - 1;
1212
1213 CALL_BEGIN (5);
1214 CALL_ARG (expr);
1215 CALL_ARG (ob);
1216 CALL_ARG (self);
1217 CALL_ARG (source);
1218 CALL_ARG (originator);
1219 CALL_CALL (cv_cf_match_match, G_SCALAR);
1220
1221 bool matched = count && SvTRUE (TOPs);
1222
1223 CALL_END;
1224
1225 return matched;
1226}
1227
1192///////////////////////////////////////////////////////////////////////////// 1228/////////////////////////////////////////////////////////////////////////////
1193 1229
1194struct EVAPI *evapi::GEVAPI; 1230struct EVAPI *evapi::GEVAPI;
1195struct CoroAPI *coroapi::GCoroAPI; 1231struct CoroAPI *coroapi::GCoroAPI;
1196 1232
… …
1228 if (active) start (); 1264 if (active) start ();
1229 } 1265 }
1230} 1266}
1231 1267
1232static void 1268static void
1233_connect_to_perl () 1269_connect_to_perl_1 ()
1234{ 1270{
1235 stash_cf = gv_stashpv ("cf", 1); 1271 stash_cf = gv_stashpv ("cf", 1);
1236 1272
1237 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1273 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1238 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1274 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
… …
1257 cb_client = get_av ("cf::CB_CLIENT", 1); 1293 cb_client = get_av ("cf::CB_CLIENT", 1);
1258 cb_type = get_av ("cf::CB_TYPE" , 1); 1294 cb_type = get_av ("cf::CB_TYPE" , 1);
1259 cb_map = get_av ("cf::CB_MAP" , 1); 1295 cb_map = get_av ("cf::CB_MAP" , 1);
1260} 1296}
1261 1297
1298static void
1299_connect_to_perl_2 ()
1300{
1301 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1302 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1303 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1304 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1305 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1306}
1307
1262MODULE = cf PACKAGE = cf PREFIX = cf_ 1308MODULE = cf PACKAGE = cf PREFIX = cf_
1263 1309
1264BOOT: 1310BOOT:
1265{ 1311{
1266 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1312 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1267 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1313 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1268 1314
1269 _connect_to_perl (); 1315 _connect_to_perl_1 ();
1270 1316
1271 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1317 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1272 1318
1273 //{ 1319 //{
1274 // require_pv ("Time::HiRes"); 1320 // require_pv ("Time::HiRes");
… …
1318 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR) 1364 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1319 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH) 1365 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1320 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL) 1366 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1321 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK) 1367 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1322 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON) 1368 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1323 const_iv (CF_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN) 1369 const_iv (T_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1324 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT) 1370 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1325 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED) 1371 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1326 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE) 1372 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1327 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON) 1373 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1328 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL) 1374 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
… …
1546 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1592 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1547 av_push (event, newSViv (eiv->klass)); 1593 av_push (event, newSViv (eiv->klass));
1548 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1594 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1549 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1595 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1550 } 1596 }
1597
1598 // used by autogenerated BOOT sections from genacc
1599 av_reflect = get_av ("cf::REFLECT", 1);
1551} 1600}
1552 1601
1553void _gv_clear (SV *gv) 1602void _gv_clear (SV *gv)
1554 CODE: 1603 CODE:
1555 assert (SvTYPE (gv) == SVt_PVGV); 1604 assert (SvTYPE (gv) == SVt_PVGV);
… …
1562 f (GvGP (gv)->gp_cv); 1611 f (GvGP (gv)->gp_cv);
1563 GvCVGEN (gv) = 0; 1612 GvCVGEN (gv) = 0;
1564 GvMULTI_off (gv); 1613 GvMULTI_off (gv);
1565# undef f 1614# undef f
1566 1615
1567void _connect_to_perl () 1616void _connect_to_perl_1 ()
1617
1618void _connect_to_perl_2 ()
1568 1619
1569void _recalc_want () 1620void _recalc_want ()
1570 1621
1571# not used by default anymore 1622# not used by default anymore
1572void _global_reattach () 1623void _global_reattach ()
… …
2143 2194
2144int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2195int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2145 2196
2146int calc_skill_exp (object *who, object *op, object *skill); 2197int calc_skill_exp (object *who, object *op, object *skill);
2147 2198
2148void push_button (object *op); 2199void push_button (object *op, object *originator);
2149 2200
2150void use_trigger (object *op); 2201void use_trigger (object *op, object *originator);
2151 2202
2152void handle_apply_yield (object *op); 2203void handle_apply_yield (object *op);
2204
2205int convert_item (object *item, object *converter);
2153 2206
2154 2207
2155MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2208MODULE = cf PACKAGE = cf::object PREFIX = cf_
2156 2209
2157# no clean way to get an object from an archetype - stupid idiotic 2210# no clean way to get an object from an archetype - stupid idiotic
… …
2362 2415
2363void 2416void
2364adjust_daylight () 2417adjust_daylight ()
2365 CODE: 2418 CODE:
2366 maptile::adjust_daylight (); 2419 maptile::adjust_daylight ();
2420
2421int
2422outdoor_darkness (int darkness = 0)
2423 CODE:
2424 RETVAL = maptile::outdoor_darkness;
2425 if (items)
2426 maptile::outdoor_darkness = darkness;
2427 OUTPUT:
2428 RETVAL
2367 2429
2368void 2430void
2369maptile::instantiate () 2431maptile::instantiate ()
2370 2432
2371maptile *new () 2433maptile *new ()

Diff Legend

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