PRINCE: Code clean-up

Author: lukaslw

engines/prince/animation.cpp

@@ -192,5 +192,3 @@ Graphics::Surface *Animation::getFrame(int frameIndex) {
 }
 
 } // End of namespace Prince
-
-/* vim: set tabstop=4 noexpandtab: */

engines/prince/animation.h

@@ -73,8 +73,6 @@ class Animation {
 	int16 _baseY;
 };
 
-}
+} // End of namespace Prince
 
 #endif
-
-/* vim: set tabstop=4 noexpandtab: */

engines/prince/archive.cpp

@@ -60,7 +60,7 @@ bool PtcArchive::open(const Common::String &filename) {
 
 	_stream->seek(fileTableOffset);
 
-	byte *fileTable = new byte[fileTableSize];
+	byte *fileTable = (byte *)malloc(fileTableSize);
 	byte *fileTableEnd = fileTable + fileTableSize;
 	_stream->read(fileTable, fileTableSize);
 	decrypt(fileTable, fileTableSize);
@@ -73,8 +73,8 @@ bool PtcArchive::open(const Common::String &filename) {
 		//debug("%12s %8X %d", name.c_str(), item._offset, item._size);
 		_items[name] = item;
 	}
-	
-	delete[] fileTable;
+
+	free(fileTable);
 
 	return true;
 }
@@ -141,6 +141,4 @@ Common::SeekableReadStream *PtcArchive::createReadStreamForMember(const Common::
 	return new Common::MemoryReadStream(buffer, size, DisposeAfterUse::YES);
 }
 
-}
-
-/* vim: set tabstop=4 noexpandtab: */
+} // End of namespace Prince

engines/prince/archive.h

@@ -59,5 +59,3 @@ class PtcArchive : public Common::Archive {
 } // End of namespace Prince
 
 #endif
-
-/* vim: set tabstop=4 noexpandtab: */

engines/prince/common.h

@@ -26,22 +26,20 @@
 namespace Prince {
 
 enum Direction {
-	kDirLD = 0,
-	kDirL  = 1,
-	kDirLU = 2,
-	kDirRD = 3,
-	kDirR  = 4,
-	kDirRU = 5,
-	kDirUL = 6,
-	kDirU  = 7,
-	kDirUR = 8,
-	kDirDL = 9,
-	kDirD  = 10,
-	kDirDR = 11
+	kDirLD,
+	kDirL,
+	kDirLU,
+	kDirRD,
+	kDirR,
+	kDirRU,
+	kDirUL,
+	kDirU,
+	kDirUR,
+	kDirDL,
+	kDirD,
+	kDirDR
 };
 
-}
+} // End of namespace Prince
 
 #endif
-
-/* vim: set tabstop=4 noexpandtab: */

engines/prince/cursor.cpp

@@ -23,32 +23,32 @@
 #include "prince/cursor.h"
 
 #include "common/debug.h"
-#include "common/stream.h"
 
 namespace Prince {
 
-Cursor::Cursor() : _surface(NULL) {
+Cursor::Cursor() : _surface(nullptr) {
 }
 
 Cursor::~Cursor() {
-	_surface->free();
-	delete _surface;
-	_surface = NULL;
+	if (_surface != nullptr) {
+		_surface->free();
+		delete _surface;
+		_surface = nullptr;
+	}
 }
 
 bool Cursor::loadFromStream(Common::SeekableReadStream &stream) {
 	stream.skip(4);
-	uint16 w = stream.readUint16LE();
-	uint16 h = stream.readUint16LE();
+	uint16 width = stream.readUint16LE();
+	uint16 heigth = stream.readUint16LE();
 
 	_surface = new Graphics::Surface();
-	_surface->create(w, h, Graphics::PixelFormat::createFormatCLUT8());
+	_surface->create(width, heigth, Graphics::PixelFormat::createFormatCLUT8());
 
-	for (int ih = 0; ih < h; ++ih)
-		stream.read(_surface->getBasePtr(0, ih), w);
+	for (int h = 0; h < heigth; h++) {
+		stream.read(_surface->getBasePtr(0, h), width);
+	}
 	return true;
 }
 
-}
-
-/* vim: set tabstop=4 noexpandtab: */
+} // End of namespace Prince

engines/prince/cursor.h

@@ -25,9 +25,7 @@
 
 #include "graphics/surface.h"
 
-namespace Common {
-	class SeekableReadStream;
-}
+#include "common/stream.h"
 
 namespace Prince {
 
@@ -43,8 +41,6 @@ class Cursor {
 	Graphics::Surface *_surface;
 };
 
-}
+} // End of namespace Prince
 
 #endif
-
-/* vim: set tabstop=4 expandtab!: */

engines/prince/debugger.cpp

@@ -171,6 +171,4 @@ bool Debugger::Cmd_AddItem(int argc, const char **argv) {
 	return true;
 }
 
-} 
-
-/* vim: set tabstop=4 noexpandtab: */
+} // End of namespace Prince

engines/prince/debugger.h

@@ -53,8 +53,6 @@ class Debugger : public GUI::Debugger {
 	InterpreterFlags *_flags;
 };
 
-} 
+} // End of namespace Prince
 
 #endif
-
-/* vim: set tabstop=4 noexpandtab: */

engines/prince/detection.cpp

@@ -71,5 +71,3 @@ REGISTER_PLUGIN_DYNAMIC(PRINCE, PLUGIN_TYPE_ENGINE, Prince::PrinceMetaEngine);
 #else
 REGISTER_PLUGIN_STATIC(PRINCE, PLUGIN_TYPE_ENGINE, Prince::PrinceMetaEngine);
 #endif
-
-/* vim: set tabstop=4 noexpandtab: */