Remove yet another file

svn-id: r13654

4 files changed, 22 insertions, 61 deletions

diff --git a/saga/image.cpp b/saga/image.cpp
index d63e6c1088..cb8ccc2545 100644
--- a/saga/image.cpp
+++ b/saga/image.cpp
@@ -45,6 +45,27 @@
 
 namespace Saga {
 
+static int granulate(int value, int granularity)
+{
+
+	int remainder;
+
+	if (value == 0)
+		return 0;
+
+	if (granularity == 0)
+		return 0;
+
+	remainder = value % granularity;
+
+	if (remainder == 0) {
+		return value;
+	} else {
+		return (granularity - remainder + value);
+	}
+
+}
+
 int
 IMG_DecodeBGImage(const uchar * image_data,
     size_t image_size,
@@ -78,7 +99,7 @@ IMG_DecodeBGImage(const uchar * image_data,
 	RLE_data_ptr = image_data + SAGA_IMAGE_DATA_OFFSET;
 	RLE_data_len = image_size - SAGA_IMAGE_DATA_OFFSET;
 
-	modex_height = Granulate(hdr.height, 4);
+	modex_height = granulate(hdr.height, 4);
 
 	decode_buf_len = hdr.width * modex_height;
 	decode_buf = (uchar *)malloc(decode_buf_len);
diff --git a/saga/misc.cpp b/saga/misc.cpp
deleted file mode 100644
index e7a2c185ca..0000000000
--- a/saga/misc.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2004 The ScummVM project
- *
- * The ReInherit Engine is (C)2000-2003 by Daniel Balsom.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * $Header$
- *
- */
-/*
- Description:	
- 
-	Misc. routines
-
- Notes: 
-*/
-
-namespace Saga {
-
-int Granulate(int value, int granularity)
-{
-
-	int remainder;
-
-	if (value == 0)
-		return 0;
-
-	if (granularity == 0)
-		return 0;
-
-	remainder = value % granularity;
-
-	if (remainder == 0) {
-		return value;
-	} else {
-		return (granularity - remainder + value);
-	}
-
-}
-
-} // End of namespace Saga
diff --git a/saga/module.mk b/saga/module.mk
index 2857f15fe6..65c2798324 100644
--- a/saga/module.mk
+++ b/saga/module.mk
@@ -19,7 +19,6 @@ MODULE_OBJS = \
 	saga/isomap.o \
 	saga/ite_introproc.o \
 	saga/math.o \
-	saga/misc.o \
 	saga/objectmap.o \
 	saga/palanim.o \
 	saga/render.o \
diff --git a/saga/reinherit.h b/saga/reinherit.h
index 851a650393..d9b4890256 100644
--- a/saga/reinherit.h
+++ b/saga/reinherit.h
@@ -161,11 +161,6 @@ enum R_ERRORCODE {
 void R_Shutdown(int param);
 
 /*
- * r_misc.c
-\*--------------------------------------------------------------------------*/
-int Granulate(int value, int granularity);
-
-/*
  * r_transitions.c
 \*--------------------------------------------------------------------------*/
 int TRANSITION_Dissolve(uchar * dst_img,