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.83 by root, Fri Dec 15 19:29:18 2006 UTC vs.
Revision 1.94 by elmex, Wed Dec 20 14:11:42 2006 UTC

… …
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;
… …
1060 1060
1061///////////////////////////////////////////////////////////////////////////// 1061/////////////////////////////////////////////////////////////////////////////
1062 1062
1063struct EventAPI *watcher_base::GEventAPI; 1063struct EventAPI *watcher_base::GEventAPI;
1064 1064
1065static void iw_dispatch (pe_event *ev)
1066{
1067 iw *w = (iw *)ev->ext_data;
1068 w->call (*w);
1069}
1070
1071void
1072iw::alloc ()
1073{
1074 pe = GEventAPI->new_idle (0, 0);
1075
1076 pe->base.callback = (void *)iw_dispatch;
1077 pe->base.ext_data = (void *)this;
1078}
1079
1065static void iow_dispatch (pe_event *ev) 1080static void iow_dispatch (pe_event *ev)
1066{ 1081{
1067 iow *w = (iow *)ev->ext_data; 1082 iow *w = (iow *)ev->ext_data;
1068 w->call (*w, ((pe_ioevent *)ev)->got); 1083 w->call (*w, ((pe_ioevent *)ev)->got);
1069} 1084}
… …
1078 1093
1079 pe->fd = -1; 1094 pe->fd = -1;
1080 pe->poll = 0; 1095 pe->poll = 0;
1081} 1096}
1082 1097
1083iow & 1098void
1084iow::fd (int fd) 1099iow::fd (int fd)
1085{ 1100{
1086 pe->fd = fd; 1101 pe->fd = fd;
1087
1088 return *this;
1089} 1102}
1090 1103
1091int 1104int
1092iow::poll () 1105iow::poll ()
1093{ 1106{
1094 return pe->poll; 1107 return pe->poll;
1095} 1108}
1096 1109
1097iow & 1110void
1098iow::poll (int events) 1111iow::poll (int events)
1099{ 1112{
1100 if (pe->poll != events) 1113 if (pe->poll != events)
1101 { 1114 {
1102 if (pe->poll) stop (); 1115 if (pe->poll) stop ();
1103 pe->poll = events; 1116 pe->poll = events;
1104 if (pe->poll) start (); 1117 if (pe->poll) start ();
1105 } 1118 }
1106
1107 return *this;
1108} 1119}
1109 1120
1110MODULE = cf PACKAGE = cf PREFIX = cf_ 1121MODULE = cf PACKAGE = cf PREFIX = cf_
1111 1122
1112BOOT: 1123BOOT:
… …
1136 const_iv (POTION) 1147 const_iv (POTION)
1137 const_iv (FOOD) 1148 const_iv (FOOD)
1138 const_iv (POISON) 1149 const_iv (POISON)
1139 const_iv (BOOK) 1150 const_iv (BOOK)
1140 const_iv (CLOCK) 1151 const_iv (CLOCK)
1141 const_iv (LIGHTNING)
1142 const_iv (ARROW) 1152 const_iv (ARROW)
1143 const_iv (BOW) 1153 const_iv (BOW)
1144 const_iv (WEAPON) 1154 const_iv (WEAPON)
1145 const_iv (ARMOUR) 1155 const_iv (ARMOUR)
1146 const_iv (PEDESTAL) 1156 const_iv (PEDESTAL)
… …
1166 const_iv (AMULET) 1176 const_iv (AMULET)
1167 const_iv (PLAYERMOVER) 1177 const_iv (PLAYERMOVER)
1168 const_iv (TELEPORTER) 1178 const_iv (TELEPORTER)
1169 const_iv (CREATOR) 1179 const_iv (CREATOR)
1170 const_iv (SKILL) 1180 const_iv (SKILL)
1171 const_iv (EXPERIENCE)
1172 const_iv (EARTHWALL) 1181 const_iv (EARTHWALL)
1173 const_iv (GOLEM) 1182 const_iv (GOLEM)
1174 const_iv (THROWN_OBJ) 1183 const_iv (THROWN_OBJ)
1175 const_iv (BLINDNESS) 1184 const_iv (BLINDNESS)
1176 const_iv (GOD) 1185 const_iv (GOD)
… …
1196 const_iv (FLOOR) 1205 const_iv (FLOOR)
1197 const_iv (FLESH) 1206 const_iv (FLESH)
1198 const_iv (INORGANIC) 1207 const_iv (INORGANIC)
1199 const_iv (SKILL_TOOL) 1208 const_iv (SKILL_TOOL)
1200 const_iv (LIGHTER) 1209 const_iv (LIGHTER)
1201 const_iv (TRAP_PART)
1202 const_iv (WALL) 1210 const_iv (BUILDABLE_WALL)
1203 const_iv (LIGHT_SOURCE)
1204 const_iv (MISC_OBJECT) 1211 const_iv (MISC_OBJECT)
1205 const_iv (MONSTER)
1206 const_iv (SPAWN_GENERATOR)
1207 const_iv (LAMP) 1212 const_iv (LAMP)
1208 const_iv (DUPLICATOR) 1213 const_iv (DUPLICATOR)
1209 const_iv (TOOL) 1214 const_iv (TOOL)
1210 const_iv (SPELLBOOK) 1215 const_iv (SPELLBOOK)
1211 const_iv (BUILDFAC) 1216 const_iv (BUILDFAC)
… …
1223 const_iv (SPELL_EFFECT) 1228 const_iv (SPELL_EFFECT)
1224 const_iv (CONVERTER) 1229 const_iv (CONVERTER)
1225 const_iv (BRACERS) 1230 const_iv (BRACERS)
1226 const_iv (POISONING) 1231 const_iv (POISONING)
1227 const_iv (SAVEBED) 1232 const_iv (SAVEBED)
1228 const_iv (POISONCLOUD)
1229 const_iv (FIREHOLES)
1230 const_iv (WAND) 1233 const_iv (WAND)
1231 const_iv (SCROLL) 1234 const_iv (SCROLL)
1232 const_iv (DIRECTOR) 1235 const_iv (DIRECTOR)
1233 const_iv (GIRDLE) 1236 const_iv (GIRDLE)
1234 const_iv (FORCE) 1237 const_iv (FORCE)
… …
1249 const_iv (DISEASE) 1252 const_iv (DISEASE)
1250 const_iv (SYMPTOM) 1253 const_iv (SYMPTOM)
1251 const_iv (BUILDER) 1254 const_iv (BUILDER)
1252 const_iv (MATERIAL) 1255 const_iv (MATERIAL)
1253 const_iv (ITEM_TRANSFORMER) 1256 const_iv (ITEM_TRANSFORMER)
1254 const_iv (QUEST)
1255 1257
1256 const_iv (NUM_SUBTYPES) 1258 const_iv (NUM_SUBTYPES)
1257 1259
1258 const_iv (ST_BD_BUILD) 1260 const_iv (ST_BD_BUILD)
1259 const_iv (ST_BD_REMOVE) 1261 const_iv (ST_BD_REMOVE)
… …
1312 const_iv (FLAG_MONSTER) 1314 const_iv (FLAG_MONSTER)
1313 const_iv (FLAG_FRIENDLY) 1315 const_iv (FLAG_FRIENDLY)
1314 const_iv (FLAG_GENERATOR) 1316 const_iv (FLAG_GENERATOR)
1315 const_iv (FLAG_IS_THROWN) 1317 const_iv (FLAG_IS_THROWN)
1316 const_iv (FLAG_AUTO_APPLY) 1318 const_iv (FLAG_AUTO_APPLY)
1317 const_iv (FLAG_TREASURE)
1318 const_iv (FLAG_PLAYER_SOLD) 1319 const_iv (FLAG_PLAYER_SOLD)
1319 const_iv (FLAG_SEE_INVISIBLE) 1320 const_iv (FLAG_SEE_INVISIBLE)
1320 const_iv (FLAG_CAN_ROLL) 1321 const_iv (FLAG_CAN_ROLL)
1321 const_iv (FLAG_OVERLAY_FLOOR) 1322 const_iv (FLAG_OVERLAY_FLOOR)
1322 const_iv (FLAG_IS_TURNABLE) 1323 const_iv (FLAG_IS_TURNABLE)
… …
1445 const_iv (F_BUY) 1446 const_iv (F_BUY)
1446 const_iv (F_SHOP) 1447 const_iv (F_SHOP)
1447 const_iv (F_SELL) 1448 const_iv (F_SELL)
1448 1449
1449 const_iv (P_BLOCKSVIEW) 1450 const_iv (P_BLOCKSVIEW)
1451 const_iv (P_PLAYER)
1450 const_iv (P_NO_MAGIC) 1452 const_iv (P_NO_MAGIC)
1451 const_iv (P_IS_ALIVE) 1453 const_iv (P_IS_ALIVE)
1452 const_iv (P_NO_CLERIC) 1454 const_iv (P_NO_CLERIC)
1453 const_iv (P_NEED_UPDATE) 1455 const_iv (P_NEED_UPDATE)
1454 const_iv (P_NO_ERROR)
1455 const_iv (P_OUT_OF_MAP) 1456 const_iv (P_OUT_OF_MAP)
1456 const_iv (P_NEW_MAP) 1457 const_iv (P_NEW_MAP)
1457 1458
1458 const_iv (UP_OBJ_INSERT) 1459 const_iv (UP_OBJ_INSERT)
1459 const_iv (UP_OBJ_REMOVE) 1460 const_iv (UP_OBJ_REMOVE)
… …
1658 for (object *op = object::first; op; op = op->next) 1659 for (object *op = object::first; op; op = op->next)
1659 reattach (op); 1660 reattach (op);
1660} 1661}
1661 1662
1662bool 1663bool
1663add_client_socket (int fd, const char *peername) 1664add_client (int fd, const char *peername)
1664 1665
1665NV floor (NV x) 1666NV floor (NV x)
1666 1667
1667NV ceil (NV x) 1668NV ceil (NV x)
1668 1669
… …
1877 1878
1878void remove (object *op) 1879void remove (object *op)
1879 CODE: 1880 CODE:
1880 op->remove (); 1881 op->remove ();
1881 1882
1882void destroy (object *op, int recursive = 0) 1883void
1883 CODE: 1884object::destroy (int recursive = 0)
1884 op->destroy (recursive);
1885 1885
1886object *cf_object_present_archname_inside (object *op, char *whatstr) 1886object *cf_object_present_archname_inside (object *op, char *whatstr)
1887 1887
1888int cf_object_transfer (object *op, int x, int y, int r = 0, object_ornull *orig = 0) 1888int cf_object_transfer (object *op, int x, int y, int r = 0, object_ornull *orig = 0)
1889 1889
… …
2040const char * 2040const char *
2041base_name (object *op, int plural = op->nrof > 1) 2041base_name (object *op, int plural = op->nrof > 1)
2042 CODE: 2042 CODE:
2043 RETVAL = query_base_name (op, plural); 2043 RETVAL = query_base_name (op, plural);
2044 OUTPUT: RETVAL 2044 OUTPUT: RETVAL
2045
2046object *decrease_ob_nr (object *op, unsigned long i)
2045 2047
2046MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_ 2048MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_
2047 2049
2048player *player (object *op) 2050player *player (object *op)
2049 CODE: 2051 CODE:
… …
2422 2424
2423MODULE = cf PACKAGE = cf::settings 2425MODULE = cf PACKAGE = cf::settings
2424 2426
2425INCLUDE: $PERL genacc Settings ../include/global.h | 2427INCLUDE: $PERL genacc Settings ../include/global.h |
2426 2428
2427MODULE = cf PACKAGE = cf::client_socket 2429MODULE = cf PACKAGE = cf::client
2428 2430
2429INCLUDE: $PERL genacc client_socket ../include/newserver.h | 2431INCLUDE: $PERL genacc client ../include/client.h |
2430 2432
2431int invoke (client_socket *ns, int event, ...) 2433int invoke (client *ns, int event, ...)
2432 CODE: 2434 CODE:
2433 if (KLASS_OF (event) != KLASS_SOCKET) croak ("event class must be SOCKET"); 2435 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
2434 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2436 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
2435 for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i))); 2437 for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
2436 RETVAL = INVOKE_((event_type)event, ARG_SOCKET (ns), ARG_AV (av)); 2438 RETVAL = INVOKE_((event_type)event, ARG_CLIENT (ns), ARG_AV (av));
2437 OUTPUT: RETVAL 2439 OUTPUT: RETVAL
2438 2440
2439SV *registry (client_socket *ns) 2441SV *registry (client *ns)
2440 2442
2443void
2444client::destroy ()
2445

Diff Legend

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