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.16 by root, Wed Feb 8 04:32:19 2006 UTC vs.
Revision 1.29 by root, Mon Mar 6 23:31:54 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; // 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 void
132SVptr_cache_set (void *ptr, SV *sv)
133{
134 hv_store (obj_cache, (char *)&ptr, sizeof (ptr), sv, 0);
135}
136
137static SV *
138SVptr_cache_get (void *ptr)
139{
140 SV **he = hv_fetch (obj_cache, (char *)&ptr, sizeof (ptr), 0);
141
142 return he ? *he : 0;
119} 143}
120 144
121static SV * 145static SV *
122newSVptr_cached (void *ptr, const char *klass) 146newSVptr_cached (void *ptr, const char *klass)
123{ 147{
124 SV *sv, **he; 148 SV *sv;
125 149
126 if (!ptr) 150 if (!ptr)
127 return &PL_sv_undef; 151 return &PL_sv_undef;
128 152
129 he = hv_fetch (obj_cache, (char *)&ptr, sizeof (ptr), 0); 153 sv = SVptr_cache_get (ptr);
130 154
131 if (he) 155 if (!sv)
132 sv = *he;
133 else
134 { 156 {
135 sv = newSVptr (ptr, klass); 157 HV *hv = newHV ();
136 hv_store (obj_cache, (char *)&ptr, sizeof (ptr), sv, 0); 158 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
159 sv = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
160
161 SVptr_cache_set (ptr, sv);
137 } 162 }
138 163
139 return newSVsv (sv); 164 return newSVsv (sv);
140} 165}
141 166
161 croak ("perl code used %s object, but C object is already destroyed, caught", klass); 186 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
162 187
163 return (long)mg->mg_ptr; 188 return (long)mg->mg_ptr;
164} 189}
165 190
191static long
192SvPTR_ornull (SV *sv, const char *klass)
193{
194 if (SvOK (sv))
195 return SvPTR (sv, klass);
196 else
197 return 0;
198}
199
166SV * 200SV *
167newSVcfapi (int type, ...) 201newSVcfapi (int type, ...)
168{ 202{
169 SV *sv; 203 SV *sv;
170 204
171 va_list args; 205 va_list args;
172 va_start (args, type); 206 va_start (args, type);
173 207
174 switch (type) 208 switch (type)
175 { 209 {
210#if 0
211 case CFAPI_INT16:
212 sv = newSViv (*va_arg (args, sint16_t *));
213 break;
214#endif
215
176 case CFAPI_INT: 216 case CFAPI_INT:
177 sv = newSViv (*va_arg (args, int *)); 217 sv = newSViv (*va_arg (args, int *));
178 break; 218 break;
179 219
180 case CFAPI_LONG: 220 case CFAPI_LONG:
260 HV *hv = newHV (); 300 HV *hv = newHV ();
261#define hv_context(type,addr,expr) hv_store (hv, #expr, sizeof (#expr) - 1, newSVcfapi (type, addr context->expr), 0) 301#define hv_context(type,addr,expr) hv_store (hv, #expr, sizeof (#expr) - 1, newSVcfapi (type, addr context->expr), 0)
262 hv_context (CFAPI_POBJECT, ,who); 302 hv_context (CFAPI_POBJECT, ,who);
263 hv_context (CFAPI_POBJECT, ,activator); 303 hv_context (CFAPI_POBJECT, ,activator);
264 hv_context (CFAPI_POBJECT, ,third); 304 hv_context (CFAPI_POBJECT, ,third);
305 hv_context (CFAPI_PMAP, ,map);
265 hv_context (CFAPI_STRING , ,message); 306 hv_context (CFAPI_STRING , ,message);
266 hv_context (CFAPI_INT ,&,fix); 307 hv_context (CFAPI_INT ,&,fix);
267 hv_context (CFAPI_INT ,&,event_code); 308 hv_context (CFAPI_INT ,&,event_code);
268 hv_context (CFAPI_STRING , ,options); 309 hv_context (CFAPI_STRING , ,options);
269 hv_context (CFAPI_STRING , ,extension); 310 hv_context (CFAPI_STRING , ,extension);
390 registerGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_register_global_event"); 431 registerGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_register_global_event");
391 unregisterGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_unregister_global_event"); 432 unregisterGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_unregister_global_event");
392 systemDirectory = gethook (&rtype, hooktype, "cfapi_system_directory"); 433 systemDirectory = gethook (&rtype, hooktype, "cfapi_system_directory");
393 object_set_property = gethook (&rtype, hooktype, "cfapi_object_set_property"); 434 object_set_property = gethook (&rtype, hooktype, "cfapi_object_set_property");
394 map_get_map = gethook (&rtype, hooktype, "cfapi_map_get_map"); 435 map_get_map = gethook (&rtype, hooktype, "cfapi_map_get_map");
436 object_insert = gethook (&rtype, hooktype, "cfapi_object_insert");
395 437
396 cf_init_plugin (gethook); 438 cf_init_plugin (gethook);
397 439
398 /* Pick the global events you want to monitor from this plugin */ 440 /* Pick the global events you want to monitor from this plugin */
399 registerGlobalEvent (NULL, EVENT_BORN, PLUGIN_NAME, globalEventListener); 441 registerGlobalEvent (NULL, EVENT_BORN, PLUGIN_NAME, globalEventListener);
404 registerGlobalEvent (NULL, EVENT_LOGIN, PLUGIN_NAME, globalEventListener); 446 registerGlobalEvent (NULL, EVENT_LOGIN, PLUGIN_NAME, globalEventListener);
405 registerGlobalEvent (NULL, EVENT_LOGOUT, PLUGIN_NAME, globalEventListener); 447 registerGlobalEvent (NULL, EVENT_LOGOUT, PLUGIN_NAME, globalEventListener);
406 registerGlobalEvent (NULL, EVENT_MAPENTER, PLUGIN_NAME, globalEventListener); 448 registerGlobalEvent (NULL, EVENT_MAPENTER, PLUGIN_NAME, globalEventListener);
407 registerGlobalEvent (NULL, EVENT_MAPLEAVE, PLUGIN_NAME, globalEventListener); 449 registerGlobalEvent (NULL, EVENT_MAPLEAVE, PLUGIN_NAME, globalEventListener);
408 registerGlobalEvent (NULL, EVENT_MAPRESET, PLUGIN_NAME, globalEventListener); 450 registerGlobalEvent (NULL, EVENT_MAPRESET, PLUGIN_NAME, globalEventListener);
451 registerGlobalEvent (NULL, EVENT_MAPLOAD, PLUGIN_NAME, globalEventListener);
452 registerGlobalEvent (NULL, EVENT_MAPOUT, PLUGIN_NAME, globalEventListener);
453 registerGlobalEvent (NULL, EVENT_MAPIN, PLUGIN_NAME, globalEventListener);
409 registerGlobalEvent (NULL, EVENT_REMOVE, PLUGIN_NAME, globalEventListener); 454 registerGlobalEvent (NULL, EVENT_REMOVE, PLUGIN_NAME, globalEventListener);
410 registerGlobalEvent (NULL, EVENT_SHOUT, PLUGIN_NAME, globalEventListener); 455 registerGlobalEvent (NULL, EVENT_SHOUT, PLUGIN_NAME, globalEventListener);
411 registerGlobalEvent (NULL, EVENT_TELL, PLUGIN_NAME, globalEventListener); 456 registerGlobalEvent (NULL, EVENT_TELL, PLUGIN_NAME, globalEventListener);
412 registerGlobalEvent (NULL, EVENT_MUZZLE, PLUGIN_NAME, globalEventListener); 457 registerGlobalEvent (NULL, EVENT_MUZZLE, PLUGIN_NAME, globalEventListener);
413 registerGlobalEvent (NULL, EVENT_KICK, PLUGIN_NAME, globalEventListener); 458 registerGlobalEvent (NULL, EVENT_KICK, PLUGIN_NAME, globalEventListener);
465 { 510 {
466 case EVENT_CRASH: 511 case EVENT_CRASH:
467 printf ("Unimplemented for now\n"); 512 printf ("Unimplemented for now\n");
468 break; 513 break;
469 514
515 case EVENT_MAPLOAD:
516 case EVENT_MAPOUT:
517 case EVENT_MAPIN:
518 context.map = va_arg (args, mapstruct *);
519 break;
520
470 case EVENT_MAPENTER: 521 case EVENT_MAPENTER:
471 case EVENT_MAPLEAVE: 522 case EVENT_MAPLEAVE:
472 case EVENT_FREE_OB: 523 case EVENT_FREE_OB:
473 case EVENT_BORN: 524 case EVENT_BORN:
474 case EVENT_REMOVE: 525 case EVENT_REMOVE:
508 559
509 case EVENT_TELL: 560 case EVENT_TELL:
510 break; 561 break;
511 562
512 case EVENT_MAPRESET: 563 case EVENT_MAPRESET:
564 /* stupid, should be the map itself, not "message"??? */
513 buf = va_arg (args, char *); 565 buf = va_arg (args, char *);
514 if (buf != 0) 566 if (buf != 0)
515 strncpy (context.message, buf, sizeof (context.message)); 567 strncpy (context.message, buf, sizeof (context.message));
516 break; 568 break;
517 } 569 }
518 570
519 va_end (args); 571 va_end (args);
520 572
521 if (context.event_code == EVENT_FREE_OB) 573 if (context.event_code == EVENT_FREE_OB)
522 { 574 {
523 SV *sv = hv_delete (obj_cache, (char *)&context.activator, sizeof (object *), 0); 575 SV *sv = hv_delete (obj_cache, (char *)&context.activator, sizeof (void *), 0);
524 576
525 if (sv) 577 if (sv)
526 {
527 clearSVptr (sv); 578 clearSVptr (sv);
528 SvREFCNT_dec (sv);
529 }
530 } 579 }
531 else 580 else
532 inject_event ("cf::inject_global_event", &context); 581 inject_event ("cf::inject_global_event", &context);
533 582
534 rv = context.returnvalue; 583 rv = context.returnvalue;
731 const_iv (ST_BD_REMOVE) 780 const_iv (ST_BD_REMOVE)
732 const_iv (ST_MAT_FLOOR) 781 const_iv (ST_MAT_FLOOR)
733 const_iv (ST_MAT_WALL) 782 const_iv (ST_MAT_WALL)
734 const_iv (ST_MAT_ITEM) 783 const_iv (ST_MAT_ITEM)
735 784
785 const_iv (AT_PHYSICAL)
786 const_iv (AT_MAGIC)
787 const_iv (AT_FIRE)
788 const_iv (AT_ELECTRICITY)
789 const_iv (AT_COLD)
790 const_iv (AT_CONFUSION)
791 const_iv (AT_ACID)
792 const_iv (AT_DRAIN)
793 const_iv (AT_WEAPONMAGIC)
794 const_iv (AT_GHOSTHIT)
795 const_iv (AT_POISON)
796 const_iv (AT_SLOW)
797 const_iv (AT_PARALYZE)
798 const_iv (AT_TURN_UNDEAD)
799 const_iv (AT_FEAR)
800 const_iv (AT_CANCELLATION)
801 const_iv (AT_DEPLETE)
802 const_iv (AT_DEATH)
803 const_iv (AT_CHAOS)
804 const_iv (AT_COUNTERSPELL)
805 const_iv (AT_GODPOWER)
806 const_iv (AT_HOLYWORD)
807 const_iv (AT_BLIND)
808 const_iv (AT_INTERNAL)
809 const_iv (AT_LIFE_STEALING)
810 const_iv (AT_DISEASE)
811
736 const_iv (QUEST_IN_PROGRESS) 812 const_iv (QUEST_IN_PROGRESS)
737 const_iv (QUEST_DONE_QUEST) 813 const_iv (QUEST_DONE_QUEST)
738 const_iv (QUEST_DONE_TASK) 814 const_iv (QUEST_DONE_TASK)
739 const_iv (QUEST_START_QUEST) 815 const_iv (QUEST_START_QUEST)
740 const_iv (QUEST_END_QUEST) 816 const_iv (QUEST_END_QUEST)
942 const_event (LOGIN) 1018 const_event (LOGIN)
943 const_event (LOGOUT) 1019 const_event (LOGOUT)
944 const_event (MAPENTER) 1020 const_event (MAPENTER)
945 const_event (MAPLEAVE) 1021 const_event (MAPLEAVE)
946 const_event (MAPRESET) 1022 const_event (MAPRESET)
1023 const_event (MAPLOAD)
1024 const_event (MAPOUT)
1025 const_event (MAPIN)
947 const_event (REMOVE) 1026 const_event (REMOVE)
948 const_event (SHOUT) 1027 const_event (SHOUT)
949 const_event (TELL) 1028 const_event (TELL)
950 const_event (MUZZLE) 1029 const_event (MUZZLE)
951 const_event (KICK) 1030 const_event (KICK)
1151 int unused_type; 1230 int unused_type;
1152 object_set_property (&unused_type, obj, idx, (double)SvNV (newval)); 1231 object_set_property (&unused_type, obj, idx, (double)SvNV (newval));
1153 } 1232 }
1154 break; 1233 break;
1155 case CFAPI_STRING: 1234 case CFAPI_STRING:
1156 cf_object_set_string_property (obj, idx, SvPV_nolen (newval)); 1235 cf_object_set_string_property (obj, idx, SvOK (newval) ? SvPV_nolen (newval) : 0);
1236 break;
1237 case CFAPI_POBJECT:
1238 {
1239 int unused_type;
1240 object_set_property (&unused_type, obj, idx, (object *)SvPTR_ornull (newval, "cf::object"));
1241 }
1157 break; 1242 break;
1158 default: 1243 default:
1159 croak ("unhandled type '%d' in set_property '%d'", type, idx); 1244 croak ("unhandled type '%d' in set_property '%d'", type, idx);
1160 } 1245 }
1161 1246
1247# missing properties
1248
1249void
1250set_attacktype (object *obj, U32 attacktype)
1251 CODE:
1252 obj->attacktype = attacktype;
1253
1254U32
1255get_attacktype (object *obj)
1256 ALIAS:
1257 attacktype = 0
1258 CODE:
1259 RETVAL = obj->attacktype;
1260 OUTPUT: RETVAL
1261
1262void
1263set_food (object *obj, int food)
1264 CODE:
1265 obj->stats.food = food;
1266
1267int
1268get_food (object *obj)
1269 ALIAS:
1270 food = 0
1271 CODE:
1272 RETVAL = obj->stats.food;
1273 OUTPUT: RETVAL
1274
1162void 1275void
1163inv (object *obj) 1276inv (object *obj)
1164 PROTOTYPE: $ 1277 PROTOTYPE: $
1165 PPCODE: 1278 PPCODE:
1166{ 1279{
1175int cf_object_get_flag (object *op, int flag) 1288int cf_object_get_flag (object *op, int flag)
1176 ALIAS: flag = 0 1289 ALIAS: flag = 0
1177 1290
1178void cf_object_set_flag (object *op, int flag, int value) 1291void cf_object_set_flag (object *op, int flag, int value)
1179 1292
1180void cf_object_move (object *op, int dir, object *originator) 1293void cf_object_move (object *op, int dir, object *originator = op)
1181 1294
1182void cf_object_apply (object *op, object *author, int flags = 0) 1295void cf_object_apply (object *op, object *author, int flags = 0)
1183 1296
1184void cf_object_apply_below (object *op) 1297void cf_object_apply_below (object *op)
1185 1298
1191 1304
1192int cf_object_transfer (object *op, int x, int y, int r, object *orig) 1305int cf_object_transfer (object *op, int x, int y, int r, object *orig)
1193 1306
1194int cf_object_change_map (object *op, int x, int y, mapstruct *map) 1307int cf_object_change_map (object *op, int x, int y, mapstruct *map)
1195 1308
1196object *cf_object_clone (object *op, int clonetype) 1309object *cf_object_clone (object *op, int clonetype = 0)
1197 1310
1198int cf_object_pay_item (object *op, object *buyer) 1311int cf_object_pay_item (object *op, object *buyer)
1199 1312
1200int cf_object_pay_amount (object *op, double amount) 1313int cf_object_pay_amount (object *op, double amount)
1201 1314
1202int cf_object_cast_spell (object *caster, object *ctoo, int dir, object *sp_, char *flags) 1315int cf_object_cast_spell (object *caster, object *ctoo, int dir, object *spell_ob, char *stringarg = 0)
1203 1316
1204int cf_object_cast_ability (object *caster, object *ctoo, int dir, object *sp_, char *flags) 1317int cf_object_cast_ability (object *caster, object *ctoo, int dir, object *sp_, char *stringarg = 0)
1205 1318
1206void cf_object_learn_spell (object *op, object *sp) 1319void cf_object_learn_spell (object *op, object *sp)
1207 1320
1208void cf_object_forget_spell (object *op, object *sp) 1321void cf_object_forget_spell (object *op, object *sp)
1209 1322
1245char *cf_object_get_key (object *op, char *keyname) 1358char *cf_object_get_key (object *op, char *keyname)
1246 ALIAS: key = 0 1359 ALIAS: key = 0
1247 1360
1248void cf_object_set_key (object *op, char *keyname, char *value) 1361void cf_object_set_key (object *op, char *keyname, char *value)
1249 1362
1250char * 1363object *cf_create_object_by_name (const char *name)
1251base_name (object *ob, int plural) 1364
1365MODULE = cf PACKAGE = cf::object PREFIX = cf_
1366
1367void cf_fix_object (object *pl)
1368 ALIAS: fix = 0
1369
1370object *cf_insert_ob_in_ob (object *ob, object *where)
1371
1372# no clean way to get an object from an archetype - stupid idiotic
1373# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
1374
1375object *new (const char *archetype = 0)
1376 PROTOTYPE: ;$
1252 CODE: 1377 CODE:
1253 RETVAL = cf_query_base_name (ob, plural); 1378 RETVAL = archetype ? get_archetype (archetype) : cf_create_object ();
1254 OUTPUT: RETVAL
1255
1256MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
1257
1258object *cf_create_object_by_name (const char *name = 0)
1259 PROTOTYPE: ;$
1260 ALIAS:
1261 create_object = 0
1262 new = 0
1263 CODE:
1264 RETVAL = name ? cf_create_object_by_name (name) : cf_create_object ();
1265 OUTPUT: 1379 OUTPUT:
1266 RETVAL 1380 RETVAL
1267 1381
1268void cf_fix_object (object *pl) 1382object *insert_ob_in_map_at (object *ob, mapstruct *where, object_ornull *orig, int flag, int x, int y)
1269 ALIAS: fix = 0 1383 PROTOTYPE: $$$$$$
1270 1384 CODE:
1271object *cf_insert_ob_in_ob (object *ob, object *where) 1385{
1386 int unused_type;
1387 RETVAL = (object *)object_insert (&unused_type, ob, 0, where, orig, flag, x, y);
1388}
1272 1389
1273object *get_nearest_player (object *ob) 1390object *get_nearest_player (object *ob)
1274 ALIAS: nearest_player = 0 1391 ALIAS: nearest_player = 0
1392 PREINIT:
1393 extern object *get_nearest_player (object *);
1275 1394
1276void rangevector (object *ob, object *other, int flags = 0) 1395void rangevector (object *ob, object *other, int flags = 0)
1277 PROTOTYPE: $$;$ 1396 PROTOTYPE: $$;$
1278 PPCODE: 1397 PPCODE:
1279{ 1398{
1290bool on_same_map_as (object *ob, object *other) 1409bool on_same_map_as (object *ob, object *other)
1291 CODE: 1410 CODE:
1292 RETVAL = on_same_map (ob, other); 1411 RETVAL = on_same_map (ob, other);
1293 OUTPUT: RETVAL 1412 OUTPUT: RETVAL
1294 1413
1414char *
1415base_name (object *ob, int plural)
1416 CODE:
1417 RETVAL = cf_query_base_name (ob, plural);
1418 OUTPUT: RETVAL
1419
1295 1420
1296MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_ 1421MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_
1297 1422
1298player *player (object *op) 1423player *player (object *op)
1299 CODE: 1424 CODE:
1302 1427
1303void cf_player_message (object *obj, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE) 1428void cf_player_message (object *obj, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE)
1304 1429
1305object *cf_player_send_inventory (object *op) 1430object *cf_player_send_inventory (object *op)
1306 1431
1432player *contr (object *op)
1433 CODE:
1434 RETVAL = op->contr;
1435 OUTPUT: RETVAL
1436
1307char *cf_player_get_ip (object *op) 1437char *cf_player_get_ip (object *op)
1308 ALIAS: ip = 0 1438 ALIAS: ip = 0
1309 1439
1310object *cf_player_get_marked_item (object *op) 1440object *cf_player_get_marked_item (object *op)
1311 ALIAS: marked_item = 0 1441 ALIAS: marked_item = 0
1324 1454
1325player *cf_player_find (char *name) 1455player *cf_player_find (char *name)
1326 PROTOTYPE: $ 1456 PROTOTYPE: $
1327 1457
1328void cf_player_move (player *pl, int dir) 1458void cf_player_move (player *pl, int dir)
1459
1460void MapNewmapCmd (player *pl)
1329 1461
1330# nonstandard 1462# nonstandard
1331object *ob (player *pl) 1463object *ob (player *pl)
1332 CODE: 1464 CODE:
1333 RETVAL = pl->ob; 1465 RETVAL = pl->ob;
1406 INIT: 1538 INIT:
1407 if (x >= MAP_WIDTH (obj) || y >= MAP_HEIGHT (obj)) XSRETURN_EMPTY; 1539 if (x >= MAP_WIDTH (obj) || y >= MAP_HEIGHT (obj)) XSRETURN_EMPTY;
1408 PPCODE: 1540 PPCODE:
1409{ 1541{
1410 object *o; 1542 object *o;
1543
1411 for (o = GET_MAP_OB (obj, x, y); o; o = o->above) 1544 for (o = GET_MAP_OB (obj, x, y); o; o = o->above)
1412 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o))); 1545 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o)));
1413} 1546}
1414 1547
1415SV * 1548SV *
1438 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break; 1571 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;
1439 } 1572 }
1440 OUTPUT: 1573 OUTPUT:
1441 RETVAL 1574 RETVAL
1442 1575
1576# "serialise" map perl data into a ref
1577void
1578_get_obs (mapstruct *map)
1579 PPCODE:
1580{
1581 object *o;
1582 int x, y;
1583 AV *obs = newAV ();
1584 int nonnull = 0;
1585
1586 for (y = 0; y < MAP_HEIGHT (map); y++)
1587 for (x = 0; x < MAP_WIDTH (map); x++)
1588 {
1589 AV *av = newAV ();
1590
1591 for (o = GET_MAP_OB (map, x, y); o; o = o->above)
1592 {
1593 SV *sv = SVptr_cache_get (o);
1594
1595 if (sv && HvFILL (SvRV (sv)))
1596 {
1597 nonnull = 1;
1598 sv = newSVsv (sv);
1599 }
1600 else
1601 sv = &PL_sv_undef;
1602
1603 av_push (av, sv);
1604 }
1605
1606 av_store (obs, x + y * MAP_HEIGHT (map), newRV_noinc ((SV *)av));
1607 }
1608
1609 if (nonnull)
1610 XPUSHs (sv_2mortal (newRV_noinc ((SV *)obs)));
1611 else
1612 SvREFCNT_dec (obs);
1613}
1614
1615# "deserialise" perl map data into the map
1616void
1617_set_obs (mapstruct *map, SV *sv)
1618 CODE:
1619{
1620 object *o;
1621 AV *av;
1622 int x, y;
1623 AV *obs = (AV *)SvRV (sv);
1624
1625 for (y = 0; y < MAP_HEIGHT (map); y++)
1626 for (x = 0; x < MAP_WIDTH (map); x++)
1627 {
1628 sv = *av_fetch (obs, x + y * MAP_HEIGHT (map), 1);
1629
1630 if (!SvROK (sv))
1631 continue;
1632
1633 av = (AV *)SvRV (sv);
1634
1635 for (o = GET_MAP_OB (map, x, y); o; o = o->above)
1636 {
1637 sv = av_shift (av);
1638
1639 if (SvROK (sv))
1640 {
1641 sv_magic ((SV *)SvRV (sv), 0, PERL_MAGIC_ext, (char *)o, 0);
1642 SVptr_cache_set (o, sv);
1643 }
1644 }
1645 }
1646}
1443 1647
1444MODULE = cf PACKAGE = cf::arch PREFIX = cf_archetype_ 1648MODULE = cf PACKAGE = cf::arch PREFIX = cf_archetype_
1445 1649
1446archetype *cf_archetype_get_first() 1650archetype *cf_archetype_get_first()
1447 PROTOTYPE: 1651 PROTOTYPE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines