[Scummvm-git-logs] scummvm master -> 432e0682c39fc413c182332c7dfed3a59db53928

[bluegr]

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:
432e0682c3 CHEWY: Remove obsolete file handles from the Room class


Commit: 432e0682c39fc413c182332c7dfed3a59db53928
    https://github.com/scummvm/scummvm/commit/432e0682c39fc413c182332c7dfed3a59db53928
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-03-05T23:24:49+02:00

Commit Message:
CHEWY: Remove obsolete file handles from the Room class

Changed paths:
    engines/chewy/dialogs/cinema.cpp
    engines/chewy/dialogs/credits.cpp
    engines/chewy/dialogs/files.cpp
    engines/chewy/room.cpp
    engines/chewy/room.h


diff --git a/engines/chewy/dialogs/cinema.cpp b/engines/chewy/dialogs/cinema.cpp
index ea4a3959383..98b3b3d0b06 100644
--- a/engines/chewy/dialogs/cinema.cpp
+++ b/engines/chewy/dialogs/cinema.cpp
@@ -58,7 +58,6 @@ void Cinema::execute() {
 	_G(fontMgr)->setFont(_G(font6));
 	_G(atds)->load_atds(98, 1);
 
-	_G(room)->open_handle(GBOOK, AAD_DATA);
 	_G(room)->load_tgp(4, &_G(room_blk), 1, 0, GBOOK);
 	showCur();
 	EVENTS_CLEAR;
@@ -197,7 +196,6 @@ void Cinema::execute() {
 		SHOULD_QUIT_RETURN;
 	}
 
-	_G(room)->open_handle(EPISODE1, AAD_DATA);
 	_G(room)->set_ak_pal(&_G(room_blk));
 	hideCur();
 	_G(uhr)->resetTimer(0, 5);
diff --git a/engines/chewy/dialogs/credits.cpp b/engines/chewy/dialogs/credits.cpp
index 76ae8322ea4..cbe9b64ea7c 100644
--- a/engines/chewy/dialogs/credits.cpp
+++ b/engines/chewy/dialogs/credits.cpp
@@ -194,7 +194,6 @@ void Credits::execute() {
 	int lineScrolled = 0;
 	int fontCol;
 
-	_G(room)->open_handle(GBOOK, AAD_DATA);
 	_G(room)->load_tgp(5, &_G(room_blk), 1, 0, GBOOK);
 	_G(spieler).scrollx = 0;
 	_G(spieler).scrolly = 0;
@@ -261,7 +260,6 @@ void Credits::execute() {
 	}
 
 	_G(fontMgr)->setFont(_G(font8));
-	_G(room)->open_handle("back/episode1.tgp", R_GEP_DATA);
 
 	_G(room)->set_ak_pal(&_G(room_blk));
 	hideCur();
diff --git a/engines/chewy/dialogs/files.cpp b/engines/chewy/dialogs/files.cpp
index 3a475f05272..be24e689e6d 100644
--- a/engines/chewy/dialogs/files.cpp
+++ b/engines/chewy/dialogs/files.cpp
@@ -63,7 +63,6 @@ int16 Files::execute(bool isInGame) {
 	TafInfo *ti = _G(mem)->taf_adr(OPTION_TAF);
 	EVENTS_CLEAR;
 
-	_G(room)->open_handle(GBOOK, AAD_DATA);
 	_G(room)->load_tgp(1, &_G(room_blk), GBOOK_TGP, 0, GBOOK);
 	_G(out)->setPointer(_G(workptr));
 	_G(out)->map_spr2screen(_G(ablage)[_G(room_blk).AkAblage], 0, 0);
@@ -295,7 +294,6 @@ enter:
 
 	free(ti);
 
-	_G(room)->open_handle(EPISODE1, AAD_DATA);
 	_G(room)->load_tgp(_G(spieler)._personRoomNr[P_CHEWY], &_G(room_blk), EPISODE1_TGP, GED_LOAD, EPISODE1);
 
 	_G(fx_blend) = BLEND1;
diff --git a/engines/chewy/room.cpp b/engines/chewy/room.cpp
index 149790017bb..9b3829d8936 100644
--- a/engines/chewy/room.cpp
+++ b/engines/chewy/room.cpp
@@ -160,6 +160,8 @@ Room::~Room() {
 }
 
 Common::Stream *Room::open_handle(const char *fname1, int16 mode) {
+	assert(mode == R_GEP_DATA || mode == R_VOC_DATA);
+
 	Common::File *f = new Common::File();
 	f->open(fname1);
 	if (f->isOpen()) {
diff --git a/engines/chewy/room.h b/engines/chewy/room.h
index ce296fa0893..25bf246457f 100644
--- a/engines/chewy/room.h
+++ b/engines/chewy/room.h
@@ -37,11 +37,11 @@ extern const int16 SURIMY_TAF19_PHASEN[4][2];
 
 #define ABLAGE_BLOCK_SIZE 64000l
 #define GED_BLOCK_SIZE 3000l
-#define MAX_ROOM_HANDLE 4
+#define MAX_ROOM_HANDLE 2
 #define GED_LOAD 1
 
-#define R_VOC_DATA 1
-#define R_GEP_DATA 2
+#define R_VOC_DATA 0
+#define R_GEP_DATA 1
 
 
 class JungleRoom {