From 23ecf8cce000967945350613fba2a0afa31cf09d Mon Sep 17 00:00:00 2001 From: helixhorned Date: Wed, 12 Feb 2014 21:02:59 +0000 Subject: [PATCH] Amend r4318: Lunatic doesn't need the safety check. git-svn-id: https://svn.eduke32.com/eduke32@4328 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/Makefile.common | 1 - polymer/eduke32/source/duke3d.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common index 6eddd2127..dffb41a8e 100644 --- a/polymer/eduke32/Makefile.common +++ b/polymer/eduke32/Makefile.common @@ -140,7 +140,6 @@ USE_OPENGL = 1 NOASM = 0 LINKED_GTK = 0 BUILD32_ON_64 ?= 0 -# DO NOT SET THIS TO 1 AND COMMIT IT. USE_LIBPNG ?= 1 USE_LIBVPX ?= 1 NETCODE ?= 1 diff --git a/polymer/eduke32/source/duke3d.h b/polymer/eduke32/source/duke3d.h index 5c6ee762f..b3cb5f22a 100644 --- a/polymer/eduke32/source/duke3d.h +++ b/polymer/eduke32/source/duke3d.h @@ -164,7 +164,7 @@ static inline int32_t G_HaveActor(int32_t actortile) static inline int32_t G_InitialActorStrength(int32_t actortile) { #ifdef LUNATIC - return G_HaveActor(actortile) ? g_elActors[actortile].strength : 0; + return g_elActors[actortile].strength; #else return G_HaveActor(actortile) ? g_tile[actortile].execPtr[0] : 0; #endif