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.7 by root, Fri Feb 3 22:52:51 2006 UTC vs.
Revision 1.26 by root, Sat Feb 25 23:36:58 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
… …
47 47
48#include <stdarg.h> 48#include <stdarg.h>
49 49
50#include "perlxsi.c" 50#include "perlxsi.c"
51 51
52typedef object object_ornull;
53typedef mapstruct mapstruct_ornull;
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;
59static f_plug_api object_set_property;
60static f_plug_api map_get_map;
61static f_plug_api object_insert;
56 62
57typedef struct 63typedef struct
58{ 64{
59 object* who; 65 object* who;
60 object* activator; 66 object* activator;
61 object* third; 67 object* third;
62 char message[1024]; 68 char message[1024];
63 int fix; 69 int fix;
64 int event_code; 70 int event_code;
65 char options[1024]; 71 char extension[1024]; // name field, should invoke specific perl extension
72 char options[1024]; // slaying field of event_connectors
66 int returnvalue; 73 int returnvalue;
67} CFPContext; 74} CFPContext;
68 75
69//static int current_command = -999; 76//static int current_command = -999;
70 77
78static HV *obj_cache;
71static PerlInterpreter *perl; 79static PerlInterpreter *perl;
72 80
73////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 81//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
82
83// garbage collect some perl objects, if possible
84// all objects no longer referenced and empty are
85// eligible for destruction.
86void
87clean_obj_cache ()
88{
89 static int count;
90
91 if (++count & 7)
92 return;
93
94 int todo = 1000;
95 do
96 {
97 I32 klen;
98 char *key;
99 HE *he = hv_iternext (obj_cache);
100
101 if (he)
102 {
103 SV *sv = hv_iterval (obj_cache, he);
104
105 // empty and unreferenced? nuke it
106 if (SvREFCNT (sv) == 1 && SvREFCNT (SvRV (sv)) == 1 && !HvFILL ((HV *)(SvRV (sv))))
107 {
108 hv_delete (obj_cache, HeKEY (he), HeKLEN (he), G_DISCARD);
109 todo++;
110 }
111 }
112 else
113 break;
114 }
115 while (--todo);
116}
74 117
75static SV * 118static SV *
76newSVptr (void *ptr, const char *klass) 119newSVptr (void *ptr, const char *klass)
77{ 120{
121 SV *sv;
122
78 if (!ptr) 123 if (!ptr)
79 return &PL_sv_undef; 124 return &PL_sv_undef;
80 125
126 sv = newSV (0);
127 sv_magic (sv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
128 return sv_bless (newRV_noinc (sv), gv_stashpv (klass, 1));
129}
130
131static SV *
132newSVptr_cached (void *ptr, const char *klass)
133{
134 SV *sv, **he;
135
136 if (!ptr)
137 return &PL_sv_undef;
138
139 he = hv_fetch (obj_cache, (char *)&ptr, sizeof (ptr), 0);
140
141 if (he)
142 sv = *he;
143 else
144 {
81 HV *hv = newHV (); 145 HV *hv = newHV ();
82 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 146 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
83 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 147 sv = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
148 hv_store (obj_cache, (char *)&ptr, sizeof (ptr), sv, 0);
149 }
150
151 return newSVsv (sv);
84} 152}
85 153
86static void 154static void
87clearSVptr (SV *sv) 155clearSVptr (SV *sv)
88{ 156{
… …
105 croak ("perl code used %s object, but C object is already destroyed, caught", klass); 173 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
106 174
107 return (long)mg->mg_ptr; 175 return (long)mg->mg_ptr;
108} 176}
109 177
178static long
179SvPTR_ornull (SV *sv, const char *klass)
180{
181 if (SvOK (sv))
182 return SvPTR (sv, klass);
183 else
184 return 0;
185}
186
110SV * 187SV *
111newSVcfapi (int type, ...) 188newSVcfapi (int type, ...)
112{ 189{
113 SV *sv; 190 SV *sv;
114 191
115 va_list args; 192 va_list args;
116 va_start (args, type); 193 va_start (args, type);
117 194
118 switch (type) 195 switch (type)
119 { 196 {
197#if 0
198 case CFAPI_INT16:
199 sv = newSViv (*va_arg (args, sint16_t *));
200 break;
201#endif
202
120 case CFAPI_INT: 203 case CFAPI_INT:
121 sv = newSViv (*va_arg (args, int *)); 204 sv = newSViv (*va_arg (args, int *));
122 break; 205 break;
123 206
124 case CFAPI_LONG: 207 case CFAPI_LONG:
… …
144 sv = &PL_sv_undef; 227 sv = &PL_sv_undef;
145 else 228 else
146 switch (*(int *)cf_object_get_property (obj, CFAPI_OBJECT_PROP_TYPE)) 229 switch (*(int *)cf_object_get_property (obj, CFAPI_OBJECT_PROP_TYPE))
147 { 230 {
148 case MAP: 231 case MAP:
149 sv = newSVptr (obj, "cf::object::map"); 232 sv = newSVptr_cached (obj, "cf::object::map");
150 break; 233 break;
151 234
152 case PLAYER: 235 case PLAYER:
153 sv = newSVptr (obj, "cf::object::player"); 236 sv = newSVptr_cached (obj, "cf::object::player");
154 break; 237 break;
155 238
156 default: 239 default:
157 sv = newSVptr (obj, "cf::object"); 240 sv = newSVptr_cached (obj, "cf::object");
158 break; 241 break;
159 } 242 }
160 } 243 }
161 break; 244 break;
162 245
… …
190} 273}
191 274
192///////////////////////////////////////////////////////////////////////////// 275/////////////////////////////////////////////////////////////////////////////
193 276
194void 277void
195inject_event (CFPContext *context) 278inject_event (const char *func, CFPContext *context)
196{ 279{
197 dSP; 280 dSP;
198 281
199 ENTER; 282 ENTER;
200 SAVETMPS; 283 SAVETMPS;
201 284
202 PUSHMARK (SP); 285 PUSHMARK (SP);
203
204 EXTEND (SP, 2);
205 //PUSHs (sv_2mortal (newSViv (type)));
206 286
207 HV *hv = newHV (); 287 HV *hv = newHV ();
208#define hv_context(type,addr,expr) hv_store (hv, #expr, sizeof (#expr) - 1, newSVcfapi (type, addr context->expr), 0) 288#define hv_context(type,addr,expr) hv_store (hv, #expr, sizeof (#expr) - 1, newSVcfapi (type, addr context->expr), 0)
209 hv_context (CFAPI_POBJECT, ,who); 289 hv_context (CFAPI_POBJECT, ,who);
210 hv_context (CFAPI_POBJECT, ,activator); 290 hv_context (CFAPI_POBJECT, ,activator);
211 hv_context (CFAPI_POBJECT, ,third); 291 hv_context (CFAPI_POBJECT, ,third);
212 hv_context (CFAPI_STRING , ,message); 292 hv_context (CFAPI_STRING , ,message);
213 hv_context (CFAPI_INT ,&,fix); 293 hv_context (CFAPI_INT ,&,fix);
214 hv_context (CFAPI_INT ,&,event_code); 294 hv_context (CFAPI_INT ,&,event_code);
215 hv_context (CFAPI_STRING , ,options); 295 hv_context (CFAPI_STRING , ,options);
296 hv_context (CFAPI_STRING , ,extension);
216 297
217 PUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 298 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
218 299
219 PUTBACK; 300 PUTBACK;
220 int count = call_pv ("cf::inject_event", G_SCALAR | G_EVAL); 301 int count = call_pv (func, G_SCALAR | G_EVAL);
221 SPAGAIN; 302 SPAGAIN;
222 303
223 if (SvTRUE (ERRSV)) 304 if (SvTRUE (ERRSV))
224 LOG (llevError, "event '%d' callback evaluation error: %s", context->event_code, SvPV_nolen (ERRSV)); 305 LOG (llevError, "event '%d' callback evaluation error: %s", context->event_code, SvPV_nolen (ERRSV));
225 306
… …
334 printf (PLUGIN_VERSION " post init\n"); 415 printf (PLUGIN_VERSION " post init\n");
335 416
336 registerGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_register_global_event"); 417 registerGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_register_global_event");
337 unregisterGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_unregister_global_event"); 418 unregisterGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_unregister_global_event");
338 systemDirectory = gethook (&rtype, hooktype, "cfapi_system_directory"); 419 systemDirectory = gethook (&rtype, hooktype, "cfapi_system_directory");
420 object_set_property = gethook (&rtype, hooktype, "cfapi_object_set_property");
421 map_get_map = gethook (&rtype, hooktype, "cfapi_map_get_map");
422 object_insert = gethook (&rtype, hooktype, "cfapi_object_insert");
423
339 cf_init_plugin (gethook); 424 cf_init_plugin (gethook);
340 425
341 /* Pick the global events you want to monitor from this plugin */ 426 /* Pick the global events you want to monitor from this plugin */
342 registerGlobalEvent (NULL, EVENT_BORN, PLUGIN_NAME, globalEventListener); 427 registerGlobalEvent (NULL, EVENT_BORN, PLUGIN_NAME, globalEventListener);
343 registerGlobalEvent (NULL, EVENT_CLOCK, PLUGIN_NAME, globalEventListener); 428 registerGlobalEvent (NULL, EVENT_CLOCK, PLUGIN_NAME, globalEventListener);
… …
352 registerGlobalEvent (NULL, EVENT_REMOVE, PLUGIN_NAME, globalEventListener); 437 registerGlobalEvent (NULL, EVENT_REMOVE, PLUGIN_NAME, globalEventListener);
353 registerGlobalEvent (NULL, EVENT_SHOUT, PLUGIN_NAME, globalEventListener); 438 registerGlobalEvent (NULL, EVENT_SHOUT, PLUGIN_NAME, globalEventListener);
354 registerGlobalEvent (NULL, EVENT_TELL, PLUGIN_NAME, globalEventListener); 439 registerGlobalEvent (NULL, EVENT_TELL, PLUGIN_NAME, globalEventListener);
355 registerGlobalEvent (NULL, EVENT_MUZZLE, PLUGIN_NAME, globalEventListener); 440 registerGlobalEvent (NULL, EVENT_MUZZLE, PLUGIN_NAME, globalEventListener);
356 registerGlobalEvent (NULL, EVENT_KICK, PLUGIN_NAME, globalEventListener); 441 registerGlobalEvent (NULL, EVENT_KICK, PLUGIN_NAME, globalEventListener);
442 registerGlobalEvent (NULL, EVENT_FREE_OB, PLUGIN_NAME, globalEventListener);
357 443
358 char *argv[] = { 444 char *argv[] = {
359 "", 445 "",
360 "-e" 446 "-e"
361 "BEGIN {" 447 "BEGIN {"
… …
375 461
376 perl_destruct (perl); 462 perl_destruct (perl);
377 perl_free (perl); 463 perl_free (perl);
378 perl = 0; 464 perl = 0;
379 } 465 }
466 else
467 {
468 obj_cache = newHV ();
469 }
380 470
381 return 0; 471 return 0;
382} 472}
383 473
384void * 474void *
… …
403 { 493 {
404 case EVENT_CRASH: 494 case EVENT_CRASH:
405 printf ("Unimplemented for now\n"); 495 printf ("Unimplemented for now\n");
406 break; 496 break;
407 497
498 case EVENT_MAPENTER:
499 case EVENT_MAPLEAVE:
500 case EVENT_FREE_OB:
408 case EVENT_BORN: 501 case EVENT_BORN:
502 case EVENT_REMOVE:
409 context.activator = va_arg (args, object *); 503 context.activator = va_arg (args, object *);
410 break; 504 break;
411 505
412 case EVENT_PLAYER_DEATH: 506 case EVENT_PLAYER_DEATH:
413 context.who = va_arg (args, object *); 507 context.who = va_arg (args, object *);
… …
417 context.who = va_arg (args, object *); 511 context.who = va_arg (args, object *);
418 context.activator = va_arg (args, object *); 512 context.activator = va_arg (args, object *);
419 break; 513 break;
420 514
421 case EVENT_LOGIN: 515 case EVENT_LOGIN:
422 pl = va_arg (args, player *);
423 context.activator = pl->ob;
424 buf = va_arg (args, char *);
425 if (buf != 0)
426 strcpy (context.message, buf);
427 break;
428
429 case EVENT_LOGOUT: 516 case EVENT_LOGOUT:
430 pl = va_arg (args, player *); 517 pl = va_arg (args, player *);
431 context.activator = pl->ob; 518 context.activator = pl->ob;
432 buf = va_arg (args, char *); 519 buf = va_arg (args, char *);
433 if (buf != 0) 520 if (buf != 0)
434 strcpy (context.message, buf); 521 strncpy (context.message, buf, sizeof (context.message));
435 break;
436
437 case EVENT_REMOVE:
438 context.activator = va_arg (args, object *);
439 break; 522 break;
440 523
441 case EVENT_SHOUT: 524 case EVENT_SHOUT:
442 context.activator = va_arg (args, object *);
443 buf = va_arg (args, char *);
444 if (buf != 0)
445 strcpy (context.message, buf);
446 break;
447
448 case EVENT_MUZZLE: 525 case EVENT_MUZZLE:
449 context.activator = va_arg (args, object *);
450 buf = va_arg (args, char *);
451 if (buf != 0)
452 strcpy (context.message, buf);
453 break;
454
455 case EVENT_KICK: 526 case EVENT_KICK:
456 context.activator = va_arg (args, object *); 527 context.activator = va_arg (args, object *);
457 buf = va_arg (args, char *); 528 buf = va_arg (args, char *);
458 if (buf != 0) 529 if (buf != 0)
459 strcpy (context.message, buf); 530 strncpy (context.message, buf, sizeof (context.message));
460 break;
461
462 case EVENT_MAPENTER:
463 context.activator = va_arg (args, object *);
464 break;
465
466 case EVENT_MAPLEAVE:
467 context.activator = va_arg (args, object *);
468 break; 531 break;
469 532
470 case EVENT_CLOCK: 533 case EVENT_CLOCK:
534 clean_obj_cache ();
535 break;
536
537 case EVENT_TELL:
471 break; 538 break;
472 539
473 case EVENT_MAPRESET: 540 case EVENT_MAPRESET:
474 buf = va_arg (args, char *); 541 buf = va_arg (args, char *);
475 if (buf != 0) 542 if (buf != 0)
476 strcpy (context.message, buf); 543 strncpy (context.message, buf, sizeof (context.message));
477 break;
478
479 case EVENT_TELL:
480 break; 544 break;
481 } 545 }
482 546
483 va_end (args); 547 va_end (args);
484 548
485 inject_event (&context); 549 if (context.event_code == EVENT_FREE_OB)
550 {
551 SV *sv = hv_delete (obj_cache, (char *)&context.activator, sizeof (void *), 0);
552
553 if (sv)
554 clearSVptr (sv);
555 }
556 else
557 inject_event ("cf::inject_global_event", &context);
486 558
487 rv = context.returnvalue; 559 rv = context.returnvalue;
488 560
489 return &rv; 561 return &rv;
490} 562}
… …
506 578
507 context.who = va_arg (args, object *); 579 context.who = va_arg (args, object *);
508 context.event_code = va_arg (args, int); 580 context.event_code = va_arg (args, int);
509 context.activator = va_arg (args, object *); 581 context.activator = va_arg (args, object *);
510 context.third = va_arg (args, object *); 582 context.third = va_arg (args, object *);
583
511 buf = va_arg (args, char *); 584 buf = va_arg (args, char *);
512
513 if (buf != 0) 585 if (buf != 0)
514 strcpy (context.message, buf); 586 strncpy (context.message, buf, sizeof (context.message));
515 587
516 context.fix = va_arg (args, int); 588 context.fix = va_arg (args, int);
589 strncpy (context.extension, va_arg (args, char *), sizeof (context.extension));
517 strcpy (context.options, va_arg (args, char *)); 590 strncpy (context.options, va_arg (args, char *), sizeof (context.options));
518 context.returnvalue = 0; 591 context.returnvalue = 0;
519 va_end (args); 592 va_end (args);
520 593
521 inject_event (&context); 594 inject_event ("cf::inject_event", &context);
522 595
523 rv = context.returnvalue; 596 rv = context.returnvalue;
524 return &rv; 597 return &rv;
525} 598}
526 599
… …
543 616
544BOOT: 617BOOT:
545{ 618{
546 HV *stash = gv_stashpv ("cf", 1); 619 HV *stash = gv_stashpv ("cf", 1);
547 620
548 const struct { 621 static const struct {
549 const char *name; 622 const char *name;
550 IV iv; 623 IV iv;
551 } *civ, const_iv[] = { 624 } *civ, const_iv[] = {
552# define const_iv(name) { # name, (IV)name }, 625# define const_iv(name) { # name, (IV)name },
553 const_iv (llevError) 626 const_iv (llevError)
… …
683 const_iv (ST_BD_REMOVE) 756 const_iv (ST_BD_REMOVE)
684 const_iv (ST_MAT_FLOOR) 757 const_iv (ST_MAT_FLOOR)
685 const_iv (ST_MAT_WALL) 758 const_iv (ST_MAT_WALL)
686 const_iv (ST_MAT_ITEM) 759 const_iv (ST_MAT_ITEM)
687 760
761 const_iv (AT_PHYSICAL)
762 const_iv (AT_MAGIC)
763 const_iv (AT_FIRE)
764 const_iv (AT_ELECTRICITY)
765 const_iv (AT_COLD)
766 const_iv (AT_CONFUSION)
767 const_iv (AT_ACID)
768 const_iv (AT_DRAIN)
769 const_iv (AT_WEAPONMAGIC)
770 const_iv (AT_GHOSTHIT)
771 const_iv (AT_POISON)
772 const_iv (AT_SLOW)
773 const_iv (AT_PARALYZE)
774 const_iv (AT_TURN_UNDEAD)
775 const_iv (AT_FEAR)
776 const_iv (AT_CANCELLATION)
777 const_iv (AT_DEPLETE)
778 const_iv (AT_DEATH)
779 const_iv (AT_CHAOS)
780 const_iv (AT_COUNTERSPELL)
781 const_iv (AT_GODPOWER)
782 const_iv (AT_HOLYWORD)
783 const_iv (AT_BLIND)
784 const_iv (AT_INTERNAL)
785 const_iv (AT_LIFE_STEALING)
786 const_iv (AT_DISEASE)
787
688 const_iv (QUEST_IN_PROGRESS) 788 const_iv (QUEST_IN_PROGRESS)
689 const_iv (QUEST_DONE_QUEST) 789 const_iv (QUEST_DONE_QUEST)
690 const_iv (QUEST_DONE_TASK) 790 const_iv (QUEST_DONE_TASK)
691 const_iv (QUEST_START_QUEST) 791 const_iv (QUEST_START_QUEST)
692 const_iv (QUEST_END_QUEST) 792 const_iv (QUEST_END_QUEST)
… …
832 const_iv (F_CURSED) 932 const_iv (F_CURSED)
833 const_iv (F_DAMNED) 933 const_iv (F_DAMNED)
834 const_iv (F_OPEN) 934 const_iv (F_OPEN)
835 const_iv (F_NOPICK) 935 const_iv (F_NOPICK)
836 const_iv (F_LOCKED) 936 const_iv (F_LOCKED)
937
938 const_iv (P_BLOCKSVIEW)
939 const_iv (P_NO_MAGIC)
940 const_iv (P_IS_ALIVE)
941 const_iv (P_NO_CLERIC)
942 const_iv (P_NEED_UPDATE)
943 const_iv (P_NO_ERROR)
944 const_iv (P_OUT_OF_MAP)
945 const_iv (P_NEW_MAP)
946
947 const_iv (UP_OBJ_INSERT)
948 const_iv (UP_OBJ_REMOVE)
949 const_iv (UP_OBJ_CHANGE)
950 const_iv (UP_OBJ_FACE)
951
952 const_iv (INS_NO_MERGE)
953 const_iv (INS_ABOVE_FLOOR_ONLY)
954 const_iv (INS_NO_WALK_ON)
955 const_iv (INS_ON_TOP)
956 const_iv (INS_BELOW_ORIGINATOR)
957 const_iv (INS_MAP_LOAD)
958
959 const_iv (WILL_APPLY_HANDLE)
960 const_iv (WILL_APPLY_TREASURE)
961 const_iv (WILL_APPLY_EARTHWALL)
962 const_iv (WILL_APPLY_DOOR)
963 const_iv (WILL_APPLY_FOOD)
837 }; 964 };
838 965
839 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 966 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
840 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 967 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
841 968
842 const struct { 969 static const struct {
843 const char *name; 970 const char *name;
844 IV iv; 971 IV iv;
845 } *event, event_list[] = { 972 } *event, event_list[] = {
846# define const_event(name) { # name, (IV)EVENT_ ## name }, 973# define const_event(name) { # name, (IV)EVENT_ ## name },
847 const_event (NONE) 974 const_event (NONE)
… …
855 const_event (TIME) 982 const_event (TIME)
856 const_event (THROW) 983 const_event (THROW)
857 const_event (TRIGGER) 984 const_event (TRIGGER)
858 const_event (CLOSE) 985 const_event (CLOSE)
859 const_event (TIMER) 986 const_event (TIMER)
987 const_event (MOVE)
860 988
861 const_event (BORN) 989 const_event (BORN)
862 const_event (CLOCK) 990 const_event (CLOCK)
863 const_event (CRASH) 991 const_event (CRASH)
864 const_event (PLAYER_DEATH) 992 const_event (PLAYER_DEATH)
… …
871 const_event (REMOVE) 999 const_event (REMOVE)
872 const_event (SHOUT) 1000 const_event (SHOUT)
873 const_event (TELL) 1001 const_event (TELL)
874 const_event (MUZZLE) 1002 const_event (MUZZLE)
875 const_event (KICK) 1003 const_event (KICK)
1004 //const_event (FREE_OB)
876 }; 1005 };
877 1006
878 AV *av = get_av ("cf::EVENT", 1); 1007 AV *av = get_av ("cf::EVENT", 1);
879 1008
880 for (event = event_list + sizeof (event_list) / sizeof (event_list [0]); event-- > event_list; ) 1009 for (event = event_list + sizeof (event_list) / sizeof (event_list [0]); event-- > event_list; )
881 av_store (av, event->iv, newSVpv ((char *)event->name, 0)); 1010 av_store (av, event->iv, newSVpv ((char *)event->name, 0));
882 1011
883 const struct { 1012 static const struct {
884 int dtype; 1013 int dtype;
885 const char *name; 1014 const char *name;
886 IV idx; 1015 IV idx;
887 } *cprop, prop_table[] = { 1016 } *cprop, prop_table[] = {
888# define prop(type, name) { type, # name, (IV) CFAPI_ ## name }, 1017# define prop(type, name) { type, # name, (IV) CFAPI_ ## name },
… …
1067 cf_object_set_int_property (obj, idx, SvIV (newval)); 1196 cf_object_set_int_property (obj, idx, SvIV (newval));
1068 break; 1197 break;
1069 case CFAPI_LONG: 1198 case CFAPI_LONG:
1070 cf_object_set_long_property (obj, idx, SvNV (newval)); 1199 cf_object_set_long_property (obj, idx, SvNV (newval));
1071 break; 1200 break;
1201 case CFAPI_DOUBLE:
1202 {
1203 int unused_type;
1204 object_set_property (&unused_type, obj, idx, (double)SvNV (newval));
1205 }
1206 break;
1072 case CFAPI_STRING: 1207 case CFAPI_STRING:
1073 cf_object_set_string_property (obj, idx, SvPV_nolen (newval)); 1208 cf_object_set_string_property (obj, idx, SvOK (newval) ? SvPV_nolen (newval) : 0);
1209 break;
1210 case CFAPI_POBJECT:
1211 {
1212 int unused_type;
1213 object_set_property (&unused_type, obj, idx, (object *)SvPTR_ornull (newval, "cf::object"));
1214 }
1074 break; 1215 break;
1075 default: 1216 default:
1076 croak ("unhandled type '%d' in set_property '%d'", type, idx); 1217 croak ("unhandled type '%d' in set_property '%d'", type, idx);
1077 } 1218 }
1078 1219
1220# missing properties
1221
1222void
1223set_attacktype (object *obj, U32 attacktype)
1224 CODE:
1225 obj->attacktype = attacktype;
1226
1227U32
1228get_attacktype (object *obj)
1229 ALIAS:
1230 attacktype = 0
1231 CODE:
1232 RETVAL = obj->attacktype;
1233 OUTPUT: RETVAL
1234
1235void
1236set_food (object *obj, int food)
1237 CODE:
1238 obj->stats.food = food;
1239
1240int
1241get_food (object *obj)
1242 ALIAS:
1243 food = 0
1244 CODE:
1245 RETVAL = obj->stats.food;
1246 OUTPUT: RETVAL
1247
1248void
1249inv (object *obj)
1250 PROTOTYPE: $
1251 PPCODE:
1252{
1253 object *o;
1254 for (o = obj->inv; o; o = o->below)
1255 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o)));
1256}
1257
1079int cf_object_get_resistance (object *op, int rtype) 1258int cf_object_get_resistance (object *op, int rtype)
1080 ALIAS: resistance = 0 1259 ALIAS: resistance = 0
1081 1260
1082int cf_object_get_flag (object *op, int flag) 1261int cf_object_get_flag (object *op, int flag)
1083 ALIAS: flag = 0 1262 ALIAS: flag = 0
1084 1263
1085void cf_object_set_flag (object *op, int flag, int value) 1264void cf_object_set_flag (object *op, int flag, int value)
1086 1265
1087void cf_object_move (object *op, object *originator, int dir) 1266void cf_object_move (object *op, int dir, object *originator = op)
1088 1267
1089void cf_object_apply (object *op, object *author, int flags) 1268void cf_object_apply (object *op, object *author, int flags = 0)
1090 1269
1091void cf_object_apply_below (object *op) 1270void cf_object_apply_below (object *op)
1092 1271
1093void cf_object_remove (object *op) 1272void cf_object_remove (object *op)
1094 1273
… …
1098 1277
1099int cf_object_transfer (object *op, int x, int y, int r, object *orig) 1278int cf_object_transfer (object *op, int x, int y, int r, object *orig)
1100 1279
1101int cf_object_change_map (object *op, int x, int y, mapstruct *map) 1280int cf_object_change_map (object *op, int x, int y, mapstruct *map)
1102 1281
1103object *cf_object_clone (object *op, int clonetype) 1282object *cf_object_clone (object *op, int clonetype = 0)
1104 1283
1105int cf_object_pay_item (object *op, object *buyer) 1284int cf_object_pay_item (object *op, object *buyer)
1106 1285
1107int cf_object_pay_amount (object *op, double amount) 1286int cf_object_pay_amount (object *op, double amount)
1108 1287
1109int cf_object_cast_spell (object *caster, object *ctoo, int dir, object *sp_, char *flags) 1288int cf_object_cast_spell (object *caster, object *ctoo, int dir, object *spell_ob, char *stringarg = 0)
1110 1289
1111int cf_object_cast_ability (object *caster, object *ctoo, int dir, object *sp_, char *flags) 1290int cf_object_cast_ability (object *caster, object *ctoo, int dir, object *sp_, char *stringarg = 0)
1112 1291
1113void cf_object_learn_spell (object *op, object *sp) 1292void cf_object_learn_spell (object *op, object *sp)
1114 1293
1115void cf_object_forget_spell (object *op, object *sp) 1294void cf_object_forget_spell (object *op, object *sp)
1116 1295
… …
1151 1330
1152char *cf_object_get_key (object *op, char *keyname) 1331char *cf_object_get_key (object *op, char *keyname)
1153 ALIAS: key = 0 1332 ALIAS: key = 0
1154 1333
1155void cf_object_set_key (object *op, char *keyname, char *value) 1334void cf_object_set_key (object *op, char *keyname, char *value)
1335
1336object *cf_create_object_by_name (const char *name)
1337
1338MODULE = cf PACKAGE = cf::object PREFIX = cf_
1339
1340void cf_fix_object (object *pl)
1341 ALIAS: fix = 0
1342
1343object *cf_insert_ob_in_ob (object *ob, object *where)
1344
1345# no clean way to get an object from an archetype - stupid idiotic
1346# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
1347
1348object *new (const char *archetype = 0)
1349 PROTOTYPE: ;$
1350 CODE:
1351 RETVAL = archetype ? get_archetype (archetype) : cf_create_object ();
1352 OUTPUT:
1353 RETVAL
1354
1355object *insert_ob_in_map_at (object *ob, mapstruct *where, object_ornull *orig, int flag, int x, int y)
1356 PROTOTYPE: $$$$$$
1357 CODE:
1358{
1359 int unused_type;
1360 RETVAL = (object *)object_insert (&unused_type, ob, 0, where, orig, flag, x, y);
1361}
1362
1363object *get_nearest_player (object *ob)
1364 ALIAS: nearest_player = 0
1365 PREINIT:
1366 extern object *get_nearest_player (object *);
1367
1368void rangevector (object *ob, object *other, int flags = 0)
1369 PROTOTYPE: $$;$
1370 PPCODE:
1371{
1372 rv_vector rv;
1373 get_rangevector (ob, other, &rv, flags);
1374 EXTEND (SP, 5);
1375 PUSHs (newSVuv (rv.distance));
1376 PUSHs (newSViv (rv.distance_x));
1377 PUSHs (newSViv (rv.distance_y));
1378 PUSHs (newSViv (rv.direction));
1379 PUSHs (newSVcfapi (CFAPI_POBJECT, rv.part));
1380}
1381
1382bool on_same_map_as (object *ob, object *other)
1383 CODE:
1384 RETVAL = on_same_map (ob, other);
1385 OUTPUT: RETVAL
1156 1386
1157char * 1387char *
1158base_name (object *ob, int plural) 1388base_name (object *ob, int plural)
1159 CODE: 1389 CODE:
1160 RETVAL = cf_query_base_name (ob, plural); 1390 RETVAL = cf_query_base_name (ob, plural);
1161 OUTPUT: RETVAL 1391 OUTPUT: RETVAL
1162 1392
1163MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
1164
1165object *cf_create_object ()
1166 PROTOTYPE:
1167 ALIAS: new = 0
1168
1169object *cf_create_object_by_name (const char *name)
1170 PROTOTYPE: $
1171 ALIAS: new_from_name = 0
1172
1173void cf_free_object (object *ob)
1174
1175void cf_fix_object (object *pl)
1176
1177object *cf_insert_ob_in_ob (object *ob, object *where)
1178
1179 1393
1180MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_ 1394MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_
1181 1395
1182player *player (object *op) 1396player *player (object *op)
1183 CODE: 1397 CODE:
… …
1186 1400
1187void cf_player_message (object *obj, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE) 1401void cf_player_message (object *obj, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE)
1188 1402
1189object *cf_player_send_inventory (object *op) 1403object *cf_player_send_inventory (object *op)
1190 1404
1405player *contr (object *op)
1406 CODE:
1407 RETVAL = op->contr;
1408 OUTPUT: RETVAL
1409
1191char *cf_player_get_ip (object *op) 1410char *cf_player_get_ip (object *op)
1192 ALIAS: ip = 0 1411 ALIAS: ip = 0
1193 1412
1194object *cf_player_get_marked_item (object *op) 1413object *cf_player_get_marked_item (object *op)
1195 ALIAS: marked_item = 0 1414 ALIAS: marked_item = 0
… …
1208 1427
1209player *cf_player_find (char *name) 1428player *cf_player_find (char *name)
1210 PROTOTYPE: $ 1429 PROTOTYPE: $
1211 1430
1212void cf_player_move (player *pl, int dir) 1431void cf_player_move (player *pl, int dir)
1432
1433void MapNewmapCmd (player *pl)
1213 1434
1214# nonstandard 1435# nonstandard
1215object *ob (player *pl) 1436object *ob (player *pl)
1216 CODE: 1437 CODE:
1217 RETVAL = pl->ob; 1438 RETVAL = pl->ob;
1218 OUTPUT: RETVAL 1439 OUTPUT: RETVAL
1440
1441player *first ()
1442 CODE:
1443 RETVAL = first_player;
1444 OUTPUT: RETVAL
1445
1446player *next (player *pl)
1447 CODE:
1448 RETVAL = pl->next;
1449 OUTPUT: RETVAL
1450
1451void
1452list ()
1453 PPCODE:
1454{
1455 player *pl;
1456 for (pl = first_player; pl; pl = pl->next)
1457 XPUSHs (newSVcfapi (CFAPI_PPLAYER, pl));
1458}
1219 1459
1220 1460
1221MODULE = cf PACKAGE = cf::map PREFIX = cf_map_ 1461MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
1222 1462
1223SV * 1463SV *
… …
1236 break; 1476 break;
1237 default: 1477 default:
1238 croak ("unhandled type '%d' in set_property '%d'", type, idx); 1478 croak ("unhandled type '%d' in set_property '%d'", type, idx);
1239 } 1479 }
1240 1480
1481mapstruct *new (int width, int height)
1482 PROTOTYPE:
1483 CODE:
1484{
1485 int unused_type;
1486 RETVAL = map_get_map (&unused_type, 0, width, height);
1487}
1488 OUTPUT:
1489 RETVAL
1490
1241mapstruct *cf_map_get_map (char *name) 1491mapstruct *cf_map_get_map (char *name)
1242 PROTOTYPE: $ 1492 PROTOTYPE: $
1243 ALIAS: map = 0 1493 ALIAS: map = 0
1244 1494
1245mapstruct *cf_map_get_first () 1495mapstruct *cf_map_get_first ()
… …
1253object* cf_map_present_arch_by_name (mapstruct *map, const char* str, int nx, int ny) 1503object* cf_map_present_arch_by_name (mapstruct *map, const char* str, int nx, int ny)
1254 C_ARGS: str, map, nx, ny 1504 C_ARGS: str, map, nx, ny
1255 1505
1256#int cf_map_get_flags (mapstruct* map, mapstruct** nmap, I16 x, I16 y, I16 *nx, I16 *ny) 1506#int cf_map_get_flags (mapstruct* map, mapstruct** nmap, I16 x, I16 y, I16 *nx, I16 *ny)
1257 1507
1508void
1509at (mapstruct *obj, unsigned int x, unsigned int y)
1510 PROTOTYPE: $$$
1511 INIT:
1512 if (x >= MAP_WIDTH (obj) || y >= MAP_HEIGHT (obj)) XSRETURN_EMPTY;
1513 PPCODE:
1514{
1515 object *o;
1516 for (o = GET_MAP_OB (obj, x, y); o; o = o->above)
1517 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o)));
1518}
1519
1520SV *
1521bot_at (mapstruct *obj, unsigned int x, unsigned int y)
1522 PROTOTYPE: $$$
1523 ALIAS:
1524 top_at = 1
1525 flags_at = 2
1526 light_at = 3
1527 move_block_at = 4
1528 move_slow_at = 5
1529 move_on_at = 6
1530 move_off_at = 7
1531 INIT:
1532 if (x >= MAP_WIDTH (obj) || y >= MAP_HEIGHT (obj)) XSRETURN_UNDEF;
1533 CODE:
1534 switch (ix)
1535 {
1536 case 0: RETVAL = newSVcfapi (CFAPI_POBJECT, GET_MAP_OB (obj, x, y)); break;
1537 case 1: RETVAL = newSVcfapi (CFAPI_POBJECT, GET_MAP_TOP (obj, x, y)); break;
1538 case 2: RETVAL = newSVuv ( GET_MAP_FLAGS (obj, x, y)); break;
1539 case 3: RETVAL = newSViv ( GET_MAP_LIGHT (obj, x, y)); break;
1540 case 4: RETVAL = newSVuv ( GET_MAP_MOVE_BLOCK (obj, x, y)); break;
1541 case 5: RETVAL = newSVuv ( GET_MAP_MOVE_SLOW (obj, x, y)); break;
1542 case 6: RETVAL = newSVuv ( GET_MAP_MOVE_ON (obj, x, y)); break;
1543 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;
1544 }
1545 OUTPUT:
1546 RETVAL
1258 1547
1259 1548
1260MODULE = cf PACKAGE = cf::arch PREFIX = cf_archetype_ 1549MODULE = cf PACKAGE = cf::arch PREFIX = cf_archetype_
1261 1550
1262archetype*cf_archetype_get_first() 1551archetype *cf_archetype_get_first()
1263 PROTOTYPE: 1552 PROTOTYPE:
1264 ALIAS: first = 0 1553 ALIAS: first = 0
1265 1554
1266archetype *cf_archetype_get_next (archetype *arch) 1555archetype *cf_archetype_get_next (archetype *arch)
1267 ALIAS: next = 0 1556 ALIAS: next = 0

Diff Legend

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