OPENGL: Merged from trunk, from rev 52105 to 53396.

This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.

Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.

svn-id: r53399

1 files changed, 106 insertions, 0 deletions

diff --git a/engines/sword25/math/regionregistry.cpp b/engines/sword25/math/regionregistry.cpp
new file mode 100644
index 0000000000..1509ea9e5e
--- /dev/null
+++ b/engines/sword25/math/regionregistry.cpp
@@ -0,0 +1,106 @@
+/* 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$
+ *
+ */
+
+/*
+ * This code is based on Broken Sword 2.5 engine
+ *
+ * Copyright (c) Malte Thiesen, Daniel Queteschiner and Michael Elsdoerfer
+ *
+ * Licensed under GNU GPL v2
+ *
+ */
+
+#define BS_LOG_PREFIX "REGIONREGISTRY"
+
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/math/regionregistry.h"
+#include "sword25/math/region.h"
+
+namespace Sword25 {
+
+Common::SharedPtr<RegionRegistry> RegionRegistry::_instancePtr;
+
+void RegionRegistry::logErrorLn(const char *message) const {
+	BS_LOG_ERRORLN(message);
+}
+
+void RegionRegistry::logWarningLn(const char *message) const {
+	BS_LOG_WARNINGLN(message);
+}
+
+bool RegionRegistry::persist(OutputPersistenceBlock &writer) {
+	bool result = true;
+
+	// write out the next handle
+	writer.write(_nextHandle);
+
+	// Number of regions to write
+	writer.write(_handle2PtrMap.size());
+
+	// Persist all the BS_Regions
+	HANDLE2PTR_MAP::const_iterator iter = _handle2PtrMap.begin();
+	while (iter != _handle2PtrMap.end()) {
+		// Handle persistence
+		writer.write(iter->_key);
+
+		// Persist object
+		result &= iter->_value->persist(writer);
+
+		++iter;
+	}
+
+	return result;
+}
+
+bool RegionRegistry::unpersist(InputPersistenceBlock &reader) {
+	bool result = true;
+
+	// read in the next handle
+	reader.read(_nextHandle);
+
+	// Destroy all existing BS_Regions
+//FIXME: This doesn't seem right - the value is being deleted but not the actual hash node itself?
+	while (!_handle2PtrMap.empty())
+		delete _handle2PtrMap.begin()->_value;
+
+	// read in the number of BS_Regions
+	uint regionCount;
+	reader.read(regionCount);
+
+	// Restore all the BS_Regions objects
+	for (uint i = 0; i < regionCount; ++i)  {
+		// Handle read
+		uint handle;
+		reader.read(handle);
+
+		// BS_Region restore
+		result &= Region::create(reader, handle) != 0;
+	}
+
+	return reader.isGood() && result;
+}
+
+} // End of namespace Sword25