From 3adda0cbd3175ad580cf35205b614f78ae504c62 Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Fri, 10 Jun 2016 18:23:22 +0000
Subject: [PATCH] Polymer: Revert part of r5481. We can't rely on the sprite
 trackers to tell us when tsprites change.

git-svn-id: https://svn.eduke32.com/eduke32@5774 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/build/include/polymer.h |  4 ++--
 polymer/eduke32/build/src/polymer.c     | 12 ++++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/polymer/eduke32/build/include/polymer.h b/polymer/eduke32/build/include/polymer.h
index f5a2646c7..91161d276 100644
--- a/polymer/eduke32/build/include/polymer.h
+++ b/polymer/eduke32/build/include/polymer.h
@@ -320,7 +320,7 @@ typedef struct      s_prwall {
 
 typedef struct      s_prsprite {
     _prplane        plane;
-    uint32_t        trackedrev;
+    uint32_t        hash;
 }                   _prsprite;
 
 typedef struct      s_prmirror {
@@ -371,7 +371,7 @@ extern _prsprite    *prsprites[MAXSPRITES];
 static inline void polymer_invalidatesprite(int32_t i)
 {
     if (prsprites[i])
-        prsprites[i]->trackedrev = UINT32_MAX;
+        prsprites[i]->hash = 0xDEADBEEF;
 }
 
 extern GLuint       prartmaps[MAXTILES];
diff --git a/polymer/eduke32/build/src/polymer.c b/polymer/eduke32/build/src/polymer.c
index 03e53124b..c636aa6b3 100644
--- a/polymer/eduke32/build/src/polymer.c
+++ b/polymer/eduke32/build/src/polymer.c
@@ -3868,7 +3868,7 @@ void                polymer_updatesprite(int32_t snum)
         s->plane.buffer = (_prvert *)Xcalloc(4, sizeof(_prvert));  // XXX
         s->plane.vertcount = 4;
         s->plane.mapvbo_vertoffset = -1;
-        s->trackedrev = UINT32_MAX;
+        s->hash = 0xDEADBEEF;
     }
 
     if ((tspr->cstat & 48) && (pr_vbos > 0) && !s->plane.vbo)
@@ -3886,16 +3886,12 @@ void                polymer_updatesprite(int32_t snum)
 
     if (tspr->cstat & 48 && searchit != 2)
     {
-#ifndef UNTRACKED_STRUCTS
-        uint32_t const changed = spritechanged[tspr->owner];
-#else
         uint32_t const changed = XXH32((uint8_t *) tspr, offsetof(spritetype, owner), 0xDEADBEEF);
-#endif
 
-        if (changed == s->trackedrev && tspr->picnum == curpicnum)
+        if (changed == s->hash)
             return;
 
-        s->trackedrev = changed;
+        s->hash = changed;
     }
 
     polymer_getbuildmaterial(&s->plane.material, curpicnum, tspr->pal, tspr->shade,
@@ -3915,7 +3911,7 @@ void                polymer_updatesprite(int32_t snum)
     if (searchit == 2)
     {
         polymer_drawsearchplane(&s->plane, NULL, 0x03, (GLubyte *) &tspr->owner);
-        s->trackedrev = UINT32_MAX;
+        s->hash = 0xDEADBEEF;
     }
 
     curpicnum = tspr->picnum;