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

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

diff --git a/SConstruct b/SConstruct
index 3045422ee..25407654c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1293,7 +1293,7 @@ class D2XProgram(DXXProgram):
 	# for editor
 	__objects_editor = DXXCommon.create_lazy_object_property([{
 		'source':[os.path.join(srcdir, f) for f in [
-'main/bmread.c',
+'main/bmread.cpp',
 ]
 ],
 	}])
diff --git a/d2x-rebirth/main/bmread.c b/d2x-rebirth/main/bmread.cpp
similarity index 99%
rename from d2x-rebirth/main/bmread.c
rename to d2x-rebirth/main/bmread.cpp
index 9058d7e40..e8795e0ca 100644
--- a/d2x-rebirth/main/bmread.c
+++ b/d2x-rebirth/main/bmread.cpp
@@ -18,6 +18,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
  *
  */
 
+#include <algorithm>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -58,6 +59,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "strutil.h"
 #include "editor/texpage.h"
 
+using std::min;
+
 #define BM_NONE			-1
 #define BM_COCKPIT		 0
 #define BM_TEXTURES		 2