[Scummvm-git-logs] scummvm master -> 4a012a295530429218dcdf661d0042ab107faf2a
Strangerke
noreply at scummvm.org
Sun Mar 6 23:58:55 UTC 2022
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:
4a012a2955 CHEWY: rename a bunch of 'Anz' variables
Commit: 4a012a295530429218dcdf661d0042ab107faf2a
https://github.com/scummvm/scummvm/commit/4a012a295530429218dcdf661d0042ab107faf2a
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2022-03-07T00:58:19+01:00
Commit Message:
CHEWY: rename a bunch of 'Anz' variables
Changed paths:
engines/chewy/atds.cpp
engines/chewy/data.cpp
engines/chewy/detail.cpp
engines/chewy/detail.h
engines/chewy/dialogs/cinema.cpp
engines/chewy/dialogs/inventory.cpp
engines/chewy/dialogs/main_menu.cpp
engines/chewy/events.cpp
engines/chewy/globals.h
engines/chewy/inits.cpp
engines/chewy/main.cpp
engines/chewy/menus.cpp
engines/chewy/mouse.cpp
engines/chewy/mouse.h
engines/chewy/ngstypes.cpp
engines/chewy/ngstypes.h
engines/chewy/r_event.cpp
engines/chewy/room.cpp
engines/chewy/room.h
engines/chewy/rooms/room00.cpp
engines/chewy/rooms/room14.cpp
engines/chewy/rooms/room17.cpp
engines/chewy/rooms/room29.cpp
engines/chewy/rooms/room31.cpp
engines/chewy/rooms/room33.cpp
engines/chewy/rooms/room51.cpp
engines/chewy/sound_player.cpp
engines/chewy/sprite.cpp
engines/chewy/t_event.cpp
engines/chewy/video/video_player.cpp
diff --git a/engines/chewy/atds.cpp b/engines/chewy/atds.cpp
index ea3cbf5744c..828ebd3403d 100644
--- a/engines/chewy/atds.cpp
+++ b/engines/chewy/atds.cpp
@@ -593,7 +593,7 @@ void Atdsys::print_ats(int16 x, int16 y, int16 scrx, int16 scry) {
_mousePush = true;
_atsv.DelayCount = 0;
KbdInfo *kbInfo = _G(in)->getPointer()->kbinfo;
- kbInfo->scan_code = Common::KEYCODE_INVALID;
+ kbInfo->_scanCode = Common::KEYCODE_INVALID;
kbInfo->_keyCode = '\0';
}
}
@@ -940,7 +940,7 @@ void Atdsys::print_aad(int16 scrx, int16 scry) {
_mousePush = true;
_aadv._delayCount = 0;
KbdInfo *kbInfo = _G(in)->getPointer()->kbinfo;
- kbInfo->scan_code = Common::KEYCODE_INVALID;
+ kbInfo->_scanCode = Common::KEYCODE_INVALID;
kbInfo->_keyCode = '\0';
}
}
diff --git a/engines/chewy/data.cpp b/engines/chewy/data.cpp
index da15be69111..ccb6d67e03a 100644
--- a/engines/chewy/data.cpp
+++ b/engines/chewy/data.cpp
@@ -43,11 +43,11 @@ uint16 Data::select_pool_item(Common::Stream *stream, uint16 nr) {
if (!ph.load(rs))
error("select_pool_item error");
- if (!strncmp(ph.id, "NGS", 3)) {
- if (nr >= ph.PoolAnz)
- nr = ph.PoolAnz - 1;
+ if (!strncmp(ph._id, "NGS", 3)) {
+ if (nr >= ph._poolNr)
+ nr = ph._poolNr - 1;
- rs->seek(-(int)((ph.PoolAnz - nr) * sizeof(uint32)), SEEK_END);
+ rs->seek(-(int)((ph._poolNr - nr) * sizeof(uint32)), SEEK_END);
uint32 tmp1 = rs->readUint32LE();
rs->seek(tmp1, SEEK_SET);
}
@@ -76,7 +76,7 @@ uint32 Data::load_tmf(Common::Stream *handle, TmfHeader *song) {
size = ch.size + sizeof(TmfHeader);
byte *speicher = (byte *)song + sizeof(TmfHeader);
- speicher += ((uint32)song->pattern_anz) * 1024l;
+ speicher += ((uint32)song->_patternNr) * 1024l;
for (int16 i = 0; i < 31; ++i) {
if (song->instrument[i].laenge) {
song->ipos[i] = speicher;
@@ -99,11 +99,11 @@ uint32 Data::get_poolsize(const char *fname, int16 chunk_start, int16 chunk_anz)
if (!Nph.load(&f))
error("get_poolsize error");
- if (!strncmp(Nph.id, "NGS", 3)) {
+ if (!strncmp(Nph._id, "NGS", 3)) {
select_pool_item(&f, chunk_start);
f.seek(-ChunkHead::SIZE(), SEEK_CUR);
- for (int16 i = chunk_start; (i < Nph.PoolAnz) && i < (chunk_start + chunk_anz); i++) {
+ for (int16 i = chunk_start; (i < Nph._poolNr) && i < (chunk_start + chunk_anz); i++) {
ChunkHead ch;
if (!ch.load(&f))
error("get_poolsize error");
diff --git a/engines/chewy/detail.cpp b/engines/chewy/detail.cpp
index e709371486d..cb12f2afee0 100644
--- a/engines/chewy/detail.cpp
+++ b/engines/chewy/detail.cpp
@@ -28,21 +28,21 @@ namespace Chewy {
bool RoomInfo::load(Common::SeekableReadStream *src) {
_roomNr = src->readByte();
- BildNr = src->readByte();
- AutoMovAnz = src->readByte();
- TafLoad = src->readByte();
- src->read(TafName, 14);
+ _imageNr = src->readByte();
+ _autoMovNr = src->readByte();
+ _tafLoad = src->readByte();
+ src->read(_tafName, 14);
_zoomFactor = src->readByte();
- Dummy = src->readByte();
+ _dummy = src->readByte();
return true;
}
bool RoomAutoMov::load(Common::SeekableReadStream *src) {
- X = src->readSint16LE();
- Y = src->readSint16LE();
- SprNr = src->readByte();
- dummy = src->readByte();
+ _x = src->readSint16LE();
+ _y = src->readSint16LE();
+ _sprNr = src->readByte();
+ _dummy = src->readByte();
return true;
}
@@ -104,8 +104,8 @@ bool StaticDetailInfo::load(Common::SeekableReadStream *src) {
bool RoomDetailInfo::load(Common::SeekableReadStream *src) {
int i;
- StaticDetailAnz = src->readSint16LE();
- AniDetailAnz = src->readSint16LE();
+ _staticDetailNr = src->readSint16LE();
+ _aniDetailNr = src->readSint16LE();
src->skip(4); // dptr
for (i = 0; i < MAXDETAILS; ++i)
Ainfo[i].load(src);
@@ -127,7 +127,7 @@ bool RoomDetailInfo::load(Common::SeekableReadStream *src) {
bool RdiDataHeader::load(Common::SeekableReadStream *src) {
src->read(_id, 4);
- Anz = src->readSint16LE();
+ _nr = src->readSint16LE();
return true;
}
@@ -248,11 +248,11 @@ void Detail::load_taf_tbl(TafInfo *fti) {
TafInfo *Detail::init_taf_tbl(const char *fname_) {
TafInfo *Tt = nullptr;
SpriteResource *res = new SpriteResource(_tafName);
- int16 anz = res->getChunkCount();
- byte *tmp = (byte *)MALLOC((int32)anz * sizeof(byte *) + sizeof(TafInfo));
+ int16 nr = res->getChunkCount();
+ byte *tmp = (byte *)MALLOC((int32)nr * sizeof(byte *) + sizeof(TafInfo));
Tt = (TafInfo *)tmp;
- Tt->_count = anz;
+ Tt->_count = nr;
Tt->_correction = (int16 *)MALLOC((int32)Tt->_count * 2 * sizeof(int16));
Tt->_image = (byte **)(tmp + sizeof(TafInfo));
memcpy(Tt->_correction, (byte *)res->getSpriteCorrectionsTable(), Tt->_count * 2 * sizeof(int16));
@@ -274,10 +274,10 @@ void Detail::del_taf_tbl(TafInfo *Tt) {
free((char *) Tt);
}
-void Detail::del_taf_tbl(int16 start, int16 anz, TafInfo *Tt) {
+void Detail::del_taf_tbl(int16 start, int16 nr, TafInfo *Tt) {
if (!Tt)
Tt = _rdi.dptr;
- for (int16 i = start; i < start + anz && i < Tt->_count; i++) {
+ for (int16 i = start; i < start + nr && i < Tt->_count; i++) {
free(Tt->_image[i]);
Tt->_image[i] = nullptr;
}
@@ -570,7 +570,7 @@ SprInfo Detail::plot_detail_sprite(int16 scrx, int16 scry, int16 det_nr, int16 s
spr_nr = adiptr->start_ani;
if (spr_nr > adiptr->end_ani)
spr_nr = adiptr->end_ani - 1;
- int16 *Cxy = _rdi.dptr->_correction + (spr_nr << 1);
+ int16 *Cxy = &_rdi.dptr->_correction[spr_nr];
int16 *Xy = (int16 *)_rdi.dptr->_image[spr_nr];
_sprInfo._image = _rdi.dptr->_image[spr_nr];
_sprInfo._x = adiptr->x + Cxy[0] - scrx;
diff --git a/engines/chewy/detail.h b/engines/chewy/detail.h
index 306d87a815a..23d4940679f 100644
--- a/engines/chewy/detail.h
+++ b/engines/chewy/detail.h
@@ -35,12 +35,12 @@ namespace Chewy {
struct RoomInfo {
uint8 _roomNr;
- uint8 BildNr;
- uint8 AutoMovAnz;
- uint8 TafLoad;
- char TafName[14];
+ uint8 _imageNr;
+ uint8 _autoMovNr;
+ uint8 _tafLoad;
+ char _tafName[14];
uint8 _zoomFactor;
- uint8 Dummy;
+ uint8 _dummy;
bool load(Common::SeekableReadStream *src);
static constexpr int SIZE() {
@@ -49,10 +49,10 @@ struct RoomInfo {
};
struct RoomAutoMov {
- int16 X;
- int16 Y;
- uint8 SprNr;
- uint8 dummy;
+ int16 _x;
+ int16 _y;
+ uint8 _sprNr;
+ uint8 _dummy;
bool load(Common::SeekableReadStream *src);
static constexpr int SIZE() {
@@ -60,10 +60,8 @@ struct RoomAutoMov {
}
};
-#define MAXTAF 10
#define MAXDETAILS 32
#define MAX_M_ITEMS 50
-#define MAX_RDI_ROOM 100
struct SprInfo {
byte *_image = nullptr;
@@ -130,8 +128,8 @@ struct StaticDetailInfo {
};
struct RoomDetailInfo {
- int16 StaticDetailAnz = 0;
- int16 AniDetailAnz = 0;
+ int16 _staticDetailNr = 0;
+ int16 _aniDetailNr = 0;
TafInfo *dptr = nullptr;
AniDetailInfo Ainfo[MAXDETAILS];
StaticDetailInfo Sinfo[MAXDETAILS];
@@ -158,7 +156,7 @@ struct RoomDetailInfo {
struct RdiDataHeader {
char _id[4];
- int16 Anz;
+ int16 _nr;
bool load(Common::SeekableReadStream *src);
};
@@ -233,7 +231,7 @@ public:
void del_taf_tbl(TafInfo *Tt);
- void del_taf_tbl(int16 start, int16 anz, TafInfo *Tt);
+ void del_taf_tbl(int16 start, int16 nr, TafInfo *Tt);
void load_taf_seq(int16 sprNr, int16 sprCount, TafInfo *Tt);
void load_taf_tbl(TafInfo *fti);
diff --git a/engines/chewy/dialogs/cinema.cpp b/engines/chewy/dialogs/cinema.cpp
index ecbfeb4fd39..9f424801aa1 100644
--- a/engines/chewy/dialogs/cinema.cpp
+++ b/engines/chewy/dialogs/cinema.cpp
@@ -61,7 +61,7 @@ void Cinema::execute() {
_G(room)->load_tgp(4, &_G(room_blk), 1, 0, GBOOK);
showCur();
EVENTS_CLEAR;
- _G(kbinfo).scan_code = 0;
+ _G(kbinfo)._scanCode = 0;
for (bool endLoop = false; !endLoop;) {
_G(out)->setPointer(_G(workptr));
@@ -88,14 +88,14 @@ void Cinema::execute() {
flag = true;
switch (_G(in)->mouseVector(g_events->_mousePos.x, g_events->_mousePos.y, CINEMA_TBL, 3)) {
case 0:
- _G(kbinfo).scan_code = Common::KEYCODE_UP;
+ _G(kbinfo)._scanCode = Common::KEYCODE_UP;
if (!endLoop)
endLoop = true;
break;
case 1:
- _G(kbinfo).scan_code = Common::KEYCODE_DOWN;
+ _G(kbinfo)._scanCode = Common::KEYCODE_DOWN;
if (!endLoop)
endLoop = true;
@@ -106,7 +106,7 @@ void Cinema::execute() {
int selIndex = (g_events->_mousePos.y - 68) / 10 + topIndex;
if (selIndex < (int)cutscenes.size())
selected = selIndex;
- _G(kbinfo).scan_code = Common::KEYCODE_RETURN;
+ _G(kbinfo)._scanCode = Common::KEYCODE_RETURN;
break;
}
@@ -114,7 +114,7 @@ void Cinema::execute() {
break;
}
} else if (_G(minfo)._button == 2 && !flag) {
- _G(kbinfo).scan_code = Common::KEYCODE_ESCAPE;
+ _G(kbinfo)._scanCode = Common::KEYCODE_ESCAPE;
flag = true;
} else if (_G(minfo)._button != 1) {
flag = false;
@@ -125,10 +125,10 @@ void Cinema::execute() {
flag = false;
}
- switch (_G(kbinfo).scan_code) {
+ switch (_G(kbinfo)._scanCode) {
case Common::KEYCODE_ESCAPE:
endLoop = true;
- _G(kbinfo).scan_code = 0;
+ _G(kbinfo)._scanCode = 0;
break;
case Common::KEYCODE_UP:
@@ -138,7 +138,7 @@ void Cinema::execute() {
} else if (topIndex > 0) {
--topIndex;
}
- _G(kbinfo).scan_code = 0;
+ _G(kbinfo)._scanCode = 0;
break;
case Common::KEYCODE_DOWN:
@@ -152,7 +152,7 @@ void Cinema::execute() {
if ((topIndex + newIndex) < (int)cutscenes.size())
++selected;
}
- _G(kbinfo).scan_code = 0;
+ _G(kbinfo)._scanCode = 0;
break;
}
@@ -175,7 +175,7 @@ void Cinema::execute() {
}
// The below are hacks to get the dialog to work in ScummVM
- _G(kbinfo).scan_code = 0;
+ _G(kbinfo)._scanCode = 0;
_G(minfo)._button = 0;
txt_anz = 0;
diff --git a/engines/chewy/dialogs/inventory.cpp b/engines/chewy/dialogs/inventory.cpp
index 2140e262755..15d23913e64 100644
--- a/engines/chewy/dialogs/inventory.cpp
+++ b/engines/chewy/dialogs/inventory.cpp
@@ -425,7 +425,7 @@ int16 Inventory::look(int16 invent_nr, int16 mode, int16 ats_nr) {
if (_G(minfo)._button) {
if (_G(minfo)._button == 2) {
if (!mouseFl)
- _G(kbinfo).scan_code = Common::KEYCODE_ESCAPE;
+ _G(kbinfo)._scanCode = Common::KEYCODE_ESCAPE;
} else if (_G(minfo)._button == 1) {
if (!mouseFl) {
switch (rect) {
@@ -441,12 +441,12 @@ int16 Inventory::look(int16 invent_nr, int16 mode, int16 ats_nr) {
case 3:
case 6:
- _G(kbinfo).scan_code = Common::KEYCODE_UP;
+ _G(kbinfo)._scanCode = Common::KEYCODE_UP;
break;
case 4:
case 7:
- _G(kbinfo).scan_code = Common::KEYCODE_DOWN;
+ _G(kbinfo)._scanCode = Common::KEYCODE_DOWN;
break;
case 5:
@@ -465,7 +465,7 @@ int16 Inventory::look(int16 invent_nr, int16 mode, int16 ats_nr) {
mouseFl = false;
}
- switch (_G(kbinfo).scan_code) {
+ switch (_G(kbinfo)._scanCode) {
case Common::KEYCODE_F1:
_G(in)->_hotkey = Common::KEYCODE_F1;
break;
@@ -492,7 +492,7 @@ int16 Inventory::look(int16 invent_nr, int16 mode, int16 ats_nr) {
break;
}
- _G(kbinfo).scan_code = Common::KEYCODE_INVALID;
+ _G(kbinfo)._scanCode = Common::KEYCODE_INVALID;
setupScreen(NO_SETUP);
plot_menu();
_G(fontMgr)->setFont(_G(font8));
diff --git a/engines/chewy/dialogs/main_menu.cpp b/engines/chewy/dialogs/main_menu.cpp
index 7bd64c1eef8..ce12960e598 100644
--- a/engines/chewy/dialogs/main_menu.cpp
+++ b/engines/chewy/dialogs/main_menu.cpp
@@ -201,7 +201,7 @@ void MainMenu::startGame() {
_G(room)->loadRoom(&_G(room_blk), 0, &_G(spieler));
_G(spieler_vector)[P_CHEWY].Phase = 6;
- _G(spieler_vector)[P_CHEWY].PhAnz = _G(chewy_ph_anz)[6];
+ _G(spieler_vector)[P_CHEWY].PhAnz = _G(chewy_ph_nr)[6];
setPersonPos(160, 80, P_CHEWY, P_RIGHT);
_G(fx_blend) = BLEND3;
_G(spieler)._personHide[P_CHEWY] = false;
@@ -243,7 +243,7 @@ void MainMenu::playGame() {
_G(cur_display) = true;
_G(tmp_menu_item) = 0;
_G(mouseLeftClick) = false;
- _G(kbinfo).scan_code = Common::KEYCODE_INVALID;
+ _G(kbinfo)._scanCode = Common::KEYCODE_INVALID;
_G(flags).mainMouseFlag = false;
_G(flags).MainInput = true;
diff --git a/engines/chewy/events.cpp b/engines/chewy/events.cpp
index 549e31da91f..7871f7842c4 100644
--- a/engines/chewy/events.cpp
+++ b/engines/chewy/events.cpp
@@ -141,9 +141,9 @@ void EventsManager::handleKbdEvent(const Common::Event &event) {
if (_kbInfo) {
if (event.type == Common::EVENT_KEYDOWN) {
_kbInfo->_keyCode = event.kbd.ascii;
- _kbInfo->scan_code = event.kbd.keycode;
+ _kbInfo->_scanCode = event.kbd.keycode;
if (event.kbd.flags & Common::KBD_ALT)
- _kbInfo->scan_code |= ALT;
+ _kbInfo->_scanCode |= ALT;
} else if (event.type == Common::EVENT_KEYUP) {
if (event.kbd.ascii == _kbInfo->_keyCode)
_kbInfo->_keyCode = '\0';
@@ -163,7 +163,7 @@ void EventsManager::delay(size_t time) {
void EventsManager::clearEvents() {
if (_kbInfo) {
- _kbInfo->scan_code = Common::KEYCODE_INVALID;
+ _kbInfo->_scanCode = Common::KEYCODE_INVALID;
_kbInfo->_keyCode = '\0';
}
@@ -249,7 +249,7 @@ char getch() {
if (g_events->_kbInfo && g_events->_kbInfo->_keyCode) {
char c = g_events->_kbInfo->_keyCode;
g_events->_kbInfo->_keyCode = 0;
- g_events->_kbInfo->scan_code = 0;
+ g_events->_kbInfo->_scanCode = 0;
return c;
}
diff --git a/engines/chewy/globals.h b/engines/chewy/globals.h
index 81f8e3143fb..549d4645ad5 100644
--- a/engines/chewy/globals.h
+++ b/engines/chewy/globals.h
@@ -120,7 +120,7 @@ public:
int16 _r68HohesC = 0;
// global.cpp
- const uint8 *_chewy_ph_anz;
+ const uint8 *_chewy_ph_nr;
const uint8 *_chewy_ph;
byte *_pal = nullptr;
byte *_screen0 = nullptr;
@@ -139,7 +139,7 @@ public:
char **_ads_item_ptr = nullptr;
int16 _ads_dia_nr = 0;
- int16 _ads_item_anz = 0;
+ int16 _ads_item_nr = 0;
int16 _ads_blk_nr = 0;
int16 _ads_push = 0;
diff --git a/engines/chewy/inits.cpp b/engines/chewy/inits.cpp
index fb6a8f6e811..82fb3c8a74c 100644
--- a/engines/chewy/inits.cpp
+++ b/engines/chewy/inits.cpp
@@ -325,7 +325,7 @@ void sound_init() {
if (!Nph.load(rs)) {
error("sound_init error");
} else {
- _G(EndOfPool) = Nph.PoolAnz - 1;
+ _G(EndOfPool) = Nph._poolNr - 1;
}
_G(atds)->setHasSpeech(true);
diff --git a/engines/chewy/main.cpp b/engines/chewy/main.cpp
index a59df7c5215..1dae703f9af 100644
--- a/engines/chewy/main.cpp
+++ b/engines/chewy/main.cpp
@@ -253,7 +253,7 @@ bool mainLoop(int16 mode) {
mouseAction();
if (_G(flags).MainInput) {
- switch (_G(kbinfo).scan_code) {
+ switch (_G(kbinfo)._scanCode) {
case Common::KEYCODE_F1:
_G(spieler).inv_cur = false;
_G(menu_item) = CUR_WALK;
@@ -425,7 +425,7 @@ bool mainLoop(int16 mode) {
case Common::KEYCODE_LEFT:
case Common::KEYCODE_UP:
case Common::KEYCODE_DOWN:
- kb_cur_action(_G(kbinfo).scan_code, 0);
+ kb_cur_action(_G(kbinfo)._scanCode, 0);
break;
case 41:
@@ -456,7 +456,7 @@ bool mainLoop(int16 mode) {
}
}
- _G(kbinfo).scan_code = Common::KEYCODE_INVALID;
+ _G(kbinfo)._scanCode = Common::KEYCODE_INVALID;
if (mode == DO_SETUP)
setupScreen(DO_MAIN_LOOP);
@@ -470,7 +470,7 @@ static void showWalkAreas() {
for (int y = 0, yp = ys; y < 200 / 8; ++y, yp += 8) {
for (int x = 0, xp = xs; x < 320 / 8; ++x, xp += 8) {
int idx = _G(ged)->ged_idx(xp, yp,
- _G(room)->_gedXAnz[_G(room_blk).AkAblage],
+ _G(room)->_gedXNr[_G(room_blk).AkAblage],
_G(ged_mem)[_G(room_blk).AkAblage]);
if (idx) {
@@ -550,8 +550,8 @@ void setupScreen(SetupScreenMode mode) {
_G(spieler_mi)[P_CHEWY].HotX;
_G(gpkt).Sy = _G(spieler_vector)[P_CHEWY].Xypos[1] +
_G(spieler_mi)[P_CHEWY].HotY;
- _G(gpkt).Breite = _G(room)->_gedXAnz[_G(room_blk).AkAblage];
- _G(gpkt).Hoehe = _G(room)->_gedYAnz[_G(room_blk).AkAblage];
+ _G(gpkt).Breite = _G(room)->_gedXNr[_G(room_blk).AkAblage];
+ _G(gpkt).Hoehe = _G(room)->_gedYNr[_G(room_blk).AkAblage];
_G(gpkt).Mem = _G(ged_mem)[_G(room_blk).AkAblage];
_G(gpkt).Ebenen = _G(room)->_gedInfo[_G(room_blk).AkAblage].Ebenen;
_G(gpkt).AkMovEbene = 1;
@@ -575,7 +575,7 @@ void setupScreen(SetupScreenMode mode) {
int16 idx = _G(ged)->ged_idx(
_G(spieler_vector)[P_CHEWY].Xypos[0] + _G(spieler_mi)[P_CHEWY].HotX,
_G(spieler_vector)[P_CHEWY].Xypos[1] + _G(spieler_mi)[P_CHEWY].HotY,
- _G(room)->_gedXAnz[_G(room_blk).AkAblage],
+ _G(room)->_gedXNr[_G(room_blk).AkAblage],
_G(ged_mem)[_G(room_blk).AkAblage]);
check_shad(idx, 0);
} else {
@@ -847,12 +847,12 @@ void mouseAction() {
if (_G(minfo)._button == 2 || _G(kbinfo)._keyCode == Common::KEYCODE_ESCAPE) {
if (!_G(flags).mainMouseFlag) {
- _G(kbinfo).scan_code = Common::KEYCODE_ESCAPE;
+ _G(kbinfo)._scanCode = Common::KEYCODE_ESCAPE;
}
} else if (_G(minfo)._button == 1 || _G(kbinfo)._keyCode == Common::KEYCODE_RETURN) {
if (!_G(flags).mainMouseFlag) {
if (_G(menu_display) == MENU_DISPLAY)
- _G(kbinfo).scan_code = Common::KEYCODE_RETURN;
+ _G(kbinfo)._scanCode = Common::KEYCODE_RETURN;
else if (_G(spieler).AkInvent != -1) {
if (_G(inv_disp_ok)) {
if (_G(spieler).inv_cur) {
@@ -862,7 +862,7 @@ void mouseAction() {
} else {
_G(menu_item) = CUR_USE;
cursorChoice(CUR_AK_INVENT);
- _G(kbinfo).scan_code = Common::KEYCODE_INVALID;
+ _G(kbinfo)._scanCode = Common::KEYCODE_INVALID;
}
} else if (!_G(flags).MouseLeft)
_G(mouseLeftClick) = true;
@@ -1189,14 +1189,14 @@ bool autoMove(int16 movNr, int16 playerNum) {
_G(auto_p_nr) = playerNum;
int16 tmp = _G(mouseLeftClick);
_G(mouseLeftClick) = false;
- _G(gpkt).Dx = _G(Rdi)->AutoMov[movNr].X -
+ _G(gpkt).Dx = _G(Rdi)->AutoMov[movNr]._x -
_G(spieler_mi)[playerNum].HotMovX + _G(spieler_mi)[playerNum].HotX;
- _G(gpkt).Dy = _G(Rdi)->AutoMov[movNr].Y -
+ _G(gpkt).Dy = _G(Rdi)->AutoMov[movNr]._y -
_G(spieler_mi)[playerNum].HotMovY + _G(spieler_mi)[playerNum].HotY;
_G(gpkt).Sx = _G(spieler_vector)[playerNum].Xypos[0] + _G(spieler_mi)[playerNum].HotX;
_G(gpkt).Sy = _G(spieler_vector)[playerNum].Xypos[1] + _G(spieler_mi)[playerNum].HotY;
- _G(gpkt).Breite = _G(room)->_gedXAnz[_G(room_blk).AkAblage];
- _G(gpkt).Hoehe = _G(room)->_gedYAnz[_G(room_blk).AkAblage];
+ _G(gpkt).Breite = _G(room)->_gedXNr[_G(room_blk).AkAblage];
+ _G(gpkt).Hoehe = _G(room)->_gedYNr[_G(room_blk).AkAblage];
_G(gpkt).Mem = _G(ged_mem)[_G(room_blk).AkAblage];
_G(gpkt).Ebenen = _G(room)->_gedInfo[_G(room_blk).AkAblage].Ebenen;
_G(gpkt).AkMovEbene = 1;
@@ -1246,7 +1246,7 @@ bool autoMove(int16 movNr, int16 playerNum) {
setPersonPos(_G(spieler_mi)[playerNum].XyzEnd[0],
_G(spieler_mi)[playerNum].XyzEnd[1],
- playerNum, _G(Rdi)->AutoMov[movNr].SprNr);
+ playerNum, _G(Rdi)->AutoMov[movNr]._sprNr);
}
}
endLoopFl = true;
@@ -1609,8 +1609,8 @@ int16 calc_mouse_mov_obj(int16 *auto_nr) {
}
void calc_ani_timer() {
- for (int16 i = _G(room)->_roomTimer.TimerStart;
- i < _G(room)->_roomTimer.TimerStart + _G(room)->_roomTimer.TimerAnz; i++) {
+ for (int16 i = _G(room)->_roomTimer._timerStart;
+ i < _G(room)->_roomTimer._timerStart + _G(room)->_roomTimer._timerMaxNr; i++) {
if (_G(ani_timer)[i]._timeFlag)
timer_action(i);
}
@@ -1743,9 +1743,9 @@ void calc_ausgang(int16 x, int16 y) {
exit_room(nr);
_G(spieler)._personRoomNr[P_CHEWY] = _G(spieler).room_e_obj[nr].Exit;
_G(room)->loadRoom(&_G(room_blk), _G(spieler)._personRoomNr[P_CHEWY], &_G(spieler));
- setPersonPos(_G(Rdi)->AutoMov[_G(spieler).room_e_obj[nr].ExitMov].X -
+ setPersonPos(_G(Rdi)->AutoMov[_G(spieler).room_e_obj[nr].ExitMov]._x -
_G(spieler_mi)[_G(auto_p_nr)].HotMovX,
- _G(Rdi)->AutoMov[_G(spieler).room_e_obj[nr].ExitMov].Y - _G(spieler_mi)[_G(auto_p_nr)].HotMovY
+ _G(Rdi)->AutoMov[_G(spieler).room_e_obj[nr].ExitMov]._y - _G(spieler_mi)[_G(auto_p_nr)].HotMovY
, P_CHEWY, -1);
int16 *ScrXy = (int16 *)_G(ablage)[_G(room_blk).AkAblage];
get_scroll_off(_G(spieler_vector)[P_CHEWY].Xypos[0] + _G(spieler_mi)[P_CHEWY].HotX,
@@ -1755,10 +1755,10 @@ void calc_ausgang(int16 x, int16 y) {
int16 u_idx = _G(ged)->ged_idx(_G(spieler_vector)[P_CHEWY].Xypos[0] + _G(spieler_mi)[P_CHEWY].HotX,
_G(spieler_vector)[P_CHEWY].Xypos[1] + _G(spieler_mi)[P_CHEWY].HotY,
- _G(room)->_gedXAnz[_G(room_blk).AkAblage],
+ _G(room)->_gedXNr[_G(room_blk).AkAblage],
_G(ged_mem)[_G(room_blk).AkAblage]);
check_shad(u_idx, 0);
- setPersonSpr(_G(Rdi)->AutoMov[_G(spieler).room_e_obj[nr].ExitMov].SprNr, P_CHEWY);
+ setPersonSpr(_G(Rdi)->AutoMov[_G(spieler).room_e_obj[nr].ExitMov]._sprNr, P_CHEWY);
_G(spieler_vector)[P_CHEWY]._delayCount = 0;
_G(fx_blend) = BLEND1;
_G(auto_obj) = 0;
diff --git a/engines/chewy/menus.cpp b/engines/chewy/menus.cpp
index 8c48f874e22..c80cf71f7ff 100644
--- a/engines/chewy/menus.cpp
+++ b/engines/chewy/menus.cpp
@@ -235,10 +235,10 @@ void adsMenu() {
if (_G(flags).AdsDialog) {
_G(flags).ShowAtsInvTxt = false;
_G(flags).MainInput = false;
- if (_G(ads_item_anz) > 4)
+ if (_G(ads_item_nr) > 4)
curYStart = 190;
else
- curYStart = 190 - (4 - _G(ads_item_anz)) * 10;
+ curYStart = 190 - (4 - _G(ads_item_nr)) * 10;
int16 curY = g_events->_mousePos.y;
if (curY < 160 || curY > curYStart + 10)
curY = 255;
@@ -251,11 +251,11 @@ void adsMenu() {
buildMenu(ADS_WIN);
_G(fontMgr)->setFont(_G(font6));
- if (_G(ads_item_anz) > 4)
+ if (_G(ads_item_nr) > 4)
curYStart = 190;
else
- curYStart = 190 - (4 - _G(ads_item_anz)) * 10;
- for (int16 i = 0; i < _G(ads_item_anz) && i < 4; i++) {
+ curYStart = 190 - (4 - _G(ads_item_nr)) * 10;
+ for (int16 i = 0; i < _G(ads_item_nr) && i < 4; i++) {
if (curY == i)
col = 255;
else
@@ -267,7 +267,7 @@ void adsMenu() {
switch (_G(in)->getSwitchCode()) {
case 255:
case Common::KEYCODE_RETURN:
- if (curY < _G(ads_item_anz) && curY >= 0 && _G(ads_push) == false) {
+ if (curY < _G(ads_item_nr) && curY >= 0 && _G(ads_push) == false) {
_G(cur_display) = false;
_G(ads_push) = true;
g_events->_mousePos.y = 159;
@@ -280,8 +280,7 @@ void adsMenu() {
an_blk = _G(atds)->calc_next_block(_G(ads_blk_nr), curY);
adsAction(_G(ads_dia_nr), _G(ads_blk_nr), an_blk->EndNr);
_G(ads_blk_nr) = an_blk->BlkNr;
- _G(ads_item_ptr) = _G(atds)->ads_item_ptr(_G(ads_blk_nr),
- &_G(ads_item_anz));
+ _G(ads_item_ptr) = _G(atds)->ads_item_ptr(_G(ads_blk_nr), &_G(ads_item_nr));
}
_G(det)->stop_detail(_G(talk_start_ani));
_G(det)->showStaticSpr(_G(talk_hide_static));
diff --git a/engines/chewy/mouse.cpp b/engines/chewy/mouse.cpp
index 9fb6253a6f4..1b3753f33c2 100644
--- a/engines/chewy/mouse.cpp
+++ b/engines/chewy/mouse.cpp
@@ -35,9 +35,9 @@ InputMgr::InputMgr() {
InputMgr::~InputMgr() {
}
-int16 InputMgr::mouseVector(int16 x, int16 y, const int16 *tbl, int16 anz) {
+int16 InputMgr::mouseVector(int16 x, int16 y, const int16 *tbl, int16 nr) {
int16 i = -1;
- for (int16 j = 0; (j < anz * 4) && (i == -1); j += 4) {
+ for (int16 j = 0; (j < nr * 4) && (i == -1); j += 4) {
if ((x >= tbl[j]) && (x <= tbl[j + 2]) && (y >= tbl[j + 1]) && (y <= tbl[j + 3]))
i = j / 4;
}
diff --git a/engines/chewy/mouse.h b/engines/chewy/mouse.h
index 133b0c85ed0..50ea419f989 100644
--- a/engines/chewy/mouse.h
+++ b/engines/chewy/mouse.h
@@ -34,7 +34,7 @@ public:
~InputMgr();
void neuer_kb_handler(KbdInfo *key);
- int16 mouseVector(int16 x, int16 y, const int16 *tbl, int16 anz);
+ int16 mouseVector(int16 x, int16 y, const int16 *tbl, int16 nr);
KbdMouseInfo *getPointer();
int16 getSwitchCode();
diff --git a/engines/chewy/ngstypes.cpp b/engines/chewy/ngstypes.cpp
index b6dfb5e61d5..8ae9ff6e10b 100644
--- a/engines/chewy/ngstypes.cpp
+++ b/engines/chewy/ngstypes.cpp
@@ -25,9 +25,9 @@
namespace Chewy {
bool NewPhead::load(Common::SeekableReadStream *src) {
- src->read(id, 4);
- type = src->readUint16LE();
- PoolAnz = src->readUint16LE();
+ src->read(_id, 4);
+ _type = src->readUint16LE();
+ _poolNr = src->readUint16LE();
return true;
}
@@ -48,16 +48,16 @@ bool TmfHeader::load(Common::SeekableReadStream *src) {
instrument[i].load(src);
lied_len = src->readByte();
- pattern_anz = src->readByte();
- src->read(sequenz, 128);
+ _patternNr = src->readByte();
+ src->read(_sequence, 128);
src->skip(4 * 31);
return true;
}
bool GedPoolHeader::load(Common::SeekableReadStream *src) {
- src->read(Id, 4);
- Anz = src->readUint16LE();
+ src->read(_id, 4);
+ _nr = src->readUint16LE();
return true;
}
diff --git a/engines/chewy/ngstypes.h b/engines/chewy/ngstypes.h
index f26fe08efd4..78960f02384 100644
--- a/engines/chewy/ngstypes.h
+++ b/engines/chewy/ngstypes.h
@@ -41,9 +41,9 @@ struct TafSeqInfo {
};
struct NewPhead {
- char id[4] = { 0 };
- uint16 type = 0;
- uint16 PoolAnz = 0;
+ char _id[4] = { 0 };
+ uint16 _type = 0;
+ uint16 _poolNr = 0;
bool load(Common::SeekableReadStream *src);
};
@@ -54,7 +54,7 @@ struct MouseInfo {
struct KbdInfo {
char _keyCode = '\0';
- int scan_code = Common::KEYCODE_INVALID;
+ int _scanCode = Common::KEYCODE_INVALID;
};
struct KbdMouseInfo {
@@ -75,8 +75,8 @@ struct TmfHeader {
char id[4] = { 0 };
TmfInst instrument[31];
uint8 lied_len = 0;
- uint8 pattern_anz = 0;
- uint8 sequenz[128] = { 0 };
+ uint8 _patternNr = 0;
+ uint8 _sequence[128] = { 0 };
byte *ipos[31] = { nullptr };
bool load(Common::SeekableReadStream *src);
@@ -108,8 +108,8 @@ struct IogInit {
};
struct GedPoolHeader {
- char Id[4] = { 0 };
- int16 Anz = 0;
+ char _id[4] = { 0 };
+ int16 _nr = 0;
bool load(Common::SeekableReadStream *src);
};
diff --git a/engines/chewy/r_event.cpp b/engines/chewy/r_event.cpp
index 4b8ca471e23..6b5f9849957 100644
--- a/engines/chewy/r_event.cpp
+++ b/engines/chewy/r_event.cpp
@@ -90,11 +90,11 @@ void play_scene_ani(int16 nr, int16 mode) {
break;
}
- _G(kbinfo).scan_code = Common::KEYCODE_INVALID;
+ _G(kbinfo)._scanCode = Common::KEYCODE_INVALID;
}
void timer_action(int16 t_nr) {
- int16 ani_nr = t_nr - _G(room)->_roomTimer.TimerStart;
+ int16 ani_nr = t_nr - _G(room)->_roomTimer._timerStart;
bool default_flag = false;
if (g_engine->_sound->isSpeechActive())
@@ -125,11 +125,11 @@ void timer_action(int16 t_nr) {
#undef TIMER
if (default_flag && _G(flags).AutoAniPlay == false) {
- _G(det)->startDetail(_G(room)->_roomTimer.ObjNr[ani_nr], 1, ANI_FRONT);
+ _G(det)->startDetail(_G(room)->_roomTimer._objNr[ani_nr], 1, ANI_FRONT);
_G(uhr)->resetTimer(t_nr, 0);
}
- _G(kbinfo).scan_code = Common::KEYCODE_INVALID;
+ _G(kbinfo)._scanCode = Common::KEYCODE_INVALID;
}
void check_ged_action(int16 index) {
@@ -174,7 +174,7 @@ void check_ged_action(int16 index) {
_G(flags).GedAction = false;
}
- _G(kbinfo).scan_code = Common::KEYCODE_INVALID;
+ _G(kbinfo)._scanCode = Common::KEYCODE_INVALID;
}
int16 ged_user_func(int16 idx_nr) {
diff --git a/engines/chewy/room.cpp b/engines/chewy/room.cpp
index 9b3829d8936..1c07fa480db 100644
--- a/engines/chewy/room.cpp
+++ b/engines/chewy/room.cpp
@@ -27,14 +27,14 @@
namespace Chewy {
-const int16 SURIMY_TAF19_PHASEN[4][2] = {
+const int16 SURIMY_TAF19_PHASES[4][2] = {
{ 0, 0 },
{ 39, 46 },
{ 0, 0 },
{ 0, 0 }
};
-static const uint8 CHEWY_PHASEN[8][8] = {
+static const uint8 CHEWY_PHASES[8][8] = {
{ 0, 1, 2, 3, 4, 5, 6, 7 },
{ 8, 9, 10, 11, 12, 13, 14, 15 },
{ 16, 17, 18, 19, 20, 21, 22, 23 },
@@ -45,9 +45,9 @@ static const uint8 CHEWY_PHASEN[8][8] = {
{ 51, 52, 53, 52, 51 }
};
-static const uint8 CHEWY_PHASEN_ANZ[] = { 8, 8, 8, 8, 5, 8, 8, 5 };
+static const uint8 CHEWY_PHASE_NR[] = { 8, 8, 8, 8, 5, 8, 8, 5 };
-static const uint8 CHEWY_BO_PHASEN[8][8] = {
+static const uint8 CHEWY_BO_PHASES[8][8] = {
{ 0, 1, 2, 3, 4, 5 },
{ 6, 7, 8, 9, 10, 11 },
{ 12, 13, 14, 15, 16, 17 },
@@ -58,9 +58,9 @@ static const uint8 CHEWY_BO_PHASEN[8][8] = {
{ 27, 28, 29, 28, 27 }
};
-static const uint8 CHEWY_BO_PHASEN_ANZ[] = { 6, 6, 6, 6, 5, 6, 6, 5 };
+static const uint8 CHEWY_BO_PHASE_NR[] = { 6, 6, 6, 6, 5, 6, 6, 5 };
-static const uint8 CHEWY_MI_PHASEN[8][8] = {
+static const uint8 CHEWY_MI_PHASES[8][8] = {
{ 0, 1, 2, 3, 4, 5, 6, 7 },
{ 8, 9, 10, 11, 12, 13, 14, 15 },
{ 24, 25, 26, 27, 28, 29, 30, 31 },
@@ -71,9 +71,9 @@ static const uint8 CHEWY_MI_PHASEN[8][8] = {
{ 35, 36, 37, 36, 35 }
};
-static const uint8 CHEWY_MI_PHASEN_ANZ[] = { 8, 8, 8, 8, 5, 8, 8, 5 };
+static const uint8 CHEWY_MI_PHASE_NR[] = { 8, 8, 8, 8, 5, 8, 8, 5 };
-static const uint8 CHEWY_RO_PHASEN[8][8] = {
+static const uint8 CHEWY_RO_PHASES[8][8] = {
{ 0, 1, 2, 3, 4, 5, 6, 7 },
{ 8, 9, 10, 11, 12, 13, 14, 15 },
{ 24, 25, 26, 27, 28, 29, 30, 31 },
@@ -84,19 +84,20 @@ static const uint8 CHEWY_RO_PHASEN[8][8] = {
{ 37, 38, 39, 40, 41, 40, 39, 38 }
};
-static const uint8 CHEWY_RO_PHASEN_ANZ[] = { 8, 8, 8, 8, 8, 8, 8, 8 };
+static const uint8 CHEWY_RO_PHASE_NR[] = { 8, 8, 8, 8, 8, 8, 8, 8 };
-static const uint8 CHEWY_JM_PHASEN[8][8] = {
- { 0, 1, 2, 3, 4, 5, 6, 7 },
- { 8, 9, 10, 11, 12, 13, 14, 15 },
+static const uint8 CHEWY_JM_PHASES[8][8] = {
+ { 0, 1, 2, 3, 4, 5, 6, 7 },
+ { 8, 9, 10, 11, 12, 13, 14, 15 },
{ 16, 17, 18, 19, 20, 21, 22, 23 },
{ 16, 17, 18, 19, 20, 21, 22, 23 },
{ 24, 25, 26, 27, 27, 26, 25, 24 },
- { 8, 9, 10, 11, 12, 13, 14, 15 },
- { 8, 9, 10, 11, 12, 13, 14, 15 },
+ { 8, 9, 10, 11, 12, 13, 14, 15 },
+ { 8, 9, 10, 11, 12, 13, 14, 15 },
{ 28, 29, 30, 31, 31, 30, 29, 28 }
};
+static const uint8 CHEWY_JM_PHASE_NR[] = {8, 8, 8, 8, 8, 8, 8, 8};
void JungleRoom::topEntry() {
_G(cur_hide_flag) = 0;
@@ -145,17 +146,19 @@ void JungleRoom::setup_func() {
}
Room::Room() {
- _roomTimer.TimerAnz = 0;
- _roomTimer.TimerStart = 0;
+ _roomTimer._timerMaxNr = 0;
+ _roomTimer._timerStart = 0;
init_ablage();
for (int16 i = 0; i < MAX_ROOM_HANDLE; i++)
- _roomHandle[i] = 0;
+ _roomHandle[i] = nullptr;
}
Room::~Room() {
- for (int16 i = 0; i < MAX_ROOM_HANDLE; i++)
+ for (int16 i = 0; i < MAX_ROOM_HANDLE; i++) {
if (_roomHandle[i])
delete _roomHandle[i];
+ }
+
free_ablage();
}
@@ -183,17 +186,17 @@ void Room::loadRoom(RaumBlk *Rb, int16 room_nr, Spieler *player) {
_G(det)->disable_room_sound();
RoomDetailInfo *Rdi_ = _G(det)->getRoomDetailInfo();
_roomInfo = &Rdi_->Ri;
- if (_roomInfo->TafLoad != 255) {
+ 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);
+ strcat(tmp_str, _roomInfo->_tafName);
+ _G(det)->load_rdi_taf(tmp_str, _roomInfo->_tafLoad);
Rb->Fti = _G(det)->get_taf_info();
Rb->_detImage = Rb->Fti->_image;
Rb->DetKorrekt = Rb->Fti->_correction;
}
_G(obj)->calc_all_static_detail();
- load_tgp(_roomInfo->BildNr, Rb, EPISODE1_TGP, GED_LOAD, "back/episode1.tgp");
+ load_tgp(_roomInfo->_imageNr, Rb, EPISODE1_TGP, GED_LOAD, "back/episode1.tgp");
set_pal(_ablagePal[Rb->AkAblage], Rb->LowPalMem);
calc_invent(Rb, player);
@@ -208,13 +211,13 @@ void Room::loadRoom(RaumBlk *Rb, int16 room_nr, Spieler *player) {
}
void Room::set_timer_start(int16 timer_start) {
- _roomTimer.TimerStart = timer_start;
+ _roomTimer._timerStart = timer_start;
}
void Room::add_timer_new_room() {
- _roomTimer.TimerAnz = 0;
+ _roomTimer._timerMaxNr = 0;
- for (int i = 0; i < MAXDETAILS && _roomTimer.TimerAnz < MAX_ROOM_TIMER; i++) {
+ for (int i = 0; i < MAXDETAILS && _roomTimer._timerMaxNr < MAX_ROOM_TIMER; i++) {
AniDetailInfo *adi = _G(det)->getAniDetail(i);
if (adi->timer_start != 0) {
set_timer(i, adi->timer_start);
@@ -225,31 +228,31 @@ void Room::add_timer_new_room() {
}
void Room::del_timer_old_room() {
- for (int i = 0; i < _roomTimer.TimerAnz; i++) {
- _G(uhr)->setStatus(_roomTimer.TimerNr[i], TIMER_STOP);
+ for (int i = 0; i < _roomTimer._timerMaxNr; i++) {
+ _G(uhr)->setStatus(_roomTimer._timerNr[i], TIMER_STOP);
}
- _roomTimer.TimerAnz = 0;
+ _roomTimer._timerMaxNr = 0;
}
int16 Room::set_timer(int16 ani_nr, int16 timer_end) {
- int16 timer_nr_ = _roomTimer.TimerStart + _roomTimer.TimerAnz;
+ int16 timer_nr_ = _roomTimer._timerStart + _roomTimer._timerMaxNr;
int16 ret = _G(uhr)->setNewTimer(timer_nr_, timer_end, SEC_MODE);
if (ret != -1) {
- _roomTimer.ObjNr[_roomTimer.TimerAnz] = ani_nr;
- _roomTimer.TimerNr[_roomTimer.TimerAnz] = timer_nr_;
- ++_roomTimer.TimerAnz;
+ _roomTimer._objNr[_roomTimer._timerMaxNr] = ani_nr;
+ _roomTimer._timerNr[_roomTimer._timerMaxNr] = timer_nr_;
+ ++_roomTimer._timerMaxNr;
}
return timer_nr_;
}
void Room::set_timer_status(int16 ani_nr, int16 status) {
- for (int i = 0; i < _roomTimer.TimerAnz; i++) {
- if (_roomTimer.ObjNr[i] == ani_nr) {
- _G(uhr)->setStatus(_roomTimer.TimerNr[i], status);
+ for (int i = 0; i < _roomTimer._timerMaxNr; i++) {
+ if (_roomTimer._objNr[i] == ani_nr) {
+ _G(uhr)->setStatus(_roomTimer._timerNr[i], status);
}
}
}
@@ -336,8 +339,8 @@ int16 Room::load_tgp(int16 nr, RaumBlk *Rb, int16 tgp_idx, int16 mode, const cha
_roomHandle[R_GEP_DATA]);
_G(ged)->load_ged_pool(gstream, &_gedInfo[Rb->AkAblage],
nr, _gedMem[Rb->AkAblage]);
- _gedXAnz[Rb->AkAblage] = img->width / _gedInfo[Rb->AkAblage].X;
- _gedYAnz[Rb->AkAblage] = img->height / _gedInfo[Rb->AkAblage].Y;
+ _gedXNr[Rb->AkAblage] = img->width / _gedInfo[Rb->AkAblage].X;
+ _gedYNr[Rb->AkAblage] = img->height / _gedInfo[Rb->AkAblage].Y;
}
}
@@ -443,24 +446,24 @@ int16 Room::get_ablage(int16 pic_nr, uint32 pic_size) {
int16 Room::get_ablage_g1(int16 ablage_bedarf, int16 ak_pos) {
short ret = 0;
- int16 ende = 0;
+ bool endLoop = false;
int16 count = 0;
_lastAblageSave = ak_pos;
- while (!ende) {
+ while (!endLoop) {
if (_lastAblageSave >= MAX_ABLAGE)
_lastAblageSave = 0;
if (ablage_bedarf == 1) {
- ende = 1;
+ endLoop = true;
ret = _lastAblageSave;
} else if (ablage_bedarf <= MAX_ABLAGE - _lastAblageSave) {
- ende = 1;
+ endLoop = true;
ret = _lastAblageSave;
} else
++_lastAblageSave;
++count;
if (count > MAX_ABLAGE) {
ret = -1;
- ende = 1;
+ endLoop = true;
}
}
return ret;
@@ -487,60 +490,60 @@ void load_chewy_taf(int16 taf_nr) {
}
_G(spieler_mi)[P_CHEWY].HotY = CH_HOT_Y;
- const char *fname_;
+ const char *filename;
switch (taf_nr) {
case CHEWY_NORMAL:
- fname_ = CHEWY_TAF;
- _G(chewy_ph_anz) = CHEWY_PHASEN_ANZ;
- _G(chewy_ph) = (const uint8 *)CHEWY_PHASEN;
+ filename = CHEWY_TAF;
+ _G(chewy_ph_nr) = CHEWY_PHASE_NR;
+ _G(chewy_ph) = (const uint8 *)CHEWY_PHASES;
break;
case CHEWY_BORK:
- fname_ = CHEWY_BO_TAF;
- _G(chewy_ph_anz) = CHEWY_BO_PHASEN_ANZ;
- _G(chewy_ph) = (const uint8 *)CHEWY_BO_PHASEN;
+ filename = CHEWY_BO_TAF;
+ _G(chewy_ph_nr) = CHEWY_BO_PHASE_NR;
+ _G(chewy_ph) = (const uint8 *)CHEWY_BO_PHASES;
break;
case CHEWY_MINI:
- fname_ = CHEWY_MI_TAF;
- _G(chewy_ph_anz) = CHEWY_MI_PHASEN_ANZ;
- _G(chewy_ph) = (const uint8 *)CHEWY_MI_PHASEN;
+ filename = CHEWY_MI_TAF;
+ _G(chewy_ph_nr) = CHEWY_MI_PHASE_NR;
+ _G(chewy_ph) = (const uint8 *)CHEWY_MI_PHASES;
break;
case CHEWY_PUMPKIN:
- fname_ = CHEWY_PUMP_TAF;
- _G(chewy_ph_anz) = CHEWY_MI_PHASEN_ANZ;
- _G(chewy_ph) = (const uint8 *)CHEWY_MI_PHASEN;
+ filename = CHEWY_PUMP_TAF;
+ _G(chewy_ph_nr) = CHEWY_MI_PHASE_NR;
+ _G(chewy_ph) = (const uint8 *)CHEWY_MI_PHASES;
break;
case CHEWY_ROCKER:
- fname_ = CHEWY_ROCK_TAF;
- _G(chewy_ph_anz) = CHEWY_RO_PHASEN_ANZ;
- _G(chewy_ph) = (const uint8 *)CHEWY_RO_PHASEN;
+ filename = CHEWY_ROCK_TAF;
+ _G(chewy_ph_nr) = CHEWY_RO_PHASE_NR;
+ _G(chewy_ph) = (const uint8 *)CHEWY_RO_PHASES;
break;
case CHEWY_JMANS:
- fname_ = CHEWY_JMAN_TAF;
- _G(chewy_ph_anz) = CHEWY_RO_PHASEN_ANZ;
- _G(chewy_ph) = (const uint8 *)CHEWY_JM_PHASEN;
+ filename = CHEWY_JMAN_TAF;
+ _G(chewy_ph_nr) = CHEWY_JM_PHASE_NR;
+ _G(chewy_ph) = (const uint8 *)CHEWY_JM_PHASES;
_G(spieler_mi)[P_CHEWY].HotY = 68;
break;
case CHEWY_ANI7:
- fname_ = CHEWY_HELM_TAF;
- _G(chewy_ph_anz) = CHEWY_MI_PHASEN_ANZ;
- _G(chewy_ph) = (const uint8 *)CHEWY_MI_PHASEN;
+ filename = CHEWY_HELM_TAF;
+ _G(chewy_ph_nr) = CHEWY_MI_PHASE_NR;
+ _G(chewy_ph) = (const uint8 *)CHEWY_MI_PHASES;
break;
default:
- fname_ = NULL;
+ filename = nullptr;
break;
}
- if (fname_ != NULL) {
+ if (filename != nullptr) {
_G(spieler).ChewyAni = taf_nr;
_G(AkChewyTaf) = taf_nr;
- _G(chewy) = _G(mem)->taf_adr(fname_);
+ _G(chewy) = _G(mem)->taf_adr(filename);
_G(chewy_kor) = _G(chewy)->_correction;
}
}
diff --git a/engines/chewy/room.h b/engines/chewy/room.h
index 25bf246457f..f32e46a5e4a 100644
--- a/engines/chewy/room.h
+++ b/engines/chewy/room.h
@@ -31,7 +31,7 @@ namespace Chewy {
#define ANI_SHOW 1
#define SURIMY_OBJ 0
-extern const int16 SURIMY_TAF19_PHASEN[4][2];
+extern const int16 SURIMY_TAF19_PHASES[4][2];
#define MAX_ABLAGE 4
@@ -72,11 +72,11 @@ struct RaumBlk {
};
struct RaumTimer {
- int16 TimerStart;
- int16 TimerAnz;
+ int16 _timerStart;
+ int16 _timerMaxNr;
- uint8 ObjNr[MAX_ROOM_TIMER];
- uint8 TimerNr[MAX_ROOM_TIMER];
+ uint8 _objNr[MAX_ROOM_TIMER];
+ uint8 _timerNr[MAX_ROOM_TIMER];
};
class Room {
@@ -103,8 +103,8 @@ public:
RaumTimer _roomTimer;
RoomInfo *_roomInfo;
GedChunkHeader _gedInfo[MAX_ABLAGE];
- int16 _gedXAnz[MAX_ABLAGE];
- int16 _gedYAnz[MAX_ABLAGE];
+ int16 _gedXNr[MAX_ABLAGE];
+ int16 _gedYNr[MAX_ABLAGE];
private:
void init_ablage();
diff --git a/engines/chewy/rooms/room00.cpp b/engines/chewy/rooms/room00.cpp
index 8ff87b3c630..f82741c513f 100644
--- a/engines/chewy/rooms/room00.cpp
+++ b/engines/chewy/rooms/room00.cpp
@@ -750,8 +750,8 @@ void Room0::feederAni() {
_G(spieler)._personRoomNr[P_CHEWY] = 1;
_G(room)->loadRoom(&_G(room_blk), _G(spieler)._personRoomNr[P_CHEWY], &_G(spieler));
- setPersonPos(_G(Rdi)->AutoMov[4].X - CH_HOT_MOV_X,
- _G(Rdi)->AutoMov[4].Y - CH_HOT_MOV_Y, P_CHEWY, P_RIGHT);
+ setPersonPos(_G(Rdi)->AutoMov[4]._x - CH_HOT_MOV_X,
+ _G(Rdi)->AutoMov[4]._y - CH_HOT_MOV_Y, P_CHEWY, P_RIGHT);
_G(spieler_vector)[P_CHEWY]._delayCount = 0;
check_shad(4, 0);
diff --git a/engines/chewy/rooms/room14.cpp b/engines/chewy/rooms/room14.cpp
index 3c289bca845..5798659707d 100644
--- a/engines/chewy/rooms/room14.cpp
+++ b/engines/chewy/rooms/room14.cpp
@@ -61,7 +61,7 @@ void Room14::eremit_feuer(int16 t_nr, int16 ani_nr) {
if (!_G(flags).AutoAniPlay && !_G(spieler).R14Feuer) {
_G(flags).AutoAniPlay = true;
_G(det)->hideStaticSpr(9);
- startSetailWait(_G(room)->_roomTimer.ObjNr[ani_nr], 1, ANI_FRONT);
+ startSetailWait(_G(room)->_roomTimer._objNr[ani_nr], 1, ANI_FRONT);
_G(uhr)->resetTimer(t_nr, 0);
_G(det)->showStaticSpr(9);
_G(det)->startDetail(7, 1, ANI_FRONT);
diff --git a/engines/chewy/rooms/room17.cpp b/engines/chewy/rooms/room17.cpp
index c099c75099c..c1b246355f2 100644
--- a/engines/chewy/rooms/room17.cpp
+++ b/engines/chewy/rooms/room17.cpp
@@ -108,8 +108,8 @@ void Room17::xit() {
}
bool Room17::timer(int16 t_nr, int16 ani_nr) {
- if (_G(room)->_roomTimer.ObjNr[ani_nr] == 2 ||
- _G(room)->_roomTimer.ObjNr[ani_nr] == 3) {
+ if (_G(room)->_roomTimer._objNr[ani_nr] == 2 ||
+ _G(room)->_roomTimer._objNr[ani_nr] == 3) {
if (_G(spieler).R17EnergieOut)
_G(uhr)->resetTimer(t_nr, 0);
else
diff --git a/engines/chewy/rooms/room29.cpp b/engines/chewy/rooms/room29.cpp
index 09aa530cb75..a316d9bda2e 100644
--- a/engines/chewy/rooms/room29.cpp
+++ b/engines/chewy/rooms/room29.cpp
@@ -151,7 +151,7 @@ void Room29::schlitz_sitz() {
_G(atds)->del_steuer_bit(212, ATS_AKTIV_BIT, ATS_DATA);
_G(spieler)._personHide[P_CHEWY] = false;
_G(mouseLeftClick) = false;
- _G(kbinfo).scan_code = Common::KEYCODE_INVALID;
+ _G(kbinfo)._scanCode = Common::KEYCODE_INVALID;
showCur();
}
diff --git a/engines/chewy/rooms/room31.cpp b/engines/chewy/rooms/room31.cpp
index 06f2ec1dac9..7b383b2441d 100644
--- a/engines/chewy/rooms/room31.cpp
+++ b/engines/chewy/rooms/room31.cpp
@@ -60,7 +60,7 @@ void Room31::surimy_go() {
_G(auto_mov_obj)[SURIMY_OBJ].Id = AUTO_OBJ0;
_G(auto_mov_vector)[SURIMY_OBJ].Delay = _G(spieler).DelaySpeed + 2;
_G(auto_mov_obj)[SURIMY_OBJ].Mode = true;
- init_auto_obj(SURIMY_OBJ, &SURIMY_TAF19_PHASEN[0][0], 2, (const MovLine *)SURIMY_MPKT);
+ init_auto_obj(SURIMY_OBJ, &SURIMY_TAF19_PHASES[0][0], 2, (const MovLine *)SURIMY_MPKT);
start_spz(CH_TALK5, 255, ANI_FRONT, P_CHEWY);
startAadWait(157);
wait_auto_obj(SURIMY_OBJ);
diff --git a/engines/chewy/rooms/room33.cpp b/engines/chewy/rooms/room33.cpp
index ea86d50805f..0179b78b5de 100644
--- a/engines/chewy/rooms/room33.cpp
+++ b/engines/chewy/rooms/room33.cpp
@@ -54,7 +54,7 @@ void Room33::surimy_go() {
_G(auto_mov_obj)[SURIMY_OBJ].Id = AUTO_OBJ0;
_G(auto_mov_vector)[SURIMY_OBJ].Delay = _G(spieler).DelaySpeed + 2;
_G(auto_mov_obj)[SURIMY_OBJ].Mode = true;
- init_auto_obj(SURIMY_OBJ, &SURIMY_TAF19_PHASEN[0][0], 2, (const MovLine *)SURIMY_MPKT);
+ init_auto_obj(SURIMY_OBJ, &SURIMY_TAF19_PHASES[0][0], 2, (const MovLine *)SURIMY_MPKT);
start_spz(CH_TALK5, 255, ANI_FRONT, P_CHEWY);
startAadWait(158);
wait_auto_obj(SURIMY_OBJ);
diff --git a/engines/chewy/rooms/room51.cpp b/engines/chewy/rooms/room51.cpp
index 22878a84a9f..416384c78a6 100644
--- a/engines/chewy/rooms/room51.cpp
+++ b/engines/chewy/rooms/room51.cpp
@@ -125,7 +125,7 @@ void Room51::xit(int16 eib_nr) {
bool Room51::timer(int16 t_nr, int16 ani_nr) {
if (_G(spieler).flags32_10)
- timer_action(t_nr, _G(room)->_roomTimer.ObjNr[ani_nr]);
+ timer_action(t_nr, _G(room)->_roomTimer._objNr[ani_nr]);
else
return true;
diff --git a/engines/chewy/sound_player.cpp b/engines/chewy/sound_player.cpp
index bab185618ed..9bae920dcec 100644
--- a/engines/chewy/sound_player.cpp
+++ b/engines/chewy/sound_player.cpp
@@ -194,7 +194,7 @@ void SoundPlayer::playMod(TmfHeader *th) {
}
SeqPointer = 0;
PatLine = 0;
- PatPointer = ActiveSong->sequenz[SeqPointer];
+ PatPointer = ActiveSong->_sequence[SeqPointer];
CurrentLine = Patterns[PatPointer];
CurrentTempo = 6;
PatternCount = 0;
@@ -231,7 +231,7 @@ void SoundPlayer::playSequence(int16 startPos, int16 endPos) {
EndPos = endPos;
SeqPointer = StartPos;
PatLine = 0;
- PatPointer = ActiveSong->sequenz[SeqPointer];
+ PatPointer = ActiveSong->_sequence[SeqPointer];
CurrentLine = Patterns[PatPointer];
MusicStatus = ON;
}
@@ -339,7 +339,7 @@ void DecodePatternLine() {
switch (PlaybackMode) {
case NORMAL_PLAYBACK:
if (SeqPointer < ActiveSong->lied_len) {
- PatPointer = ActiveSong->sequenz[SeqPointer];
+ PatPointer = ActiveSong->_sequence[SeqPointer];
CurrentLine = Patterns[PatPointer];
} else {
if (LoopEnable == OFF)
@@ -347,7 +347,7 @@ void DecodePatternLine() {
else {
PatLine = 0;
SeqPointer = 0;
- PatPointer = ActiveSong->sequenz[SeqPointer];
+ PatPointer = ActiveSong->_sequence[SeqPointer];
CurrentLine = Patterns[PatPointer];
}
}
@@ -355,7 +355,7 @@ void DecodePatternLine() {
case SEQUENCE_PLAYBACK:
if (SeqPointer != EndPos) {
- PatPointer = ActiveSong->sequenz[SeqPointer];
+ PatPointer = ActiveSong->_sequence[SeqPointer];
CurrentLine = Patterns[PatPointer];
} else {
if (LoopEnable == OFF)
@@ -363,7 +363,7 @@ void DecodePatternLine() {
else {
PatLine = 0;
SeqPointer = StartPos;
- PatPointer = ActiveSong->sequenz[SeqPointer];
+ PatPointer = ActiveSong->_sequence[SeqPointer];
CurrentLine = Patterns[PatPointer];
}
}
diff --git a/engines/chewy/sprite.cpp b/engines/chewy/sprite.cpp
index f99f4bd63d8..a70f34b511b 100644
--- a/engines/chewy/sprite.cpp
+++ b/engines/chewy/sprite.cpp
@@ -322,7 +322,7 @@ void setPersonPos(int16 x, int16 y, int16 personNr, int16 direction) {
_G(ssi)[tmpNr].Y = _G(spieler_vector)[personNr].Xypos[1] - _G(spieler).scrolly;
if (!_G(flags).ExitMov && personNr == P_CHEWY) {
int16 u_index = _G(ged)->ged_idx(x + _G(spieler_mi)[personNr].HotX, y + _G(spieler_mi)[personNr].HotY,
- _G(room)->_gedXAnz[_G(room_blk).AkAblage],
+ _G(room)->_gedXNr[_G(room_blk).AkAblage],
_G(ged_mem)[_G(room_blk).AkAblage]);
check_shad(u_index, 1);
}
@@ -340,14 +340,14 @@ void setPersonSpr(int16 nr, int16 personNr) {
case P_LEFT:
_G(spieler_vector)[P_CHEWY].Phase = CH_L_STEHEN;
_G(spieler_vector)[P_CHEWY].PhNr = 0;
- _G(spieler_vector)[P_CHEWY].PhAnz = _G(chewy_ph_anz)[CH_L_STEHEN];
+ _G(spieler_vector)[P_CHEWY].PhAnz = _G(chewy_ph_nr)[CH_L_STEHEN];
_G(person_end_phase)[P_CHEWY] = P_LEFT;
break;
case P_RIGHT:
_G(spieler_vector)[P_CHEWY].Phase = CH_R_STEHEN;
_G(spieler_vector)[P_CHEWY].PhNr = 0;
- _G(spieler_vector)[P_CHEWY].PhAnz = _G(chewy_ph_anz)[CH_R_STEHEN];
+ _G(spieler_vector)[P_CHEWY].PhAnz = _G(chewy_ph_nr)[CH_R_STEHEN];
_G(person_end_phase)[P_CHEWY] = P_RIGHT;
break;
@@ -472,7 +472,7 @@ void startAadWait(int16 diaNr) {
_G(mouseLeftClick) = oldMouseLeftClick;
if (_G(minfo)._button)
_G(flags).mainMouseFlag = 1;
- _G(kbinfo).scan_code = Common::KEYCODE_INVALID;
+ _G(kbinfo)._scanCode = Common::KEYCODE_INVALID;
stop_spz();
}
@@ -536,7 +536,7 @@ bool startAtsWait(int16 txtNr, int16 txtMode, int16 col, int16 mode) {
if (_G(minfo)._button)
_G(flags).mainMouseFlag = 1;
- _G(kbinfo).scan_code = Common::KEYCODE_INVALID;
+ _G(kbinfo)._scanCode = Common::KEYCODE_INVALID;
_G(mouseLeftClick) = oldMouseLeftClick;
return ret != DISPLAY_NONE;
@@ -557,7 +557,7 @@ void aadWait(int16 strNr) {
_G(mouseLeftClick) = oldMouseLeftClick;
if (_G(minfo)._button)
_G(flags).mainMouseFlag = 1;
- _G(kbinfo).scan_code = Common::KEYCODE_INVALID;
+ _G(kbinfo)._scanCode = Common::KEYCODE_INVALID;
}
void start_aad(int16 diaNr, int16 ssiNr) {
@@ -777,17 +777,17 @@ void mov_objekt(ObjMov *om, MovInfo *mi) {
if (!mi->Mode) {
if (!(u_index = _G(ged)->ged_idx(om->Xypos[0] + mi->HotX + tmpx,
om->Xypos[1] + mi->HotY + tmpy,
- _G(room)->_gedXAnz[_G(room_blk).AkAblage],
+ _G(room)->_gedXNr[_G(room_blk).AkAblage],
_G(ged_mem)[_G(room_blk).AkAblage]))) {
if (!(u_index = _G(ged)->ged_idx(om->Xypos[0] + mi->HotX + tmpx,
om->Xypos[1] + mi->HotY,
- _G(room)->_gedXAnz[_G(room_blk).AkAblage],
+ _G(room)->_gedXNr[_G(room_blk).AkAblage],
_G(ged_mem)[_G(room_blk).AkAblage]))) {
if (!(u_index = _G(ged)->ged_idx(om->Xypos[0] + mi->HotX,
om->Xypos[1] + mi->HotY + tmpy,
- _G(room)->_gedXAnz[_G(room_blk).AkAblage],
+ _G(room)->_gedXNr[_G(room_blk).AkAblage],
_G(ged_mem)[_G(room_blk).AkAblage]))) {
om->Count = 0;
} else {
@@ -892,7 +892,7 @@ void mov_objekt(ObjMov *om, MovInfo *mi) {
if (mi->Id == CHEWY_OBJ) {
u_index = _G(ged)->ged_idx(om->Xypos[0] + mi->HotX,
om->Xypos[1] + mi->HotY,
- _G(room)->_gedXAnz[_G(room_blk).AkAblage],
+ _G(room)->_gedXNr[_G(room_blk).AkAblage],
_G(ged_mem)[_G(room_blk).AkAblage]);
check_shad(u_index, 1);
}
diff --git a/engines/chewy/t_event.cpp b/engines/chewy/t_event.cpp
index ac0fbdb4db7..fb9c01d7ace 100644
--- a/engines/chewy/t_event.cpp
+++ b/engines/chewy/t_event.cpp
@@ -37,7 +37,7 @@ int16 loadAdsDia(int16 diaNr) {
_G(atds)->load_atds(diaNr, ADH_DATA);
ret = true;
_G(ads_blk_nr) = 0;
- _G(ads_item_ptr) = _G(atds)->ads_item_ptr(_G(ads_blk_nr), &_G(ads_item_anz));
+ _G(ads_item_ptr) = _G(atds)->ads_item_ptr(_G(ads_blk_nr), &_G(ads_item_nr));
_G(flags).AdsDialog = true;
_G(ads_push) = true;
_G(ads_tmp_dsp) = _G(spieler).DispFlag;
diff --git a/engines/chewy/video/video_player.cpp b/engines/chewy/video/video_player.cpp
index f065fb6bbed..b59ee6b8f67 100644
--- a/engines/chewy/video/video_player.cpp
+++ b/engines/chewy/video/video_player.cpp
@@ -96,7 +96,7 @@ bool VideoPlayer::playVideo(uint num, bool stopMusic) {
// Clear any pending keys
_G(in)->_hotkey = 0;
_G(kbinfo)._keyCode = '\0';
- _G(kbinfo).scan_code = 0;
+ _G(kbinfo)._scanCode = 0;
}
cfoDecoder->close();
More information about the Scummvm-git-logs
mailing list