dahjah/hostile-takeover
1
0
Fork 0
mirror of https://github.com/spiffcode/hostile-takeover.git synced 2026-04-24 19:55:11 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove second case of Assert checking bottom 2 gid bits for 0

Browse Source 
This is no longer valid because gids are indexes now.
This commit is contained in:
Scott Ludwig 2016-01-26 12:03:10 -08:00
parent dd56fab4bd
commit 5c25a9b167
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
game/GameObjects.cpp
View File

@ -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);