[Scummvm-git-logs] scummvm master -> a429d97779edc1d30c3ff3371a0c77ec8c4aa661

[dreammaster]

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

Summary:
a429d97779 ULTIMA8: Cleanup of unneeded file code


Commit: a429d97779edc1d30c3ff3371a0c77ec8c4aa661
    https://github.com/scummvm/scummvm/commit/a429d97779edc1d30c3ff3371a0c77ec8c4aa661
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-03-08T09:43:48-07:00

Commit Message:
ULTIMA8: Cleanup of unneeded file code

Changed paths:
    engines/ultima/ultima8/filesys/idata_source.h
    engines/ultima/ultima8/filesys/odata_source.h


diff --git a/engines/ultima/ultima8/filesys/idata_source.h b/engines/ultima/ultima8/filesys/idata_source.h
index 06f1b110b4..f7da9f4438 100644
--- a/engines/ultima/ultima8/filesys/idata_source.h
+++ b/engines/ultima/ultima8/filesys/idata_source.h
@@ -202,55 +202,21 @@ protected:
 	bool _freeBuffer;
 	uint32 _size;
 
-	void ConvertTextBuffer() {
-#ifdef WIN32
-		uint8 *new_buf = new uint8[_size];
-		uint8 *new_buf_ptr = new_buf;
-		uint32 new_size = 0;
-
-		// What we want to do is convert all 0x0D 0x0A to just 0x0D
-
-		// Do for all but last byte
-		while (_size > 1) {
-			if (*(uint16 *)_bufPtr == 0x0A0D) {
-				_bufPtr++;
-				_size--;
-			}
-
-			*new_buf_ptr = *_bufPtr;
-
-			new_buf_ptr++;
-			new_size++;
-			_bufPtr++;
-			_size--;
-		}
-
-		// Do last byte
-		if (_size) *new_buf_ptr = *_bufPtr;
-
-		// Delete old buffer if requested
-		if (_freeBuffer) delete[] const_cast<uint8 *>(_buf);
-
-		_bufPtr = _buf = new_buf;
-		_size = new_size;
-		_freeBuffer = true;
-#endif
-	}
-
 public:
 	IBufferDataSource(const void *data, unsigned int len, bool is_text = false,
 	                  bool delete_data = false) {
+		assert(!is_text);
 		assert(data != 0 || len == 0);
 		_buf = _bufPtr = static_cast<const uint8 *>(data);
 		_size = len;
 		_freeBuffer = delete_data;
-
-		if (is_text) ConvertTextBuffer();
 	}
 
 	virtual void load(const void *data, unsigned int len, bool is_text = false,
 	                  bool delete_data = false) {
-		if (_freeBuffer && _buf) delete [] const_cast<uint8 *>(_buf);
+		assert(!is_text);
+		if (_freeBuffer && _buf)
+			delete[] const_cast<uint8 *>(_buf);
 		_freeBuffer = false;
 		_buf = _bufPtr = 0;
 
@@ -258,12 +224,11 @@ public:
 		_buf = _bufPtr = static_cast<const uint8 *>(data);
 		_size = len;
 		_freeBuffer = delete_data;
-
-		if (is_text) ConvertTextBuffer();
 	}
 
 	~IBufferDataSource() override {
-		if (_freeBuffer && _buf) delete [] const_cast<uint8 *>(_buf);
+		if (_freeBuffer && _buf)
+			delete[] const_cast<uint8 *>(_buf);
 		_freeBuffer = false;
 		_buf = _bufPtr = 0;
 	}
diff --git a/engines/ultima/ultima8/filesys/odata_source.h b/engines/ultima/ultima8/filesys/odata_source.h
index 6dd2d9c5fd..3744d1dad2 100644
--- a/engines/ultima/ultima8/filesys/odata_source.h
+++ b/engines/ultima/ultima8/filesys/odata_source.h
@@ -53,17 +53,6 @@ public:
 		else write4(val);
 	}
 
-	void writef(float f) {
-		// FIXME: dubious...
-		union {
-			uint32  i;
-			float   f;
-		} int_float;
-		int_float.f = f;
-		write4(int_float.i);
-	}
-
-
 	virtual Common::WriteStream *GetRawStream() {
 		return 0;
 	}