--- deliantra/server/plugins/cfperl/cfperl.xs	2006/02/10 04:35:33	1.21
+++ deliantra/server/plugins/cfperl/cfperl.xs	2006/02/17 21:10:18	1.24
@@ -31,7 +31,7 @@
 #undef save_long // clashes with libproto.h
 
 #define PLUGIN_NAME    "perl"
-#define PLUGIN_VERSION "cfperl 0.0"
+#define PLUGIN_VERSION "cfperl 0.1"
 
 #ifndef __CEXTRACT__
 #include <plugin.h>
@@ -49,12 +49,16 @@
 
 #include "perlxsi.c"
 
+typedef object    object_ornull;
+typedef mapstruct mapstruct_ornull;
+
 static f_plug_api gethook;
 static f_plug_api registerGlobalEvent;
 static f_plug_api unregisterGlobalEvent;
 static f_plug_api systemDirectory;
 static f_plug_api object_set_property;
 static f_plug_api map_get_map;
+static f_plug_api object_insert;
 
 typedef struct
 {
@@ -171,6 +175,15 @@
   return (long)mg->mg_ptr;
 }
 
+static long
+SvPTR_ornull (SV *sv, const char *klass)
+{
+  if (SvOK (sv))
+    return SvPTR (sv, klass);
+  else
+    return 0;
+}
+
 SV *
 newSVcfapi (int type, ...)
 {
@@ -400,6 +413,7 @@
   systemDirectory = gethook (&rtype, hooktype, "cfapi_system_directory");
   object_set_property = gethook (&rtype, hooktype, "cfapi_object_set_property");
   map_get_map = gethook (&rtype, hooktype, "cfapi_map_get_map");
+  object_insert = gethook (&rtype, hooktype, "cfapi_object_insert");
 
   cf_init_plugin (gethook);
 
@@ -738,6 +752,33 @@
     const_iv (ST_MAT_WALL)
     const_iv (ST_MAT_ITEM)
 
+    const_iv (AT_PHYSICAL)
+    const_iv (AT_MAGIC)
+    const_iv (AT_FIRE)
+    const_iv (AT_ELECTRICITY)
+    const_iv (AT_COLD)
+    const_iv (AT_CONFUSION)
+    const_iv (AT_ACID)
+    const_iv (AT_DRAIN)
+    const_iv (AT_WEAPONMAGIC)
+    const_iv (AT_GHOSTHIT)
+    const_iv (AT_POISON)
+    const_iv (AT_SLOW)
+    const_iv (AT_PARALYZE)
+    const_iv (AT_TURN_UNDEAD)
+    const_iv (AT_FEAR)
+    const_iv (AT_CANCELLATION)
+    const_iv (AT_DEPLETE)
+    const_iv (AT_DEATH)
+    const_iv (AT_CHAOS)
+    const_iv (AT_COUNTERSPELL)
+    const_iv (AT_GODPOWER)
+    const_iv (AT_HOLYWORD)
+    const_iv (AT_BLIND)
+    const_iv (AT_INTERNAL)
+    const_iv (AT_LIFE_STEALING)
+    const_iv (AT_DISEASE)
+
     const_iv (QUEST_IN_PROGRESS)
     const_iv (QUEST_DONE_QUEST)
     const_iv (QUEST_DONE_TASK)
@@ -1158,12 +1199,46 @@
               }
               break;
             case CFAPI_STRING:
-              cf_object_set_string_property (obj, idx, SvPV_nolen (newval));
+              cf_object_set_string_property (obj, idx, SvOK (newval) ? SvPV_nolen (newval) : 0);
+              break;
+            case CFAPI_POBJECT:
+              {
+                 int unused_type;
+                 object_set_property (&unused_type, obj, idx, (object *)SvPTR_ornull (newval, "cf::object"));
+              }
               break;
             default:
               croak ("unhandled type '%d' in set_property '%d'", type, idx);
           }
 
+# missing properties
+
+void 
+set_attacktype (object *obj, U32 attacktype)
+	CODE:
+        obj->attacktype = attacktype;
+
+U32
+get_attacktype (object *obj)
+	ALIAS:
+        attacktype = 0
+	CODE:
+        RETVAL = obj->attacktype;
+	OUTPUT: RETVAL
+
+void 
+set_food (object *obj, int food)
+	CODE:
+        obj->stats.food = food;
+
+int
+get_food (object *obj)
+	ALIAS:
+        food = 0
+	CODE:
+        RETVAL = obj->stats.food;
+	OUTPUT: RETVAL
+
 void
 inv (object *obj)
 	PROTOTYPE: $
@@ -1204,9 +1279,9 @@
 
 int cf_object_pay_amount (object *op, double amount)
 
-int cf_object_cast_spell (object *caster, object *ctoo, int dir, object *sp_, char *flags)
+int cf_object_cast_spell (object *caster, object *ctoo, int dir, object *spell_ob, char *stringarg = 0)
 
-int cf_object_cast_ability (object *caster, object *ctoo, int dir, object *sp_, char *flags)
+int cf_object_cast_ability (object *caster, object *ctoo, int dir, object *sp_, char *stringarg = 0)
 
 void cf_object_learn_spell (object *op, object *sp)
 
@@ -1252,28 +1327,32 @@
 
 void cf_object_set_key (object *op, char *keyname, char *value)
 
-char *
-base_name (object *ob, int plural)
-        CODE:
-        RETVAL = cf_query_base_name (ob, plural);
-        OUTPUT: RETVAL
+object *cf_create_object_by_name (const char *name)
 
-MODULE = cf        PACKAGE = cf::object         PREFIX = cf_object_
+MODULE = cf        PACKAGE = cf::object         PREFIX = cf_
+
+void cf_fix_object (object *pl)
+	ALIAS: fix = 0
+
+object *cf_insert_ob_in_ob (object *ob, object *where)
+
+# no clean way to get an object from an archetype - stupid idiotic
+# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
 
-object *cf_create_object_by_name (const char *name = 0)
+object *new (const char *archetype = 0)
 	PROTOTYPE: ;$
-	ALIAS:
-        create_object = 0
-        new           = 0
         CODE:
-        RETVAL = name ? cf_create_object_by_name (name) : cf_create_object ();
+        RETVAL = archetype ? get_archetype (archetype) : cf_create_object ();
         OUTPUT:
 	RETVAL
 
-void cf_fix_object (object *pl)
-	ALIAS: fix = 0
-
-object *cf_insert_ob_in_ob (object *ob, object *where)
+object *insert_ob_in_map_at (object *ob, mapstruct *where, object_ornull *orig, int flag, int x, int y)
+	PROTOTYPE: $$$$$$
+        CODE:
+{
+	int unused_type;
+        RETVAL = (object *)object_insert (&unused_type, ob, 0, where, orig, flag, x, y);
+}
 
 object *get_nearest_player (object *ob)
 	ALIAS: nearest_player = 0
@@ -1299,6 +1378,12 @@
         RETVAL = on_same_map (ob, other);
 	OUTPUT: RETVAL
 
+char *
+base_name (object *ob, int plural)
+        CODE:
+        RETVAL = cf_query_base_name (ob, plural);
+        OUTPUT: RETVAL
+
 
 MODULE = cf        PACKAGE = cf::object::player PREFIX = cf_player_
 
@@ -1311,6 +1396,11 @@
 
 object *cf_player_send_inventory (object *op)
 
+player *contr (object *op)
+	CODE:
+        RETVAL = op->contr;
+        OUTPUT: RETVAL
+
 char *cf_player_get_ip (object *op)
 	ALIAS: ip = 0
 
@@ -1334,6 +1424,8 @@
 
 void cf_player_move (player *pl, int dir)
 
+void MapNewmapCmd (player *pl)
+
 # nonstandard
 object *ob (player *pl)
 	CODE: