From 91e2556ad2f6f377e93f95d393e6070de70c3d49 Mon Sep 17 00:00:00 2001 From: terminx Date: Wed, 29 Oct 2014 17:06:05 +0000 Subject: [PATCH] Inline yax_getbunches with old map format. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4700 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/include/build.h | 6 +++++- polymer/eduke32/build/src/engine.c | 6 ------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/polymer/eduke32/build/include/build.h b/polymer/eduke32/build/include/build.h index cb702e4ee..728681299 100644 --- a/polymer/eduke32/build/include/build.h +++ b/polymer/eduke32/build/include/build.h @@ -177,7 +177,11 @@ extern int32_t r_tror_nomaskpass; // Moved below declarations of sector, wall, sprite. # else int16_t yax_getbunch(int16_t i, int16_t cf); -void yax_getbunches(int16_t i, int16_t *cb, int16_t *fb); +static inline void yax_getbunches(int16_t i, int16_t *cb, int16_t *fb) +{ + *cb = yax_getbunch(i, YAX_CEILING); + *fb = yax_getbunch(i, YAX_FLOOR); +} int16_t yax_getnextwall(int16_t wal, int16_t cf); void yax_setnextwall(int16_t wal, int16_t cf, int16_t thenextwall); # endif diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c index 67fa75b04..80a53dd48 100644 --- a/polymer/eduke32/build/src/engine.c +++ b/polymer/eduke32/build/src/engine.c @@ -393,12 +393,6 @@ int16_t yax_getbunch(int16_t i, int16_t cf) return YAX_BUNCHNUM(i, cf); } - -void yax_getbunches(int16_t i, int16_t *cb, int16_t *fb) -{ - *cb = yax_getbunch(i, YAX_CEILING); - *fb = yax_getbunch(i, YAX_FLOOR); -} # else # define YAX_PTRBUNCHNUM(Ptr, Sect, Cf) (*((Cf) ? &(Ptr)[Sect].floorbunch : &(Ptr)[Sect].ceilingbunch)) # define YAX_BUNCHNUM(Sect, Cf) YAX_PTRBUNCHNUM(sector, Sect, Cf)