mirror of git://git.psyced.org/git/psyclpc
This commit is contained in:
parent
4953d4bc3b
commit
ed0db6fa32
|
@ -18,6 +18,7 @@
|
||||||
#include "interpret.h"
|
#include "interpret.h"
|
||||||
#include "mapping.h"
|
#include "mapping.h"
|
||||||
#include "mstrings.h"
|
#include "mstrings.h"
|
||||||
|
#include "object.h"
|
||||||
#include "pkg-psyc.h"
|
#include "pkg-psyc.h"
|
||||||
#include "simulate.h"
|
#include "simulate.h"
|
||||||
#include "xalloc.h"
|
#include "xalloc.h"
|
||||||
|
@ -122,6 +123,9 @@ f_psyc_parse (svalue_t *sp) {
|
||||||
int ret;
|
int ret;
|
||||||
size_t len;
|
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);
|
psycState *state = O_GET_PSYC_STATE(current_object);
|
||||||
if (!state) {
|
if (!state) {
|
||||||
state = pxalloc(sizeof(psycState));
|
state = pxalloc(sizeof(psycState));
|
||||||
|
|
|
@ -2702,8 +2702,8 @@ destruct (object_t *ob)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef USE_PSYC
|
#ifdef USE_PSYC
|
||||||
if (shadow_sent->psyc_parser)
|
if (shadow_sent->psyc_state)
|
||||||
psyc_free_parser(shadow_sent->psyc_parser);
|
psyc_free_parser(shadow_sent->psyc_state);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef USE_SHADOWING
|
#ifdef USE_SHADOWING
|
||||||
|
@ -3183,7 +3183,7 @@ new_shadow_sent(void)
|
||||||
p->ed_buffer = NULL;
|
p->ed_buffer = NULL;
|
||||||
#endif
|
#endif
|
||||||
#ifdef USE_PSYC
|
#ifdef USE_PSYC
|
||||||
p->psyc_parser = NULL;
|
p->psyc_state = NULL;
|
||||||
#endif
|
#endif
|
||||||
p->ip = NULL;
|
p->ip = NULL;
|
||||||
return p;
|
return p;
|
||||||
|
@ -3227,7 +3227,7 @@ check_shadow_sent (object_t *ob)
|
||||||
&& !sh->ed_buffer
|
&& !sh->ed_buffer
|
||||||
#endif
|
#endif
|
||||||
#ifdef USE_PSYC
|
#ifdef USE_PSYC
|
||||||
&& !sh->psyc_parser
|
&& !sh->psyc_state
|
||||||
#endif
|
#endif
|
||||||
#ifdef USE_SHADOWING
|
#ifdef USE_SHADOWING
|
||||||
&& !sh->shadowing
|
&& !sh->shadowing
|
||||||
|
|
|
@ -17,7 +17,7 @@ version_longtype="stable"
|
||||||
# A timestamp, to be used by bumpversion and other scripts.
|
# A timestamp, to be used by bumpversion and other scripts.
|
||||||
# It can be used, for example, to 'touch' this file on every build, thus
|
# 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.
|
# 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
|
# Okay, LDMUD is using 3.x.x so to avoid conflicts let's just use 4.x.x
|
||||||
version_major=4
|
version_major=4
|
||||||
|
|
Loading…
Reference in New Issue