cppbind: tweaking from_nasal/to_nasal.

[simgear.git] / simgear / nasal / misc.c

diff --git a/simgear/nasal/misc.c b/simgear/nasal/misc.c
index 8640aea09769c2b90bc5c17f796cb8d7a7a5058f..a249fce70332fb186e991fddb46a9d863acec7db 100644 (file)
--- a/simgear/nasal/misc.c
+++ b/simgear/nasal/misc.c
@@ -107,6 +107,24 @@ naRef naNewCCode(struct Context* c, naCFunction fptr)
 {
     naRef r = naNew(c, T_CCODE);
     PTR(r).ccode->fptr = fptr;
+    PTR(r).ccode->fptru = 0;
+    return r;
+}
+
+naRef naNewCCodeU(struct Context* c, naCFunctionU fptr, void* user_data)
+{
+    return naNewCCodeUD(c, fptr, user_data, 0);
+}
+
+naRef naNewCCodeUD( struct Context* c,
+                    naCFunctionU fptr,
+                    void* user_data,
+                    void (*destroy)(void*) )
+{
+    naRef r = naNew(c, T_CCODE);
+    PTR(r).ccode->fptru = fptr;
+    PTR(r).ccode->user_data = user_data;
+    PTR(r).ccode->destroy = destroy;
     return r;
 }
 
@@ -121,12 +139,25 @@ naRef naNewFunc(struct Context* c, naRef code)
 
 naRef naNewGhost(naContext c, naGhostType* type, void* ptr)
 {
-    naRef ghost = naNew(c, T_GHOST);
+    naRef ghost;
+    // ensure 'simple' ghost users don't see garbage for these fields
+    type->get_member = 0;
+    type->set_member = 0;
+    
+    ghost = naNew(c, T_GHOST);
     PTR(ghost).ghost->gtype = type;
     PTR(ghost).ghost->ptr = ptr;
     return ghost;
 }
 
+naRef naNewGhost2(naContext c, naGhostType* t, void* ptr)
+{
+    naRef ghost = naNew(c, T_GHOST);
+    PTR(ghost).ghost->gtype = t;
+    PTR(ghost).ghost->ptr = ptr;
+    return ghost;
+}
+
 naGhostType* naGhost_type(naRef ghost)
 {
     if(!IS_GHOST(ghost)) return 0;