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.324 by root, Mon Oct 12 04:02:17 2009 UTC

… …
71static int tick_pending; 71static int tick_pending;
72 72
73global gbl_ev; 73global gbl_ev;
74static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map; 74static 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; 75static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now;
76static AV *av_reflect;
76 77
77bitset<NUM_EVENT_TYPES> ev_want_event; 78bitset<NUM_EVENT_TYPES> ev_want_event;
78bitset<NUM_TYPES> ev_want_type; 79bitset<NUM_TYPES> ev_want_type;
79 80
80static HV 81static HV
… …
88 *stash_cf_arch_wrap, 89 *stash_cf_arch_wrap,
89 *stash_cf_party_wrap, 90 *stash_cf_party_wrap,
90 *stash_cf_region_wrap, 91 *stash_cf_region_wrap,
91 *stash_cf_living_wrap; 92 *stash_cf_living_wrap;
92 93
94static SV
95 *cv_cf_do_invoke,
96 *cv_cf__can_merge,
97 *cv_cf_client_send_msg,
98 *cv_cf_tick,
99 *cv_cf_match_match;
100
93#ifndef newSVpv_utf8 101#ifndef newSVpv_utf8
94static inline SV * 102static inline SV *
95newSVpv_utf8 (const char *s) 103newSVpv_utf8 (const char *s)
96{ 104{
97 if (!s) 105 if (!s)
… …
317 fprintf (stderr, "P %p\n", pl); 325 fprintf (stderr, "P %p\n", pl);
318 326
319 for_all_clients (ns) 327 for_all_clients (ns)
320 if (find_backref (ptr, ns)) 328 if (find_backref (ptr, ns))
321 fprintf (stderr, "C %p\n", ns); 329 fprintf (stderr, "C %p\n", ns);
322
323} 330}
324 331
325////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 332//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
326 333
327static SV * 334static SV *
… …
919 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 926 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
920 } 927 }
921 928
922 va_end (ap); 929 va_end (ap);
923 930
924 CALL_CALL ("cf::do_invoke", G_SCALAR); 931 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
925 count = count > 0 ? POPi : 0; 932 count = count > 0 ? POPi : 0;
926 933
927 CALL_END; 934 CALL_END;
928 935
929 return count; 936 return count;
… …
970 977
971 dSP; 978 dSP;
972 979
973 PUSHMARK (SP); 980 PUSHMARK (SP);
974 PUTBACK; 981 PUTBACK;
975 call_pv ("cf::tick", G_DISCARD | G_VOID); 982 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
976 983
977 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick); 984 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
978} 985}
979 986
980void 987void
… …
1010 CALL_BEGIN (4); 1017 CALL_BEGIN (4);
1011 CALL_ARG (ns); 1018 CALL_ARG (ns);
1012 CALL_ARG (type); 1019 CALL_ARG (type);
1013 CALL_ARG_SV (newSVpv_utf8 (msg)); 1020 CALL_ARG_SV (newSVpv_utf8 (msg));
1014 CALL_ARG (color); 1021 CALL_ARG (color);
1015 CALL_CALL ("cf::client::send_msg", G_VOID); 1022 CALL_CALL (cv_cf_client_send_msg, G_VOID);
1016 CALL_END; 1023 CALL_END;
1017} 1024}
1018 1025
1019int 1026int
1020cfperl_can_merge (object *ob1, object *ob2) 1027cfperl_can_merge (object *ob1, object *ob2)
… …
1022 int can; 1029 int can;
1023 1030
1024 CALL_BEGIN (2); 1031 CALL_BEGIN (2);
1025 CALL_ARG (ob1); 1032 CALL_ARG (ob1);
1026 CALL_ARG (ob2); 1033 CALL_ARG (ob2);
1027 CALL_CALL ("cf::_can_merge", G_SCALAR); 1034 CALL_CALL (cv_cf__can_merge, G_SCALAR);
1028 can = count && SvTRUE (TOPs); 1035 can = count && SvTRUE (TOPs);
1029 CALL_END; 1036 CALL_END;
1030 1037
1031 return can; 1038 return can;
1032} 1039}
1033 1040
1034void 1041void
1035cfperl_mapscript_activate (object *ob, object *activator, int state) 1042cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator)
1036{ 1043{
1037 CALL_BEGIN (3); 1044 CALL_BEGIN (4);
1038 CALL_ARG (ob); 1045 CALL_ARG (ob);
1046 CALL_ARG (state);
1039 CALL_ARG (activator); 1047 CALL_ARG (activator);
1040 CALL_ARG (state); 1048 CALL_ARG (originator);
1041 CALL_CALL ("cf::mapscript::activate", G_VOID); 1049 CALL_CALL ("cf::mapscript::activate", G_VOID);
1042 CALL_END; 1050 CALL_END;
1043} 1051}
1044 1052
1045player * 1053player *
… …
1187 CALL_CALL ("cf::_log_backtrace", G_VOID); 1195 CALL_CALL ("cf::_log_backtrace", G_VOID);
1188 CALL_END; 1196 CALL_END;
1189#endif 1197#endif
1190} 1198}
1191 1199
1200bool
1201is_match_expr (const char *expr)
1202{
1203 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1204}
1205
1206bool
1207match (const char *expr, object *ob, object *self, object *source, object *originator)
1208{
1209 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1210 expr += sizeof ("match ") - 1;
1211
1212 CALL_BEGIN (5);
1213 CALL_ARG (expr);
1214 CALL_ARG (ob);
1215 CALL_ARG (self);
1216 CALL_ARG (source);
1217 CALL_ARG (originator);
1218 CALL_CALL (cv_cf_match_match, G_SCALAR);
1219
1220 bool matched = count && SvTRUE (TOPs);
1221
1222 CALL_END;
1223
1224 return matched;
1225}
1226
1192///////////////////////////////////////////////////////////////////////////// 1227/////////////////////////////////////////////////////////////////////////////
1193 1228
1194struct EVAPI *evapi::GEVAPI; 1229struct EVAPI *evapi::GEVAPI;
1195struct CoroAPI *coroapi::GCoroAPI; 1230struct CoroAPI *coroapi::GCoroAPI;
1196 1231
… …
1228 if (active) start (); 1263 if (active) start ();
1229 } 1264 }
1230} 1265}
1231 1266
1232static void 1267static void
1233_connect_to_perl () 1268_connect_to_perl_1 ()
1234{ 1269{
1235 stash_cf = gv_stashpv ("cf", 1); 1270 stash_cf = gv_stashpv ("cf", 1);
1236 1271
1237 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1272 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1238 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1273 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
… …
1257 cb_client = get_av ("cf::CB_CLIENT", 1); 1292 cb_client = get_av ("cf::CB_CLIENT", 1);
1258 cb_type = get_av ("cf::CB_TYPE" , 1); 1293 cb_type = get_av ("cf::CB_TYPE" , 1);
1259 cb_map = get_av ("cf::CB_MAP" , 1); 1294 cb_map = get_av ("cf::CB_MAP" , 1);
1260} 1295}
1261 1296
1297static void
1298_connect_to_perl_2 ()
1299{
1300 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1301 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1302 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1303 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1304 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1305}
1306
1262MODULE = cf PACKAGE = cf PREFIX = cf_ 1307MODULE = cf PACKAGE = cf PREFIX = cf_
1263 1308
1264BOOT: 1309BOOT:
1265{ 1310{
1266 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1311 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1267 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1312 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1268 1313
1269 _connect_to_perl (); 1314 _connect_to_perl_1 ();
1270 1315
1271 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1316 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1272 1317
1273 //{ 1318 //{
1274 // require_pv ("Time::HiRes"); 1319 // require_pv ("Time::HiRes");
… …
1546 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1591 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1547 av_push (event, newSViv (eiv->klass)); 1592 av_push (event, newSViv (eiv->klass));
1548 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1593 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1549 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1594 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1550 } 1595 }
1596
1597 // used by autogenerated BOOT sections from genacc
1598 av_reflect = get_av ("cf::REFLECT", 1);
1551} 1599}
1552 1600
1553void _gv_clear (SV *gv) 1601void _gv_clear (SV *gv)
1554 CODE: 1602 CODE:
1555 assert (SvTYPE (gv) == SVt_PVGV); 1603 assert (SvTYPE (gv) == SVt_PVGV);
… …
1562 f (GvGP (gv)->gp_cv); 1610 f (GvGP (gv)->gp_cv);
1563 GvCVGEN (gv) = 0; 1611 GvCVGEN (gv) = 0;
1564 GvMULTI_off (gv); 1612 GvMULTI_off (gv);
1565# undef f 1613# undef f
1566 1614
1567void _connect_to_perl () 1615void _connect_to_perl_1 ()
1616
1617void _connect_to_perl_2 ()
1568 1618
1569void _recalc_want () 1619void _recalc_want ()
1570 1620
1571# not used by default anymore 1621# not used by default anymore
1572void _global_reattach () 1622void _global_reattach ()
… …
2143 2193
2144int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2194int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2145 2195
2146int calc_skill_exp (object *who, object *op, object *skill); 2196int calc_skill_exp (object *who, object *op, object *skill);
2147 2197
2148void push_button (object *op); 2198void push_button (object *op, object *originator);
2149 2199
2150void use_trigger (object *op); 2200void use_trigger (object *op, object *originator);
2151 2201
2152void handle_apply_yield (object *op); 2202void handle_apply_yield (object *op);
2203
2204int convert_item (object *item, object *converter);
2153 2205
2154 2206
2155MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2207MODULE = cf PACKAGE = cf::object PREFIX = cf_
2156 2208
2157# no clean way to get an object from an archetype - stupid idiotic 2209# no clean way to get an object from an archetype - stupid idiotic
… …
2362 2414
2363void 2415void
2364adjust_daylight () 2416adjust_daylight ()
2365 CODE: 2417 CODE:
2366 maptile::adjust_daylight (); 2418 maptile::adjust_daylight ();
2419
2420int
2421outdoor_darkness (int darkness = 0)
2422 CODE:
2423 RETVAL = maptile::outdoor_darkness;
2424 if (items)
2425 maptile::outdoor_darkness = darkness;
2426 OUTPUT:
2427 RETVAL
2367 2428
2368void 2429void
2369maptile::instantiate () 2430maptile::instantiate ()
2370 2431
2371maptile *new () 2432maptile *new ()

Diff Legend

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