Some const correctness changes; cleanup

svn-id: r44850

4 files changed, 7 insertions, 9 deletions

diff --git a/engines/lure/memory.cpp b/engines/lure/memory.cpp
index 814251e425..f96b5015bc 100644
--- a/engines/lure/memory.cpp
+++ b/engines/lure/memory.cpp
@@ -38,8 +38,8 @@ MemoryBlock *Memory::duplicate(MemoryBlock *src) {
 	return block;
 }
 
-uint8 *Memory::alloc(uint32 size) {
-	return (uint8 *) malloc(size);
+void *Memory::alloc(uint32 size) {
+	return malloc(size);
 }
 
 void Memory::dealloc(void *block) {
diff --git a/engines/lure/memory.h b/engines/lure/memory.h
index 730e3656e3..f51c4fc49e 100644
--- a/engines/lure/memory.h
+++ b/engines/lure/memory.h
@@ -56,7 +56,7 @@ class Memory {
 public:
 	static MemoryBlock *allocate(uint32 size);
 	static MemoryBlock *duplicate(MemoryBlock *src);
-	static uint8 *alloc(uint32 size);
+	static void *alloc(uint32 size);
 	static void dealloc(void *block);
 };
 
diff --git a/engines/lure/surface.cpp b/engines/lure/surface.cpp
index 54b579c557..dc0ddda432 100644
--- a/engines/lure/surface.cpp
+++ b/engines/lure/surface.cpp
@@ -42,11 +42,11 @@ namespace Lure {
 static MemoryBlock *int_font = NULL;
 static MemoryBlock *int_dialog_frame = NULL;
 static uint8 fontSize[256];
-int numFontChars;
+static int numFontChars;
 
-const byte char8A[8] = {0x40, 0x20, 0x00, 0x90, 0x90, 0x90, 0x68, 0x00}; // accented `u
-const byte char8D[8] = {0x80, 0x40, 0x00, 0xc0, 0x40, 0x40, 0x60, 0x00}; // accented `i
-const byte char95[8] = {0x40, 0x20, 0x00, 0x60, 0x90, 0x90, 0x60, 0x00}; // accented `o
+static const byte char8A[8] = {0x40, 0x20, 0x00, 0x90, 0x90, 0x90, 0x68, 0x00}; // accented `u
+static const byte char8D[8] = {0x80, 0x40, 0x00, 0xc0, 0x40, 0x40, 0x60, 0x00}; // accented `i
+static const byte char95[8] = {0x40, 0x20, 0x00, 0x60, 0x90, 0x90, 0x60, 0x00}; // accented `o
 
 void Surface::initialise() {
 	Disk &disk = Disk::getReference();
diff --git a/engines/lure/surface.h b/engines/lure/surface.h
index 7e66f6aae9..8e5de6eaa0 100644
--- a/engines/lure/surface.h
+++ b/engines/lure/surface.h
@@ -150,8 +150,6 @@ public:
 	bool show();
 };
 
-extern int numFontChars;
-
 } // End of namespace Lure
 
 #endif