From a5f95cab76555a8a1b8192b6b98e4020fa69fbdc Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sun, 11 Nov 2012 22:12:51 +0000
Subject: [PATCH] Move similar/main/morph.c -> similar/main/morph.cpp

---
 SConstruct                          | 2 +-
 similar/main/{morph.c => morph.cpp} | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
 rename similar/main/{morph.c => morph.cpp} (99%)

diff --git a/SConstruct b/SConstruct
index dd38c43aa..f7c534592 100644
--- a/SConstruct
+++ b/SConstruct
@@ -779,7 +779,7 @@ class DXXProgram(DXXCommon):
 'main/menu.cpp',
 'main/mglobal.cpp',
 'main/mission.cpp',
-'main/morph.c',
+'main/morph.cpp',
 'main/multi.c',
 'main/multibot.c',
 'main/newdemo.c',
diff --git a/similar/main/morph.c b/similar/main/morph.cpp
similarity index 99%
rename from similar/main/morph.c
rename to similar/main/morph.cpp
index 06df3dce1..195d4c61f 100644
--- a/similar/main/morph.c
+++ b/similar/main/morph.cpp
@@ -17,6 +17,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
  *
  */
 
+#include <algorithm>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -33,6 +34,8 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "bm.h"
 #include "interp.h"
 
+using std::max;
+
 morph_data morph_objects[MAX_MORPH_OBJECTS];
 
 //returns ptr to data for this object, or NULL if none