[Scummvm-cvs-logs] scummvm master -> 9e964b52b1c6d8711f690cf50af9675449fca094

dreammaster dreammaster at scummvm.org
Mon Jun 8 14:49:47 CEST 2015


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
aa0dd080dd SHERLOCK: Add virtual destructors to Map classes
9e964b52b1 SHERLOCK: Remove redundant game check from ScalpelMap


Commit: aa0dd080dd0e16124a7cba538c5bee0e63534946
    https://github.com/scummvm/scummvm/commit/aa0dd080dd0e16124a7cba538c5bee0e63534946
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-08T08:48:05-04:00

Commit Message:
SHERLOCK: Add virtual destructors to Map classes

Changed paths:
    engines/sherlock/map.h
    engines/sherlock/scalpel/scalpel_map.h
    engines/sherlock/tattoo/tattoo_map.h



diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h
index 2569e18..104f5e9 100644
--- a/engines/sherlock/map.h
+++ b/engines/sherlock/map.h
@@ -43,6 +43,7 @@ public:
 	bool _frameChangeFlag;
 public:
 	static Map *init(SherlockEngine *vm);
+	virtual ~Map() {}
 
 	/**
 	 * Show the map
diff --git a/engines/sherlock/scalpel/scalpel_map.h b/engines/sherlock/scalpel/scalpel_map.h
index e61375f..b176777 100644
--- a/engines/sherlock/scalpel/scalpel_map.h
+++ b/engines/sherlock/scalpel/scalpel_map.h
@@ -146,6 +146,7 @@ protected:
 	void highlightIcon(const Common::Point &pt);
 public:
 	ScalpelMap(SherlockEngine *vm);
+	virtual ~ScalpelMap() {}
 
 	const MapEntry &operator[](int idx) { return _points[idx]; }
 
diff --git a/engines/sherlock/tattoo/tattoo_map.h b/engines/sherlock/tattoo/tattoo_map.h
index 15dd90e..750cd90 100644
--- a/engines/sherlock/tattoo/tattoo_map.h
+++ b/engines/sherlock/tattoo/tattoo_map.h
@@ -35,6 +35,7 @@ namespace Tattoo {
 class TattooMap : public Map {
 public:
 	TattooMap(SherlockEngine *vm) : Map(vm) {}
+	virtual ~TattooMap() {}
 
 	/**
 	 * Show the map


Commit: 9e964b52b1c6d8711f690cf50af9675449fca094
    https://github.com/scummvm/scummvm/commit/9e964b52b1c6d8711f690cf50af9675449fca094
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-08T08:48:40-04:00

Commit Message:
SHERLOCK: Remove redundant game check from ScalpelMap

Changed paths:
    engines/sherlock/scalpel/scalpel_map.cpp



diff --git a/engines/sherlock/scalpel/scalpel_map.cpp b/engines/sherlock/scalpel/scalpel_map.cpp
index 613587d..bcb41ab 100644
--- a/engines/sherlock/scalpel/scalpel_map.cpp
+++ b/engines/sherlock/scalpel/scalpel_map.cpp
@@ -95,8 +95,7 @@ void ScalpelMap::loadData() {
 		return;
 
 	// Load the list of location names
-	Common::SeekableReadStream *txtStream = _vm->_res->load(
-		_vm->getGameID() == GType_SerratedScalpel ? "chess.txt" : "map.txt");
+	Common::SeekableReadStream *txtStream = _vm->_res->load("chess.txt");
 
 	int streamSize = txtStream->size();
 	while (txtStream->pos() < streamSize) {






More information about the Scummvm-git-logs mailing list