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.79 by root, Thu Dec 14 05:09:32 2006 UTC vs.
Revision 1.100 by root, Fri Dec 22 02:04:21 2006 UTC

… …
59static f_plug_api object_set_property = cfapi_object_set_property; 59static f_plug_api object_set_property = cfapi_object_set_property;
60static f_plug_api object_insert = cfapi_object_insert; 60static f_plug_api object_insert = cfapi_object_insert;
61 61
62static PerlInterpreter *perl; 62static PerlInterpreter *perl;
63 63
64static AV *cb_global, *cb_object, *cb_player, *cb_type, *cb_map; 64static AV *cb_global, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map;
65 65
66////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 66//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
67 67
68static SV * 68static SV *
69newSVptr (void *ptr, const char *klass, HV *hv = newHV ()) 69newSVptr (void *ptr, const char *klass, HV *hv = newHV ())
… …
136inline SV *to_sv (unsigned long v) { return newSVuv (v); } 136inline SV *to_sv (unsigned long v) { return newSVuv (v); }
137inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 137inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
138inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 138inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
139inline SV *to_sv (float v) { return newSVnv (v); } 139inline SV *to_sv (float v) { return newSVnv (v); }
140inline SV *to_sv (double v) { return newSVnv (v); } 140inline SV *to_sv (double v) { return newSVnv (v); }
141inline SV *to_sv (client_socket *v) { return newSVattachable (v, "cf::client_socket::wrap"); } 141inline SV *to_sv (client * v) { return newSVattachable (v, "cf::client::wrap"); }
142inline SV *to_sv (player * v) { return newSVattachable (v, "cf::player::wrap"); } 142inline SV *to_sv (player * v) { return newSVattachable (v, "cf::player::wrap"); }
143inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? "cf::object::player::wrap" : "cf::object::wrap"); } 143inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? "cf::object::player::wrap" : "cf::object::wrap"); }
144inline SV *to_sv (maptile * v) { return newSVattachable (v, "cf::map::wrap"); } 144inline SV *to_sv (maptile * v) { return newSVattachable (v, "cf::map::wrap"); }
145inline SV *to_sv (archetype * v) { return newSVptr (v, "cf::arch::wrap"); } 145inline SV *to_sv (archetype * v) { return newSVptr (v, "cf::arch::wrap"); }
146inline SV *to_sv (partylist * v) { return newSVptr (v, "cf::party::wrap"); } 146inline SV *to_sv (partylist * v) { return newSVptr (v, "cf::party::wrap"); }
… …
174inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 174inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
175inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); } 175inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }
176inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); } 176inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }
177inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 177inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
178inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 178inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
179inline void sv_to (SV *sv, client_socket *&v) { v = (client_socket *)SvPTR_ornull (sv, "cf::client_socket"); } 179inline void sv_to (SV *sv, client * &v) { v = (client *)SvPTR_ornull (sv, "cf::client"); }
180inline void sv_to (SV *sv, player * &v) { v = (player *)SvPTR_ornull (sv, "cf::player"); } 180inline void sv_to (SV *sv, player * &v) { v = (player *)SvPTR_ornull (sv, "cf::player"); }
181inline void sv_to (SV *sv, object * &v) { v = (object *)SvPTR_ornull (sv, "cf::object"); } 181inline void sv_to (SV *sv, object * &v) { v = (object *)SvPTR_ornull (sv, "cf::object"); }
182inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)SvPTR_ornull (sv, "cf::arch"); } 182inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)SvPTR_ornull (sv, "cf::arch"); }
183inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)SvPTR_ornull (sv, "cf::map"); } 183inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)SvPTR_ornull (sv, "cf::map"); }
184inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 184inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
… …
243 case DT_MAP: 243 case DT_MAP:
244 // va_arg (object *) when void * is passed is an XSI extension 244 // va_arg (object *) when void * is passed is an XSI extension
245 sv = to_sv (va_arg (ap, maptile *)); 245 sv = to_sv (va_arg (ap, maptile *));
246 break; 246 break;
247 247
248 case DT_SOCKET: 248 case DT_CLIENT:
249 sv = to_sv (va_arg (ap, client_socket *)); 249 sv = to_sv (va_arg (ap, client *));
250 break; 250 break;
251 251
252 case DT_PLAYER: 252 case DT_PLAYER:
253 sv = to_sv (va_arg (ap, player *)); 253 sv = to_sv (va_arg (ap, player *));
254 break; 254 break;
… …
361 361
362 HV *hv = (HV *)SvRV ((SV *)self); 362 HV *hv = (HV *)SvRV ((SV *)self);
363 363
364 if (SvREFCNT ((SV *)self) == 1 364 if (SvREFCNT ((SV *)self) == 1
365 && SvREFCNT ((SV *)hv) == 1 365 && SvREFCNT ((SV *)hv) == 1
366 && !HvKEYS (hv)) 366 && !HvTOTALKEYS (hv))
367 { 367 {
368 SvREFCNT_dec ((SV *)self); 368 SvREFCNT_dec ((SV *)self);
369 self = 0; 369 self = 0;
370 } 370 }
371} 371}
… …
412 412
413 switch (type) 413 switch (type)
414 { 414 {
415 case DT_OBJECT: INVOKE_OBJECT (REATTACH, obj); break; 415 case DT_OBJECT: INVOKE_OBJECT (REATTACH, obj); break;
416 case DT_PLAYER: INVOKE_PLAYER (REATTACH, obj); break; 416 case DT_PLAYER: INVOKE_PLAYER (REATTACH, obj); break;
417 case DT_CLIENT: INVOKE_CLIENT (REATTACH, obj); break;
417 case DT_MAP: INVOKE_MAP (REATTACH, obj); break; 418 case DT_MAP: INVOKE_MAP (REATTACH, obj); break;
418 } 419 }
419} 420}
420 421
421template<class subclass> 422template<class subclass>
… …
834 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 835 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
835 836
836 char *argv[] = { 837 char *argv[] = {
837 "", 838 "",
838 "-e" 839 "-e"
839 "cf->bootstrap;" 840 "use Event;" // required for bootstrap
841 "cf->bootstrap;" // required for datadir :*>
840 "unshift @INC, cf::datadir ();" 842 "unshift @INC, cf::datadir ();"
841 "require cf;" 843 "require cf;"
842 }; 844 };
843 845
844 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) || perl_run (perl)) 846 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) || perl_run (perl))
… …
905 AV *callbacks = 0; 907 AV *callbacks = 0;
906 908
907 object *op; 909 object *op;
908 player *pl; 910 player *pl;
909 maptile *map; 911 maptile *map;
912 client *ns;
910 913
911 // callback call ordering is: 914 // callback call ordering is:
912 // 1. per-object callback 915 // 1. per-object callback
913 // 2. per-class object 916 // 2. per-class object
914 // 3. per-type callback 917 // 3. per-type callback
… …
972 gather_callbacks (callbacks, map->cb, event); 975 gather_callbacks (callbacks, map->cb, event);
973 976
974 gather_callbacks (callbacks, cb_map, event); 977 gather_callbacks (callbacks, cb_map, event);
975 break; 978 break;
976 979
980 case KLASS_CLIENT:
981 dt = (data_type) va_arg (ap, int);
982 assert (("first argument must be of type client", dt == DT_CLIENT));
983 ns = va_arg (ap, client *);
984
985 if (ns->cb)
986 gather_callbacks (callbacks, ns->cb, event);
987
988 gather_callbacks (callbacks, cb_client, event);
989 break;
990
977 default: 991 default:
978 assert (("unsupported event klass in cfperl_invoke", 0)); 992 assert (("unsupported event klass in cfperl_invoke", 0));
979 } 993 }
980 994
981 // short-circuit processing if no callbacks found/defined 995 // short-circuit processing if no callbacks found/defined
… …
994 1008
995 switch (KLASS_OF (event)) 1009 switch (KLASS_OF (event))
996 { 1010 {
997 case KLASS_OBJECT: PUSHs (sv_2mortal (newSVdt (DT_OBJECT, op))); break; 1011 case KLASS_OBJECT: PUSHs (sv_2mortal (newSVdt (DT_OBJECT, op))); break;
998 case KLASS_PLAYER: PUSHs (sv_2mortal (newSVdt (DT_PLAYER, pl))); break; 1012 case KLASS_PLAYER: PUSHs (sv_2mortal (newSVdt (DT_PLAYER, pl))); break;
1013 case KLASS_CLIENT: PUSHs (sv_2mortal (newSVdt (DT_CLIENT, ns))); break;
999 case KLASS_MAP: PUSHs (sv_2mortal (newSVdt (DT_MAP, map))); break; 1014 case KLASS_MAP: PUSHs (sv_2mortal (newSVdt (DT_MAP, map))); break;
1000 } 1015 }
1001 1016
1002 for (;;) 1017 for (;;)
1003 { 1018 {
… …
1055cfperl_result_DOUBLE (int idx) 1070cfperl_result_DOUBLE (int idx)
1056{ 1071{
1057 return SvNV (cfperl_result (idx)); 1072 return SvNV (cfperl_result (idx));
1058} 1073}
1059 1074
1075/////////////////////////////////////////////////////////////////////////////
1076
1077struct EventAPI *watcher_base::GEventAPI;
1078
1079static void iw_dispatch (pe_event *ev)
1080{
1081 iw *w = (iw *)ev->ext_data;
1082 w->call (*w);
1083}
1084
1085void
1086iw::alloc ()
1087{
1088 pe = GEventAPI->new_idle (0, 0);
1089
1090 pe->base.callback = (void *)iw_dispatch;
1091 pe->base.ext_data = (void *)this;
1092}
1093
1094static void iow_dispatch (pe_event *ev)
1095{
1096 iow *w = (iow *)ev->ext_data;
1097 w->call (*w, ((pe_ioevent *)ev)->got);
1098}
1099
1100void
1101iow::alloc ()
1102{
1103 pe = GEventAPI->new_io (0, 0);
1104
1105 pe->base.callback = (void *)iow_dispatch;
1106 pe->base.ext_data = (void *)this;
1107
1108 pe->fd = -1;
1109 pe->poll = 0;
1110}
1111
1112void
1113iow::fd (int fd)
1114{
1115 pe->fd = fd;
1116}
1117
1118int
1119iow::poll ()
1120{
1121 return pe->poll;
1122}
1123
1124void
1125iow::poll (int events)
1126{
1127 if (pe->poll != events)
1128 {
1129 if (pe->poll) stop ();
1130 pe->poll = events;
1131 if (pe->poll) start ();
1132 }
1133}
1134
1060MODULE = cf PACKAGE = cf PREFIX = cf_ 1135MODULE = cf PACKAGE = cf PREFIX = cf_
1061 1136
1062BOOT: 1137BOOT:
1063{ 1138{
1064 HV *stash = gv_stashpv ("cf", 1); 1139 HV *stash = gv_stashpv ("cf", 1);
1140
1141 I_EVENT_API (PACKAGE);
1142 watcher_base::GEventAPI = GEventAPI;
1065 1143
1066 newCONSTSUB (stash, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1144 newCONSTSUB (stash, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1067 1145
1068 static const struct { 1146 static const struct {
1069 const char *name; 1147 const char *name;
… …
1083 const_iv (POTION) 1161 const_iv (POTION)
1084 const_iv (FOOD) 1162 const_iv (FOOD)
1085 const_iv (POISON) 1163 const_iv (POISON)
1086 const_iv (BOOK) 1164 const_iv (BOOK)
1087 const_iv (CLOCK) 1165 const_iv (CLOCK)
1088 const_iv (LIGHTNING)
1089 const_iv (ARROW) 1166 const_iv (ARROW)
1090 const_iv (BOW) 1167 const_iv (BOW)
1091 const_iv (WEAPON) 1168 const_iv (WEAPON)
1092 const_iv (ARMOUR) 1169 const_iv (ARMOUR)
1093 const_iv (PEDESTAL) 1170 const_iv (PEDESTAL)
… …
1113 const_iv (AMULET) 1190 const_iv (AMULET)
1114 const_iv (PLAYERMOVER) 1191 const_iv (PLAYERMOVER)
1115 const_iv (TELEPORTER) 1192 const_iv (TELEPORTER)
1116 const_iv (CREATOR) 1193 const_iv (CREATOR)
1117 const_iv (SKILL) 1194 const_iv (SKILL)
1118 const_iv (EXPERIENCE)
1119 const_iv (EARTHWALL) 1195 const_iv (EARTHWALL)
1120 const_iv (GOLEM) 1196 const_iv (GOLEM)
1121 const_iv (THROWN_OBJ) 1197 const_iv (THROWN_OBJ)
1122 const_iv (BLINDNESS) 1198 const_iv (BLINDNESS)
1123 const_iv (GOD) 1199 const_iv (GOD)
… …
1143 const_iv (FLOOR) 1219 const_iv (FLOOR)
1144 const_iv (FLESH) 1220 const_iv (FLESH)
1145 const_iv (INORGANIC) 1221 const_iv (INORGANIC)
1146 const_iv (SKILL_TOOL) 1222 const_iv (SKILL_TOOL)
1147 const_iv (LIGHTER) 1223 const_iv (LIGHTER)
1148 const_iv (TRAP_PART)
1149 const_iv (WALL) 1224 const_iv (BUILDABLE_WALL)
1150 const_iv (LIGHT_SOURCE)
1151 const_iv (MISC_OBJECT) 1225 const_iv (MISC_OBJECT)
1152 const_iv (MONSTER)
1153 const_iv (SPAWN_GENERATOR)
1154 const_iv (LAMP) 1226 const_iv (LAMP)
1155 const_iv (DUPLICATOR) 1227 const_iv (DUPLICATOR)
1156 const_iv (TOOL)
1157 const_iv (SPELLBOOK) 1228 const_iv (SPELLBOOK)
1158 const_iv (BUILDFAC)
1159 const_iv (CLOAK) 1229 const_iv (CLOAK)
1160 const_iv (SPINNER) 1230 const_iv (SPINNER)
1161 const_iv (GATE) 1231 const_iv (GATE)
1162 const_iv (BUTTON) 1232 const_iv (BUTTON)
1163 const_iv (CF_HANDLE) 1233 const_iv (CF_HANDLE)
… …
1170 const_iv (SPELL_EFFECT) 1240 const_iv (SPELL_EFFECT)
1171 const_iv (CONVERTER) 1241 const_iv (CONVERTER)
1172 const_iv (BRACERS) 1242 const_iv (BRACERS)
1173 const_iv (POISONING) 1243 const_iv (POISONING)
1174 const_iv (SAVEBED) 1244 const_iv (SAVEBED)
1175 const_iv (POISONCLOUD)
1176 const_iv (FIREHOLES)
1177 const_iv (WAND) 1245 const_iv (WAND)
1178 const_iv (SCROLL) 1246 const_iv (SCROLL)
1179 const_iv (DIRECTOR) 1247 const_iv (DIRECTOR)
1180 const_iv (GIRDLE) 1248 const_iv (GIRDLE)
1181 const_iv (FORCE) 1249 const_iv (FORCE)
… …
1196 const_iv (DISEASE) 1264 const_iv (DISEASE)
1197 const_iv (SYMPTOM) 1265 const_iv (SYMPTOM)
1198 const_iv (BUILDER) 1266 const_iv (BUILDER)
1199 const_iv (MATERIAL) 1267 const_iv (MATERIAL)
1200 const_iv (ITEM_TRANSFORMER) 1268 const_iv (ITEM_TRANSFORMER)
1201 const_iv (QUEST)
1202 1269
1203 const_iv (NUM_SUBTYPES) 1270 const_iv (NUM_SUBTYPES)
1204 1271
1205 const_iv (ST_BD_BUILD) 1272 const_iv (ST_BD_BUILD)
1206 const_iv (ST_BD_REMOVE) 1273 const_iv (ST_BD_REMOVE)
… …
1259 const_iv (FLAG_MONSTER) 1326 const_iv (FLAG_MONSTER)
1260 const_iv (FLAG_FRIENDLY) 1327 const_iv (FLAG_FRIENDLY)
1261 const_iv (FLAG_GENERATOR) 1328 const_iv (FLAG_GENERATOR)
1262 const_iv (FLAG_IS_THROWN) 1329 const_iv (FLAG_IS_THROWN)
1263 const_iv (FLAG_AUTO_APPLY) 1330 const_iv (FLAG_AUTO_APPLY)
1264 const_iv (FLAG_TREASURE)
1265 const_iv (FLAG_PLAYER_SOLD) 1331 const_iv (FLAG_PLAYER_SOLD)
1266 const_iv (FLAG_SEE_INVISIBLE) 1332 const_iv (FLAG_SEE_INVISIBLE)
1267 const_iv (FLAG_CAN_ROLL) 1333 const_iv (FLAG_CAN_ROLL)
1268 const_iv (FLAG_OVERLAY_FLOOR) 1334 const_iv (FLAG_OVERLAY_FLOOR)
1269 const_iv (FLAG_IS_TURNABLE) 1335 const_iv (FLAG_IS_TURNABLE)
… …
1392 const_iv (F_BUY) 1458 const_iv (F_BUY)
1393 const_iv (F_SHOP) 1459 const_iv (F_SHOP)
1394 const_iv (F_SELL) 1460 const_iv (F_SELL)
1395 1461
1396 const_iv (P_BLOCKSVIEW) 1462 const_iv (P_BLOCKSVIEW)
1463 const_iv (P_PLAYER)
1397 const_iv (P_NO_MAGIC) 1464 const_iv (P_NO_MAGIC)
1398 const_iv (P_IS_ALIVE) 1465 const_iv (P_IS_ALIVE)
1399 const_iv (P_NO_CLERIC) 1466 const_iv (P_NO_CLERIC)
1400 const_iv (P_NEED_UPDATE) 1467 const_iv (P_NEED_UPDATE)
1401 const_iv (P_NO_ERROR)
1402 const_iv (P_OUT_OF_MAP) 1468 const_iv (P_OUT_OF_MAP)
1403 const_iv (P_NEW_MAP) 1469 const_iv (P_NEW_MAP)
1404 1470
1405 const_iv (UP_OBJ_INSERT) 1471 const_iv (UP_OBJ_INSERT)
1406 const_iv (UP_OBJ_REMOVE) 1472 const_iv (UP_OBJ_REMOVE)
… …
1552 const_iv (MAP_LOADING) 1618 const_iv (MAP_LOADING)
1553 const_iv (MAP_SAVING) 1619 const_iv (MAP_SAVING)
1554 1620
1555 const_iv (KLASS_GLOBAL) 1621 const_iv (KLASS_GLOBAL)
1556 const_iv (KLASS_OBJECT) 1622 const_iv (KLASS_OBJECT)
1623 const_iv (KLASS_CLIENT)
1557 const_iv (KLASS_PLAYER) 1624 const_iv (KLASS_PLAYER)
1558 const_iv (KLASS_MAP) 1625 const_iv (KLASS_MAP)
1626
1627 const_iv (CS_QUERY_YESNO)
1628 const_iv (CS_QUERY_SINGLECHAR)
1629 const_iv (CS_QUERY_HIDEINPUT)
1630
1631 const_iv (ST_DEAD)
1632 const_iv (ST_SETUP)
1633 const_iv (ST_PLAYING)
1634 const_iv (ST_CUSTOM)
1635
1636 const_iv (ST_PLAY_AGAIN)
1637 const_iv (ST_ROLL_STAT)
1638 const_iv (ST_CHANGE_CLASS)
1639 const_iv (ST_CONFIRM_QUIT)
1640 const_iv (ST_CONFIGURE)
1641 const_iv (ST_GET_NAME)
1642 const_iv (ST_GET_PASSWORD)
1643 const_iv (ST_CONFIRM_PASSWORD)
1644 const_iv (ST_GET_PARTY_PASSWORD)
1559 }; 1645 };
1560 1646
1561 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1647 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1562 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1648 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1563 1649
… …
1580 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1666 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1581 av_push (event, newSViv (eiv->klass)); 1667 av_push (event, newSViv (eiv->klass));
1582 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1668 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1583 newCONSTSUB (stash, (char *)eiv->name, newSViv (eiv->iv)); 1669 newCONSTSUB (stash, (char *)eiv->name, newSViv (eiv->iv));
1584 } 1670 }
1585
1586 //I_EVENT_API (PACKAGE);
1587} 1671}
1588 1672
1589void _init_vars () 1673void _init_vars ()
1590 CODE: 1674 CODE:
1591 cb_global = get_av ("cf::CB_GLOBAL", 1); 1675 cb_global = get_av ("cf::CB_GLOBAL", 1);
1592 cb_object = get_av ("cf::CB_OBJECT", 1); 1676 cb_object = get_av ("cf::CB_OBJECT", 1);
1593 cb_player = get_av ("cf::CB_PLAYER", 1); 1677 cb_player = get_av ("cf::CB_PLAYER", 1);
1678 cb_client = get_av ("cf::CB_CLIENT", 1);
1594 cb_type = get_av ("cf::CB_TYPE" , 1); 1679 cb_type = get_av ("cf::CB_TYPE" , 1);
1595 cb_map = get_av ("cf::CB_MAP" , 1); 1680 cb_map = get_av ("cf::CB_MAP" , 1);
1596 1681
1597void _global_reattach () 1682void _global_reattach ()
1598 CODE: 1683 CODE:
1599{ 1684{
1600 // reattach to all attachable objects in the game. 1685 // reattach to all attachable objects in the game.
1686 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
1687 reattach (*i);
1688
1601 for (player *pl = first_player; pl; pl = pl->next) 1689 for (player *pl = first_player; pl; pl = pl->next)
1602 reattach (pl); 1690 reattach (pl);
1603 1691
1604 for (maptile *map = first_map; map; map = map->next) 1692 for (maptile *map = first_map; map; map = map->next)
1605 reattach (map); 1693 reattach (map);
1606 1694
1607 for (object *op = object::first; op; op = op->next) 1695 for (object *op = object::first; op; op = op->next)
1608 reattach (op); 1696 reattach (op);
1609} 1697}
1610
1611bool
1612add_client_socket (int fd, const char *peername)
1613 1698
1614NV floor (NV x) 1699NV floor (NV x)
1615 1700
1616NV ceil (NV x) 1701NV ceil (NV x)
1617 1702
… …
1719 RETVAL = newSVpv (resist_plus[atnr], 0); 1804 RETVAL = newSVpv (resist_plus[atnr], 0);
1720 else 1805 else
1721 XSRETURN_UNDEF; 1806 XSRETURN_UNDEF;
1722 OUTPUT: RETVAL 1807 OUTPUT: RETVAL
1723 1808
1809MODULE = cf PACKAGE = cf::attachable
1810
1724int 1811int
1725_valid (SV *obj) 1812valid (SV *obj)
1726 CODE: 1813 CODE:
1727 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1814 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1728 OUTPUT: 1815 OUTPUT:
1729 RETVAL 1816 RETVAL
1730 1817
… …
1783 PROTOTYPE: $ 1870 PROTOTYPE: $
1784 PPCODE: 1871 PPCODE:
1785{ 1872{
1786 object *o; 1873 object *o;
1787 for (o = obj->inv; o; o = o->below) 1874 for (o = obj->inv; o; o = o->below)
1788 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o))); 1875 XPUSHs (sv_2mortal (to_sv (o)));
1789} 1876}
1790 1877
1791object *find_best_object_match (object *op, const char *match) 1878object *find_best_object_match (object *op, const char *match)
1792 1879
1793object *find_marked_object (object *op) 1880object *find_marked_object (object *op)
… …
1826 1913
1827void remove (object *op) 1914void remove (object *op)
1828 CODE: 1915 CODE:
1829 op->remove (); 1916 op->remove ();
1830 1917
1831void destroy (object *op, int recursive = 0) 1918void
1832 CODE: 1919object::destroy (int recursive = 0)
1833 op->destroy (recursive);
1834 1920
1835object *cf_object_present_archname_inside (object *op, char *whatstr) 1921object *cf_object_present_archname_inside (object *op, char *whatstr)
1836 1922
1837int cf_object_transfer (object *op, int x, int y, int r = 0, object_ornull *orig = 0) 1923int cf_object_transfer (object *op, int x, int y, int r = 0, object_ornull *orig = 0)
1838 1924
… …
1990base_name (object *op, int plural = op->nrof > 1) 2076base_name (object *op, int plural = op->nrof > 1)
1991 CODE: 2077 CODE:
1992 RETVAL = query_base_name (op, plural); 2078 RETVAL = query_base_name (op, plural);
1993 OUTPUT: RETVAL 2079 OUTPUT: RETVAL
1994 2080
2081object *decrease_ob_nr (object *op, unsigned long i)
2082
1995MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_ 2083MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_
1996 2084
1997player *player (object *op) 2085player *player (object *op)
1998 CODE: 2086 CODE:
1999 RETVAL = op->contr; 2087 RETVAL = op->contr;
… …
2037 2125
2038 2126
2039MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 2127MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2040 2128
2041INCLUDE: $PERL genacc player ../include/player.h | 2129INCLUDE: $PERL genacc player ../include/player.h |
2042
2043char *
2044client (player *pl)
2045 CODE:
2046 RETVAL = pl->socket->client;
2047 OUTPUT:
2048 RETVAL
2049
2050char *
2051host (player *pl)
2052 CODE:
2053 RETVAL = pl->socket->host;
2054 OUTPUT:
2055 RETVAL
2056 2130
2057int invoke (player *pl, int event, ...) 2131int invoke (player *pl, int event, ...)
2058 CODE: 2132 CODE:
2059 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER"); 2133 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
2060 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2134 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2082 OUTPUT: RETVAL 2156 OUTPUT: RETVAL
2083 2157
2084bool 2158bool
2085cell_visible (player *pl, int dx, int dy) 2159cell_visible (player *pl, int dx, int dy)
2086 CODE: 2160 CODE:
2087 RETVAL = FABS (dx) <= pl->socket->mapx / 2 && FABS (dy) <= pl->socket->mapy / 2 2161 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2
2088 && !pl->blocked_los [dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2]; 2162 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2089 OUTPUT: 2163 OUTPUT:
2090 RETVAL 2164 RETVAL
2091 2165
2092void 2166void
2093buggy_mapscroll (player *pl, int value = 1)
2094 CODE:
2095 pl->socket->buggy_mapscroll = value;
2096
2097void
2098send (player *pl, SV *packet) 2167send (player *pl, SV *packet)
2099 CODE: 2168 CODE:
2100{ 2169{
2101 STRLEN len; 2170 STRLEN len;
2102 char *buf = SvPVbyte (packet, len); 2171 char *buf = SvPVbyte (packet, len);
2103 2172
2173 if (pl->ns)
2104 pl->socket->send_packet (buf, len); 2174 pl->ns->send_packet (buf, len);
2105} 2175}
2106 2176
2107int 2177int
2108listening (player *pl, int new_value = -1) 2178listening (player *pl, int new_value = -1)
2109 CODE: 2179 CODE:
… …
2128 if (y) sv_to (y, pl->bed_y); 2198 if (y) sv_to (y, pl->bed_y);
2129 2199
2130void 2200void
2131list () 2201list ()
2132 PPCODE: 2202 PPCODE:
2133{
2134 player *pl;
2135 for (pl = first_player; pl; pl = pl->next) 2203 for (player *pl = first_player; pl; pl = pl->next)
2136 XPUSHs (newSVcfapi (CFAPI_PPLAYER, pl)); 2204 XPUSHs (sv_2mortal (to_sv (pl)));
2137}
2138 2205
2139bool 2206bool
2140peaceful (player *pl, bool new_setting = 0) 2207peaceful (player *pl, bool new_setting = 0)
2141 PROTOTYPE: $;$ 2208 PROTOTYPE: $;$
2142 CODE: 2209 CODE:
… …
2390 2457
2391MODULE = cf PACKAGE = cf::settings 2458MODULE = cf PACKAGE = cf::settings
2392 2459
2393INCLUDE: $PERL genacc Settings ../include/global.h | 2460INCLUDE: $PERL genacc Settings ../include/global.h |
2394 2461
2395MODULE = cf PACKAGE = cf::client_socket 2462MODULE = cf PACKAGE = cf::client
2396 2463
2397INCLUDE: $PERL genacc client_socket ../include/newserver.h | 2464INCLUDE: $PERL genacc client ../include/client.h |
2398 2465
2399int invoke (client_socket *ns, int event, ...) 2466int invoke (client *ns, int event, ...)
2400 CODE: 2467 CODE:
2401 if (KLASS_OF (event) != KLASS_SOCKET) croak ("event class must be SOCKET"); 2468 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
2402 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2469 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
2403 for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i))); 2470 for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
2404 RETVAL = INVOKE_((event_type)event, ARG_SOCKET (ns), ARG_AV (av)); 2471 RETVAL = INVOKE_((event_type)event, ARG_CLIENT (ns), ARG_AV (av));
2405 OUTPUT: RETVAL 2472 OUTPUT: RETVAL
2406 2473
2407SV *registry (client_socket *ns) 2474SV *registry (client *ns)
2408 2475
2476void
2477list ()
2478 PPCODE:
2479 EXTEND (SP, clients.size ());
2480 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
2481 PUSHs (sv_2mortal (to_sv (*i)));
2482
2483client *
2484create (int fd, const char *peername)
2485 CODE:
2486 RETVAL = client::create (fd, peername);
2487 OUTPUT:
2488 RETVAL
2489
2490void
2491client::send_packet (SV *packet)
2492 CODE:
2493{
2494 STRLEN len;
2495 char *buf = SvPVbyte (packet, len);
2496
2497 THIS->send_packet (buf, len);
2498}
2499
2500void
2501client::destroy ()
2502

Diff Legend

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