From 8601ef255eb64440f49bdc795e7ae03b98112385 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 11 Nov 2012 22:12:51 +0000 Subject: [PATCH] Move similar/main/gameseg.c -> similar/main/gameseg.cpp --- SConstruct | 2 +- similar/main/{gameseg.c => gameseg.cpp} | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) rename similar/main/{gameseg.c => gameseg.cpp} (99%) diff --git a/SConstruct b/SConstruct index 51e4c3b1c..f02839b6f 100644 --- a/SConstruct +++ b/SConstruct @@ -766,7 +766,7 @@ class DXXProgram(DXXCommon): 'main/gamefont.cpp', 'main/gamerend.cpp', 'main/gamesave.cpp', -'main/gameseg.c', +'main/gameseg.cpp', 'main/gauges.c', 'main/hostage.c', 'main/hud.c', diff --git a/similar/main/gameseg.c b/similar/main/gameseg.cpp similarity index 99% rename from similar/main/gameseg.c rename to similar/main/gameseg.cpp index ad294ebd1..f97cf0713 100644 --- a/similar/main/gameseg.c +++ b/similar/main/gameseg.cpp @@ -17,6 +17,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#include #include #include #include // for memset() @@ -40,6 +41,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "editor/editor.h" #endif +using std::min; + // How far a point can be from a plane, and still be "in" the plane #define PLANE_DIST_TOLERANCE 250