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.10 by root, Sat Feb 4 20:38:29 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
… …
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;
56static f_plug_api object_set_property; 59static f_plug_api object_set_property;
60static f_plug_api map_get_map;
61static f_plug_api object_insert;
57 62
63/* this is a stupid way to do things, and awkward to use for plug-in authors */
58typedef struct 64typedef struct
59{ 65{
60 object* who; 66 object* who;
61 object* activator; 67 object* activator;
62 object* third; 68 object* third;
69 mapstruct* map;
63 char message[1024]; 70 char message[1024];
64 int fix; 71 int fix; // seems to be python-only, and should not be part of the API
65 int event_code; 72 int event_code;
66 char options[1024]; 73 char extension[1024]; // name field, should invoke specific perl extension
74 char options[1024]; // slaying field of event_connectors
67 int returnvalue; 75 int returnvalue;
68} CFPContext; 76} CFPContext;
69 77
70//static int current_command = -999; 78static HV *obj_cache;
71
72static PerlInterpreter *perl; 79static PerlInterpreter *perl;
73 80
74////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 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}
75 117
76static SV * 118static SV *
77newSVptr (void *ptr, const char *klass) 119newSVptr (void *ptr, const char *klass)
78{ 120{
121 SV *sv;
122
79 if (!ptr) 123 if (!ptr)
80 return &PL_sv_undef; 124 return &PL_sv_undef;
81 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 {
82 HV *hv = newHV (); 157 HV *hv = newHV ();
83 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 158 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
84 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);
85} 165}
86 166
87static void 167static void
88clearSVptr (SV *sv) 168clearSVptr (SV *sv)
89{ 169{
… …
106 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);
107 187
108 return (long)mg->mg_ptr; 188 return (long)mg->mg_ptr;
109} 189}
110 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
111SV * 200SV *
112newSVcfapi (int type, ...) 201newSVcfapi (int type, ...)
113{ 202{
114 SV *sv; 203 SV *sv;
115 204
116 va_list args; 205 va_list args;
117 va_start (args, type); 206 va_start (args, type);
118 207
119 switch (type) 208 switch (type)
120 { 209 {
210#if 0
211 case CFAPI_INT16:
212 sv = newSViv (*va_arg (args, sint16_t *));
213 break;
214#endif
215
121 case CFAPI_INT: 216 case CFAPI_INT:
122 sv = newSViv (*va_arg (args, int *)); 217 sv = newSViv (*va_arg (args, int *));
123 break; 218 break;
124 219
125 case CFAPI_LONG: 220 case CFAPI_LONG:
… …
145 sv = &PL_sv_undef; 240 sv = &PL_sv_undef;
146 else 241 else
147 switch (*(int *)cf_object_get_property (obj, CFAPI_OBJECT_PROP_TYPE)) 242 switch (*(int *)cf_object_get_property (obj, CFAPI_OBJECT_PROP_TYPE))
148 { 243 {
149 case MAP: 244 case MAP:
150 sv = newSVptr (obj, "cf::object::map"); 245 sv = newSVptr_cached (obj, "cf::object::map");
151 break; 246 break;
152 247
153 case PLAYER: 248 case PLAYER:
154 sv = newSVptr (obj, "cf::object::player"); 249 sv = newSVptr_cached (obj, "cf::object::player");
155 break; 250 break;
156 251
157 default: 252 default:
158 sv = newSVptr (obj, "cf::object"); 253 sv = newSVptr_cached (obj, "cf::object");
159 break; 254 break;
160 } 255 }
161 } 256 }
162 break; 257 break;
163 258
… …
191} 286}
192 287
193///////////////////////////////////////////////////////////////////////////// 288/////////////////////////////////////////////////////////////////////////////
194 289
195void 290void
196inject_event (CFPContext *context) 291inject_event (const char *func, CFPContext *context)
197{ 292{
198 dSP; 293 dSP;
199 294
200 ENTER; 295 ENTER;
201 SAVETMPS; 296 SAVETMPS;
202 297
203 PUSHMARK (SP); 298 PUSHMARK (SP);
204
205 EXTEND (SP, 2);
206 //PUSHs (sv_2mortal (newSViv (type)));
207 299
208 HV *hv = newHV (); 300 HV *hv = newHV ();
209#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)
210 hv_context (CFAPI_POBJECT, ,who); 302 hv_context (CFAPI_POBJECT, ,who);
211 hv_context (CFAPI_POBJECT, ,activator); 303 hv_context (CFAPI_POBJECT, ,activator);
212 hv_context (CFAPI_POBJECT, ,third); 304 hv_context (CFAPI_POBJECT, ,third);
305 hv_context (CFAPI_PMAP, ,map);
213 hv_context (CFAPI_STRING , ,message); 306 hv_context (CFAPI_STRING , ,message);
214 hv_context (CFAPI_INT ,&,fix); 307 hv_context (CFAPI_INT ,&,fix);
215 hv_context (CFAPI_INT ,&,event_code); 308 hv_context (CFAPI_INT ,&,event_code);
216 hv_context (CFAPI_STRING , ,options); 309 hv_context (CFAPI_STRING , ,options);
310 hv_context (CFAPI_STRING , ,extension);
217 311
218 PUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 312 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
219 313
220 PUTBACK; 314 PUTBACK;
221 int count = call_pv ("cf::inject_event", G_SCALAR | G_EVAL); 315 int count = call_pv (func, G_SCALAR | G_EVAL);
222 SPAGAIN; 316 SPAGAIN;
223 317
224 if (SvTRUE (ERRSV)) 318 if (SvTRUE (ERRSV))
225 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));
226 320
… …
336 430
337 registerGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_register_global_event"); 431 registerGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_register_global_event");
338 unregisterGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_unregister_global_event"); 432 unregisterGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_unregister_global_event");
339 systemDirectory = gethook (&rtype, hooktype, "cfapi_system_directory"); 433 systemDirectory = gethook (&rtype, hooktype, "cfapi_system_directory");
340 object_set_property = gethook (&rtype, hooktype, "cfapi_object_set_property"); 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
341 cf_init_plugin (gethook); 438 cf_init_plugin (gethook);
342 439
343 /* Pick the global events you want to monitor from this plugin */ 440 /* Pick the global events you want to monitor from this plugin */
344 registerGlobalEvent (NULL, EVENT_BORN, PLUGIN_NAME, globalEventListener); 441 registerGlobalEvent (NULL, EVENT_BORN, PLUGIN_NAME, globalEventListener);
345 registerGlobalEvent (NULL, EVENT_CLOCK, PLUGIN_NAME, globalEventListener); 442 registerGlobalEvent (NULL, EVENT_CLOCK, PLUGIN_NAME, globalEventListener);
… …
349 registerGlobalEvent (NULL, EVENT_LOGIN, PLUGIN_NAME, globalEventListener); 446 registerGlobalEvent (NULL, EVENT_LOGIN, PLUGIN_NAME, globalEventListener);
350 registerGlobalEvent (NULL, EVENT_LOGOUT, PLUGIN_NAME, globalEventListener); 447 registerGlobalEvent (NULL, EVENT_LOGOUT, PLUGIN_NAME, globalEventListener);
351 registerGlobalEvent (NULL, EVENT_MAPENTER, PLUGIN_NAME, globalEventListener); 448 registerGlobalEvent (NULL, EVENT_MAPENTER, PLUGIN_NAME, globalEventListener);
352 registerGlobalEvent (NULL, EVENT_MAPLEAVE, PLUGIN_NAME, globalEventListener); 449 registerGlobalEvent (NULL, EVENT_MAPLEAVE, PLUGIN_NAME, globalEventListener);
353 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);
354 registerGlobalEvent (NULL, EVENT_REMOVE, PLUGIN_NAME, globalEventListener); 455 registerGlobalEvent (NULL, EVENT_REMOVE, PLUGIN_NAME, globalEventListener);
355 registerGlobalEvent (NULL, EVENT_SHOUT, PLUGIN_NAME, globalEventListener); 456 registerGlobalEvent (NULL, EVENT_SHOUT, PLUGIN_NAME, globalEventListener);
356 registerGlobalEvent (NULL, EVENT_TELL, PLUGIN_NAME, globalEventListener); 457 registerGlobalEvent (NULL, EVENT_TELL, PLUGIN_NAME, globalEventListener);
357 registerGlobalEvent (NULL, EVENT_MUZZLE, PLUGIN_NAME, globalEventListener); 458 registerGlobalEvent (NULL, EVENT_MUZZLE, PLUGIN_NAME, globalEventListener);
358 registerGlobalEvent (NULL, EVENT_KICK, PLUGIN_NAME, globalEventListener); 459 registerGlobalEvent (NULL, EVENT_KICK, 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);
359 463
360 char *argv[] = { 464 char *argv[] = {
361 "", 465 "",
362 "-e" 466 "-e"
363 "BEGIN {" 467 "BEGIN {"
… …
377 481
378 perl_destruct (perl); 482 perl_destruct (perl);
379 perl_free (perl); 483 perl_free (perl);
380 perl = 0; 484 perl = 0;
381 } 485 }
486 else
487 {
488 obj_cache = newHV ();
489 }
382 490
383 return 0; 491 return 0;
384} 492}
385 493
386void * 494void *
… …
405 { 513 {
406 case EVENT_CRASH: 514 case EVENT_CRASH:
407 printf ("Unimplemented for now\n"); 515 printf ("Unimplemented for now\n");
408 break; 516 break;
409 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
533 case EVENT_MAPENTER:
534 case EVENT_MAPLEAVE:
535 case EVENT_FREE_OB:
410 case EVENT_BORN: 536 case EVENT_BORN:
537 case EVENT_REMOVE:
411 context.activator = va_arg (args, object *); 538 context.activator = va_arg (args, object *);
412 break; 539 break;
413 540
414 case EVENT_PLAYER_DEATH: 541 case EVENT_PLAYER_DEATH:
415 context.who = va_arg (args, object *); 542 context.who = va_arg (args, object *);
… …
419 context.who = va_arg (args, object *); 546 context.who = va_arg (args, object *);
420 context.activator = va_arg (args, object *); 547 context.activator = va_arg (args, object *);
421 break; 548 break;
422 549
423 case EVENT_LOGIN: 550 case EVENT_LOGIN:
424 pl = va_arg (args, player *);
425 context.activator = pl->ob;
426 buf = va_arg (args, char *);
427 if (buf != 0)
428 strcpy (context.message, buf);
429 break;
430
431 case EVENT_LOGOUT: 551 case EVENT_LOGOUT:
432 pl = va_arg (args, player *); 552 pl = va_arg (args, player *);
433 context.activator = pl->ob; 553 context.activator = pl->ob;
434 buf = va_arg (args, char *); 554 buf = va_arg (args, char *);
435 if (buf != 0) 555 if (buf != 0)
436 strcpy (context.message, buf); 556 strncpy (context.message, buf, sizeof (context.message));
437 break;
438
439 case EVENT_REMOVE:
440 context.activator = va_arg (args, object *);
441 break; 557 break;
442 558
443 case EVENT_SHOUT: 559 case EVENT_SHOUT:
444 context.activator = va_arg (args, object *);
445 buf = va_arg (args, char *);
446 if (buf != 0)
447 strcpy (context.message, buf);
448 break;
449
450 case EVENT_MUZZLE: 560 case EVENT_MUZZLE:
451 context.activator = va_arg (args, object *);
452 buf = va_arg (args, char *);
453 if (buf != 0)
454 strcpy (context.message, buf);
455 break;
456
457 case EVENT_KICK: 561 case EVENT_KICK:
458 context.activator = va_arg (args, object *); 562 context.activator = va_arg (args, object *);
459 buf = va_arg (args, char *); 563 buf = va_arg (args, char *);
460 if (buf != 0) 564 if (buf != 0)
461 strcpy (context.message, buf); 565 strncpy (context.message, buf, sizeof (context.message));
462 break;
463
464 case EVENT_MAPENTER:
465 context.activator = va_arg (args, object *);
466 break;
467
468 case EVENT_MAPLEAVE:
469 context.activator = va_arg (args, object *);
470 break; 566 break;
471 567
472 case EVENT_CLOCK: 568 case EVENT_CLOCK:
569 clean_obj_cache ();
570 break;
571
572 case EVENT_TELL:
473 break; 573 break;
474 574
475 case EVENT_MAPRESET: 575 case EVENT_MAPRESET:
576 /* stupid, should be the map itself, not "message"??? */
476 buf = va_arg (args, char *); 577 buf = va_arg (args, char *);
477 if (buf != 0) 578 if (buf != 0)
478 strcpy (context.message, buf); 579 strncpy (context.message, buf, sizeof (context.message));
479 break;
480
481 case EVENT_TELL:
482 break; 580 break;
483 } 581 }
484 582
485 va_end (args); 583 va_end (args);
486 584
487 inject_event (&context); 585 if (context.event_code == EVENT_FREE_OB)
586 {
587 SV *sv = hv_delete (obj_cache, (char *)&context.activator, sizeof (void *), 0);
588
589 if (sv)
590 clearSVptr (sv);
591 }
592 else
593 inject_event ("cf::inject_global_event", &context);
488 594
489 rv = context.returnvalue; 595 rv = context.returnvalue;
490 596
491 return &rv; 597 return &rv;
492} 598}
… …
508 614
509 context.who = va_arg (args, object *); 615 context.who = va_arg (args, object *);
510 context.event_code = va_arg (args, int); 616 context.event_code = va_arg (args, int);
511 context.activator = va_arg (args, object *); 617 context.activator = va_arg (args, object *);
512 context.third = va_arg (args, object *); 618 context.third = va_arg (args, object *);
619
513 buf = va_arg (args, char *); 620 buf = va_arg (args, char *);
514
515 if (buf != 0) 621 if (buf != 0)
516 strcpy (context.message, buf); 622 strncpy (context.message, buf, sizeof (context.message));
517 623
518 context.fix = va_arg (args, int); 624 context.fix = va_arg (args, int);
625 strncpy (context.extension, va_arg (args, char *), sizeof (context.extension));
519 strcpy (context.options, va_arg (args, char *)); 626 strncpy (context.options, va_arg (args, char *), sizeof (context.options));
520 context.returnvalue = 0; 627 context.returnvalue = 0;
521 va_end (args); 628 va_end (args);
522 629
523 inject_event (&context); 630 inject_event ("cf::inject_event", &context);
524 631
525 rv = context.returnvalue; 632 rv = context.returnvalue;
526 return &rv; 633 return &rv;
527} 634}
528 635
… …
556 const_iv (llevInfo) 663 const_iv (llevInfo)
557 const_iv (llevDebug) 664 const_iv (llevDebug)
558 const_iv (llevMonster) 665 const_iv (llevMonster)
559 666
560 const_iv (PLAYER) 667 const_iv (PLAYER)
668 const_iv (TRANSPORT)
561 const_iv (ROD) 669 const_iv (ROD)
562 const_iv (TREASURE) 670 const_iv (TREASURE)
563 const_iv (POTION) 671 const_iv (POTION)
564 const_iv (FOOD) 672 const_iv (FOOD)
565 const_iv (POISON) 673 const_iv (POISON)
… …
570 const_iv (BOW) 678 const_iv (BOW)
571 const_iv (WEAPON) 679 const_iv (WEAPON)
572 const_iv (ARMOUR) 680 const_iv (ARMOUR)
573 const_iv (PEDESTAL) 681 const_iv (PEDESTAL)
574 const_iv (ALTAR) 682 const_iv (ALTAR)
575 const_iv (CONFUSION)
576 const_iv (LOCKED_DOOR) 683 const_iv (LOCKED_DOOR)
577 const_iv (SPECIAL_KEY) 684 const_iv (SPECIAL_KEY)
578 const_iv (MAP) 685 const_iv (MAP)
579 const_iv (DOOR) 686 const_iv (DOOR)
580 const_iv (KEY) 687 const_iv (KEY)
… …
681 const_iv (ITEM_TRANSFORMER) 788 const_iv (ITEM_TRANSFORMER)
682 const_iv (QUEST) 789 const_iv (QUEST)
683 790
684 const_iv (ST_BD_BUILD) 791 const_iv (ST_BD_BUILD)
685 const_iv (ST_BD_REMOVE) 792 const_iv (ST_BD_REMOVE)
793
686 const_iv (ST_MAT_FLOOR) 794 const_iv (ST_MAT_FLOOR)
687 const_iv (ST_MAT_WALL) 795 const_iv (ST_MAT_WALL)
688 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)
689 824
690 const_iv (QUEST_IN_PROGRESS) 825 const_iv (QUEST_IN_PROGRESS)
691 const_iv (QUEST_DONE_QUEST) 826 const_iv (QUEST_DONE_QUEST)
692 const_iv (QUEST_DONE_TASK) 827 const_iv (QUEST_DONE_TASK)
693 const_iv (QUEST_START_QUEST) 828 const_iv (QUEST_START_QUEST)
… …
834 const_iv (F_CURSED) 969 const_iv (F_CURSED)
835 const_iv (F_DAMNED) 970 const_iv (F_DAMNED)
836 const_iv (F_OPEN) 971 const_iv (F_OPEN)
837 const_iv (F_NOPICK) 972 const_iv (F_NOPICK)
838 const_iv (F_LOCKED) 973 const_iv (F_LOCKED)
974
975 const_iv (P_BLOCKSVIEW)
976 const_iv (P_NO_MAGIC)
977 const_iv (P_IS_ALIVE)
978 const_iv (P_NO_CLERIC)
979 const_iv (P_NEED_UPDATE)
980 const_iv (P_NO_ERROR)
981 const_iv (P_OUT_OF_MAP)
982 const_iv (P_NEW_MAP)
983
984 const_iv (UP_OBJ_INSERT)
985 const_iv (UP_OBJ_REMOVE)
986 const_iv (UP_OBJ_CHANGE)
987 const_iv (UP_OBJ_FACE)
988
989 const_iv (INS_NO_MERGE)
990 const_iv (INS_ABOVE_FLOOR_ONLY)
991 const_iv (INS_NO_WALK_ON)
992 const_iv (INS_ON_TOP)
993 const_iv (INS_BELOW_ORIGINATOR)
994 const_iv (INS_MAP_LOAD)
995
996 const_iv (WILL_APPLY_HANDLE)
997 const_iv (WILL_APPLY_TREASURE)
998 const_iv (WILL_APPLY_EARTHWALL)
999 const_iv (WILL_APPLY_DOOR)
1000 const_iv (WILL_APPLY_FOOD)
1001
1002 const_iv (SAVE_MODE)
1003 const_iv (SAVE_DIR_MODE)
839 }; 1004 };
840 1005
841 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; )
842 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1007 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
843 1008
… …
857 const_event (TIME) 1022 const_event (TIME)
858 const_event (THROW) 1023 const_event (THROW)
859 const_event (TRIGGER) 1024 const_event (TRIGGER)
860 const_event (CLOSE) 1025 const_event (CLOSE)
861 const_event (TIMER) 1026 const_event (TIMER)
1027 const_event (MOVE)
862 1028
863 const_event (BORN) 1029 const_event (BORN)
864 const_event (CLOCK) 1030 const_event (CLOCK)
865 const_event (CRASH) 1031 const_event (CRASH)
866 const_event (PLAYER_DEATH) 1032 const_event (PLAYER_DEATH)
1033 const_event (PLAYER_LOAD)
1034 const_event (PLAYER_SAVE)
867 const_event (GKILL) 1035 const_event (GKILL)
868 const_event (LOGIN) 1036 const_event (LOGIN)
869 const_event (LOGOUT) 1037 const_event (LOGOUT)
870 const_event (MAPENTER) 1038 const_event (MAPENTER)
871 const_event (MAPLEAVE) 1039 const_event (MAPLEAVE)
872 const_event (MAPRESET) 1040 const_event (MAPRESET)
1041 const_event (MAPLOAD)
1042 const_event (MAPOUT)
1043 const_event (MAPIN)
1044 const_event (MAPCLEAN)
873 const_event (REMOVE) 1045 const_event (REMOVE)
874 const_event (SHOUT) 1046 const_event (SHOUT)
875 const_event (TELL) 1047 const_event (TELL)
876 const_event (MUZZLE) 1048 const_event (MUZZLE)
877 const_event (KICK) 1049 const_event (KICK)
1050 //const_event (FREE_OB)
878 }; 1051 };
879 1052
880 AV *av = get_av ("cf::EVENT", 1); 1053 AV *av = get_av ("cf::EVENT", 1);
881 1054
882 for (event = event_list + sizeof (event_list) / sizeof (event_list [0]); event-- > event_list; ) 1055 for (event = event_list + sizeof (event_list) / sizeof (event_list [0]); event-- > event_list; )
… …
1076 int unused_type; 1249 int unused_type;
1077 object_set_property (&unused_type, obj, idx, (double)SvNV (newval)); 1250 object_set_property (&unused_type, obj, idx, (double)SvNV (newval));
1078 } 1251 }
1079 break; 1252 break;
1080 case CFAPI_STRING: 1253 case CFAPI_STRING:
1081 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 }
1082 break; 1261 break;
1083 default: 1262 default:
1084 croak ("unhandled type '%d' in set_property '%d'", type, idx); 1263 croak ("unhandled type '%d' in set_property '%d'", type, idx);
1085 } 1264 }
1086 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
1294void
1295inv (object *obj)
1296 PROTOTYPE: $
1297 PPCODE:
1298{
1299 object *o;
1300 for (o = obj->inv; o; o = o->below)
1301 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o)));
1302}
1303
1087int cf_object_get_resistance (object *op, int rtype) 1304int cf_object_get_resistance (object *op, int rtype)
1088 ALIAS: resistance = 0 1305 ALIAS: resistance = 0
1089 1306
1090int cf_object_get_flag (object *op, int flag) 1307int cf_object_get_flag (object *op, int flag)
1091 ALIAS: flag = 0 1308 ALIAS: flag = 0
1092 1309
1093void cf_object_set_flag (object *op, int flag, int value) 1310void cf_object_set_flag (object *op, int flag, int value)
1094 1311
1095void cf_object_move (object *op, object *originator, int dir) 1312void cf_object_move (object *op, int dir, object *originator = op)
1096 1313
1097void cf_object_apply (object *op, object *author, int flags) 1314void cf_object_apply (object *op, object *author, int flags = 0)
1098 1315
1099void cf_object_apply_below (object *op) 1316void cf_object_apply_below (object *op)
1100 1317
1101void cf_object_remove (object *op) 1318void cf_object_remove (object *op)
1102 1319
… …
1106 1323
1107int 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)
1108 1325
1109int 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)
1110 1327
1111object *cf_object_clone (object *op, int clonetype) 1328object *cf_object_clone (object *op, int clonetype = 0)
1112 1329
1113int cf_object_pay_item (object *op, object *buyer) 1330int cf_object_pay_item (object *op, object *buyer)
1114 1331
1115int cf_object_pay_amount (object *op, double amount) 1332int cf_object_pay_amount (object *op, double amount)
1116 1333
1117int 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)
1118 1335
1119int 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)
1120 1337
1121void cf_object_learn_spell (object *op, object *sp) 1338void cf_object_learn_spell (object *op, object *sp)
1122 1339
1123void cf_object_forget_spell (object *op, object *sp) 1340void cf_object_forget_spell (object *op, object *sp)
1124 1341
… …
1159 1376
1160char *cf_object_get_key (object *op, char *keyname) 1377char *cf_object_get_key (object *op, char *keyname)
1161 ALIAS: key = 0 1378 ALIAS: key = 0
1162 1379
1163void 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
1164 1432
1165char * 1433char *
1166base_name (object *ob, int plural) 1434base_name (object *ob, int plural)
1167 CODE: 1435 CODE:
1168 RETVAL = cf_query_base_name (ob, plural); 1436 RETVAL = cf_query_base_name (ob, plural);
1169 OUTPUT: RETVAL 1437 OUTPUT: RETVAL
1170 1438
1171MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
1172
1173object *cf_create_object_by_name (const char *name = 0)
1174 PROTOTYPE: ;$
1175 ALIAS:
1176 create_object = 0
1177 new = 0
1178 CODE:
1179 RETVAL = name ? cf_create_object_by_name (name) : cf_create_object ();
1180 OUTPUT:
1181 RETVAL
1182
1183void cf_fix_object (object *pl)
1184 ALIAS: fix = 0
1185
1186object *cf_insert_ob_in_ob (object *ob, object *where)
1187
1188 1439
1189MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_ 1440MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_
1190 1441
1191player *player (object *op) 1442player *player (object *op)
1192 CODE: 1443 CODE:
… …
1195 1446
1196void 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)
1197 1448
1198object *cf_player_send_inventory (object *op) 1449object *cf_player_send_inventory (object *op)
1199 1450
1451player *contr (object *op)
1452 CODE:
1453 RETVAL = op->contr;
1454 OUTPUT: RETVAL
1455
1200char *cf_player_get_ip (object *op) 1456char *cf_player_get_ip (object *op)
1201 ALIAS: ip = 0 1457 ALIAS: ip = 0
1202 1458
1203object *cf_player_get_marked_item (object *op) 1459object *cf_player_get_marked_item (object *op)
1204 ALIAS: marked_item = 0 1460 ALIAS: marked_item = 0
… …
1217 1473
1218player *cf_player_find (char *name) 1474player *cf_player_find (char *name)
1219 PROTOTYPE: $ 1475 PROTOTYPE: $
1220 1476
1221void cf_player_move (player *pl, int dir) 1477void cf_player_move (player *pl, int dir)
1478
1479void MapNewmapCmd (player *pl)
1222 1480
1223# nonstandard 1481# nonstandard
1224object *ob (player *pl) 1482object *ob (player *pl)
1225 CODE: 1483 CODE:
1226 RETVAL = pl->ob; 1484 RETVAL = pl->ob;
1227 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}
1228 1505
1229 1506
1230MODULE = cf PACKAGE = cf::map PREFIX = cf_map_ 1507MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
1231 1508
1232SV * 1509SV *
… …
1245 break; 1522 break;
1246 default: 1523 default:
1247 croak ("unhandled type '%d' in set_property '%d'", type, idx); 1524 croak ("unhandled type '%d' in set_property '%d'", type, idx);
1248 } 1525 }
1249 1526
1527mapstruct *new (int width, int height)
1528 PROTOTYPE:
1529 CODE:
1530{
1531 int unused_type;
1532 RETVAL = map_get_map (&unused_type, 0, width, height);
1533}
1534 OUTPUT:
1535 RETVAL
1536
1250mapstruct *cf_map_get_map (char *name) 1537mapstruct *cf_map_get_map (char *name)
1251 PROTOTYPE: $ 1538 PROTOTYPE: $
1252 ALIAS: map = 0 1539 ALIAS: map = 0
1253 1540
1254mapstruct *cf_map_get_first () 1541mapstruct *cf_map_get_first ()
… …
1262object* cf_map_present_arch_by_name (mapstruct *map, const char* str, int nx, int ny) 1549object* cf_map_present_arch_by_name (mapstruct *map, const char* str, int nx, int ny)
1263 C_ARGS: str, map, nx, ny 1550 C_ARGS: str, map, nx, ny
1264 1551
1265#int cf_map_get_flags (mapstruct* map, mapstruct** nmap, I16 x, I16 y, I16 *nx, I16 *ny) 1552#int cf_map_get_flags (mapstruct* map, mapstruct** nmap, I16 x, I16 y, I16 *nx, I16 *ny)
1266 1553
1554void
1555at (mapstruct *obj, unsigned int x, unsigned int y)
1556 PROTOTYPE: $$$
1557 INIT:
1558 if (x >= MAP_WIDTH (obj) || y >= MAP_HEIGHT (obj)) XSRETURN_EMPTY;
1559 PPCODE:
1560{
1561 object *o;
1562
1563 for (o = GET_MAP_OB (obj, x, y); o; o = o->above)
1564 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o)));
1565}
1267 1566
1567SV *
1568bot_at (mapstruct *obj, unsigned int x, unsigned int y)
1569 PROTOTYPE: $$$
1570 ALIAS:
1571 top_at = 1
1572 flags_at = 2
1573 light_at = 3
1574 move_block_at = 4
1575 move_slow_at = 5
1576 move_on_at = 6
1577 move_off_at = 7
1578 INIT:
1579 if (x >= MAP_WIDTH (obj) || y >= MAP_HEIGHT (obj)) XSRETURN_UNDEF;
1580 CODE:
1581 switch (ix)
1582 {
1583 case 0: RETVAL = newSVcfapi (CFAPI_POBJECT, GET_MAP_OB (obj, x, y)); break;
1584 case 1: RETVAL = newSVcfapi (CFAPI_POBJECT, GET_MAP_TOP (obj, x, y)); break;
1585 case 2: RETVAL = newSVuv ( GET_MAP_FLAGS (obj, x, y)); break;
1586 case 3: RETVAL = newSViv ( GET_MAP_LIGHT (obj, x, y)); break;
1587 case 4: RETVAL = newSVuv ( GET_MAP_MOVE_BLOCK (obj, x, y)); break;
1588 case 5: RETVAL = newSVuv ( GET_MAP_MOVE_SLOW (obj, x, y)); break;
1589 case 6: RETVAL = newSVuv ( GET_MAP_MOVE_ON (obj, x, y)); break;
1590 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;
1591 }
1592 OUTPUT:
1593 RETVAL
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}
1268 1666
1269MODULE = cf PACKAGE = cf::arch PREFIX = cf_archetype_ 1667MODULE = cf PACKAGE = cf::arch PREFIX = cf_archetype_
1270 1668
1271archetype*cf_archetype_get_first() 1669archetype *cf_archetype_get_first()
1272 PROTOTYPE: 1670 PROTOTYPE:
1273 ALIAS: first = 0 1671 ALIAS: first = 0
1274 1672
1275archetype *cf_archetype_get_next (archetype *arch) 1673archetype *cf_archetype_get_next (archetype *arch)
1276 ALIAS: next = 0 1674 ALIAS: next = 0

Diff Legend

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