[Scummvm-cvs-logs] SF.net SVN: scummvm:[47440] tools/trunk/engines/mohawk

[fingolfin at users.sourceforge.net]

Revision: 47440
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47440&view=rev
Author:   fingolfin
Date:     2010-01-22 14:44:40 +0000 (Fri, 22 Jan 2010)

Log Message:
-----------
Remove engines/mohawk/utils/util.h

Modified Paths:
--------------
    tools/trunk/engines/mohawk/deriven.cpp
    tools/trunk/engines/mohawk/extract_mohawk.cpp

Removed Paths:
-------------
    tools/trunk/engines/mohawk/utils/util.h

Modified: tools/trunk/engines/mohawk/deriven.cpp
===================================================================
--- tools/trunk/engines/mohawk/deriven.cpp	2010-01-22 14:26:03 UTC (rev 47439)
+++ tools/trunk/engines/mohawk/deriven.cpp	2010-01-22 14:44:40 UTC (rev 47440)
@@ -21,8 +21,8 @@
  */
 
 #include "engines/mohawk/archive.h"
-#include "util.h"
-#include "utils/file.h"
+#include "common/util.h"
+#include "engines/mohawk/utils/file.h"
 
 #include <assert.h>
 

Modified: tools/trunk/engines/mohawk/extract_mohawk.cpp
===================================================================
--- tools/trunk/engines/mohawk/extract_mohawk.cpp	2010-01-22 14:26:03 UTC (rev 47439)
+++ tools/trunk/engines/mohawk/extract_mohawk.cpp	2010-01-22 14:44:40 UTC (rev 47440)
@@ -21,8 +21,8 @@
  */
 
 #include "engines/mohawk/archive.h"
-#include "util.h"
-#include "utils/file.h"
+#include "common/util.h"
+#include "engines/mohawk/utils/file.h"
 
 #include <assert.h>
 

Deleted: tools/trunk/engines/mohawk/utils/util.h
===================================================================
--- tools/trunk/engines/mohawk/utils/util.h	2010-01-22 14:26:03 UTC (rev 47439)
+++ tools/trunk/engines/mohawk/utils/util.h	2010-01-22 14:44:40 UTC (rev 47440)
@@ -1,95 +0,0 @@
-/* Scumm Tools
- * Copyright (C) 2004-2006  The ScummVM Team
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/tools/branches/gsoc2009-gui/utils/util.h $
- * $Id: util.h 40868 2009-05-24 15:19:28Z lordhoto $
- *
- */
-
-#ifndef COMMON_UTIL_H
-#define COMMON_UTIL_H
-
-namespace Common {
-
-
-#ifdef MIN
-#undef MIN
-#endif
-
-#ifdef MAX
-#undef MAX
-#endif
-
-template<typename T> inline T ABS (T x)			{ return (x>=0) ? x : -x; }
-template<typename T> inline T MIN (T a, T b)	{ return (a<b) ? a : b; }
-template<typename T> inline T MAX (T a, T b)	{ return (a>b) ? a : b; }
-template<typename T> inline T CLIP (T v, T amin, T amax)
-		{ if (v < amin) return amin; else if (v > amax) return amax; else return v; }
-
-/**
- * List of game language.
- */
-enum Language {
-	EN_ANY,     // Generic English (when only one game version exist)
-	EN_USA,
-	EN_GRB,
-
-	DE_DEU,
-	FR_FRA,
-	IT_ITA,
-	PT_BRA,
-	ES_ESP,
-	JA_JPN,
-	ZH_TWN,
-	KO_KOR,
-	SE_SWE,
-	HB_ISR,
-	RU_RUS,
-	CZ_CZE,
-	NL_NLD,
-	NB_NOR,
-	PL_POL,
-
-	UNK_LANG = -1	// Use default language (i.e. none specified)
-};
-
-/**
- * List of game platforms. Specifying a platform for a target can be used to
- * give the game engines a hint for which platform the game data file are.
- * This may be optional or required, depending on the game engine and the
- * game in question.
- */
-enum Platform {
-	kPlatformPC,
-	kPlatformAmiga,
-	kPlatformAtariST,
-	kPlatformMacintosh,
-	kPlatformFMTowns,
-	kPlatformWindows,
-	kPlatformNES,
-	kPlatformC64,
-	kPlatformLinux,
-	kPlatformAcorn,
-	kPlatformSegaCD,
-	kPlatform3DO,
-//	kPlatformPCEngine,
-
-	kPlatformUnknown = -1
-};
-}
-
-#endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.