From ed0db6fa32798975d0c40f9e8399dbfcd813e853 Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Sun, 8 May 2011 21:54:28 +0200
Subject: [PATCH] +

---
 src/pkg-psyc.c | 4 ++++
 src/simulate.c | 8 ++++----
 src/version.sh | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/pkg-psyc.c b/src/pkg-psyc.c
index 0b5463e..95861df 100644
--- a/src/pkg-psyc.c
+++ b/src/pkg-psyc.c
@@ -18,6 +18,7 @@
 #include "interpret.h"
 #include "mapping.h"
 #include "mstrings.h"
+#include "object.h"
 #include "pkg-psyc.h"
 #include "simulate.h"
 #include "xalloc.h"
@@ -122,6 +123,9 @@ f_psyc_parse (svalue_t *sp) {
     int ret;
     size_t len;
 
+    if (! (current_object->flags & O_SHADOW))
+	errorf("Need to learn how to make an object have O_SHADOW quick!\n");
+
     psycState *state = O_GET_PSYC_STATE(current_object);
     if (!state) {
 	state = pxalloc(sizeof(psycState));
diff --git a/src/simulate.c b/src/simulate.c
index 0a50d26..64cb924 100644
--- a/src/simulate.c
+++ b/src/simulate.c
@@ -2702,8 +2702,8 @@ destruct (object_t *ob)
 #endif
 
 #ifdef USE_PSYC
-	if (shadow_sent->psyc_parser)
-	    psyc_free_parser(shadow_sent->psyc_parser);
+	if (shadow_sent->psyc_state)
+	    psyc_free_parser(shadow_sent->psyc_state);
 #endif
 
 #ifdef USE_SHADOWING
@@ -3183,7 +3183,7 @@ new_shadow_sent(void)
     p->ed_buffer = NULL;
 #endif
 #ifdef USE_PSYC
-    p->psyc_parser = NULL;
+    p->psyc_state = NULL;
 #endif
     p->ip = NULL;
     return p;
@@ -3227,7 +3227,7 @@ check_shadow_sent (object_t *ob)
          && !sh->ed_buffer
 #endif
 #ifdef USE_PSYC
-	 && !sh->psyc_parser
+	 && !sh->psyc_state
 #endif
 #ifdef USE_SHADOWING
          && !sh->shadowing
diff --git a/src/version.sh b/src/version.sh
index 8944554..2397d1b 100644
--- a/src/version.sh
+++ b/src/version.sh
@@ -17,7 +17,7 @@ version_longtype="stable"
 # A timestamp, to be used by bumpversion and other scripts.
 # It can be used, for example, to 'touch' this file on every build, thus
 # forcing revision control systems to add it on every checkin automatically.
-version_stamp="Sun May  8 21:03:26 CEST 2011"
+version_stamp="Sun May  8 21:54:01 CEST 2011"
 
 # Okay, LDMUD is using 3.x.x so to avoid conflicts let's just use 4.x.x
 version_major=4