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.14 by root, Tue Feb 7 23:29:55 2006 UTC vs.
Revision 1.33 by root, Thu Mar 16 21:08:20 2006 UTC

… …
28#include <perl.h> 28#include <perl.h>
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 "cfperl" 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 options[1024]; 73 char extension[1024]; // name field, should invoke specific perl extension
74 char options[1024]; // slaying field of event_connectors
68 int returnvalue; 75 int returnvalue;
69} CFPContext; 76} CFPContext;
70
71//static int current_command = -999;
72 77
73static HV *obj_cache; 78static HV *obj_cache;
74static PerlInterpreter *perl; 79static PerlInterpreter *perl;
75 80
76////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 81//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
… …
79// all objects no longer referenced and empty are 84// all objects no longer referenced and empty are
80// eligible for destruction. 85// eligible for destruction.
81void 86void
82clean_obj_cache () 87clean_obj_cache ()
83{ 88{
89 static int count;
90
91 if (++count & 7)
92 return;
93
84 int todo = 10; 94 int todo = 1000;
85 do 95 do
86 { 96 {
87 I32 klen; 97 I32 klen;
88 char *key; 98 char *key;
89 HE *he = hv_iternext (obj_cache); 99 HE *he = hv_iternext (obj_cache);
90 100
91 if (he) 101 if (he)
92 { 102 {
93 SV *sv = SvRV (hv_iterval (obj_cache, he)); 103 SV *sv = hv_iterval (obj_cache, he);
94 104
95 // emopty and unreferened? nuke it 105 // empty and unreferenced? nuke it
96 if (SvREFCNT (sv) == 1 && !HvFILL ((HV *)sv)) 106 if (SvREFCNT (sv) == 1 && SvREFCNT (SvRV (sv)) == 1 && !HvFILL ((HV *)(SvRV (sv))))
97 { 107 {
98 hv_delete (obj_cache, HeKEY (he), HeKLEN (he), G_DISCARD); 108 hv_delete (obj_cache, HeKEY (he), HeKLEN (he), G_DISCARD);
99 todo++; 109 todo++;
100 } 110 }
101 } 111 }
… …
106} 116}
107 117
108static SV * 118static SV *
109newSVptr (void *ptr, const char *klass) 119newSVptr (void *ptr, const char *klass)
110{ 120{
121 SV *sv;
122
111 if (!ptr) 123 if (!ptr)
112 return &PL_sv_undef; 124 return &PL_sv_undef;
113 125
114 HV *hv = newHV (); 126 sv = newSV (0);
115 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 127 sv_magic (sv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
116 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;
117} 143}
118 144
119static SV * 145static SV *
120newSVptr_cached (void *ptr, const char *klass) 146newSVptr_cached (void *ptr, const char *klass)
121{ 147{
122 SV *sv, **he; 148 SV *sv;
123 149
124 if (!ptr) 150 if (!ptr)
125 return &PL_sv_undef; 151 return &PL_sv_undef;
126 152
127 he = hv_fetch (obj_cache, (char *)&ptr, sizeof (ptr), 0); 153 sv = SVptr_cache_get (ptr);
128 154
129 if (he) 155 if (!sv)
130 sv = *he;
131 else
132 { 156 {
133 sv = newSVptr (ptr, klass); 157 HV *hv = newHV ();
134 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);
135 } 162 }
136 163
137 return newSVsv (sv); 164 return newSVsv (sv);
138} 165}
139 166
… …
159 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);
160 187
161 return (long)mg->mg_ptr; 188 return (long)mg->mg_ptr;
162} 189}
163 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
164SV * 200SV *
165newSVcfapi (int type, ...) 201newSVcfapi (int type, ...)
166{ 202{
167 SV *sv; 203 SV *sv;
168 204
169 va_list args; 205 va_list args;
170 va_start (args, type); 206 va_start (args, type);
171 207
172 switch (type) 208 switch (type)
173 { 209 {
210#if 0
211 case CFAPI_INT16:
212 sv = newSViv (*va_arg (args, sint16_t *));
213 break;
214#endif
215
174 case CFAPI_INT: 216 case CFAPI_INT:
175 sv = newSViv (*va_arg (args, int *)); 217 sv = newSViv (*va_arg (args, int *));
176 break; 218 break;
177 219
178 case CFAPI_LONG: 220 case CFAPI_LONG:
… …
244} 286}
245 287
246///////////////////////////////////////////////////////////////////////////// 288/////////////////////////////////////////////////////////////////////////////
247 289
248void 290void
249inject_event (CFPContext *context) 291inject_event (const char *func, CFPContext *context)
250{ 292{
251 dSP; 293 dSP;
252 294
253 ENTER; 295 ENTER;
254 SAVETMPS; 296 SAVETMPS;
255 297
256 PUSHMARK (SP); 298 PUSHMARK (SP);
257
258 EXTEND (SP, 2);
259 //PUSHs (sv_2mortal (newSViv (type)));
260 299
261 HV *hv = newHV (); 300 HV *hv = newHV ();
262#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)
263 hv_context (CFAPI_POBJECT, ,who); 302 hv_context (CFAPI_POBJECT, ,who);
264 hv_context (CFAPI_POBJECT, ,activator); 303 hv_context (CFAPI_POBJECT, ,activator);
265 hv_context (CFAPI_POBJECT, ,third); 304 hv_context (CFAPI_POBJECT, ,third);
305 hv_context (CFAPI_PMAP, ,map);
266 hv_context (CFAPI_STRING , ,message); 306 hv_context (CFAPI_STRING , ,message);
267 hv_context (CFAPI_INT ,&,fix); 307 hv_context (CFAPI_INT ,&,fix);
268 hv_context (CFAPI_INT ,&,event_code); 308 hv_context (CFAPI_INT ,&,event_code);
269 hv_context (CFAPI_STRING , ,options); 309 hv_context (CFAPI_STRING , ,options);
310 hv_context (CFAPI_STRING , ,extension);
270 311
271 PUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 312 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
272 313
273 PUTBACK; 314 PUTBACK;
274 int count = call_pv ("cf::inject_event", G_SCALAR | G_EVAL); 315 int count = call_pv (func, G_SCALAR | G_EVAL);
275 SPAGAIN; 316 SPAGAIN;
276 317
277 if (SvTRUE (ERRSV)) 318 if (SvTRUE (ERRSV))
278 LOG (llevError, "event '%d' callback evaluation error: %s", context->event_code, SvPV_nolen (ERRSV)); 319 LOG (llevError, "event '%d' callback evaluation error: %s", context->event_code, SvPV_nolen (ERRSV));
279 320
… …
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);
454 registerGlobalEvent (NULL, EVENT_MAPCLEAN, PLUGIN_NAME, globalEventListener);
409 registerGlobalEvent (NULL, EVENT_REMOVE, PLUGIN_NAME, globalEventListener); 455 registerGlobalEvent (NULL, EVENT_REMOVE, PLUGIN_NAME, globalEventListener);
410 registerGlobalEvent (NULL, EVENT_SHOUT, PLUGIN_NAME, globalEventListener); 456 registerGlobalEvent (NULL, EVENT_SHOUT, PLUGIN_NAME, globalEventListener);
411 registerGlobalEvent (NULL, EVENT_TELL, PLUGIN_NAME, globalEventListener); 457 registerGlobalEvent (NULL, EVENT_TELL, PLUGIN_NAME, globalEventListener);
412 registerGlobalEvent (NULL, EVENT_MUZZLE, PLUGIN_NAME, globalEventListener); 458 registerGlobalEvent (NULL, EVENT_MUZZLE, PLUGIN_NAME, globalEventListener);
413 registerGlobalEvent (NULL, EVENT_KICK, PLUGIN_NAME, globalEventListener); 459 registerGlobalEvent (NULL, EVENT_KICK, PLUGIN_NAME, globalEventListener);
414 registerGlobalEvent (NULL, EVENT_FREE_OB, PLUGIN_NAME, globalEventListener); 460 registerGlobalEvent (NULL, EVENT_FREE_OB, PLUGIN_NAME, globalEventListener);
461 registerGlobalEvent (NULL, EVENT_PLAYER_LOAD, PLUGIN_NAME, globalEventListener);
462 registerGlobalEvent (NULL, EVENT_PLAYER_SAVE, PLUGIN_NAME, globalEventListener);
415 463
416 char *argv[] = { 464 char *argv[] = {
417 "", 465 "",
418 "-e" 466 "-e"
419 "BEGIN {" 467 "BEGIN {"
… …
465 { 513 {
466 case EVENT_CRASH: 514 case EVENT_CRASH:
467 printf ("Unimplemented for now\n"); 515 printf ("Unimplemented for now\n");
468 break; 516 break;
469 517
518 case EVENT_PLAYER_LOAD:
519 case EVENT_PLAYER_SAVE:
520 context.who = va_arg (args, object *);
521 buf = va_arg (args, char *);
522 if (buf != 0)
523 strncpy (context.message, buf, sizeof (context.message));
524 break;
525
526 case EVENT_MAPLOAD:
527 case EVENT_MAPOUT:
528 case EVENT_MAPIN:
529 case EVENT_MAPCLEAN:
530 context.map = va_arg (args, mapstruct *);
531 break;
532
470 case EVENT_MAPENTER: 533 case EVENT_MAPENTER:
471 case EVENT_MAPLEAVE: 534 case EVENT_MAPLEAVE:
472 case EVENT_FREE_OB: 535 case EVENT_FREE_OB:
473 case EVENT_BORN: 536 case EVENT_BORN:
474 case EVENT_REMOVE: 537 case EVENT_REMOVE:
… …
488 case EVENT_LOGOUT: 551 case EVENT_LOGOUT:
489 pl = va_arg (args, player *); 552 pl = va_arg (args, player *);
490 context.activator = pl->ob; 553 context.activator = pl->ob;
491 buf = va_arg (args, char *); 554 buf = va_arg (args, char *);
492 if (buf != 0) 555 if (buf != 0)
493 strcpy (context.message, buf); 556 strncpy (context.message, buf, sizeof (context.message));
494 break; 557 break;
495 558
496 case EVENT_SHOUT: 559 case EVENT_SHOUT:
497 case EVENT_MUZZLE: 560 case EVENT_MUZZLE:
498 case EVENT_KICK: 561 case EVENT_KICK:
499 context.activator = va_arg (args, object *); 562 context.activator = va_arg (args, object *);
500 buf = va_arg (args, char *); 563 buf = va_arg (args, char *);
501 if (buf != 0) 564 if (buf != 0)
502 strcpy (context.message, buf); 565 strncpy (context.message, buf, sizeof (context.message));
503 break; 566 break;
504 567
505 case EVENT_CLOCK: 568 case EVENT_CLOCK:
506 clean_obj_cache (); 569 clean_obj_cache ();
507 break; 570 break;
508 571
509 case EVENT_TELL: 572 case EVENT_TELL:
510 break; 573 break;
511 574
512 case EVENT_MAPRESET: 575 case EVENT_MAPRESET:
576 /* stupid, should be the map itself, not "message"??? */
513 buf = va_arg (args, char *); 577 buf = va_arg (args, char *);
514 if (buf != 0) 578 if (buf != 0)
515 strcpy (context.message, buf); 579 strncpy (context.message, buf, sizeof (context.message));
516 break; 580 break;
517 } 581 }
518 582
519 va_end (args); 583 va_end (args);
520 584
521 if (context.event_code == EVENT_FREE_OB) 585 if (context.event_code == EVENT_FREE_OB)
522 { 586 {
523 SV *sv = hv_delete (obj_cache, (char *)&context.activator, sizeof (object *), 0); 587 SV *sv = hv_delete (obj_cache, (char *)&context.activator, sizeof (void *), 0);
524 588
525 if (sv) 589 if (sv)
526 {
527 clearSVptr (sv); 590 clearSVptr (sv);
528 SvREFCNT_dec (sv);
529 }
530 } 591 }
531 else 592 else
532 inject_event (&context); 593 inject_event ("cf::inject_global_event", &context);
533 594
534 rv = context.returnvalue; 595 rv = context.returnvalue;
535 596
536 return &rv; 597 return &rv;
537} 598}
… …
553 614
554 context.who = va_arg (args, object *); 615 context.who = va_arg (args, object *);
555 context.event_code = va_arg (args, int); 616 context.event_code = va_arg (args, int);
556 context.activator = va_arg (args, object *); 617 context.activator = va_arg (args, object *);
557 context.third = va_arg (args, object *); 618 context.third = va_arg (args, object *);
619
558 buf = va_arg (args, char *); 620 buf = va_arg (args, char *);
559
560 if (buf != 0) 621 if (buf != 0)
561 strcpy (context.message, buf); 622 strncpy (context.message, buf, sizeof (context.message));
562 623
563 context.fix = va_arg (args, int); 624 context.fix = va_arg (args, int);
625 strncpy (context.extension, va_arg (args, char *), sizeof (context.extension));
564 strcpy (context.options, va_arg (args, char *)); 626 strncpy (context.options, va_arg (args, char *), sizeof (context.options));
565 context.returnvalue = 0; 627 context.returnvalue = 0;
566 va_end (args); 628 va_end (args);
567 629
568 inject_event (&context); 630 inject_event ("cf::inject_event", &context);
569 631
570 rv = context.returnvalue; 632 rv = context.returnvalue;
571 return &rv; 633 return &rv;
572} 634}
573 635
… …
601 const_iv (llevInfo) 663 const_iv (llevInfo)
602 const_iv (llevDebug) 664 const_iv (llevDebug)
603 const_iv (llevMonster) 665 const_iv (llevMonster)
604 666
605 const_iv (PLAYER) 667 const_iv (PLAYER)
668 const_iv (TRANSPORT)
606 const_iv (ROD) 669 const_iv (ROD)
607 const_iv (TREASURE) 670 const_iv (TREASURE)
608 const_iv (POTION) 671 const_iv (POTION)
609 const_iv (FOOD) 672 const_iv (FOOD)
610 const_iv (POISON) 673 const_iv (POISON)
… …
615 const_iv (BOW) 678 const_iv (BOW)
616 const_iv (WEAPON) 679 const_iv (WEAPON)
617 const_iv (ARMOUR) 680 const_iv (ARMOUR)
618 const_iv (PEDESTAL) 681 const_iv (PEDESTAL)
619 const_iv (ALTAR) 682 const_iv (ALTAR)
620 const_iv (CONFUSION)
621 const_iv (LOCKED_DOOR) 683 const_iv (LOCKED_DOOR)
622 const_iv (SPECIAL_KEY) 684 const_iv (SPECIAL_KEY)
623 const_iv (MAP) 685 const_iv (MAP)
624 const_iv (DOOR) 686 const_iv (DOOR)
625 const_iv (KEY) 687 const_iv (KEY)
… …
726 const_iv (ITEM_TRANSFORMER) 788 const_iv (ITEM_TRANSFORMER)
727 const_iv (QUEST) 789 const_iv (QUEST)
728 790
729 const_iv (ST_BD_BUILD) 791 const_iv (ST_BD_BUILD)
730 const_iv (ST_BD_REMOVE) 792 const_iv (ST_BD_REMOVE)
793
731 const_iv (ST_MAT_FLOOR) 794 const_iv (ST_MAT_FLOOR)
732 const_iv (ST_MAT_WALL) 795 const_iv (ST_MAT_WALL)
733 const_iv (ST_MAT_ITEM) 796 const_iv (ST_MAT_ITEM)
797
798 const_iv (AT_PHYSICAL)
799 const_iv (AT_MAGIC)
800 const_iv (AT_FIRE)
801 const_iv (AT_ELECTRICITY)
802 const_iv (AT_COLD)
803 const_iv (AT_CONFUSION)
804 const_iv (AT_ACID)
805 const_iv (AT_DRAIN)
806 const_iv (AT_WEAPONMAGIC)
807 const_iv (AT_GHOSTHIT)
808 const_iv (AT_POISON)
809 const_iv (AT_SLOW)
810 const_iv (AT_PARALYZE)
811 const_iv (AT_TURN_UNDEAD)
812 const_iv (AT_FEAR)
813 const_iv (AT_CANCELLATION)
814 const_iv (AT_DEPLETE)
815 const_iv (AT_DEATH)
816 const_iv (AT_CHAOS)
817 const_iv (AT_COUNTERSPELL)
818 const_iv (AT_GODPOWER)
819 const_iv (AT_HOLYWORD)
820 const_iv (AT_BLIND)
821 const_iv (AT_INTERNAL)
822 const_iv (AT_LIFE_STEALING)
823 const_iv (AT_DISEASE)
734 824
735 const_iv (QUEST_IN_PROGRESS) 825 const_iv (QUEST_IN_PROGRESS)
736 const_iv (QUEST_DONE_QUEST) 826 const_iv (QUEST_DONE_QUEST)
737 const_iv (QUEST_DONE_TASK) 827 const_iv (QUEST_DONE_TASK)
738 const_iv (QUEST_START_QUEST) 828 const_iv (QUEST_START_QUEST)
… …
906 const_iv (WILL_APPLY_HANDLE) 996 const_iv (WILL_APPLY_HANDLE)
907 const_iv (WILL_APPLY_TREASURE) 997 const_iv (WILL_APPLY_TREASURE)
908 const_iv (WILL_APPLY_EARTHWALL) 998 const_iv (WILL_APPLY_EARTHWALL)
909 const_iv (WILL_APPLY_DOOR) 999 const_iv (WILL_APPLY_DOOR)
910 const_iv (WILL_APPLY_FOOD) 1000 const_iv (WILL_APPLY_FOOD)
1001
1002 const_iv (SAVE_MODE)
1003 const_iv (SAVE_DIR_MODE)
911 }; 1004 };
912 1005
913 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1006 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
914 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1007 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
915 1008
… …
935 1028
936 const_event (BORN) 1029 const_event (BORN)
937 const_event (CLOCK) 1030 const_event (CLOCK)
938 const_event (CRASH) 1031 const_event (CRASH)
939 const_event (PLAYER_DEATH) 1032 const_event (PLAYER_DEATH)
1033 const_event (PLAYER_LOAD)
1034 const_event (PLAYER_SAVE)
940 const_event (GKILL) 1035 const_event (GKILL)
941 const_event (LOGIN) 1036 const_event (LOGIN)
942 const_event (LOGOUT) 1037 const_event (LOGOUT)
943 const_event (MAPENTER) 1038 const_event (MAPENTER)
944 const_event (MAPLEAVE) 1039 const_event (MAPLEAVE)
945 const_event (MAPRESET) 1040 const_event (MAPRESET)
1041 const_event (MAPLOAD)
1042 const_event (MAPOUT)
1043 const_event (MAPIN)
1044 const_event (MAPCLEAN)
946 const_event (REMOVE) 1045 const_event (REMOVE)
947 const_event (SHOUT) 1046 const_event (SHOUT)
948 const_event (TELL) 1047 const_event (TELL)
949 const_event (MUZZLE) 1048 const_event (MUZZLE)
950 const_event (KICK) 1049 const_event (KICK)
… …
1150 int unused_type; 1249 int unused_type;
1151 object_set_property (&unused_type, obj, idx, (double)SvNV (newval)); 1250 object_set_property (&unused_type, obj, idx, (double)SvNV (newval));
1152 } 1251 }
1153 break; 1252 break;
1154 case CFAPI_STRING: 1253 case CFAPI_STRING:
1155 cf_object_set_string_property (obj, idx, SvPV_nolen (newval)); 1254 cf_object_set_string_property (obj, idx, SvOK (newval) ? SvPV_nolen (newval) : 0);
1255 break;
1256 case CFAPI_POBJECT:
1257 {
1258 int unused_type;
1259 object_set_property (&unused_type, obj, idx, (object *)SvPTR_ornull (newval, "cf::object"));
1260 }
1156 break; 1261 break;
1157 default: 1262 default:
1158 croak ("unhandled type '%d' in set_property '%d'", type, idx); 1263 croak ("unhandled type '%d' in set_property '%d'", type, idx);
1159 } 1264 }
1160 1265
1266# missing properties
1267
1268void
1269set_attacktype (object *obj, U32 attacktype)
1270 CODE:
1271 obj->attacktype = attacktype;
1272
1273U32
1274get_attacktype (object *obj)
1275 ALIAS:
1276 attacktype = 0
1277 CODE:
1278 RETVAL = obj->attacktype;
1279 OUTPUT: RETVAL
1280
1281void
1282set_food (object *obj, int food)
1283 CODE:
1284 obj->stats.food = food;
1285
1286int
1287get_food (object *obj)
1288 ALIAS:
1289 food = 0
1290 CODE:
1291 RETVAL = obj->stats.food;
1292 OUTPUT: RETVAL
1293
1161void 1294void
1162inv (object *obj) 1295inv (object *obj)
1163 PROTOTYPE: $ 1296 PROTOTYPE: $
1164 PPCODE: 1297 PPCODE:
1165{ 1298{
… …
1174int cf_object_get_flag (object *op, int flag) 1307int cf_object_get_flag (object *op, int flag)
1175 ALIAS: flag = 0 1308 ALIAS: flag = 0
1176 1309
1177void cf_object_set_flag (object *op, int flag, int value) 1310void cf_object_set_flag (object *op, int flag, int value)
1178 1311
1179void cf_object_move (object *op, object *originator, int dir) 1312void cf_object_move (object *op, int dir, object *originator = op)
1180 1313
1181void cf_object_apply (object *op, object *author, int flags = 0) 1314void cf_object_apply (object *op, object *author, int flags = 0)
1182 1315
1183void cf_object_apply_below (object *op) 1316void cf_object_apply_below (object *op)
1184 1317
… …
1190 1323
1191int cf_object_transfer (object *op, int x, int y, int r, object *orig) 1324int cf_object_transfer (object *op, int x, int y, int r, object *orig)
1192 1325
1193int cf_object_change_map (object *op, int x, int y, mapstruct *map) 1326int cf_object_change_map (object *op, int x, int y, mapstruct *map)
1194 1327
1195object *cf_object_clone (object *op, int clonetype) 1328object *cf_object_clone (object *op, int clonetype = 0)
1196 1329
1197int cf_object_pay_item (object *op, object *buyer) 1330int cf_object_pay_item (object *op, object *buyer)
1198 1331
1199int cf_object_pay_amount (object *op, double amount) 1332int cf_object_pay_amount (object *op, double amount)
1200 1333
1201int cf_object_cast_spell (object *caster, object *ctoo, int dir, object *sp_, char *flags) 1334int cf_object_cast_spell (object *caster, object *ctoo, int dir, object *spell_ob, char *stringarg = 0)
1202 1335
1203int cf_object_cast_ability (object *caster, object *ctoo, int dir, object *sp_, char *flags) 1336int cf_object_cast_ability (object *caster, object *ctoo, int dir, object *sp_, char *stringarg = 0)
1204 1337
1205void cf_object_learn_spell (object *op, object *sp) 1338void cf_object_learn_spell (object *op, object *sp)
1206 1339
1207void cf_object_forget_spell (object *op, object *sp) 1340void cf_object_forget_spell (object *op, object *sp)
1208 1341
… …
1243 1376
1244char *cf_object_get_key (object *op, char *keyname) 1377char *cf_object_get_key (object *op, char *keyname)
1245 ALIAS: key = 0 1378 ALIAS: key = 0
1246 1379
1247void cf_object_set_key (object *op, char *keyname, char *value) 1380void cf_object_set_key (object *op, char *keyname, char *value)
1381
1382object *cf_create_object_by_name (const char *name)
1383
1384MODULE = cf PACKAGE = cf::object PREFIX = cf_
1385
1386void cf_fix_object (object *pl)
1387 ALIAS: fix = 0
1388
1389object *cf_insert_ob_in_ob (object *ob, object *where)
1390
1391# no clean way to get an object from an archetype - stupid idiotic
1392# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
1393
1394object *new (const char *archetype = 0)
1395 PROTOTYPE: ;$
1396 CODE:
1397 RETVAL = archetype ? get_archetype (archetype) : cf_create_object ();
1398 OUTPUT:
1399 RETVAL
1400
1401object *insert_ob_in_map_at (object *ob, mapstruct *where, object_ornull *orig, int flag, int x, int y)
1402 PROTOTYPE: $$$$$$
1403 CODE:
1404{
1405 int unused_type;
1406 RETVAL = (object *)object_insert (&unused_type, ob, 0, where, orig, flag, x, y);
1407}
1408
1409object *get_nearest_player (object *ob)
1410 ALIAS: nearest_player = 0
1411 PREINIT:
1412 extern object *get_nearest_player (object *);
1413
1414void rangevector (object *ob, object *other, int flags = 0)
1415 PROTOTYPE: $$;$
1416 PPCODE:
1417{
1418 rv_vector rv;
1419 get_rangevector (ob, other, &rv, flags);
1420 EXTEND (SP, 5);
1421 PUSHs (newSVuv (rv.distance));
1422 PUSHs (newSViv (rv.distance_x));
1423 PUSHs (newSViv (rv.distance_y));
1424 PUSHs (newSViv (rv.direction));
1425 PUSHs (newSVcfapi (CFAPI_POBJECT, rv.part));
1426}
1427
1428bool on_same_map_as (object *ob, object *other)
1429 CODE:
1430 RETVAL = on_same_map (ob, other);
1431 OUTPUT: RETVAL
1248 1432
1249char * 1433char *
1250base_name (object *ob, int plural) 1434base_name (object *ob, int plural)
1251 CODE: 1435 CODE:
1252 RETVAL = cf_query_base_name (ob, plural); 1436 RETVAL = cf_query_base_name (ob, plural);
1253 OUTPUT: RETVAL 1437 OUTPUT: RETVAL
1254 1438
1255MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
1256
1257object *cf_create_object_by_name (const char *name = 0)
1258 PROTOTYPE: ;$
1259 ALIAS:
1260 create_object = 0
1261 new = 0
1262 CODE:
1263 RETVAL = name ? cf_create_object_by_name (name) : cf_create_object ();
1264 OUTPUT:
1265 RETVAL
1266
1267void cf_fix_object (object *pl)
1268 ALIAS: fix = 0
1269
1270object *cf_insert_ob_in_ob (object *ob, object *where)
1271
1272 1439
1273MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_ 1440MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_
1274 1441
1275player *player (object *op) 1442player *player (object *op)
1276 CODE: 1443 CODE:
… …
1279 1446
1280void cf_player_message (object *obj, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE) 1447void cf_player_message (object *obj, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE)
1281 1448
1282object *cf_player_send_inventory (object *op) 1449object *cf_player_send_inventory (object *op)
1283 1450
1451player *contr (object *op)
1452 CODE:
1453 RETVAL = op->contr;
1454 OUTPUT: RETVAL
1455
1284char *cf_player_get_ip (object *op) 1456char *cf_player_get_ip (object *op)
1285 ALIAS: ip = 0 1457 ALIAS: ip = 0
1286 1458
1287object *cf_player_get_marked_item (object *op) 1459object *cf_player_get_marked_item (object *op)
1288 ALIAS: marked_item = 0 1460 ALIAS: marked_item = 0
… …
1301 1473
1302player *cf_player_find (char *name) 1474player *cf_player_find (char *name)
1303 PROTOTYPE: $ 1475 PROTOTYPE: $
1304 1476
1305void cf_player_move (player *pl, int dir) 1477void cf_player_move (player *pl, int dir)
1478
1479void MapNewmapCmd (player *pl)
1306 1480
1307# nonstandard 1481# nonstandard
1308object *ob (player *pl) 1482object *ob (player *pl)
1309 CODE: 1483 CODE:
1310 RETVAL = pl->ob; 1484 RETVAL = pl->ob;
1311 OUTPUT: RETVAL 1485 OUTPUT: RETVAL
1486
1487player *first ()
1488 CODE:
1489 RETVAL = first_player;
1490 OUTPUT: RETVAL
1491
1492player *next (player *pl)
1493 CODE:
1494 RETVAL = pl->next;
1495 OUTPUT: RETVAL
1496
1497void
1498list ()
1499 PPCODE:
1500{
1501 player *pl;
1502 for (pl = first_player; pl; pl = pl->next)
1503 XPUSHs (newSVcfapi (CFAPI_PPLAYER, pl));
1504}
1312 1505
1313 1506
1314MODULE = cf PACKAGE = cf::map PREFIX = cf_map_ 1507MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
1315 1508
1316SV * 1509SV *
… …
1364 INIT: 1557 INIT:
1365 if (x >= MAP_WIDTH (obj) || y >= MAP_HEIGHT (obj)) XSRETURN_EMPTY; 1558 if (x >= MAP_WIDTH (obj) || y >= MAP_HEIGHT (obj)) XSRETURN_EMPTY;
1366 PPCODE: 1559 PPCODE:
1367{ 1560{
1368 object *o; 1561 object *o;
1562
1369 for (o = GET_MAP_OB (obj, x, y); o; o = o->above) 1563 for (o = GET_MAP_OB (obj, x, y); o; o = o->above)
1370 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o))); 1564 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o)));
1371} 1565}
1372 1566
1373SV * 1567SV *
… …
1396 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break; 1590 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;
1397 } 1591 }
1398 OUTPUT: 1592 OUTPUT:
1399 RETVAL 1593 RETVAL
1400 1594
1595# "serialise" map perl data into a ref
1596void
1597_get_obs (mapstruct *map)
1598 PPCODE:
1599{
1600 object *o;
1601 int x, y;
1602 AV *obs = newAV ();
1603 int nonnull = 0;
1604
1605 for (y = 0; y < MAP_HEIGHT (map); y++)
1606 for (x = 0; x < MAP_WIDTH (map); x++)
1607 {
1608 AV *av = newAV ();
1609
1610 for (o = GET_MAP_OB (map, x, y); o; o = o->above)
1611 {
1612 SV *sv = SVptr_cache_get (o);
1613
1614 if (sv && HvFILL (SvRV (sv)))
1615 {
1616 nonnull = 1;
1617 sv = newSVsv (sv);
1618 }
1619 else
1620 sv = &PL_sv_undef;
1621
1622 av_push (av, sv);
1623 }
1624
1625 av_store (obs, x + y * MAP_HEIGHT (map), newRV_noinc ((SV *)av));
1626 }
1627
1628 if (nonnull)
1629 XPUSHs (sv_2mortal (newRV_noinc ((SV *)obs)));
1630 else
1631 SvREFCNT_dec (obs);
1632}
1633
1634# "deserialise" perl map data into the map
1635void
1636_set_obs (mapstruct *map, SV *sv)
1637 CODE:
1638{
1639 object *o;
1640 AV *av;
1641 int x, y;
1642 AV *obs = (AV *)SvRV (sv);
1643
1644 for (y = 0; y < MAP_HEIGHT (map); y++)
1645 for (x = 0; x < MAP_WIDTH (map); x++)
1646 {
1647 sv = *av_fetch (obs, x + y * MAP_HEIGHT (map), 1);
1648
1649 if (!SvROK (sv))
1650 continue;
1651
1652 av = (AV *)SvRV (sv);
1653
1654 for (o = GET_MAP_OB (map, x, y); o; o = o->above)
1655 {
1656 sv = av_shift (av);
1657
1658 if (SvROK (sv))
1659 {
1660 sv_magic ((SV *)SvRV (sv), 0, PERL_MAGIC_ext, (char *)o, 0);
1661 SVptr_cache_set (o, sv);
1662 }
1663 }
1664 }
1665}
1401 1666
1402MODULE = cf PACKAGE = cf::arch PREFIX = cf_archetype_ 1667MODULE = cf PACKAGE = cf::arch PREFIX = cf_archetype_
1403 1668
1404archetype *cf_archetype_get_first() 1669archetype *cf_archetype_get_first()
1405 PROTOTYPE: 1670 PROTOTYPE:

Diff Legend

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