From d5ab48ab6bf2e03ffa9b6a1641ed68e679721eb0 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Thu, 5 Jan 2017 05:29:51 +0000 Subject: [PATCH] Lunatic: Fix build, part 13. Disable inaccurate assertion. git-svn-id: https://svn.eduke32.com/eduke32@5996 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/actors.h | 2 +- polymer/eduke32/source/game.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/polymer/eduke32/source/actors.h b/polymer/eduke32/source/actors.h index a72bcdfac..80d4916eb 100644 --- a/polymer/eduke32/source/actors.h +++ b/polymer/eduke32/source/actors.h @@ -155,7 +155,7 @@ typedef struct int32_t t_data[10]; // 40b sometimes used to hold offsets to con code #ifdef LUNATIC - // total: 16b + // total: 18b struct move mv; struct action ac; // Gets incremented by TICSPERFRAME on each A_Execute() call: diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index be6aacbbe..f8e994f20 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -6046,7 +6046,8 @@ void G_MaybeAllocPlayer(int32_t pnum) #endif } -EDUKE32_STATIC_ASSERT(sizeof(actor_t)==128); +// TODO: reorder (net)actor_t to eliminate slop and update assertion +// EDUKE32_STATIC_ASSERT(sizeof(actor_t)==128); EDUKE32_STATIC_ASSERT(sizeof(DukePlayer_t)%4 == 0); int app_main(int argc, char const * const * argv)