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.8 by root, Sat Feb 4 00:33:07 2006 UTC vs.
Revision 1.29 by root, Mon Mar 6 23:31:54 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
63/* this is a stupid way to do things, and awkward to use for plug-in authors */
57typedef struct 64typedef struct
58{ 65{
59 object* who; 66 object* who;
60 object* activator; 67 object* activator;
61 object* third; 68 object* third;
69 mapstruct* map;
62 char message[1024]; 70 char message[1024];
63 int fix; 71 int fix; // seems to be python-only, and should not be part of the API
64 int event_code; 72 int event_code;
65 char options[1024]; 73 char extension[1024]; // name field, should invoke specific perl extension
74 char options[1024]; // slaying field of event_connectors
66 int returnvalue; 75 int returnvalue;
67} CFPContext; 76} CFPContext;
68 77
69//static int current_command = -999; 78static HV *obj_cache;
70
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 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;
143}
144
145static SV *
146newSVptr_cached (void *ptr, const char *klass)
147{
148 SV *sv;
149
150 if (!ptr)
151 return &PL_sv_undef;
152
153 sv = SVptr_cache_get (ptr);
154
155 if (!sv)
156 {
81 HV *hv = newHV (); 157 HV *hv = newHV ();
82 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 158 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
83 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 159 sv = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
160
161 SVptr_cache_set (ptr, sv);
162 }
163
164 return newSVsv (sv);
84} 165}
85 166
86static void 167static void
87clearSVptr (SV *sv) 168clearSVptr (SV *sv)
88{ 169{
… …
105 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);
106 187
107 return (long)mg->mg_ptr; 188 return (long)mg->mg_ptr;
108} 189}
109 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
110SV * 200SV *
111newSVcfapi (int type, ...) 201newSVcfapi (int type, ...)
112{ 202{
113 SV *sv; 203 SV *sv;
114 204
115 va_list args; 205 va_list args;
116 va_start (args, type); 206 va_start (args, type);
117 207
118 switch (type) 208 switch (type)
119 { 209 {
210#if 0
211 case CFAPI_INT16:
212 sv = newSViv (*va_arg (args, sint16_t *));
213 break;
214#endif
215
120 case CFAPI_INT: 216 case CFAPI_INT:
121 sv = newSViv (*va_arg (args, int *)); 217 sv = newSViv (*va_arg (args, int *));
122 break; 218 break;
123 219
124 case CFAPI_LONG: 220 case CFAPI_LONG:
… …
144 sv = &PL_sv_undef; 240 sv = &PL_sv_undef;
145 else 241 else
146 switch (*(int *)cf_object_get_property (obj, CFAPI_OBJECT_PROP_TYPE)) 242 switch (*(int *)cf_object_get_property (obj, CFAPI_OBJECT_PROP_TYPE))
147 { 243 {
148 case MAP: 244 case MAP:
149 sv = newSVptr (obj, "cf::object::map"); 245 sv = newSVptr_cached (obj, "cf::object::map");
150 break; 246 break;
151 247
152 case PLAYER: 248 case PLAYER:
153 sv = newSVptr (obj, "cf::object::player"); 249 sv = newSVptr_cached (obj, "cf::object::player");
154 break; 250 break;
155 251
156 default: 252 default:
157 sv = newSVptr (obj, "cf::object"); 253 sv = newSVptr_cached (obj, "cf::object");
158 break; 254 break;
159 } 255 }
160 } 256 }
161 break; 257 break;
162 258
… …
190} 286}
191 287
192///////////////////////////////////////////////////////////////////////////// 288/////////////////////////////////////////////////////////////////////////////
193 289
194void 290void
195inject_event (CFPContext *context) 291inject_event (const char *func, CFPContext *context)
196{ 292{
197 dSP; 293 dSP;
198 294
199 ENTER; 295 ENTER;
200 SAVETMPS; 296 SAVETMPS;
201 297
202 PUSHMARK (SP); 298 PUSHMARK (SP);
203
204 EXTEND (SP, 2);
205 //PUSHs (sv_2mortal (newSViv (type)));
206 299
207 HV *hv = newHV (); 300 HV *hv = newHV ();
208#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)
209 hv_context (CFAPI_POBJECT, ,who); 302 hv_context (CFAPI_POBJECT, ,who);
210 hv_context (CFAPI_POBJECT, ,activator); 303 hv_context (CFAPI_POBJECT, ,activator);
211 hv_context (CFAPI_POBJECT, ,third); 304 hv_context (CFAPI_POBJECT, ,third);
305 hv_context (CFAPI_PMAP, ,map);
212 hv_context (CFAPI_STRING , ,message); 306 hv_context (CFAPI_STRING , ,message);
213 hv_context (CFAPI_INT ,&,fix); 307 hv_context (CFAPI_INT ,&,fix);
214 hv_context (CFAPI_INT ,&,event_code); 308 hv_context (CFAPI_INT ,&,event_code);
215 hv_context (CFAPI_STRING , ,options); 309 hv_context (CFAPI_STRING , ,options);
310 hv_context (CFAPI_STRING , ,extension);
216 311
217 PUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 312 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
218 313
219 PUTBACK; 314 PUTBACK;
220 int count = call_pv ("cf::inject_event", G_SCALAR | G_EVAL); 315 int count = call_pv (func, G_SCALAR | G_EVAL);
221 SPAGAIN; 316 SPAGAIN;
222 317
223 if (SvTRUE (ERRSV)) 318 if (SvTRUE (ERRSV))
224 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));
225 320
… …
334 printf (PLUGIN_VERSION " post init\n"); 429 printf (PLUGIN_VERSION " post init\n");
335 430
336 registerGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_register_global_event"); 431 registerGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_register_global_event");
337 unregisterGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_unregister_global_event"); 432 unregisterGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_unregister_global_event");
338 systemDirectory = gethook (&rtype, hooktype, "cfapi_system_directory"); 433 systemDirectory = gethook (&rtype, hooktype, "cfapi_system_directory");
434 object_set_property = gethook (&rtype, hooktype, "cfapi_object_set_property");
435 map_get_map = gethook (&rtype, hooktype, "cfapi_map_get_map");
436 object_insert = gethook (&rtype, hooktype, "cfapi_object_insert");
437
339 cf_init_plugin (gethook); 438 cf_init_plugin (gethook);
340 439
341 /* Pick the global events you want to monitor from this plugin */ 440 /* Pick the global events you want to monitor from this plugin */
342 registerGlobalEvent (NULL, EVENT_BORN, PLUGIN_NAME, globalEventListener); 441 registerGlobalEvent (NULL, EVENT_BORN, PLUGIN_NAME, globalEventListener);
343 registerGlobalEvent (NULL, EVENT_CLOCK, PLUGIN_NAME, globalEventListener); 442 registerGlobalEvent (NULL, EVENT_CLOCK, PLUGIN_NAME, globalEventListener);
… …
347 registerGlobalEvent (NULL, EVENT_LOGIN, PLUGIN_NAME, globalEventListener); 446 registerGlobalEvent (NULL, EVENT_LOGIN, PLUGIN_NAME, globalEventListener);
348 registerGlobalEvent (NULL, EVENT_LOGOUT, PLUGIN_NAME, globalEventListener); 447 registerGlobalEvent (NULL, EVENT_LOGOUT, PLUGIN_NAME, globalEventListener);
349 registerGlobalEvent (NULL, EVENT_MAPENTER, PLUGIN_NAME, globalEventListener); 448 registerGlobalEvent (NULL, EVENT_MAPENTER, PLUGIN_NAME, globalEventListener);
350 registerGlobalEvent (NULL, EVENT_MAPLEAVE, PLUGIN_NAME, globalEventListener); 449 registerGlobalEvent (NULL, EVENT_MAPLEAVE, PLUGIN_NAME, globalEventListener);
351 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);
352 registerGlobalEvent (NULL, EVENT_REMOVE, PLUGIN_NAME, globalEventListener); 454 registerGlobalEvent (NULL, EVENT_REMOVE, PLUGIN_NAME, globalEventListener);
353 registerGlobalEvent (NULL, EVENT_SHOUT, PLUGIN_NAME, globalEventListener); 455 registerGlobalEvent (NULL, EVENT_SHOUT, PLUGIN_NAME, globalEventListener);
354 registerGlobalEvent (NULL, EVENT_TELL, PLUGIN_NAME, globalEventListener); 456 registerGlobalEvent (NULL, EVENT_TELL, PLUGIN_NAME, globalEventListener);
355 registerGlobalEvent (NULL, EVENT_MUZZLE, PLUGIN_NAME, globalEventListener); 457 registerGlobalEvent (NULL, EVENT_MUZZLE, PLUGIN_NAME, globalEventListener);
356 registerGlobalEvent (NULL, EVENT_KICK, PLUGIN_NAME, globalEventListener); 458 registerGlobalEvent (NULL, EVENT_KICK, PLUGIN_NAME, globalEventListener);
459 registerGlobalEvent (NULL, EVENT_FREE_OB, PLUGIN_NAME, globalEventListener);
357 460
358 char *argv[] = { 461 char *argv[] = {
359 "", 462 "",
360 "-e" 463 "-e"
361 "BEGIN {" 464 "BEGIN {"
… …
375 478
376 perl_destruct (perl); 479 perl_destruct (perl);
377 perl_free (perl); 480 perl_free (perl);
378 perl = 0; 481 perl = 0;
379 } 482 }
483 else
484 {
485 obj_cache = newHV ();
486 }
380 487
381 return 0; 488 return 0;
382} 489}
383 490
384void * 491void *
… …
403 { 510 {
404 case EVENT_CRASH: 511 case EVENT_CRASH:
405 printf ("Unimplemented for now\n"); 512 printf ("Unimplemented for now\n");
406 break; 513 break;
407 514
515 case EVENT_MAPLOAD:
516 case EVENT_MAPOUT:
517 case EVENT_MAPIN:
518 context.map = va_arg (args, mapstruct *);
519 break;
520
521 case EVENT_MAPENTER:
522 case EVENT_MAPLEAVE:
523 case EVENT_FREE_OB:
408 case EVENT_BORN: 524 case EVENT_BORN:
525 case EVENT_REMOVE:
409 context.activator = va_arg (args, object *); 526 context.activator = va_arg (args, object *);
410 break; 527 break;
411 528
412 case EVENT_PLAYER_DEATH: 529 case EVENT_PLAYER_DEATH:
413 context.who = va_arg (args, object *); 530 context.who = va_arg (args, object *);
… …
417 context.who = va_arg (args, object *); 534 context.who = va_arg (args, object *);
418 context.activator = va_arg (args, object *); 535 context.activator = va_arg (args, object *);
419 break; 536 break;
420 537
421 case EVENT_LOGIN: 538 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: 539 case EVENT_LOGOUT:
430 pl = va_arg (args, player *); 540 pl = va_arg (args, player *);
431 context.activator = pl->ob; 541 context.activator = pl->ob;
432 buf = va_arg (args, char *); 542 buf = va_arg (args, char *);
433 if (buf != 0) 543 if (buf != 0)
434 strcpy (context.message, buf); 544 strncpy (context.message, buf, sizeof (context.message));
435 break;
436
437 case EVENT_REMOVE:
438 context.activator = va_arg (args, object *);
439 break; 545 break;
440 546
441 case EVENT_SHOUT: 547 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: 548 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: 549 case EVENT_KICK:
456 context.activator = va_arg (args, object *); 550 context.activator = va_arg (args, object *);
457 buf = va_arg (args, char *); 551 buf = va_arg (args, char *);
458 if (buf != 0) 552 if (buf != 0)
459 strcpy (context.message, buf); 553 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; 554 break;
469 555
470 case EVENT_CLOCK: 556 case EVENT_CLOCK:
557 clean_obj_cache ();
558 break;
559
560 case EVENT_TELL:
471 break; 561 break;
472 562
473 case EVENT_MAPRESET: 563 case EVENT_MAPRESET:
564 /* stupid, should be the map itself, not "message"??? */
474 buf = va_arg (args, char *); 565 buf = va_arg (args, char *);
475 if (buf != 0) 566 if (buf != 0)
476 strcpy (context.message, buf); 567 strncpy (context.message, buf, sizeof (context.message));
477 break;
478
479 case EVENT_TELL:
480 break; 568 break;
481 } 569 }
482 570
483 va_end (args); 571 va_end (args);
484 572
485 inject_event (&context); 573 if (context.event_code == EVENT_FREE_OB)
574 {
575 SV *sv = hv_delete (obj_cache, (char *)&context.activator, sizeof (void *), 0);
576
577 if (sv)
578 clearSVptr (sv);
579 }
580 else
581 inject_event ("cf::inject_global_event", &context);
486 582
487 rv = context.returnvalue; 583 rv = context.returnvalue;
488 584
489 return &rv; 585 return &rv;
490} 586}
… …
506 602
507 context.who = va_arg (args, object *); 603 context.who = va_arg (args, object *);
508 context.event_code = va_arg (args, int); 604 context.event_code = va_arg (args, int);
509 context.activator = va_arg (args, object *); 605 context.activator = va_arg (args, object *);
510 context.third = va_arg (args, object *); 606 context.third = va_arg (args, object *);
607
511 buf = va_arg (args, char *); 608 buf = va_arg (args, char *);
512
513 if (buf != 0) 609 if (buf != 0)
514 strcpy (context.message, buf); 610 strncpy (context.message, buf, sizeof (context.message));
515 611
516 context.fix = va_arg (args, int); 612 context.fix = va_arg (args, int);
613 strncpy (context.extension, va_arg (args, char *), sizeof (context.extension));
517 strcpy (context.options, va_arg (args, char *)); 614 strncpy (context.options, va_arg (args, char *), sizeof (context.options));
518 context.returnvalue = 0; 615 context.returnvalue = 0;
519 va_end (args); 616 va_end (args);
520 617
521 inject_event (&context); 618 inject_event ("cf::inject_event", &context);
522 619
523 rv = context.returnvalue; 620 rv = context.returnvalue;
524 return &rv; 621 return &rv;
525} 622}
526 623
… …
543 640
544BOOT: 641BOOT:
545{ 642{
546 HV *stash = gv_stashpv ("cf", 1); 643 HV *stash = gv_stashpv ("cf", 1);
547 644
548 const struct { 645 static const struct {
549 const char *name; 646 const char *name;
550 IV iv; 647 IV iv;
551 } *civ, const_iv[] = { 648 } *civ, const_iv[] = {
552# define const_iv(name) { # name, (IV)name }, 649# define const_iv(name) { # name, (IV)name },
553 const_iv (llevError) 650 const_iv (llevError)
… …
683 const_iv (ST_BD_REMOVE) 780 const_iv (ST_BD_REMOVE)
684 const_iv (ST_MAT_FLOOR) 781 const_iv (ST_MAT_FLOOR)
685 const_iv (ST_MAT_WALL) 782 const_iv (ST_MAT_WALL)
686 const_iv (ST_MAT_ITEM) 783 const_iv (ST_MAT_ITEM)
687 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
688 const_iv (QUEST_IN_PROGRESS) 812 const_iv (QUEST_IN_PROGRESS)
689 const_iv (QUEST_DONE_QUEST) 813 const_iv (QUEST_DONE_QUEST)
690 const_iv (QUEST_DONE_TASK) 814 const_iv (QUEST_DONE_TASK)
691 const_iv (QUEST_START_QUEST) 815 const_iv (QUEST_START_QUEST)
692 const_iv (QUEST_END_QUEST) 816 const_iv (QUEST_END_QUEST)
… …
832 const_iv (F_CURSED) 956 const_iv (F_CURSED)
833 const_iv (F_DAMNED) 957 const_iv (F_DAMNED)
834 const_iv (F_OPEN) 958 const_iv (F_OPEN)
835 const_iv (F_NOPICK) 959 const_iv (F_NOPICK)
836 const_iv (F_LOCKED) 960 const_iv (F_LOCKED)
961
962 const_iv (P_BLOCKSVIEW)
963 const_iv (P_NO_MAGIC)
964 const_iv (P_IS_ALIVE)
965 const_iv (P_NO_CLERIC)
966 const_iv (P_NEED_UPDATE)
967 const_iv (P_NO_ERROR)
968 const_iv (P_OUT_OF_MAP)
969 const_iv (P_NEW_MAP)
970
971 const_iv (UP_OBJ_INSERT)
972 const_iv (UP_OBJ_REMOVE)
973 const_iv (UP_OBJ_CHANGE)
974 const_iv (UP_OBJ_FACE)
975
976 const_iv (INS_NO_MERGE)
977 const_iv (INS_ABOVE_FLOOR_ONLY)
978 const_iv (INS_NO_WALK_ON)
979 const_iv (INS_ON_TOP)
980 const_iv (INS_BELOW_ORIGINATOR)
981 const_iv (INS_MAP_LOAD)
982
983 const_iv (WILL_APPLY_HANDLE)
984 const_iv (WILL_APPLY_TREASURE)
985 const_iv (WILL_APPLY_EARTHWALL)
986 const_iv (WILL_APPLY_DOOR)
987 const_iv (WILL_APPLY_FOOD)
837 }; 988 };
838 989
839 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 990 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
840 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 991 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
841 992
842 const struct { 993 static const struct {
843 const char *name; 994 const char *name;
844 IV iv; 995 IV iv;
845 } *event, event_list[] = { 996 } *event, event_list[] = {
846# define const_event(name) { # name, (IV)EVENT_ ## name }, 997# define const_event(name) { # name, (IV)EVENT_ ## name },
847 const_event (NONE) 998 const_event (NONE)
… …
855 const_event (TIME) 1006 const_event (TIME)
856 const_event (THROW) 1007 const_event (THROW)
857 const_event (TRIGGER) 1008 const_event (TRIGGER)
858 const_event (CLOSE) 1009 const_event (CLOSE)
859 const_event (TIMER) 1010 const_event (TIMER)
1011 const_event (MOVE)
860 1012
861 const_event (BORN) 1013 const_event (BORN)
862 const_event (CLOCK) 1014 const_event (CLOCK)
863 const_event (CRASH) 1015 const_event (CRASH)
864 const_event (PLAYER_DEATH) 1016 const_event (PLAYER_DEATH)
… …
866 const_event (LOGIN) 1018 const_event (LOGIN)
867 const_event (LOGOUT) 1019 const_event (LOGOUT)
868 const_event (MAPENTER) 1020 const_event (MAPENTER)
869 const_event (MAPLEAVE) 1021 const_event (MAPLEAVE)
870 const_event (MAPRESET) 1022 const_event (MAPRESET)
1023 const_event (MAPLOAD)
1024 const_event (MAPOUT)
1025 const_event (MAPIN)
871 const_event (REMOVE) 1026 const_event (REMOVE)
872 const_event (SHOUT) 1027 const_event (SHOUT)
873 const_event (TELL) 1028 const_event (TELL)
874 const_event (MUZZLE) 1029 const_event (MUZZLE)
875 const_event (KICK) 1030 const_event (KICK)
1031 //const_event (FREE_OB)
876 }; 1032 };
877 1033
878 AV *av = get_av ("cf::EVENT", 1); 1034 AV *av = get_av ("cf::EVENT", 1);
879 1035
880 for (event = event_list + sizeof (event_list) / sizeof (event_list [0]); event-- > event_list; ) 1036 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)); 1037 av_store (av, event->iv, newSVpv ((char *)event->name, 0));
882 1038
883 const struct { 1039 static const struct {
884 int dtype; 1040 int dtype;
885 const char *name; 1041 const char *name;
886 IV idx; 1042 IV idx;
887 } *cprop, prop_table[] = { 1043 } *cprop, prop_table[] = {
888# define prop(type, name) { type, # name, (IV) CFAPI_ ## name }, 1044# define prop(type, name) { type, # name, (IV) CFAPI_ ## name },
… …
1067 cf_object_set_int_property (obj, idx, SvIV (newval)); 1223 cf_object_set_int_property (obj, idx, SvIV (newval));
1068 break; 1224 break;
1069 case CFAPI_LONG: 1225 case CFAPI_LONG:
1070 cf_object_set_long_property (obj, idx, SvNV (newval)); 1226 cf_object_set_long_property (obj, idx, SvNV (newval));
1071 break; 1227 break;
1228 case CFAPI_DOUBLE:
1229 {
1230 int unused_type;
1231 object_set_property (&unused_type, obj, idx, (double)SvNV (newval));
1232 }
1233 break;
1072 case CFAPI_STRING: 1234 case CFAPI_STRING:
1073 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 }
1074 break; 1242 break;
1075 default: 1243 default:
1076 croak ("unhandled type '%d' in set_property '%d'", type, idx); 1244 croak ("unhandled type '%d' in set_property '%d'", type, idx);
1077 } 1245 }
1078 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
1275void
1276inv (object *obj)
1277 PROTOTYPE: $
1278 PPCODE:
1279{
1280 object *o;
1281 for (o = obj->inv; o; o = o->below)
1282 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o)));
1283}
1284
1079int cf_object_get_resistance (object *op, int rtype) 1285int cf_object_get_resistance (object *op, int rtype)
1080 ALIAS: resistance = 0 1286 ALIAS: resistance = 0
1081 1287
1082int cf_object_get_flag (object *op, int flag) 1288int cf_object_get_flag (object *op, int flag)
1083 ALIAS: flag = 0 1289 ALIAS: flag = 0
1084 1290
1085void cf_object_set_flag (object *op, int flag, int value) 1291void cf_object_set_flag (object *op, int flag, int value)
1086 1292
1087void cf_object_move (object *op, object *originator, int dir) 1293void cf_object_move (object *op, int dir, object *originator = op)
1088 1294
1089void cf_object_apply (object *op, object *author, int flags) 1295void cf_object_apply (object *op, object *author, int flags = 0)
1090 1296
1091void cf_object_apply_below (object *op) 1297void cf_object_apply_below (object *op)
1092 1298
1093void cf_object_remove (object *op) 1299void cf_object_remove (object *op)
1094 1300
… …
1098 1304
1099int 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)
1100 1306
1101int 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)
1102 1308
1103object *cf_object_clone (object *op, int clonetype) 1309object *cf_object_clone (object *op, int clonetype = 0)
1104 1310
1105int cf_object_pay_item (object *op, object *buyer) 1311int cf_object_pay_item (object *op, object *buyer)
1106 1312
1107int cf_object_pay_amount (object *op, double amount) 1313int cf_object_pay_amount (object *op, double amount)
1108 1314
1109int 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)
1110 1316
1111int 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)
1112 1318
1113void cf_object_learn_spell (object *op, object *sp) 1319void cf_object_learn_spell (object *op, object *sp)
1114 1320
1115void cf_object_forget_spell (object *op, object *sp) 1321void cf_object_forget_spell (object *op, object *sp)
1116 1322
… …
1151 1357
1152char *cf_object_get_key (object *op, char *keyname) 1358char *cf_object_get_key (object *op, char *keyname)
1153 ALIAS: key = 0 1359 ALIAS: key = 0
1154 1360
1155void cf_object_set_key (object *op, char *keyname, char *value) 1361void cf_object_set_key (object *op, char *keyname, char *value)
1362
1363object *cf_create_object_by_name (const char *name)
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: ;$
1377 CODE:
1378 RETVAL = archetype ? get_archetype (archetype) : cf_create_object ();
1379 OUTPUT:
1380 RETVAL
1381
1382object *insert_ob_in_map_at (object *ob, mapstruct *where, object_ornull *orig, int flag, int x, int y)
1383 PROTOTYPE: $$$$$$
1384 CODE:
1385{
1386 int unused_type;
1387 RETVAL = (object *)object_insert (&unused_type, ob, 0, where, orig, flag, x, y);
1388}
1389
1390object *get_nearest_player (object *ob)
1391 ALIAS: nearest_player = 0
1392 PREINIT:
1393 extern object *get_nearest_player (object *);
1394
1395void rangevector (object *ob, object *other, int flags = 0)
1396 PROTOTYPE: $$;$
1397 PPCODE:
1398{
1399 rv_vector rv;
1400 get_rangevector (ob, other, &rv, flags);
1401 EXTEND (SP, 5);
1402 PUSHs (newSVuv (rv.distance));
1403 PUSHs (newSViv (rv.distance_x));
1404 PUSHs (newSViv (rv.distance_y));
1405 PUSHs (newSViv (rv.direction));
1406 PUSHs (newSVcfapi (CFAPI_POBJECT, rv.part));
1407}
1408
1409bool on_same_map_as (object *ob, object *other)
1410 CODE:
1411 RETVAL = on_same_map (ob, other);
1412 OUTPUT: RETVAL
1156 1413
1157char * 1414char *
1158base_name (object *ob, int plural) 1415base_name (object *ob, int plural)
1159 CODE: 1416 CODE:
1160 RETVAL = cf_query_base_name (ob, plural); 1417 RETVAL = cf_query_base_name (ob, plural);
1161 OUTPUT: RETVAL 1418 OUTPUT: RETVAL
1162 1419
1163MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
1164
1165object *cf_create_object_by_name (const char *name = 0)
1166 PROTOTYPE: ;$
1167 ALIAS:
1168 create_object = 0
1169 new = 0
1170 CODE:
1171 RETVAL = name ? cf_create_object_by_name (name) : cf_create_object ();
1172 OUTPUT:
1173 RETVAL
1174
1175void cf_fix_object (object *pl)
1176 ALIAS: fix = 0
1177
1178object *cf_insert_ob_in_ob (object *ob, object *where)
1179
1180 1420
1181MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_ 1421MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_
1182 1422
1183player *player (object *op) 1423player *player (object *op)
1184 CODE: 1424 CODE:
… …
1187 1427
1188void 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)
1189 1429
1190object *cf_player_send_inventory (object *op) 1430object *cf_player_send_inventory (object *op)
1191 1431
1432player *contr (object *op)
1433 CODE:
1434 RETVAL = op->contr;
1435 OUTPUT: RETVAL
1436
1192char *cf_player_get_ip (object *op) 1437char *cf_player_get_ip (object *op)
1193 ALIAS: ip = 0 1438 ALIAS: ip = 0
1194 1439
1195object *cf_player_get_marked_item (object *op) 1440object *cf_player_get_marked_item (object *op)
1196 ALIAS: marked_item = 0 1441 ALIAS: marked_item = 0
… …
1209 1454
1210player *cf_player_find (char *name) 1455player *cf_player_find (char *name)
1211 PROTOTYPE: $ 1456 PROTOTYPE: $
1212 1457
1213void cf_player_move (player *pl, int dir) 1458void cf_player_move (player *pl, int dir)
1459
1460void MapNewmapCmd (player *pl)
1214 1461
1215# nonstandard 1462# nonstandard
1216object *ob (player *pl) 1463object *ob (player *pl)
1217 CODE: 1464 CODE:
1218 RETVAL = pl->ob; 1465 RETVAL = pl->ob;
1219 OUTPUT: RETVAL 1466 OUTPUT: RETVAL
1467
1468player *first ()
1469 CODE:
1470 RETVAL = first_player;
1471 OUTPUT: RETVAL
1472
1473player *next (player *pl)
1474 CODE:
1475 RETVAL = pl->next;
1476 OUTPUT: RETVAL
1477
1478void
1479list ()
1480 PPCODE:
1481{
1482 player *pl;
1483 for (pl = first_player; pl; pl = pl->next)
1484 XPUSHs (newSVcfapi (CFAPI_PPLAYER, pl));
1485}
1220 1486
1221 1487
1222MODULE = cf PACKAGE = cf::map PREFIX = cf_map_ 1488MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
1223 1489
1224SV * 1490SV *
… …
1237 break; 1503 break;
1238 default: 1504 default:
1239 croak ("unhandled type '%d' in set_property '%d'", type, idx); 1505 croak ("unhandled type '%d' in set_property '%d'", type, idx);
1240 } 1506 }
1241 1507
1508mapstruct *new (int width, int height)
1509 PROTOTYPE:
1510 CODE:
1511{
1512 int unused_type;
1513 RETVAL = map_get_map (&unused_type, 0, width, height);
1514}
1515 OUTPUT:
1516 RETVAL
1517
1242mapstruct *cf_map_get_map (char *name) 1518mapstruct *cf_map_get_map (char *name)
1243 PROTOTYPE: $ 1519 PROTOTYPE: $
1244 ALIAS: map = 0 1520 ALIAS: map = 0
1245 1521
1246mapstruct *cf_map_get_first () 1522mapstruct *cf_map_get_first ()
… …
1254object* cf_map_present_arch_by_name (mapstruct *map, const char* str, int nx, int ny) 1530object* cf_map_present_arch_by_name (mapstruct *map, const char* str, int nx, int ny)
1255 C_ARGS: str, map, nx, ny 1531 C_ARGS: str, map, nx, ny
1256 1532
1257#int cf_map_get_flags (mapstruct* map, mapstruct** nmap, I16 x, I16 y, I16 *nx, I16 *ny) 1533#int cf_map_get_flags (mapstruct* map, mapstruct** nmap, I16 x, I16 y, I16 *nx, I16 *ny)
1258 1534
1535void
1536at (mapstruct *obj, unsigned int x, unsigned int y)
1537 PROTOTYPE: $$$
1538 INIT:
1539 if (x >= MAP_WIDTH (obj) || y >= MAP_HEIGHT (obj)) XSRETURN_EMPTY;
1540 PPCODE:
1541{
1542 object *o;
1543
1544 for (o = GET_MAP_OB (obj, x, y); o; o = o->above)
1545 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o)));
1546}
1259 1547
1548SV *
1549bot_at (mapstruct *obj, unsigned int x, unsigned int y)
1550 PROTOTYPE: $$$
1551 ALIAS:
1552 top_at = 1
1553 flags_at = 2
1554 light_at = 3
1555 move_block_at = 4
1556 move_slow_at = 5
1557 move_on_at = 6
1558 move_off_at = 7
1559 INIT:
1560 if (x >= MAP_WIDTH (obj) || y >= MAP_HEIGHT (obj)) XSRETURN_UNDEF;
1561 CODE:
1562 switch (ix)
1563 {
1564 case 0: RETVAL = newSVcfapi (CFAPI_POBJECT, GET_MAP_OB (obj, x, y)); break;
1565 case 1: RETVAL = newSVcfapi (CFAPI_POBJECT, GET_MAP_TOP (obj, x, y)); break;
1566 case 2: RETVAL = newSVuv ( GET_MAP_FLAGS (obj, x, y)); break;
1567 case 3: RETVAL = newSViv ( GET_MAP_LIGHT (obj, x, y)); break;
1568 case 4: RETVAL = newSVuv ( GET_MAP_MOVE_BLOCK (obj, x, y)); break;
1569 case 5: RETVAL = newSVuv ( GET_MAP_MOVE_SLOW (obj, x, y)); break;
1570 case 6: RETVAL = newSVuv ( GET_MAP_MOVE_ON (obj, x, y)); break;
1571 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;
1572 }
1573 OUTPUT:
1574 RETVAL
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}
1260 1647
1261MODULE = cf PACKAGE = cf::arch PREFIX = cf_archetype_ 1648MODULE = cf PACKAGE = cf::arch PREFIX = cf_archetype_
1262 1649
1263archetype*cf_archetype_get_first() 1650archetype *cf_archetype_get_first()
1264 PROTOTYPE: 1651 PROTOTYPE:
1265 ALIAS: first = 0 1652 ALIAS: first = 0
1266 1653
1267archetype *cf_archetype_get_next (archetype *arch) 1654archetype *cf_archetype_get_next (archetype *arch)
1268 ALIAS: next = 0 1655 ALIAS: next = 0

Diff Legend

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