1 files changed, 1 insertions, 118 deletions

diff --git a/queen/graphics.cpp b/queen/graphics.cpp
index 10b5c0dee2..3d4f8c45bb 100644
--- a/queen/graphics.cpp
+++ b/queen/graphics.cpp
@@ -22,6 +22,7 @@
 #include "stdafx.h"
 #include "queen/graphics.h"
 
+#include "queen/bankman.h"
 #include "queen/display.h"
 #include "queen/logic.h"
 #include "queen/queen.h"
@@ -180,124 +181,6 @@ void BobSlot::clear() {
 }
 
 
-
-BankManager::BankManager(Resource *res) 
-	: _res(res) {
-	memset(_frames, 0, sizeof(_frames));
-	memset(_banks, 0, sizeof(_banks));
-}
-
-
-BankManager::~BankManager() {
-	for(uint32 i = 0; i < MAX_BANKS_NUMBER; ++i) {
-		close(i);
-	}
-	eraseAllFrames(true);
-}
-
-
-void BankManager::load(const char *bankname, uint32 bankslot) {
-	close(bankslot);
-
-	_banks[bankslot].data = _res->loadFile(bankname);
-	if (!_banks[bankslot].data) {
-		error("Unable to open bank '%s'", bankname);	
-	}
-
-	int16 entries = (int16)READ_LE_UINT16(_banks[bankslot].data);
-	if (entries < 0 || entries >= MAX_BANK_SIZE) {
-		error("Maximum bank size exceeded or negative bank size : %d", entries);
-	}
-
-	debug(9, "BankManager::load(%s, %d) - entries = %d", bankname, bankslot, entries); 
-
-	uint32 offset = 2;
-	uint8 *p = _banks[bankslot].data;
-	for (int16 i = 1; i <= entries; ++i) {
-		_banks[bankslot].indexes[i] = offset;
-		uint16 w = READ_LE_UINT16(p + offset + 0);
-		uint16 h = READ_LE_UINT16(p + offset + 2);
-		// jump to next entry, skipping data & header
-		offset += w * h + 8; 
-	}
-}
-
-
-void BankManager::unpack(uint32 srcframe, uint32 dstframe, uint32 bankslot) {
-	debug(9, "BankManager::unpack(%d, %d, %d)", srcframe, dstframe, bankslot);
-	if (!_banks[bankslot].data)
-		error("BankManager::unpack() _banks[bankslot].data is NULL!");
-		
-	BobFrame *pbf = &_frames[dstframe];
-	uint8 *p = _banks[bankslot].data + _banks[bankslot].indexes[srcframe];
-	pbf->width    = READ_LE_UINT16(p + 0);
-	pbf->height   = READ_LE_UINT16(p + 2);
-	pbf->xhotspot = READ_LE_UINT16(p + 4);
-	pbf->yhotspot = READ_LE_UINT16(p + 6);
-
-	uint32 size = pbf->width * pbf->height;
-	delete[] pbf->data;
-	pbf->data = new uint8[ size ];
-	memcpy(pbf->data, p + 8, size);
-}
-
-
-void BankManager::overpack(uint32 srcframe, uint32 dstframe, uint32 bankslot) {
-	debug(9, "BankManager::overpack(%d, %d, %d)", srcframe, dstframe, bankslot);
-	if (!_banks[bankslot].data)
-		error("BankManager::overpack() _banks[bankslot].data is NULL!");
-
-	uint8 *p = _banks[bankslot].data + _banks[bankslot].indexes[srcframe];
-	uint16 src_w = READ_LE_UINT16(p + 0);
-	uint16 src_h = READ_LE_UINT16(p + 2);
-
-	// unpack if destination frame is smaller than source one
-	if (_frames[dstframe].width < src_w || _frames[dstframe].height < src_h) {
-		unpack(srcframe, dstframe, bankslot);
-	} else {
-		// copy data 'over' destination frame (without changing frame header)
-		memcpy(_frames[dstframe].data, p + 8, src_w * src_h);
-	}
-}
-
-
-void BankManager::close(uint32 bankslot) {
-	debug(9, "BankManager::close(%d)", bankslot);
-	delete[] _banks[bankslot].data;
-	memset(&_banks[bankslot], 0, sizeof(_banks[bankslot]));
-}
-
-
-BobFrame *BankManager::fetchFrame(uint32 index) {
-	debug(9, "BankManager::fetchFrame(%d)", index);
-	if (index >= MAX_FRAMES_NUMBER) {
-		error("BankManager::fetchFrame() invalid frame index = %d", index);
-	}
-	return &_frames[index];
-}
-
-
-void BankManager::eraseFrame(uint32 index) {
-	debug(9, "BankManager::eraseFrame(%d)", index);
-	BobFrame *pbf = &_frames[index];
-	delete[] pbf->data;
-	memset(pbf, 0, sizeof(BobFrame));
-}
-
-
-void BankManager::eraseAllFrames(bool joe) {
-    uint32 i = 0;
-	if (!joe) {
-		i = FRAMES_JOE + FRAMES_JOE_XTRA;
-	}
-	while (i < 256) {
-		eraseFrame(i);
-		++i;
-	}
-}
-
-
-
 Graphics::Graphics(QueenEngine *vm)
 	: _cameraBob(0), _vm(vm) {
 	memset(_bobs, 0, sizeof(_bobs));