diff --git a/game/GameObjects.cpp b/game/GameObjects.cpp index cac72e7..58e09fc 100644 --- a/game/GameObjects.cpp +++ b/game/GameObjects.cpp @@ -1542,8 +1542,8 @@ void GobMgr::AddGob(Gob *pgob, Gid gid) // Assign gid, link it in - Assert(gid < (m_cpgobMax + 1) * sizeof(Gob *)); - Assert((gid & 3) == 0); + Assert(gid < (m_cpgobMax + 1)); + pgob->m_gid = gid; pgob->m_pgobNext = m_pgobHead; m_pgobHead = pgob; @@ -1734,9 +1734,6 @@ bool GobMgr::MoveGob(Gob *pgob, WCoord wxOld, WCoord wyOld, WCoord wxNew, WCoord Assert(wxNew >= -1 && TcFromWc(wxNew) < m_ctx && wyNew >= -1 && TcFromWc(wyNew) < m_cty); 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) igidOld = IgidFromWXY(wxOld, wyOld);