ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/plugins/cfperl/cfperl.xs
(Generate patch)

Comparing deliantra/server/plugins/cfperl/cfperl.xs (file contents):
Revision 1.17 by root, Wed Feb 8 05:22:41 2006 UTC vs.
Revision 1.28 by root, Mon Mar 6 22:59:26 2006 UTC

29#include <XSUB.h> 29#include <XSUB.h>
30 30
31#undef save_long // clashes with libproto.h 31#undef save_long // clashes with libproto.h
32 32
33#define PLUGIN_NAME "perl" 33#define PLUGIN_NAME "perl"
34#define PLUGIN_VERSION "cfperl 0.0" 34#define PLUGIN_VERSION "cfperl 0.2"
35 35
36#ifndef __CEXTRACT__ 36#ifndef __CEXTRACT__
37#include <plugin.h> 37#include <plugin.h>
38#endif 38#endif
39 39
46#include <plugin_common.h> 46#include <plugin_common.h>
47 47
48#include <stdarg.h> 48#include <stdarg.h>
49 49
50#include "perlxsi.c" 50#include "perlxsi.c"
51
52typedef object object_ornull;
53typedef mapstruct mapstruct_ornull;
51 54
52static f_plug_api gethook; 55static f_plug_api gethook;
53static f_plug_api registerGlobalEvent; 56static f_plug_api registerGlobalEvent;
54static f_plug_api unregisterGlobalEvent; 57static f_plug_api unregisterGlobalEvent;
55static f_plug_api systemDirectory; 58static f_plug_api systemDirectory;
56static f_plug_api object_set_property; 59static f_plug_api object_set_property;
57static f_plug_api map_get_map; 60static f_plug_api map_get_map;
61static f_plug_api object_insert;
58 62
63/* this is a stupid way to do things, and awkward to use for plug-in authors */
59typedef struct 64typedef struct
60{ 65{
61 object* who; 66 object* who;
62 object* activator; 67 object* activator;
63 object* third; 68 object* third;
69 mapstruct* map;
64 char message[1024]; 70 char message[1024];
65 int fix; 71 int fix; // seems to be python-only, and should not be part of the API
66 int event_code; 72 int event_code;
67 char extension[1024]; // name field, should invoke specific perl extension 73 char extension[1024]; // name field, should invoke specific perl extension
68 char options[1024]; // slaying field of event_connectors 74 char options[1024]; // slaying field of event_connectors
69 int returnvalue; 75 int returnvalue;
70} CFPContext; 76} CFPContext;
71 77
72//static int current_command = -999;
73
74static HV *obj_cache; 78static HV *obj_cache;
75static PerlInterpreter *perl; 79static PerlInterpreter *perl;
76 80
77////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 81//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
78 82
80// all objects no longer referenced and empty are 84// all objects no longer referenced and empty are
81// eligible for destruction. 85// eligible for destruction.
82void 86void
83clean_obj_cache () 87clean_obj_cache ()
84{ 88{
85 return; //D // killing neko-san gives me an unreferenced scalar 89 static int count;
90
91 if (++count & 7)
92 return;
93
86 int todo = 10; 94 int todo = 1000;
87 do 95 do
88 { 96 {
89 I32 klen; 97 I32 klen;
90 char *key; 98 char *key;
91 HE *he = hv_iternext (obj_cache); 99 HE *he = hv_iternext (obj_cache);
92 100
93 if (he) 101 if (he)
94 { 102 {
95 SV *sv = hv_iterval (obj_cache, he); 103 SV *sv = hv_iterval (obj_cache, he);
96 104
97 // emopty and unreferened? nuke it 105 // empty and unreferenced? nuke it
98 if (SvREFCNT (sv) == 1 && SvREFCNT (SvRV (sv)) == 1 && !HvFILL ((HV *)(SvRV (sv)))) 106 if (SvREFCNT (sv) == 1 && SvREFCNT (SvRV (sv)) == 1 && !HvFILL ((HV *)(SvRV (sv))))
99 { 107 {
100 hv_delete (obj_cache, HeKEY (he), HeKLEN (he), G_DISCARD); 108 hv_delete (obj_cache, HeKEY (he), HeKLEN (he), G_DISCARD);
101 todo++; 109 todo++;
102 } 110 }
108} 116}
109 117
110static SV * 118static SV *
111newSVptr (void *ptr, const char *klass) 119newSVptr (void *ptr, const char *klass)
112{ 120{
121 SV *sv;
122
113 if (!ptr) 123 if (!ptr)
114 return &PL_sv_undef; 124 return &PL_sv_undef;
115 125
116 HV *hv = newHV (); 126 sv = newSV (0);
117 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 127 sv_magic (sv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
118 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 128 return sv_bless (newRV_noinc (sv), gv_stashpv (klass, 1));
129}
130
131static SV *
132SVptr_cached (void *ptr)
133{
134 SV **he = hv_fetch (obj_cache, (char *)&ptr, sizeof (ptr), 0);
135
136 return he ? *he : 0;
119} 137}
120 138
121static SV * 139static SV *
122newSVptr_cached (void *ptr, const char *klass) 140newSVptr_cached (void *ptr, const char *klass)
123{ 141{
124 SV *sv, **he; 142 SV *sv;
125 143
126 if (!ptr) 144 if (!ptr)
127 return &PL_sv_undef; 145 return &PL_sv_undef;
128 146
129 he = hv_fetch (obj_cache, (char *)&ptr, sizeof (ptr), 0); 147 sv = SVptr_cached (ptr);
130 148
131 if (he) 149 if (!sv)
132 sv = *he;
133 else
134 { 150 {
135 return sv; //D 151 HV *hv = newHV ();
136 sv = newSVptr (ptr, klass); 152 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
153 sv = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
137 hv_store (obj_cache, (char *)&ptr, sizeof (ptr), sv, 0); 154 hv_store (obj_cache, (char *)&ptr, sizeof (ptr), sv, 0);
138 } 155 }
139 156
140 return newSVsv (sv); 157 return newSVsv (sv);
141} 158}
162 croak ("perl code used %s object, but C object is already destroyed, caught", klass); 179 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
163 180
164 return (long)mg->mg_ptr; 181 return (long)mg->mg_ptr;
165} 182}
166 183
184static long
185SvPTR_ornull (SV *sv, const char *klass)
186{
187 if (SvOK (sv))
188 return SvPTR (sv, klass);
189 else
190 return 0;
191}
192
167SV * 193SV *
168newSVcfapi (int type, ...) 194newSVcfapi (int type, ...)
169{ 195{
170 SV *sv; 196 SV *sv;
171 197
172 va_list args; 198 va_list args;
173 va_start (args, type); 199 va_start (args, type);
174 200
175 switch (type) 201 switch (type)
176 { 202 {
203#if 0
204 case CFAPI_INT16:
205 sv = newSViv (*va_arg (args, sint16_t *));
206 break;
207#endif
208
177 case CFAPI_INT: 209 case CFAPI_INT:
178 sv = newSViv (*va_arg (args, int *)); 210 sv = newSViv (*va_arg (args, int *));
179 break; 211 break;
180 212
181 case CFAPI_LONG: 213 case CFAPI_LONG:
261 HV *hv = newHV (); 293 HV *hv = newHV ();
262#define hv_context(type,addr,expr) hv_store (hv, #expr, sizeof (#expr) - 1, newSVcfapi (type, addr context->expr), 0) 294#define hv_context(type,addr,expr) hv_store (hv, #expr, sizeof (#expr) - 1, newSVcfapi (type, addr context->expr), 0)
263 hv_context (CFAPI_POBJECT, ,who); 295 hv_context (CFAPI_POBJECT, ,who);
264 hv_context (CFAPI_POBJECT, ,activator); 296 hv_context (CFAPI_POBJECT, ,activator);
265 hv_context (CFAPI_POBJECT, ,third); 297 hv_context (CFAPI_POBJECT, ,third);
298 hv_context (CFAPI_PMAP, ,map);
266 hv_context (CFAPI_STRING , ,message); 299 hv_context (CFAPI_STRING , ,message);
267 hv_context (CFAPI_INT ,&,fix); 300 hv_context (CFAPI_INT ,&,fix);
268 hv_context (CFAPI_INT ,&,event_code); 301 hv_context (CFAPI_INT ,&,event_code);
269 hv_context (CFAPI_STRING , ,options); 302 hv_context (CFAPI_STRING , ,options);
270 hv_context (CFAPI_STRING , ,extension); 303 hv_context (CFAPI_STRING , ,extension);
391 registerGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_register_global_event"); 424 registerGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_register_global_event");
392 unregisterGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_unregister_global_event"); 425 unregisterGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_unregister_global_event");
393 systemDirectory = gethook (&rtype, hooktype, "cfapi_system_directory"); 426 systemDirectory = gethook (&rtype, hooktype, "cfapi_system_directory");
394 object_set_property = gethook (&rtype, hooktype, "cfapi_object_set_property"); 427 object_set_property = gethook (&rtype, hooktype, "cfapi_object_set_property");
395 map_get_map = gethook (&rtype, hooktype, "cfapi_map_get_map"); 428 map_get_map = gethook (&rtype, hooktype, "cfapi_map_get_map");
429 object_insert = gethook (&rtype, hooktype, "cfapi_object_insert");
396 430
397 cf_init_plugin (gethook); 431 cf_init_plugin (gethook);
398 432
399 /* Pick the global events you want to monitor from this plugin */ 433 /* Pick the global events you want to monitor from this plugin */
400 registerGlobalEvent (NULL, EVENT_BORN, PLUGIN_NAME, globalEventListener); 434 registerGlobalEvent (NULL, EVENT_BORN, PLUGIN_NAME, globalEventListener);
405 registerGlobalEvent (NULL, EVENT_LOGIN, PLUGIN_NAME, globalEventListener); 439 registerGlobalEvent (NULL, EVENT_LOGIN, PLUGIN_NAME, globalEventListener);
406 registerGlobalEvent (NULL, EVENT_LOGOUT, PLUGIN_NAME, globalEventListener); 440 registerGlobalEvent (NULL, EVENT_LOGOUT, PLUGIN_NAME, globalEventListener);
407 registerGlobalEvent (NULL, EVENT_MAPENTER, PLUGIN_NAME, globalEventListener); 441 registerGlobalEvent (NULL, EVENT_MAPENTER, PLUGIN_NAME, globalEventListener);
408 registerGlobalEvent (NULL, EVENT_MAPLEAVE, PLUGIN_NAME, globalEventListener); 442 registerGlobalEvent (NULL, EVENT_MAPLEAVE, PLUGIN_NAME, globalEventListener);
409 registerGlobalEvent (NULL, EVENT_MAPRESET, PLUGIN_NAME, globalEventListener); 443 registerGlobalEvent (NULL, EVENT_MAPRESET, PLUGIN_NAME, globalEventListener);
444 registerGlobalEvent (NULL, EVENT_MAPLOAD, PLUGIN_NAME, globalEventListener);
445 registerGlobalEvent (NULL, EVENT_MAPOUT, PLUGIN_NAME, globalEventListener);
446 registerGlobalEvent (NULL, EVENT_MAPIN, PLUGIN_NAME, globalEventListener);
410 registerGlobalEvent (NULL, EVENT_REMOVE, PLUGIN_NAME, globalEventListener); 447 registerGlobalEvent (NULL, EVENT_REMOVE, PLUGIN_NAME, globalEventListener);
411 registerGlobalEvent (NULL, EVENT_SHOUT, PLUGIN_NAME, globalEventListener); 448 registerGlobalEvent (NULL, EVENT_SHOUT, PLUGIN_NAME, globalEventListener);
412 registerGlobalEvent (NULL, EVENT_TELL, PLUGIN_NAME, globalEventListener); 449 registerGlobalEvent (NULL, EVENT_TELL, PLUGIN_NAME, globalEventListener);
413 registerGlobalEvent (NULL, EVENT_MUZZLE, PLUGIN_NAME, globalEventListener); 450 registerGlobalEvent (NULL, EVENT_MUZZLE, PLUGIN_NAME, globalEventListener);
414 registerGlobalEvent (NULL, EVENT_KICK, PLUGIN_NAME, globalEventListener); 451 registerGlobalEvent (NULL, EVENT_KICK, PLUGIN_NAME, globalEventListener);
466 { 503 {
467 case EVENT_CRASH: 504 case EVENT_CRASH:
468 printf ("Unimplemented for now\n"); 505 printf ("Unimplemented for now\n");
469 break; 506 break;
470 507
508 case EVENT_MAPLOAD:
509 case EVENT_MAPOUT:
510 case EVENT_MAPIN:
511 context.map = va_arg (args, mapstruct *);
512 break;
513
471 case EVENT_MAPENTER: 514 case EVENT_MAPENTER:
472 case EVENT_MAPLEAVE: 515 case EVENT_MAPLEAVE:
473 case EVENT_FREE_OB: 516 case EVENT_FREE_OB:
474 case EVENT_BORN: 517 case EVENT_BORN:
475 case EVENT_REMOVE: 518 case EVENT_REMOVE:
509 552
510 case EVENT_TELL: 553 case EVENT_TELL:
511 break; 554 break;
512 555
513 case EVENT_MAPRESET: 556 case EVENT_MAPRESET:
557 /* stupid, should be the map itself, not "message"??? */
514 buf = va_arg (args, char *); 558 buf = va_arg (args, char *);
515 if (buf != 0) 559 if (buf != 0)
516 strncpy (context.message, buf, sizeof (context.message)); 560 strncpy (context.message, buf, sizeof (context.message));
517 break; 561 break;
518 } 562 }
519 563
520 va_end (args); 564 va_end (args);
521 565
522 if (context.event_code == EVENT_FREE_OB) 566 if (context.event_code == EVENT_FREE_OB)
523 { 567 {
524 SV *sv = hv_delete (obj_cache, (char *)&context.activator, sizeof (object *), 0); 568 SV *sv = hv_delete (obj_cache, (char *)&context.activator, sizeof (void *), 0);
525 569
526 if (sv) 570 if (sv)
527 {
528 clearSVptr (sv); 571 clearSVptr (sv);
529 SvREFCNT_dec (sv);
530 }
531 } 572 }
532 else 573 else
533 inject_event ("cf::inject_global_event", &context); 574 inject_event ("cf::inject_global_event", &context);
534 575
535 rv = context.returnvalue; 576 rv = context.returnvalue;
732 const_iv (ST_BD_REMOVE) 773 const_iv (ST_BD_REMOVE)
733 const_iv (ST_MAT_FLOOR) 774 const_iv (ST_MAT_FLOOR)
734 const_iv (ST_MAT_WALL) 775 const_iv (ST_MAT_WALL)
735 const_iv (ST_MAT_ITEM) 776 const_iv (ST_MAT_ITEM)
736 777
778 const_iv (AT_PHYSICAL)
779 const_iv (AT_MAGIC)
780 const_iv (AT_FIRE)
781 const_iv (AT_ELECTRICITY)
782 const_iv (AT_COLD)
783 const_iv (AT_CONFUSION)
784 const_iv (AT_ACID)
785 const_iv (AT_DRAIN)
786 const_iv (AT_WEAPONMAGIC)
787 const_iv (AT_GHOSTHIT)
788 const_iv (AT_POISON)
789 const_iv (AT_SLOW)
790 const_iv (AT_PARALYZE)
791 const_iv (AT_TURN_UNDEAD)
792 const_iv (AT_FEAR)
793 const_iv (AT_CANCELLATION)
794 const_iv (AT_DEPLETE)
795 const_iv (AT_DEATH)
796 const_iv (AT_CHAOS)
797 const_iv (AT_COUNTERSPELL)
798 const_iv (AT_GODPOWER)
799 const_iv (AT_HOLYWORD)
800 const_iv (AT_BLIND)
801 const_iv (AT_INTERNAL)
802 const_iv (AT_LIFE_STEALING)
803 const_iv (AT_DISEASE)
804
737 const_iv (QUEST_IN_PROGRESS) 805 const_iv (QUEST_IN_PROGRESS)
738 const_iv (QUEST_DONE_QUEST) 806 const_iv (QUEST_DONE_QUEST)
739 const_iv (QUEST_DONE_TASK) 807 const_iv (QUEST_DONE_TASK)
740 const_iv (QUEST_START_QUEST) 808 const_iv (QUEST_START_QUEST)
741 const_iv (QUEST_END_QUEST) 809 const_iv (QUEST_END_QUEST)
943 const_event (LOGIN) 1011 const_event (LOGIN)
944 const_event (LOGOUT) 1012 const_event (LOGOUT)
945 const_event (MAPENTER) 1013 const_event (MAPENTER)
946 const_event (MAPLEAVE) 1014 const_event (MAPLEAVE)
947 const_event (MAPRESET) 1015 const_event (MAPRESET)
1016 const_event (MAPLOAD)
1017 const_event (MAPOUT)
1018 const_event (MAPIN)
948 const_event (REMOVE) 1019 const_event (REMOVE)
949 const_event (SHOUT) 1020 const_event (SHOUT)
950 const_event (TELL) 1021 const_event (TELL)
951 const_event (MUZZLE) 1022 const_event (MUZZLE)
952 const_event (KICK) 1023 const_event (KICK)
1152 int unused_type; 1223 int unused_type;
1153 object_set_property (&unused_type, obj, idx, (double)SvNV (newval)); 1224 object_set_property (&unused_type, obj, idx, (double)SvNV (newval));
1154 } 1225 }
1155 break; 1226 break;
1156 case CFAPI_STRING: 1227 case CFAPI_STRING:
1157 cf_object_set_string_property (obj, idx, SvPV_nolen (newval)); 1228 cf_object_set_string_property (obj, idx, SvOK (newval) ? SvPV_nolen (newval) : 0);
1229 break;
1230 case CFAPI_POBJECT:
1231 {
1232 int unused_type;
1233 object_set_property (&unused_type, obj, idx, (object *)SvPTR_ornull (newval, "cf::object"));
1234 }
1158 break; 1235 break;
1159 default: 1236 default:
1160 croak ("unhandled type '%d' in set_property '%d'", type, idx); 1237 croak ("unhandled type '%d' in set_property '%d'", type, idx);
1161 } 1238 }
1162 1239
1240# missing properties
1241
1242void
1243set_attacktype (object *obj, U32 attacktype)
1244 CODE:
1245 obj->attacktype = attacktype;
1246
1247U32
1248get_attacktype (object *obj)
1249 ALIAS:
1250 attacktype = 0
1251 CODE:
1252 RETVAL = obj->attacktype;
1253 OUTPUT: RETVAL
1254
1255void
1256set_food (object *obj, int food)
1257 CODE:
1258 obj->stats.food = food;
1259
1260int
1261get_food (object *obj)
1262 ALIAS:
1263 food = 0
1264 CODE:
1265 RETVAL = obj->stats.food;
1266 OUTPUT: RETVAL
1267
1163void 1268void
1164inv (object *obj) 1269inv (object *obj)
1165 PROTOTYPE: $ 1270 PROTOTYPE: $
1166 PPCODE: 1271 PPCODE:
1167{ 1272{
1176int cf_object_get_flag (object *op, int flag) 1281int cf_object_get_flag (object *op, int flag)
1177 ALIAS: flag = 0 1282 ALIAS: flag = 0
1178 1283
1179void cf_object_set_flag (object *op, int flag, int value) 1284void cf_object_set_flag (object *op, int flag, int value)
1180 1285
1181void cf_object_move (object *op, int dir, object *originator) 1286void cf_object_move (object *op, int dir, object *originator = op)
1182 1287
1183void cf_object_apply (object *op, object *author, int flags = 0) 1288void cf_object_apply (object *op, object *author, int flags = 0)
1184 1289
1185void cf_object_apply_below (object *op) 1290void cf_object_apply_below (object *op)
1186 1291
1192 1297
1193int cf_object_transfer (object *op, int x, int y, int r, object *orig) 1298int cf_object_transfer (object *op, int x, int y, int r, object *orig)
1194 1299
1195int cf_object_change_map (object *op, int x, int y, mapstruct *map) 1300int cf_object_change_map (object *op, int x, int y, mapstruct *map)
1196 1301
1197object *cf_object_clone (object *op, int clonetype) 1302object *cf_object_clone (object *op, int clonetype = 0)
1198 1303
1199int cf_object_pay_item (object *op, object *buyer) 1304int cf_object_pay_item (object *op, object *buyer)
1200 1305
1201int cf_object_pay_amount (object *op, double amount) 1306int cf_object_pay_amount (object *op, double amount)
1202 1307
1203int cf_object_cast_spell (object *caster, object *ctoo, int dir, object *sp_, char *flags) 1308int cf_object_cast_spell (object *caster, object *ctoo, int dir, object *spell_ob, char *stringarg = 0)
1204 1309
1205int cf_object_cast_ability (object *caster, object *ctoo, int dir, object *sp_, char *flags) 1310int cf_object_cast_ability (object *caster, object *ctoo, int dir, object *sp_, char *stringarg = 0)
1206 1311
1207void cf_object_learn_spell (object *op, object *sp) 1312void cf_object_learn_spell (object *op, object *sp)
1208 1313
1209void cf_object_forget_spell (object *op, object *sp) 1314void cf_object_forget_spell (object *op, object *sp)
1210 1315
1246char *cf_object_get_key (object *op, char *keyname) 1351char *cf_object_get_key (object *op, char *keyname)
1247 ALIAS: key = 0 1352 ALIAS: key = 0
1248 1353
1249void cf_object_set_key (object *op, char *keyname, char *value) 1354void cf_object_set_key (object *op, char *keyname, char *value)
1250 1355
1251char * 1356object *cf_create_object_by_name (const char *name)
1252base_name (object *ob, int plural) 1357
1358MODULE = cf PACKAGE = cf::object PREFIX = cf_
1359
1360void cf_fix_object (object *pl)
1361 ALIAS: fix = 0
1362
1363object *cf_insert_ob_in_ob (object *ob, object *where)
1364
1365# no clean way to get an object from an archetype - stupid idiotic
1366# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
1367
1368object *new (const char *archetype = 0)
1369 PROTOTYPE: ;$
1253 CODE: 1370 CODE:
1254 RETVAL = cf_query_base_name (ob, plural); 1371 RETVAL = archetype ? get_archetype (archetype) : cf_create_object ();
1255 OUTPUT: RETVAL
1256
1257MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
1258
1259object *cf_create_object_by_name (const char *name = 0)
1260 PROTOTYPE: ;$
1261 ALIAS:
1262 create_object = 0
1263 new = 0
1264 CODE:
1265 RETVAL = name ? cf_create_object_by_name (name) : cf_create_object ();
1266 OUTPUT: 1372 OUTPUT:
1267 RETVAL 1373 RETVAL
1268 1374
1269void cf_fix_object (object *pl) 1375object *insert_ob_in_map_at (object *ob, mapstruct *where, object_ornull *orig, int flag, int x, int y)
1270 ALIAS: fix = 0 1376 PROTOTYPE: $$$$$$
1271 1377 CODE:
1272object *cf_insert_ob_in_ob (object *ob, object *where) 1378{
1379 int unused_type;
1380 RETVAL = (object *)object_insert (&unused_type, ob, 0, where, orig, flag, x, y);
1381}
1273 1382
1274object *get_nearest_player (object *ob) 1383object *get_nearest_player (object *ob)
1275 ALIAS: nearest_player = 0 1384 ALIAS: nearest_player = 0
1385 PREINIT:
1386 extern object *get_nearest_player (object *);
1276 1387
1277void rangevector (object *ob, object *other, int flags = 0) 1388void rangevector (object *ob, object *other, int flags = 0)
1278 PROTOTYPE: $$;$ 1389 PROTOTYPE: $$;$
1279 PPCODE: 1390 PPCODE:
1280{ 1391{
1291bool on_same_map_as (object *ob, object *other) 1402bool on_same_map_as (object *ob, object *other)
1292 CODE: 1403 CODE:
1293 RETVAL = on_same_map (ob, other); 1404 RETVAL = on_same_map (ob, other);
1294 OUTPUT: RETVAL 1405 OUTPUT: RETVAL
1295 1406
1407char *
1408base_name (object *ob, int plural)
1409 CODE:
1410 RETVAL = cf_query_base_name (ob, plural);
1411 OUTPUT: RETVAL
1412
1296 1413
1297MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_ 1414MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_
1298 1415
1299player *player (object *op) 1416player *player (object *op)
1300 CODE: 1417 CODE:
1303 1420
1304void cf_player_message (object *obj, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE) 1421void cf_player_message (object *obj, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE)
1305 1422
1306object *cf_player_send_inventory (object *op) 1423object *cf_player_send_inventory (object *op)
1307 1424
1425player *contr (object *op)
1426 CODE:
1427 RETVAL = op->contr;
1428 OUTPUT: RETVAL
1429
1308char *cf_player_get_ip (object *op) 1430char *cf_player_get_ip (object *op)
1309 ALIAS: ip = 0 1431 ALIAS: ip = 0
1310 1432
1311object *cf_player_get_marked_item (object *op) 1433object *cf_player_get_marked_item (object *op)
1312 ALIAS: marked_item = 0 1434 ALIAS: marked_item = 0
1325 1447
1326player *cf_player_find (char *name) 1448player *cf_player_find (char *name)
1327 PROTOTYPE: $ 1449 PROTOTYPE: $
1328 1450
1329void cf_player_move (player *pl, int dir) 1451void cf_player_move (player *pl, int dir)
1452
1453void MapNewmapCmd (player *pl)
1330 1454
1331# nonstandard 1455# nonstandard
1332object *ob (player *pl) 1456object *ob (player *pl)
1333 CODE: 1457 CODE:
1334 RETVAL = pl->ob; 1458 RETVAL = pl->ob;
1407 INIT: 1531 INIT:
1408 if (x >= MAP_WIDTH (obj) || y >= MAP_HEIGHT (obj)) XSRETURN_EMPTY; 1532 if (x >= MAP_WIDTH (obj) || y >= MAP_HEIGHT (obj)) XSRETURN_EMPTY;
1409 PPCODE: 1533 PPCODE:
1410{ 1534{
1411 object *o; 1535 object *o;
1536
1412 for (o = GET_MAP_OB (obj, x, y); o; o = o->above) 1537 for (o = GET_MAP_OB (obj, x, y); o; o = o->above)
1413 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o))); 1538 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o)));
1414} 1539}
1415 1540
1416SV * 1541SV *
1439 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break; 1564 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;
1440 } 1565 }
1441 OUTPUT: 1566 OUTPUT:
1442 RETVAL 1567 RETVAL
1443 1568
1569void
1570_get_obs (mapstruct *map)
1571 PPCODE:
1572{
1573 object *o;
1574 int x, y;
1575 AV *obs = newAV ();
1576 int nonnull = 0;
1577
1578 for (y = 0; y < MAP_HEIGHT (map); y++)
1579 for (x = 0; x < MAP_WIDTH (map); x++)
1580 {
1581 AV *av = newAV ();
1582
1583 for (o = GET_MAP_OB (map, x, y); o; o = o->above)
1584 {
1585 SV *sv = SVptr_cached (o);
1586
1587 if (sv && HvFILL (SvRV (sv)))
1588 {
1589 nonnull = 1;
1590 sv = newSVsv (sv);
1591 }
1592 else
1593 sv = &PL_sv_undef;
1594
1595 av_push (av, sv);
1596 }
1597
1598 av_store (obs, x + y * MAP_HEIGHT (map), newRV_noinc ((SV *)av));
1599 }
1600
1601 if (nonnull)
1602 XPUSHs (sv_2mortal (newRV_noinc ((SV *)obs)));
1603 else
1604 SvREFCNT_dec (obs);
1605}
1444 1606
1445MODULE = cf PACKAGE = cf::arch PREFIX = cf_archetype_ 1607MODULE = cf PACKAGE = cf::arch PREFIX = cf_archetype_
1446 1608
1447archetype *cf_archetype_get_first() 1609archetype *cf_archetype_get_first()
1448 PROTOTYPE: 1610 PROTOTYPE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines