From 59db1e85f3dfcad29a6e030aedce039cb2a67661 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 19 Feb 2009 11:08:11 +0000
Subject: Merged the contents of fontCharacterTable into staticres
svn-id: r38542
---
dists/msvc8/cruise.vcproj | 8 --
dists/msvc9/cruise.vcproj | 8 --
engines/cruise/cruise_main.h | 1 -
engines/cruise/font.cpp | 3 +-
engines/cruise/fontCharacterTable.cpp | 195 ----------------------------------
engines/cruise/fontCharacterTable.h | 34 ------
engines/cruise/module.mk | 1 -
engines/cruise/staticres.cpp | 63 +++++++++++
engines/cruise/staticres.h | 2 +
9 files changed, 67 insertions(+), 248 deletions(-)
delete mode 100644 engines/cruise/fontCharacterTable.cpp
delete mode 100644 engines/cruise/fontCharacterTable.h
diff --git a/dists/msvc8/cruise.vcproj b/dists/msvc8/cruise.vcproj
index ef7f08cb73..1b17c64639 100644
--- a/dists/msvc8/cruise.vcproj
+++ b/dists/msvc8/cruise.vcproj
@@ -254,14 +254,6 @@
RelativePath="..\..\engines\cruise\font.h"
>
-
-
-
-
diff --git a/dists/msvc9/cruise.vcproj b/dists/msvc9/cruise.vcproj
index ff12a391ae..d3eb78bde1 100644
--- a/dists/msvc9/cruise.vcproj
+++ b/dists/msvc9/cruise.vcproj
@@ -255,14 +255,6 @@
RelativePath="..\..\engines\cruise\font.h"
>
-
-
-
-
diff --git a/engines/cruise/cruise_main.h b/engines/cruise/cruise_main.h
index 955f8c9ad9..9ec38231e7 100644
--- a/engines/cruise/cruise_main.h
+++ b/engines/cruise/cruise_main.h
@@ -41,7 +41,6 @@
#include "cruise/vars.h"
#include "cruise/font.h"
#include "cruise/volume.h"
-#include "cruise/fontCharacterTable.h"
#include "cruise/stack.h"
#include "cruise/script.h"
#include "cruise/various.h"
diff --git a/engines/cruise/font.cpp b/engines/cruise/font.cpp
index 179c8ca3c4..e60d22e457 100644
--- a/engines/cruise/font.cpp
+++ b/engines/cruise/font.cpp
@@ -23,11 +23,12 @@
*
*/
+#include "common/endian.h"
#include "common/file.h"
#include "common/util.h"
#include "cruise/cruise_main.h"
-#include "common/endian.h"
+#include "cruise/staticres.h"
namespace Cruise {
diff --git a/engines/cruise/fontCharacterTable.cpp b/engines/cruise/fontCharacterTable.cpp
deleted file mode 100644
index 2c2dddc479..0000000000
--- a/engines/cruise/fontCharacterTable.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * 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$
- * $Id$
- *
- */
-
-#include "cruise/cruise_main.h"
-
-namespace Cruise {
-
-int16 fontCharacterTable[256] = {
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
- 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
- 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
- 86, 87, 88, 89, 90, 91, 92,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- 106, 105,
- -1,
- -1,
- -1,
- -1,
- 107, 108,
- -1, -1,
- 109, 110,
- -1,
- -1,
- -1,
- -1,
- -1, -1,
- 111, -1,
- 112,
- -1, -1,
- 113,
- 114,
- -1,
- -1,
- 116, 93,
- -1,
- 118,
- -1,
- 94,
- -1,
- 117,
- 115,
- 96,
- 95,
- 97,
- 98,
- -1,
- -1,
- 99,
- 100,
- -1,
- -1,
- -1,
- -1,
- 101,
- -1,
- 102,
- -1,
- -1,
- 103,
- -1,
- 104,
- -1,
- -1,
- -1,
- -1,
-};
-
-} // End of namespace Cruise
diff --git a/engines/cruise/fontCharacterTable.h b/engines/cruise/fontCharacterTable.h
deleted file mode 100644
index 0bfe78641a..0000000000
--- a/engines/cruise/fontCharacterTable.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * 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$
- * $Id$
- *
- */
-
-#ifndef CRUISE_FONTCHARACTERTABLE_H
-#define CRUISE_FONTCHARACTERTABLE_H
-
-namespace Cruise {
-
-extern short int fontCharacterTable[256];
-
-} // End of namespace Cruise
-#endif
diff --git a/engines/cruise/module.mk b/engines/cruise/module.mk
index 96d8f63fea..1622062159 100644
--- a/engines/cruise/module.mk
+++ b/engines/cruise/module.mk
@@ -14,7 +14,6 @@ MODULE_OBJS := \
delphine-unpack.o \
detection.o \
font.o \
- fontCharacterTable.o \
function.o \
gfxModule.o \
linker.o \
diff --git a/engines/cruise/staticres.cpp b/engines/cruise/staticres.cpp
index 8b3fc3b9f9..748aded219 100644
--- a/engines/cruise/staticres.cpp
+++ b/engines/cruise/staticres.cpp
@@ -57,4 +57,67 @@ int actor_invstat[][13] = {
{ -59, -60, -62, -63, -78, 0, 0, 0, 0, 0, 0, 0, 0}
};
+int16 fontCharacterTable[256] = {
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
+ 86, 87, 88, 89, 90, 91, 92,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1,
+ 106, 105,
+ -1, -1, -1, -1,
+ 107, 108,
+ -1, -1,
+ 109, 110,
+ -1, -1, -1, -1, -1, -1,
+ 111, -1,
+ 112,
+ -1, -1,
+ 113,
+ 114,
+ -1,
+ -1,
+ 116, 93,
+ -1,
+ 118,
+ -1,
+ 94,
+ -1,
+ 117,
+ 115,
+ 96,
+ 95,
+ 97,
+ 98,
+ -1,
+ -1,
+ 99,
+ 100,
+ -1,
+ -1,
+ -1,
+ -1,
+ 101,
+ -1,
+ 102,
+ -1,
+ -1,
+ 103,
+ -1,
+ 104,
+ -1,
+ -1,
+ -1,
+ -1,
+};
+
} // End of namespace Cruise
diff --git a/engines/cruise/staticres.h b/engines/cruise/staticres.h
index c827a92d30..28ee9b43a0 100644
--- a/engines/cruise/staticres.h
+++ b/engines/cruise/staticres.h
@@ -36,6 +36,8 @@ extern int actor_stat[][13];
extern int actor_invstat[][13];
+extern short int fontCharacterTable[256];
+
} // End of namespace Cruise
#endif
--
cgit v1.2.3