From 2a3ef9776debf09e7d0b76bf3909d60f6fee4a3a Mon Sep 17 00:00:00 2001 From: Scott Ludwig Date: Thu, 21 Jan 2016 21:44:51 -0800 Subject: [PATCH] Remove old assert that is firing frequently on debug builds This assert checked for the bottom 2 bits of a gid to be 0. Now that gids are indexes, these two bits are frequently not zero. Looking at the code, there is no place (that I could find) where those bits are set (I think kwfGidEndMarker used to be stored there). --- game/GameObjects.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/game/GameObjects.cpp b/game/GameObjects.cpp index c701abd..cac72e7 100644 --- a/game/GameObjects.cpp +++ b/game/GameObjects.cpp @@ -1732,8 +1732,10 @@ bool GobMgr::MoveGob(Gob *pgob, WCoord wxOld, WCoord wyOld, WCoord wxNew, WCoord { Assert(wxOld >= -1 && TcFromWc(wxOld) < m_ctx && wyOld >= -1 && TcFromWc(wyOld) < m_cty); Assert(wxNew >= -1 && TcFromWc(wxNew) < m_ctx && wyNew >= -1 && TcFromWc(wyNew) < m_cty); - Assert(pgob->m_gid < (m_cpgobMax + 1) * sizeof(Gob *)); - Assert((pgob->m_gid & 3) == 0); + Assert(pgob->m_gid < (m_cpgobMax + 1)); + + // Doesn't look like the bottom 2 bits are being used anymore + // Assert((pgob->m_gid & 3) == 0); int igidOld = -1; if (wxOld != -1 && wyOld != -1)