From 90fcbefaffbe9e6e4d0e31b9986d5474ed624368 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sat, 25 Dec 2010 19:53:09 +0900 Subject: [PATCH] Don't use entity_t's next for linking static enitities. --- include/QF/render.h | 1 + qw/source/cl_demo.c | 2 +- qw/source/cl_parse.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/QF/render.h b/include/QF/render.h index 5fa1e2132..c23c7d582 100644 --- a/include/QF/render.h +++ b/include/QF/render.h @@ -75,6 +75,7 @@ extern lightstyle_t r_lightstyle[MAX_LIGHTSTYLES]; typedef struct entity_s { struct entity_s *next; + struct entity_s *unext; //FIXME this shouldn't be here. for qw demos vec3_t origin; vec3_t old_origin; diff --git a/qw/source/cl_demo.c b/qw/source/cl_demo.c index 8a2787106..5248ae25f 100644 --- a/qw/source/cl_demo.c +++ b/qw/source/cl_demo.c @@ -672,7 +672,7 @@ CL_Record (const char *argv1) SZ_Clear (&buf); } // spawnstatic - for (ent = cl_static_entities; ent; ent = ent->next) { + for (ent = cl_static_entities; ent; ent = ent->unext) { MSG_WriteByte (&buf, svc_spawnstatic); for (j = 1; j < MAX_MODELS; j++) diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c index fd7176c1b..3dc520737 100644 --- a/qw/source/cl_parse.c +++ b/qw/source/cl_parse.c @@ -929,7 +929,7 @@ CL_ParseStatic (void) CL_Init_Entity (ent); *cl_static_tail = ent; - cl_static_tail = &ent->next; + cl_static_tail = &ent->unext; // copy it to the current state ent->model = cl.model_precache[es.modelindex];