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.323 by root, Sun Oct 11 23:51:41 2009 UTC vs.
Revision 1.331 by root, Thu Nov 5 14:38:47 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
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
6 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de> 5 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de>
7 * 6 *
8 * Deliantra is free software: you can redistribute it and/or modify 7 * 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 8 * 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 9 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 10 * option) any later version.
12 * 11 *
13 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 15 * GNU General Public License for more details.
17 * 16 *
18 * You should have received a copy of the GNU General Public License 17 * 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/>. 18 * and the GNU General Public License along with this program. If not, see
19 * <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include "autoconf.h" 24#include "autoconf.h"
… …
88 *stash_cf_client_wrap, 88 *stash_cf_client_wrap,
89 *stash_cf_arch_wrap, 89 *stash_cf_arch_wrap,
90 *stash_cf_party_wrap, 90 *stash_cf_party_wrap,
91 *stash_cf_region_wrap, 91 *stash_cf_region_wrap,
92 *stash_cf_living_wrap; 92 *stash_cf_living_wrap;
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;
93 100
94#ifndef newSVpv_utf8 101#ifndef newSVpv_utf8
95static inline SV * 102static inline SV *
96newSVpv_utf8 (const char *s) 103newSVpv_utf8 (const char *s)
97{ 104{
… …
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}
… …
1206 CALL_ARG (expr); 1213 CALL_ARG (expr);
1207 CALL_ARG (ob); 1214 CALL_ARG (ob);
1208 CALL_ARG (self); 1215 CALL_ARG (self);
1209 CALL_ARG (source); 1216 CALL_ARG (source);
1210 CALL_ARG (originator); 1217 CALL_ARG (originator);
1211 CALL_CALL ("cf::match::match", G_SCALAR); 1218 CALL_CALL (cv_cf_match_match, G_SCALAR);
1212 1219
1213 bool matched = count && SvTRUE (POPs); 1220 bool matched = count && SvTRUE (TOPs);
1214 1221
1215 CALL_END; 1222 CALL_END;
1216 1223
1217 return matched; 1224 return matched;
1225}
1226
1227object *
1228match_one (const char *expr, object *ob, object *self, object *source, object *originator)
1229{
1230 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1231 expr += sizeof ("match ") - 1;
1232
1233 CALL_BEGIN (5);
1234 CALL_ARG (expr);
1235 CALL_ARG (ob);
1236 CALL_ARG (self);
1237 CALL_ARG (source);
1238 CALL_ARG (originator);
1239 CALL_CALL (cv_cf_match_match, G_ARRAY);
1240
1241 object *one = 0;
1242
1243 if (count)
1244 sv_to (TOPs, one);
1245
1246 CALL_END;
1247
1248 return one;
1218} 1249}
1219 1250
1220///////////////////////////////////////////////////////////////////////////// 1251/////////////////////////////////////////////////////////////////////////////
1221 1252
1222struct EVAPI *evapi::GEVAPI; 1253struct EVAPI *evapi::GEVAPI;
… …
1256 if (active) start (); 1287 if (active) start ();
1257 } 1288 }
1258} 1289}
1259 1290
1260static void 1291static void
1261_connect_to_perl () 1292_connect_to_perl_1 ()
1262{ 1293{
1263 stash_cf = gv_stashpv ("cf", 1); 1294 stash_cf = gv_stashpv ("cf", 1);
1264 1295
1265 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1296 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1266 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1297 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
… …
1283 cb_object = get_av ("cf::CB_OBJECT", 1); 1314 cb_object = get_av ("cf::CB_OBJECT", 1);
1284 cb_player = get_av ("cf::CB_PLAYER", 1); 1315 cb_player = get_av ("cf::CB_PLAYER", 1);
1285 cb_client = get_av ("cf::CB_CLIENT", 1); 1316 cb_client = get_av ("cf::CB_CLIENT", 1);
1286 cb_type = get_av ("cf::CB_TYPE" , 1); 1317 cb_type = get_av ("cf::CB_TYPE" , 1);
1287 cb_map = get_av ("cf::CB_MAP" , 1); 1318 cb_map = get_av ("cf::CB_MAP" , 1);
1319}
1288 1320
1289 av_reflect = get_av ("cf::REFLECT" , 1); 1321static void
1322_connect_to_perl_2 ()
1323{
1324 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1325 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1326 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1327 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1328 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1290} 1329}
1291 1330
1292MODULE = cf PACKAGE = cf PREFIX = cf_ 1331MODULE = cf PACKAGE = cf PREFIX = cf_
1293 1332
1294BOOT: 1333BOOT:
1295{ 1334{
1296 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1335 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1297 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1336 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1298 1337
1299 _connect_to_perl (); 1338 _connect_to_perl_1 ();
1300 1339
1301 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1340 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1302 1341
1303 //{ 1342 //{
1304 // require_pv ("Time::HiRes"); 1343 // require_pv ("Time::HiRes");
… …
1348 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR) 1387 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1349 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH) 1388 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1350 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL) 1389 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1351 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK) 1390 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1352 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON) 1391 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1353 const_iv (CF_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN) 1392 const_iv (T_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1354 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT) 1393 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1355 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED) 1394 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1356 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE) 1395 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1357 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON) 1396 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1358 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL) 1397 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
… …
1576 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1615 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1577 av_push (event, newSViv (eiv->klass)); 1616 av_push (event, newSViv (eiv->klass));
1578 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1617 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1579 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1618 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1580 } 1619 }
1620
1621 // used by autogenerated BOOT sections from genacc
1622 av_reflect = get_av ("cf::REFLECT", 1);
1581} 1623}
1582 1624
1583void _gv_clear (SV *gv) 1625void _gv_clear (SV *gv)
1584 CODE: 1626 CODE:
1585 assert (SvTYPE (gv) == SVt_PVGV); 1627 assert (SvTYPE (gv) == SVt_PVGV);
… …
1592 f (GvGP (gv)->gp_cv); 1634 f (GvGP (gv)->gp_cv);
1593 GvCVGEN (gv) = 0; 1635 GvCVGEN (gv) = 0;
1594 GvMULTI_off (gv); 1636 GvMULTI_off (gv);
1595# undef f 1637# undef f
1596 1638
1597void _connect_to_perl () 1639void _connect_to_perl_1 ()
1640
1641void _connect_to_perl_2 ()
1598 1642
1599void _recalc_want () 1643void _recalc_want ()
1600 1644
1601# not used by default anymore 1645# not used by default anymore
1602void _global_reattach () 1646void _global_reattach ()
… …
2120 CODE: 2164 CODE:
2121 player_apply_below (op); 2165 player_apply_below (op);
2122 2166
2123int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2167int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2124 2168
2169int casting_level (object *caster, object *spell)
2170
2125int pay_item (object *op, object *buyer) 2171int pay_item (object *op, object *buyer)
2126 CODE: 2172 CODE:
2127 RETVAL = pay_for_item (op, buyer); 2173 RETVAL = pay_for_item (op, buyer);
2128 OUTPUT: RETVAL 2174 OUTPUT: RETVAL
2129 2175
… …
2202object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2248object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2203 PROTOTYPE: $$$$$$ 2249 PROTOTYPE: $$$$$$
2204 CODE: 2250 CODE:
2205{ 2251{
2206 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2252 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2253
2254 if (RETVAL->destroyed ())
2255 RETVAL = 0;
2207} 2256}
2208 2257
2209shstr 2258shstr
2210object::kv_get (shstr key) 2259object::kv_get (shstr key)
2211 2260
… …
2622 case 6: RETVAL = newSVuv (ms.move_on ); break; 2671 case 6: RETVAL = newSVuv (ms.move_on ); break;
2623 case 7: RETVAL = newSVuv (ms.move_off ); break; 2672 case 7: RETVAL = newSVuv (ms.move_off ); break;
2624 } 2673 }
2625} 2674}
2626 OUTPUT: RETVAL 2675 OUTPUT: RETVAL
2627
2628void fix_walls (maptile *map, int x, int y)
2629
2630void fix_walls_around (maptile *map, int x, int y)
2631 2676
2632# worst xs function of my life 2677# worst xs function of my life
2633bool 2678bool
2634_create_random_map (\ 2679_create_random_map (\
2635 maptile *self,\ 2680 maptile *self,\

Diff Legend

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