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, 90 insertions, 0 deletions

diff --git a/engines/sword25/kernel/inputpersistenceblock.h b/engines/sword25/kernel/inputpersistenceblock.h
new file mode 100644
index 0000000000..a6978e5899
--- /dev/null
+++ b/engines/sword25/kernel/inputpersistenceblock.h
@@ -0,0 +1,90 @@
+/* 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
+ *
+ */
+
+#ifndef SWORD25_INPUTPERSISTENCEBLOCK_H
+#define SWORD25_INPUTPERSISTENCEBLOCK_H
+
+// -----------------------------------------------------------------------------
+// Includes
+// -----------------------------------------------------------------------------
+
+#include "common/array.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/persistenceblock.h"
+
+namespace Sword25 {
+
+// -----------------------------------------------------------------------------
+// Class declaration
+// -----------------------------------------------------------------------------
+
+class InputPersistenceBlock : public PersistenceBlock {
+public:
+	enum ErrorState {
+		NONE,
+		END_OF_DATA,
+		OUT_OF_SYNC
+	};
+
+	InputPersistenceBlock(const void *Data, uint DataLength);
+	virtual ~InputPersistenceBlock();
+
+	void read(int16 &Value);
+	void read(signed int &Value);
+	void read(uint &Value);
+	void read(float &Value);
+	void read(bool &Value);
+	void read(Common::String &Value);
+	void read(Common::Array<byte> &Value);
+
+	bool isGood() const {
+		return m_ErrorState == NONE;
+	}
+	ErrorState GetErrorState() const {
+		return m_ErrorState;
+	}
+
+private:
+	bool CheckMarker(byte Marker);
+	bool CheckBlockSize(int Size);
+	void RawRead(void *DestPtr, size_t Size);
+
+	Common::Array<byte> m_Data;
+	Common::Array<byte>::const_iterator m_Iter;
+	ErrorState m_ErrorState;
+};
+
+} // End of namespace Sword25
+
+#endif