[Scummvm-git-logs] scummvm master -> 45da48e79939283e0da3354dd76e7eb0ff1277e4
bluegr
noreply at scummvm.org
Sun Mar 27 22:36:39 UTC 2022
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
85df27b406 CHEWY: Remove superfluous room resource file directory
45da48e799 CHEWY: Remove dead code
Commit: 85df27b40620e1f4e4f549fba97c082d0564d31a
https://github.com/scummvm/scummvm/commit/85df27b40620e1f4e4f549fba97c082d0564d31a
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-03-28T01:36:18+03:00
Commit Message:
CHEWY: Remove superfluous room resource file directory
Changed paths:
engines/chewy/inits.cpp
engines/chewy/room.cpp
engines/chewy/room.h
diff --git a/engines/chewy/inits.cpp b/engines/chewy/inits.cpp
index 14e394cf488..f9226cce487 100644
--- a/engines/chewy/inits.cpp
+++ b/engines/chewy/inits.cpp
@@ -159,7 +159,6 @@ void init_room() {
_G(room_blk).Rsi = _G(gameState).room_s_obj;
_G(room_blk).AadLoad = true;
_G(room_blk).AtsLoad = true;
- strcpy(_G(room_blk).RoomDir, "room/");
_G(room)->open_handle(EPISODE1_GEP, R_GEP_DATA);
}
diff --git a/engines/chewy/room.cpp b/engines/chewy/room.cpp
index 1b7f08113a0..ebbb1ec44f0 100644
--- a/engines/chewy/room.cpp
+++ b/engines/chewy/room.cpp
@@ -189,10 +189,7 @@ void Room::loadRoom(RaumBlk *Rb, int16 room_nr, GameState *player) {
RoomDetailInfo *Rdi_ = _G(det)->getRoomDetailInfo();
_roomInfo = &Rdi_->Ri;
if (_roomInfo->_tafLoad != 255) {
- char tmp_str[MAXPATH];
- strcpy(tmp_str, Rb->RoomDir);
- strcat(tmp_str, _roomInfo->_tafName);
- _G(det)->load_rdi_taf(tmp_str, _roomInfo->_tafLoad);
+ _G(det)->load_rdi_taf(_roomInfo->_tafName, _roomInfo->_tafLoad);
Rb->Fti = _G(det)->get_taf_info();
Rb->_detImage = Rb->Fti->_image;
Rb->DetKorrekt = Rb->Fti->_correction;
diff --git a/engines/chewy/room.h b/engines/chewy/room.h
index 34b44c15870..81bf0a43f46 100644
--- a/engines/chewy/room.h
+++ b/engines/chewy/room.h
@@ -62,7 +62,6 @@ struct RaumBlk {
RoomMovObject *Rmo;
RoomStaticInventory *Rsi;
- char RoomDir[9];
int16 AkAblage;
byte **_detImage;
int16 *DetKorrekt;
Commit: 45da48e79939283e0da3354dd76e7eb0ff1277e4
https://github.com/scummvm/scummvm/commit/45da48e79939283e0da3354dd76e7eb0ff1277e4
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-03-28T01:36:18+03:00
Commit Message:
CHEWY: Remove dead code
Changed paths:
engines/chewy/defines.h
engines/chewy/detail.cpp
engines/chewy/detail.h
diff --git a/engines/chewy/defines.h b/engines/chewy/defines.h
index 64202b9a61b..b50a682dbad 100644
--- a/engines/chewy/defines.h
+++ b/engines/chewy/defines.h
@@ -24,8 +24,6 @@
namespace Chewy {
-#define MAXPATH 255
-
#define VERSION1 0
#define VERSION2 2
diff --git a/engines/chewy/detail.cpp b/engines/chewy/detail.cpp
index 9822e3dbbba..82088d8c018 100644
--- a/engines/chewy/detail.cpp
+++ b/engines/chewy/detail.cpp
@@ -203,7 +203,7 @@ void Detail::load_rdi_taf(const char *filename, int16 load_flag) {
del_taf_tbl(_rdi.dptr);
}
}
- _tafName = Common::String(filename);
+ _tafName = filename;
if (!load_flag) {
_rdi.dptr = init_taf_tbl(filename);
load_taf_tbl(_rdi.dptr);
@@ -297,10 +297,6 @@ void Detail::load_taf_seq(int16 sprNr, int16 sprCount, TafInfo *Tt) {
delete res;
}
-void Detail::setStaticSpr(int16 nr, int16 sprNr) {
- _rdi.Sinfo[nr].SprNr = sprNr;
-}
-
void Detail::hideStaticSpr(int16 nr) {
if (nr >= 0 && nr < MAXDETAILS)
_rdi.Sinfo[nr].Hide = true;
@@ -311,14 +307,6 @@ void Detail::showStaticSpr(int16 nr) {
_rdi.Sinfo[nr].Hide = false;
}
-byte *Detail::getStaticImage(int16 detNr) {
- byte *ret = nullptr;
- const int16 index = _rdi.Sinfo[detNr].SprNr;
- if (index != -1)
- ret = _rdi.dptr->_image[index];
- return ret;
-}
-
void Detail::setStaticPos(int16 detNr, int16 x, int16 y, bool hideFl, bool correctionFlag) {
if (correctionFlag) {
int16 *Cxy = &_rdi.dptr->_correction[_rdi.Sinfo[detNr].SprNr];
@@ -340,29 +328,11 @@ void Detail::getAniValues(int16 aniNr, int16 *start, int16 *end) {
*end = _rdi.Ainfo[aniNr].end_ani;
}
-void Detail::setAni(int16 aniNr, int16 start, int16 end) {
- if (start > end)
- SWAP(start, end);
-
- _rdi.Ainfo[aniNr].start_ani = start;
- _rdi.Ainfo[aniNr].end_ani = end;
-}
-
-byte *Detail::getImage(int16 sprNr) {
- byte *ret = _rdi.dptr->_image[sprNr];
- return ret;
-}
-
AniDetailInfo *Detail::getAniDetail(int16 aniNr) {
AniDetailInfo *ret = &_rdi.Ainfo[aniNr];
return ret;
}
-int16 *Detail::getCorrectionArray() {
- int16 *ret = _rdi.dptr->_correction;
- return ret;
-}
-
void Detail::init_taf(TafInfo *dptr) {
_rdi.dptr = dptr;
}
@@ -523,21 +493,6 @@ void Detail::stop_detail(int16 nr) {
}
}
-void Detail::set_ani_delay(int16 nr, int16 del) {
- AniDetailInfo *adiptr = &_rdi.Ainfo[nr];
- adiptr->delay = del;
-}
-
-void Detail::init_list(int16 *mv) {
- for (int16 i = 0; i < ((MAX_M_ITEMS - 1) << 2); i++)
- _rdi.mvect[i] = mv[i];
-}
-
-void Detail::get_list(int16 *mv) {
- for (int16 i = 0; i < ((MAX_M_ITEMS - 1) << 2); i++)
- mv[i] = _rdi.mvect[i];
-}
-
int16 Detail::maus_vector(int16 x, int16 y) {
int16 i = -1;
for (int16 j = 0; (j < (MAX_M_ITEMS - 1) << 2) && (i == -1); j += 4) {
diff --git a/engines/chewy/detail.h b/engines/chewy/detail.h
index 11809e90b32..c92b7823fd4 100644
--- a/engines/chewy/detail.h
+++ b/engines/chewy/detail.h
@@ -161,26 +161,6 @@ struct RdiDataHeader {
bool load(Common::SeekableReadStream *src);
};
-struct DeteditPrj {
- char Id[7];
- char IibFile[MAXPATH];
- char SibFile[MAXPATH];
- char RdiFile[MAXPATH];
- char TafFile[MAXPATH];
- char TgpFile[MAXPATH];
- char Workdir[MAXPATH];
- char InventFile[MAXPATH];
- char EibFile[MAXPATH];
- char AtsRoomFile[MAXPATH];
- char AadFile[MAXPATH];
- char AtsRoomSteuer[MAXPATH];
- char AdsFile[MAXPATH];
- char AtdsFont[MAXPATH];
- char AdhFile[MAXPATH];
- char TvpFile[MAXPATH];
- char DummyFile[MAXPATH];
-};
-
class Detail {
public:
Detail();
@@ -190,9 +170,6 @@ public:
void load_rdi_taf(const char *fname, int16 load_flag);
- void setStaticSpr(int16 detNr, int16 sprNr);
- byte *getStaticImage(int16 detNr);
-
void setStaticPos(int16 detNr, int16 x, int16 y, bool hideFl, bool correctionFlag);
void setSetailPos(int16 detNr, int16 x, int16 y);
void hideStaticSpr(int16 detNr);
@@ -200,10 +177,7 @@ public:
void freezeAni();
void unfreeze_ani();
void getAniValues(int16 aniNr, int16 *start, int16 *end);
- void setAni(int16 aniNr, int16 start, int16 end);
- byte *getImage(int16 sprNr);
AniDetailInfo *getAniDetail(int16 aniNr);
- int16 *getCorrectionArray();
void init_taf(TafInfo *dptr);
TafInfo *get_taf_info();
RoomDetailInfo *getRoomDetailInfo();
@@ -211,14 +185,11 @@ public:
void set_static_ani(int16 ani_nr, int16 static_nr);
void del_static_ani(int16 ani_nr);
- void set_ani_delay(int16 nr, int16 del);
void startDetail(int16 nr, int16 rep, int16 reverse);
void stop_detail(int16 nr);
void plot_ani_details(int16 scrx, int16 scry, int16 start, int16 end,
int16 zoomx, int16 zoomy);
void plot_static_details(int16 scrx, int16 scry, int16 start, int16 end);
- void init_list(int16 *mv);
- void get_list(int16 *mv);
int16 maus_vector(int16 x, int16 y);
int16 get_ani_status(int16 det_nr);
More information about the Scummvm-git-logs
mailing list