From dd576b731917cc2810ed5c582fcc2909636d6a41 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Tue, 19 May 2015 22:08:13 +0000 Subject: [PATCH] SW: Remove redefinition of SEARCH_FLOOR and SEARCH_CEILING. git-svn-id: https://svn.eduke32.com/eduke32@5220 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/sw/src/game.h | 15 --------------- polymer/eduke32/source/sw/src/sector.c | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/polymer/eduke32/source/sw/src/game.h b/polymer/eduke32/source/sw/src/game.h index 07cfa5b6e..ed1b51205 100644 --- a/polymer/eduke32/source/sw/src/game.h +++ b/polymer/eduke32/source/sw/src/game.h @@ -691,21 +691,6 @@ int StdRandomRange(int range); #define DEGREE_45 256 #define DEGREE_90 512 -// -// nextsectorneighborz defines - what a god-awful name! -// - -#define SEARCH_DOWN 1 -#define SEARCH_UP -1 -#define SEARCH_FLOOR 1 -#define SEARCH_CEILING -1 - -#define UP_DIR -1 -#define DOWN_DIR 1 - -#define OPEN 0 -#define CLOSE 1 - //// // // Directional enumerations diff --git a/polymer/eduke32/source/sw/src/sector.c b/polymer/eduke32/source/sw/src/sector.c index 45b50c521..547ed6b37 100644 --- a/polymer/eduke32/source/sw/src/sector.c +++ b/polymer/eduke32/source/sw/src/sector.c @@ -786,7 +786,7 @@ DoSpringBoardDown(void) { int destz; - destz = sector[nextsectorneighborz(sbp->Sector, sector[sbp->Sector].floorz, SEARCH_FLOOR, SEARCH_DOWN)].floorz; + destz = sector[nextsectorneighborz(sbp->Sector, sector[sbp->Sector].floorz, 1, 1)].floorz; AnimSet(§or[sbp->Sector].floorz, destz, 256);