Pull up the size() implementation to Res_mem.

roncli · Feb 20, 2014 · 76e13f9 · 76e13f9
1 parent a3a7fb8
commit 76e13f9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 20 deletions.
diff --git a/skelton/common/res_compress.cpp b/skelton/common/res_compress.cpp
@@ -27,7 +27,6 @@ using std::max;
 
 Res_compress::Res_compress(const char *fil, Res_mode pmode, bool res_doze) {
 	mode = pmode;
-	ressize = 0;
 	write_pos = 0;
 	res_dos = new Res_dos(fil, mode);
 	res = res_dos;
@@ -39,7 +38,6 @@ Res_compress::Res_compress(const char *fil, Res_mode pmode, bool res_doze) {
 
 Res_compress::Res_compress(const ResName& fil, Res_mode pmode) {
 	mode = pmode;
-	ressize = 0;
 	write_pos = 0;
 	res = new Res_doze(fil);
 	if((mode == RES_TRY && exist) || mode == RES_READ) {
@@ -107,10 +105,6 @@ void Res_compress::write(const void *b, int nb) {
 	write_pos += nb;
 }
 
-uint32_t Res_compress::size() {
-	return ressize;
-}
-
 void Res_compress::write_compress() {
 	if(!res)
 		fatal_msgbox("Trying to write_compress a second time!");

diff --git a/skelton/include/res.h b/skelton/include/res.h
@@ -58,8 +58,13 @@ class Res_mem: public Res {
 protected:
 	uint8_t *_buf;
 	uint32_t pos;
+	uint32_t ressize;
 public:
-	Res_mem();
+	Res_mem()
+		: _buf(NULL),
+			pos(0),
+			ressize(0) {
+	}
 	virtual int read(void *b, int nb) {
 		if(pos+nb>size()) {
 			memset(b, 0, nb);
@@ -81,21 +86,18 @@ class Res_mem: public Res {
 	virtual uint32_t get_position() {
 		return pos;
 	}
+	virtual uint32_t size() {
+		return ressize;
+	}
 };
 
 class Res_doze: public Res_mem {
-	unsigned int ressize;
 public:
 	Res_doze(const ResName& res) {
 		ressize = resmanager->get(res.name_.c_str(), &_buf);
 		if(!_buf)
 			fatal_msgbox("Unable to find resource: %s", res.name_.c_str());
 	}
-	virtual ~Res_doze() {
-	}
-	virtual uint32_t size() {
-		return ressize;
-	}
 };
 
 enum Res_mode {

diff --git a/skelton/include/res_compress.h b/skelton/include/res_compress.h
@@ -29,7 +29,6 @@ class Res_compress: public Res_mem {
 	Res_mode mode;
 	Res *res;
 	Res_dos *res_dos;
-	mutable uint32_t ressize;
 	mutable uint32_t write_pos;
 	void read_uncompress();
 public:
@@ -39,7 +38,6 @@ class Res_compress: public Res_mem {
 	Res_compress(const ResName& fil, Res_mode pmode=RES_READ);
 	virtual ~Res_compress();
 	virtual void write(const void *b, int nb);
-	virtual uint32_t size();
 };
 
 #endif
diff --git a/skelton/svgalib/res.cpp b/skelton/svgalib/res.cpp
@@ -21,11 +21,6 @@
 #include <sys/stat.h>
 #include "res.h"
 
-Res_mem::Res_mem() {
-	pos = 0;
-	_buf = NULL;
-}
-
 Res_dos::Res_dos(const char *fil, Res_mode mode) {
 	int flag(0);
 	_buf = NULL;