thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CHEWY: Some more renaming

Browse source
This commit is contained in:
Strangerke 2022-03-01 00:17:25 +01:00 • committed by Paul Gilbert
parent 8aec52fd82
commit beec516ffb
23 changed files with 427 additions and 437 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/chewy/data.cpp
View file

@ -37,10 +37,10 @@ Data::~Data() {
uint16 Data::select_pool_item(Stream *stream, uint16 nr) {
Common::SeekableReadStream *rs = dynamic_cast<Common::SeekableReadStream *>(stream);
NewPhead ph;
if (rs) {
rs->seek(0, SEEK_SET);
NewPhead ph;
if (!ph.load(rs))
error("select_pool_item error");
@ -59,11 +59,11 @@ uint16 Data::select_pool_item(Stream *stream, uint16 nr) {
uint32 Data::load_tmf(Stream *handle, TmfHeader *song) {
Common::SeekableReadStream *rs = dynamic_cast<Common::SeekableReadStream *>(handle);
ChunkHead ch;
uint32 size = 0;
if (rs) {
rs->seek(-ChunkHead::SIZE(), SEEK_CUR);
ChunkHead ch;
if (!ch.load(rs))
error("load_tmf error");
@ -90,13 +90,13 @@ uint32 Data::load_tmf(Stream *handle, TmfHeader *song) {
}
uint32 Data::get_poolsize(const char *fname, int16 chunk_start, int16 chunk_anz) {
NewPhead Nph;
uint32 size = 0;
Common::File f;
if (!f.open(fname))
error("get_poolsize error");
NewPhead Nph;
if (!Nph.load(&f))
error("get_poolsize error");

4
engines/chewy/defines.h
View file

@ -134,7 +134,7 @@ enum SetupScreenMode {
#define INVENTAR_NORMAL 0
#define INVENTAR_STATIC 1
#define INVENTORY_STATIC 1
#define STATIC_USE 2
#define DETEDIT_REC 3
@ -298,7 +298,7 @@ enum SetupScreenMode {
#define SLIME_INV 1
#define RED_CARD_INV 2
#define KABEL_INV 3
#define MONOKEL_INV 4
#define MONOCLE_INV 4
#define GBUCH_INV 5
#define GBUCH_OPEN_INV 6
#define DEFEKT_INV 7

8
engines/chewy/dialogs/inventory.cpp
View file

@ -225,7 +225,7 @@ void Inventory::menu() {
del_invent_slot(_G(spieler).InventSlot[k]);
}
} else if (_G(spieler).InventSlot[k] != -1)
obj_auswerten(_G(spieler).InventSlot[k], INVENTAR_NORMAL);
evaluateObj(_G(spieler).InventSlot[k], INVENTAR_NORMAL);
else {
_G(spieler).InventSlot[k] = _G(spieler).AkInvent;
_G(obj)->sort();
@ -554,7 +554,7 @@ void Inventory::look_screen(int16 txt_mode, int16 txt_nr) {
if (txt_nr != -1) {
switch (txt_mode) {
case INVENTAR_NORMAL:
case INVENTAR_STATIC:
case INVENTORY_STATIC:
ok = true;
switch (_G(menu_item)) {
case CUR_LOOK:
@ -583,14 +583,14 @@ void Inventory::look_screen(int16 txt_mode, int16 txt_nr) {
}
if (_G(atds)->get_steuer_bit(txt_nr, ATS_ACTION_BIT, ATS_DATA)) {
ats_action(txt_nr, m_mode, ATS_ACTION_VOR);
atsAction(txt_nr, m_mode, ATS_ACTION_VOR);
}
if (ok) {
start_ats_wait(txt_nr, m_mode, 14, ATS_DATA);
}
if (_G(atds)->get_steuer_bit(txt_nr, ATS_ACTION_BIT, ATS_DATA))
ats_action(txt_nr, m_mode, ATS_ACTION_NACH);
atsAction(txt_nr, m_mode, ATS_ACTION_NACH);
if (_G(menu_item) == CUR_USE)
_G(flags).StaticUseTxt = true;
break;

16
engines/chewy/globals.h
View file

@ -327,7 +327,7 @@ void kb_mov(int16 mode);
void kb_cur_action(int16 key, int16 mode);
void mouseAction();
void obj_auswerten(int16 test_nr, int16 txt_nr);
void evaluateObj(int16 testNr, int16 txt_nr);
void swap_if_l(int16 *x1, int16 *x2);
@ -344,7 +344,7 @@ void del_inventar(int16 nr);
bool is_cur_inventar(int16 nr);
void check_shad(int16 g_idx, int16 mode);
void check_shad(int16 palIdx, int16 mode);
void get_scroll_off(int16 x, int16 y, int16 pic_x, int16 pic_y,
int16 *sc_x, int16 *sc_y);
@ -450,17 +450,17 @@ uint16 exit_flip_flop(int16 ani_nr, int16 eib_nr1, int16 eib_nr2,
int16 ats_nr1, int16 ats_nr2, int16 sib_nr,
int16 spr_nr1, int16 spr_nr2, int16 flag);
int16 load_ads_dia(int16 dia_nr);
int16 loadAdsDia(int16 diaNr);
void set_ssi_xy();
void setSsiPos();
int16 ats_action(int16 txt_nr, int16 txt_mode, int16 MODE);
int16 atsAction(int16 txtNr, int16 txtMode, int16 MODE);
void ads_action(int16 dia_nr, int16 blk_nr, int16 str_end_nr);
void adsAction(int16 diaNr, int16 blkNr, int16 strEndNr);
void ads_ende(int16 dia_nr, int16 blk_nr, int16 str_end_nr);
void ads_ende(int16 diaNr, int16 blkNr, int16 strEndNr);
void atds_string_start(int16 dia_nr, int16 str_nr, int16 person_nr,
void atdsStringStart(int16 diaNr, int16 strNr, int16 personNr,
int16 mode);
void calc_inv_use_txt(int16 test_nr);
bool calc_inv_no_use(int16 test_nr, int16 mode);

2
engines/chewy/inits.cpp
View file

@ -216,7 +216,7 @@ void init_atds() {
_G(atds)->set_delay(&_G(spieler).DelaySpeed, _G(spieler).AadSilent);
for (int16 i = 0; i < AAD_MAX_PERSON; i++)
_G(atds)->set_split_win(i, &_G(ssi)[i]);
_G(atds)->set_string_end_func(&atds_string_start);
_G(atds)->set_string_end_func(&atdsStringStart);
}
void new_game() {

126
engines/chewy/main.cpp
View file

@ -605,7 +605,7 @@ void set_up_screen(SetupScreenMode mode) {
nr = _G(obj)->is_sib_mouse(_G(minfo).x + _G(spieler).scrollx, _G(minfo).y + _G(spieler).scrolly);
if (nr != -1) {
txt_nr = _G(obj)->sib_txt_nr(nr);
mous_obj_action(nr, mode, INVENTAR_STATIC, txt_nr);
mous_obj_action(nr, mode, INVENTORY_STATIC, txt_nr);
} else
calc_mouse_person(_G(minfo).x, _G(minfo).y);
}
@ -691,7 +691,7 @@ void mous_obj_action(int16 nr, int16 mode, int16 txt_mode, int16 txt_nr) {
switch (txt_mode) {
case INVENTAR_NORMAL:
case INVENTAR_STATIC:
case INVENTORY_STATIC:
str_adr = _G(atds)->ats_get_txt(txt_nr, TXT_MARK_NAME, &anz, ATS_DATA);
break;
default:
@ -714,7 +714,7 @@ void mous_obj_action(int16 nr, int16 mode, int16 txt_mode, int16 txt_nr) {
Dialogs::Inventory::look_screen(txt_mode, txt_nr);
else {
if (_G(spieler).inv_cur) {
obj_auswerten(nr, txt_mode);
evaluateObj(nr, txt_mode);
} else {
if (txt_mode == INVENTAR_NORMAL) {
if (!_G(flags).ChAutoMov) {
@ -743,8 +743,8 @@ void mous_obj_action(int16 nr, int16 mode, int16 txt_mode, int16 txt_nr) {
_G(spieler).room_m_obj[_G(spieler).AkInvent].RoomNr = 255;
}
} else if (txt_mode == INVENTAR_STATIC) {
obj_auswerten(nr, STATIC_USE);
} else if (txt_mode == INVENTORY_STATIC) {
evaluateObj(nr, STATIC_USE);
}
}
}
@ -883,7 +883,7 @@ void mouseAction() {
}
}
void obj_auswerten(int16 test_nr, int16 mode) {
void evaluateObj(int16 testNr, int16 mode) {
int16 ani_nr;
int16 txt_nr;
int16 tmp = _G(spieler).AkInvent;
@ -892,19 +892,19 @@ void obj_auswerten(int16 test_nr, int16 mode) {
switch (mode) {
case INVENTAR_NORMAL:
ret = _G(obj)->action_iib_iib(_G(spieler).AkInvent, test_nr);
ret = _G(obj)->action_iib_iib(_G(spieler).AkInvent, testNr);
if (ret != NO_ACTION) {
hideCur();
if (_G(flags).InventMenu == false) {
if (_G(spieler).room_m_obj[_G(spieler).AkInvent].AutoMov != 255) {
_G(maus_links_click) = false;
autoMove(_G(spieler).room_m_obj[test_nr].AutoMov, P_CHEWY);
autoMove(_G(spieler).room_m_obj[testNr].AutoMov, P_CHEWY);
}
txt_nr = _G(obj)->iib_txt_nr(test_nr);
txt_nr = _G(obj)->iib_txt_nr(testNr);
Dialogs::Inventory::look_screen(INVENTAR_NORMAL, txt_nr);
if (_G(spieler).room_m_obj[test_nr].AniFlag != 255) {
_G(spieler).PersonHide[P_CHEWY] = _G(spieler).room_m_obj[test_nr].HeldHide;
play_scene_ani(_G(spieler).room_m_obj[test_nr].AniFlag, ANI_FRONT);
if (_G(spieler).room_m_obj[testNr].AniFlag != 255) {
_G(spieler).PersonHide[P_CHEWY] = _G(spieler).room_m_obj[testNr].HeldHide;
play_scene_ani(_G(spieler).room_m_obj[testNr].AniFlag, ANI_FRONT);
_G(spieler).PersonHide[P_CHEWY] = false;
}
}
@ -912,27 +912,27 @@ void obj_auswerten(int16 test_nr, int16 mode) {
}
break;
case INVENTAR_STATIC:
ret = _G(obj)->action_iib_sib(_G(spieler).AkInvent, test_nr);
case INVENTORY_STATIC:
ret = _G(obj)->action_iib_sib(_G(spieler).AkInvent, testNr);
if (ret != NO_ACTION) {
_G(maus_links_click) = false;
hideCur();
if (_G(spieler).room_m_obj[_G(spieler).AkInvent].AutoMov != 255) {
autoMove(_G(spieler).room_s_obj[test_nr].AutoMov, P_CHEWY);
autoMove(_G(spieler).room_s_obj[testNr].AutoMov, P_CHEWY);
}
txt_nr = _G(obj)->sib_txt_nr(test_nr);
Dialogs::Inventory::look_screen(INVENTAR_STATIC, txt_nr);
if (_G(spieler).room_s_obj[test_nr].AniFlag != 255) {
_G(spieler).PersonHide[P_CHEWY] = _G(spieler).room_s_obj[test_nr].HeldHide;
tmp = getAniDirection((int16)_G(spieler).room_s_obj[test_nr].ZustandAk);
ani_nr = _G(spieler).room_s_obj[test_nr].AniFlag;
txt_nr = _G(obj)->sib_txt_nr(testNr);
Dialogs::Inventory::look_screen(INVENTORY_STATIC, txt_nr);
if (_G(spieler).room_s_obj[testNr].AniFlag != 255) {
_G(spieler).PersonHide[P_CHEWY] = _G(spieler).room_s_obj[testNr].HeldHide;
tmp = getAniDirection((int16)_G(spieler).room_s_obj[testNr].ZustandAk);
ani_nr = _G(spieler).room_s_obj[testNr].AniFlag;
if (ani_nr >= 150) {
start_spz_wait(ani_nr - 150, 1, false, P_CHEWY);
ani_nr = -1;
} else if (ani_nr >= 100) {
ani_nr -= 100;
_G(obj)->calc_static_detail(test_nr);
_G(obj)->calc_static_detail(testNr);
}
if (ani_nr != -1)
play_scene_ani(ani_nr, tmp);
@ -940,7 +940,7 @@ void obj_auswerten(int16 test_nr, int16 mode) {
}
_G(menu_item_vorwahl) = CUR_WALK;
showCur();
sib_event_inv(test_nr);
sib_event_inv(testNr);
if (!_G(spieler).inv_cur) {
_G(menu_item) = _G(menu_item_vorwahl);
@ -951,41 +951,41 @@ void obj_auswerten(int16 test_nr, int16 mode) {
break;
case STATIC_USE:
ret = _G(obj)->calc_static_use(test_nr);
ret = _G(obj)->calc_static_use(testNr);
if (ret == OBJECT_1) {
_G(maus_links_click) = false;
hideCur();
if (_G(spieler).room_s_obj[test_nr].AutoMov != 255) {
if (_G(spieler).room_s_obj[testNr].AutoMov != 255) {
autoMove(_G(spieler).room_s_obj[test_nr].AutoMov, P_CHEWY);
autoMove(_G(spieler).room_s_obj[testNr].AutoMov, P_CHEWY);
}
txt_nr = _G(obj)->sib_txt_nr(test_nr);
Dialogs::Inventory::look_screen(INVENTAR_STATIC, txt_nr);
if (_G(spieler).room_s_obj[test_nr].AniFlag != 255) {
_G(spieler).PersonHide[P_CHEWY] = _G(spieler).room_s_obj[test_nr].HeldHide;
tmp = getAniDirection((int16)_G(spieler).room_s_obj[test_nr].ZustandAk);
txt_nr = _G(obj)->sib_txt_nr(testNr);
Dialogs::Inventory::look_screen(INVENTORY_STATIC, txt_nr);
if (_G(spieler).room_s_obj[testNr].AniFlag != 255) {
_G(spieler).PersonHide[P_CHEWY] = _G(spieler).room_s_obj[testNr].HeldHide;
tmp = getAniDirection((int16)_G(spieler).room_s_obj[testNr].ZustandAk);
ani_nr = _G(spieler).room_s_obj[test_nr].AniFlag;
ani_nr = _G(spieler).room_s_obj[testNr].AniFlag;
if (ani_nr >= 150) {
start_spz_wait(ani_nr - 150, 1, false, P_CHEWY);
ani_nr = -1;
} else if (ani_nr >= 100) {
ani_nr -= 100;
_G(obj)->calc_static_detail(test_nr);
_G(obj)->calc_static_detail(testNr);
}
if (ani_nr != -1)
play_scene_ani(ani_nr, tmp);
_G(spieler).PersonHide[P_CHEWY] = false;
}
if (_G(spieler).room_s_obj[test_nr].InvNr != -1) {
invent_2_slot(_G(spieler).room_s_obj[test_nr].InvNr);
if (_G(spieler).room_s_obj[testNr].InvNr != -1) {
invent_2_slot(_G(spieler).room_s_obj[testNr].InvNr);
action_flag = true;
}
_G(menu_item_vorwahl) = CUR_WALK;
showCur();
int16 sib_ret = sib_event_no_inv(test_nr);
int16 sib_ret = sib_event_no_inv(testNr);
_G(obj)->calc_all_static_detail();
@ -999,23 +999,23 @@ void obj_auswerten(int16 test_nr, int16 mode) {
} else if (ret == SIB_GET_INV) {
_G(maus_links_click) = false;
hideCur();
if (_G(spieler).room_s_obj[test_nr].AutoMov != 255) {
autoMove(_G(spieler).room_s_obj[test_nr].AutoMov, P_CHEWY);
if (_G(spieler).room_s_obj[testNr].AutoMov != 255) {
autoMove(_G(spieler).room_s_obj[testNr].AutoMov, P_CHEWY);
}
txt_nr = _G(obj)->sib_txt_nr(test_nr);
Dialogs::Inventory::look_screen(INVENTAR_STATIC, txt_nr);
if (_G(spieler).room_s_obj[test_nr].AniFlag != 255) {
_G(spieler).PersonHide[P_CHEWY] = _G(spieler).room_s_obj[test_nr].HeldHide;
tmp = getAniDirection((int16)_G(spieler).room_s_obj[test_nr].ZustandAk);
txt_nr = _G(obj)->sib_txt_nr(testNr);
Dialogs::Inventory::look_screen(INVENTORY_STATIC, txt_nr);
if (_G(spieler).room_s_obj[testNr].AniFlag != 255) {
_G(spieler).PersonHide[P_CHEWY] = _G(spieler).room_s_obj[testNr].HeldHide;
tmp = getAniDirection((int16)_G(spieler).room_s_obj[testNr].ZustandAk);
ani_nr = _G(spieler).room_s_obj[test_nr].AniFlag;
ani_nr = _G(spieler).room_s_obj[testNr].AniFlag;
if (ani_nr >= 150) {
start_spz_wait(ani_nr - 150, 1, false, P_CHEWY);
ani_nr = -1;
} else if (ani_nr >= 100) {
ani_nr -= 100;
_G(obj)->calc_static_detail(test_nr);
_G(obj)->calc_static_detail(testNr);
}
if (ani_nr != -1) {
play_scene_ani(ani_nr, tmp);
@ -1023,20 +1023,20 @@ void obj_auswerten(int16 test_nr, int16 mode) {
_G(spieler).PersonHide[P_CHEWY] = false;
}
if (_G(spieler).room_s_obj[test_nr].InvNr != -1)
invent_2_slot(_G(spieler).room_s_obj[test_nr].InvNr);
_G(obj)->calc_rsi_flip_flop(test_nr);
if (_G(spieler).room_s_obj[testNr].InvNr != -1)
invent_2_slot(_G(spieler).room_s_obj[testNr].InvNr);
_G(obj)->calc_rsi_flip_flop(testNr);
_G(menu_item_vorwahl) = CUR_WALK;
showCur();
sib_event_no_inv(test_nr);
sib_event_no_inv(testNr);
_G(obj)->calc_all_static_detail();
if (!_G(spieler).inv_cur) {
_G(menu_item) = _G(menu_item_vorwahl);
cursorChoice(_G(menu_item));
}
} else if (ret == NO_ACTION) {
txt_nr = _G(obj)->sib_txt_nr(test_nr);
Dialogs::Inventory::look_screen(INVENTAR_STATIC, txt_nr);
txt_nr = _G(obj)->sib_txt_nr(testNr);
Dialogs::Inventory::look_screen(INVENTORY_STATIC, txt_nr);
}
break;
@ -1048,14 +1048,14 @@ void obj_auswerten(int16 test_nr, int16 mode) {
case OBJECT_1:
case OBJECT_2:
if (mode == INVENTAR_NORMAL)
calc_inv_use_txt(test_nr);
calc_inv_use_txt(testNr);
break;
case NO_ACTION:
if (mode == STATIC_USE && _G(flags).StaticUseTxt == true)
_G(flags).StaticUseTxt = false;
else if (mode != STATIC_USE)
calc_inv_no_use(test_nr, mode);
calc_inv_no_use(testNr, mode);
break;
@ -1087,7 +1087,7 @@ void palcopy(byte *destPal, const byte *srcPal, int16 destStartIndex, int16 srcS
}
}
void check_shad(int16 g_idx, int16 mode) {
void check_shad(int16 palIdx, int16 mode) {
static const uint8 PAL_0[] = {
0, 0, 0,
39, 0, 26,
@ -1151,7 +1151,7 @@ void check_shad(int16 g_idx, int16 mode) {
45, 6, 32
};
switch (g_idx) {
switch (palIdx) {
case 1:
if (mode)
_G(out)->set_teilpalette(PAL_1, 1, 11);
@ -1311,11 +1311,11 @@ void goAutoXy(int16 x, int16 y, int16 personNum, int16 mode) {
}
}
int16 getAniDirection(int16 zustand) {
int16 getAniDirection(int16 status) {
int16 ret = ANI_FRONT;
switch (zustand) {
switch (status) {
case OBJZU_ZU:
case OBJZU_VERSCHLOSSEN:
case OBJZU_LOCKED:
ret = ANI_BACK;
break;
default:
@ -1388,7 +1388,7 @@ int16 calcMouseText(int16 x, int16 y, int16 mode) {
}
if (_G(atds)->get_steuer_bit(txtNr, ATS_ACTION_BIT, ATS_DATA)) {
action_ret = ats_action(txtNr, txtMode, ATS_ACTION_VOR);
action_ret = atsAction(txtNr, txtMode, ATS_ACTION_VOR);
}
if (ok && !_G(atds)->get_steuer_bit(txtNr, ATS_AKTIV_BIT, ATS_DATA)) {
@ -1399,7 +1399,7 @@ int16 calcMouseText(int16 x, int16 y, int16 mode) {
}
if (_G(atds)->get_steuer_bit(txtNr, ATS_ACTION_BIT, ATS_DATA)) {
action_ret = ats_action(txtNr, txtMode, ATS_ACTION_NACH);
action_ret = atsAction(txtNr, txtMode, ATS_ACTION_NACH);
actionFl = true;
if (action_ret)
ret = 1;
@ -1497,7 +1497,7 @@ int16 is_mouse_person(int16 x, int16 y) {
void calc_mouse_person(int16 x, int16 y) {
int16 mode = 0;
char ch_txt[MAX_PERSON][9] = {"Chewy", "Howard", "Nichelle"};
int16 dia_nr = -1;
int16 diaNr = -1;
if (_G(flags).ShowAtsInvTxt && !_G(flags).InventMenu) {
int16 p_nr = is_mouse_person(x, y);
if (p_nr != -1) {
@ -1555,7 +1555,7 @@ void calc_mouse_person(int16 x, int16 y) {
switch (p_nr) {
case P_HOWARD:
case P_NICHELLE:
dia_nr = true;
diaNr = true;
calc_person_dia(p_nr);
break;
@ -1573,7 +1573,7 @@ void calc_mouse_person(int16 x, int16 y) {
break;
}
if (dia_nr == -1) {
if (diaNr == -1) {
if (txt_nr != 30000) {
if (_G(menu_item) != CUR_WALK) {
if (x + _G(spieler).scrollx > _G(spieler_vector)[P_CHEWY].Xypos[0])

2
engines/chewy/main.h
View file

@ -35,7 +35,7 @@ void palcopy(byte *destPal, const byte *srcPal, int16 destStartIndex,
short calcMouseText(int16 x, int16 y, int16 mode);
void calc_ani_timer();
void mous_obj_action(int16 nr, int16 mode, int16 txt_mode, int16 txt_nr);
int16 getAniDirection(int16 zustand);
int16 getAniDirection(int16 status);
void menuEntry();
void menuExit();

5
engines/chewy/menus.cpp
View file

@ -20,6 +20,7 @@
*/
#include "chewy/defines.h"
#include "chewy/detail.h"
#include "chewy/events.h"
#include "chewy/globals.h"
#include "chewy/main.h"
@ -275,12 +276,12 @@ void ads_menu() {
_G(minfo).y = 159;
AdsNextBlk *an_blk = _G(atds)->ads_item_choice(_G(ads_blk_nr), cur_y);
if (an_blk->BlkNr == -1) {
ads_action(_G(ads_dia_nr), _G(ads_blk_nr), an_blk->EndNr);
adsAction(_G(ads_dia_nr), _G(ads_blk_nr), an_blk->EndNr);
ads_ende(_G(ads_dia_nr), _G(ads_blk_nr), an_blk->EndNr);
stop_ads_dialog();
} else {
an_blk = _G(atds)->calc_next_block(_G(ads_blk_nr), cur_y);
ads_action(_G(ads_dia_nr), _G(ads_blk_nr), an_blk->EndNr);
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));

2
engines/chewy/object_extra.h
View file

@ -31,7 +31,7 @@ namespace Chewy {
#define OBJZU_ZU 1
#define OBJZU_AN 2
#define OBJZU_AUS 3
#define OBJZU_VERSCHLOSSEN 5
#define OBJZU_LOCKED 5
#define OBJZU_GEOEFFNET 6
#define OBJZU_NASS 7
#define OBJZU_TROCKEN 8

1
engines/chewy/room.h
View file

@ -22,6 +22,7 @@
#ifndef CHEWY_ROOM_H
#define CHEWY_ROOM_H
#include "chewy/detail.h"
#include "chewy/object_extra.h"
namespace Chewy {

4
engines/chewy/rooms/room08.cpp
View file

@ -174,12 +174,12 @@ void Room8::talk_nimoy() {
int16 diaNr = _G(spieler).R8GipsWurf ? 2 : 1;
if (!_G(spieler).R8GTuer)
load_ads_dia(diaNr);
loadAdsDia(diaNr);
else
start_aad_wait(61, -1);
} else {
start_aad_wait(603, -1);
load_ads_dia(6);
loadAdsDia(6);
}
_G(flags).NoScroll = false;

4
engines/chewy/rooms/room11.cpp
View file

@ -156,7 +156,7 @@ int16 Room11::scanner() {
cursorChoice(_G(menu_item));
start_aad_wait(12, -1);
showCur();
load_ads_dia(3);
loadAdsDia(3);
} else if (!_G(spieler).inv_cur) {
if (!_G(spieler).R11TerminalOk) {
actionFl = true;
@ -167,7 +167,7 @@ int16 Room11::scanner() {
start_aad_wait(12, -1);
_G(menu_item) = CUR_TALK;
cursorChoice(_G(menu_item));
load_ads_dia(3);
loadAdsDia(3);
}
}
}

2
engines/chewy/rooms/room14.cpp
View file

@ -117,7 +117,7 @@ void Room14::talk_eremit() {
_G(flags).AutoAniPlay = true;
if (_G(spieler).R14Translator) {
load_ads_dia(0);
loadAdsDia(0);
_G(obj)->show_sib(46);
} else {
hideCur();

1
engines/chewy/rooms/room86.cpp
View file

@ -20,6 +20,7 @@
*/
#include "chewy/defines.h"
#include "chewy/detail.h"
#include "chewy/events.h"
#include "chewy/globals.h"
#include "chewy/room.h"

1
engines/chewy/rooms/room88.cpp
View file

@ -20,6 +20,7 @@
*/
#include "chewy/defines.h"
#include "chewy/detail.h"
#include "chewy/events.h"
#include "chewy/globals.h"
#include "chewy/room.h"

11
engines/chewy/sprite.cpp
View file

@ -22,6 +22,7 @@
#include "chewy/defines.h"
#include "chewy/globals.h"
#include "chewy/sound.h"
#include "chewy/detail.h"
namespace Chewy {
@ -451,7 +452,7 @@ void start_aad_wait(int16 dia_nr, int16 str_nr) {
_G(maus_links_click) = false;
_G(talk_start_ani) = -1;
_G(talk_hide_static) = -1;
set_ssi_xy();
setSsiPos();
_G(atds)->start_aad(dia_nr);
while (!SHOULD_QUIT && (
@ -470,7 +471,7 @@ void start_aad_wait(int16 dia_nr, int16 str_nr) {
void start_aad(int16 dia_nr) {
g_engine->_sound->waitForSpeechToFinish();
set_ssi_xy();
setSsiPos();
_G(atds)->start_aad(dia_nr);
}
@ -486,7 +487,7 @@ bool start_ats_wait(int16 txt_nr, int16 txt_mode, int16 col, int16 mode) {
_G(flags).AtsText = true;
if (txt_nr != -1) {
if (_G(menu_item) != CUR_WALK)
atds_string_start(30000, 0, 0, AAD_STR_START);
atdsStringStart(30000, 0, 0, AAD_STR_START);
ret = _G(atds)->start_ats(txt_nr, txt_mode, col, mode, &VocNr);
@ -514,7 +515,7 @@ bool start_ats_wait(int16 txt_nr, int16 txt_mode, int16 col, int16 mode) {
}
if (_G(menu_item) != CUR_WALK)
atds_string_start(30000, 0, 0, AAD_STR_END);
atdsStringStart(30000, 0, 0, AAD_STR_END);
}
_G(flags).AtsText = false;
@ -561,7 +562,7 @@ void start_ads_wait(int16 dia_nr) {
if (!_G(flags).AdsDialog) {
_G(menu_item) = CUR_TALK;
cursorChoice(_G(menu_item));
load_ads_dia(dia_nr);
loadAdsDia(dia_nr);
while (_G(flags).AdsDialog && !SHOULD_QUIT) {
set_up_screen(DO_SETUP);
}

649
engines/chewy/t_event.cpp
View file

File diff suppressed because it is too large Load diff

6
engines/chewy/temp_file.cpp
View file

@ -97,8 +97,7 @@ void TempFileArchive::FileProxy::finalize() {
TempFileArchive::TempFileArchive() {
}
const TempFileArchive::Entry *TempFileArchive::getEntry(
const Common::String &name) const {
const TempFileArchive::Entry *TempFileArchive::getEntry(const Common::String &name) const {
for (EntryList::const_iterator it = _files.begin(); it != _files.end(); ++it) {
const Entry &e = *it;
if (e._name.equalsIgnoreCase(name))
@ -132,8 +131,7 @@ const Common::ArchiveMemberPtr TempFileArchive::getMember(const Common::Path &pa
return Common::ArchiveMemberPtr();
}
Common::SeekableReadStream *TempFileArchive::createReadStreamForMember(
const Common::Path &path) const {
Common::SeekableReadStream *TempFileArchive::createReadStreamForMember(const Common::Path &path) const {
const Entry *entry = getEntry(path.toString());
if (!entry)
return nullptr;

1
engines/chewy/text.cpp
View file

@ -86,7 +86,6 @@ TextEntry *Text::getText(uint dialogNum, uint entryNum) {
TextEntry *d = new TextEntry();
bool isText = (dialogNum >= kADSTextMax && dialogNum < kADSTextMax + kATSTextMax);
bool isAutoDialog = (dialogNum >= kADSTextMax + kATSTextMax && dialogNum < kADSTextMax + kATSTextMax + kAADTextMax);
//bool isInvText = (dialogNum >= kADSTextMax + kATSTextMax + kAADTextMax && dialogNum < kADSTextMax + kATSTextMax + kAADTextMax + kINVTextMax);
byte *data = getChunkData(dialogNum);
byte *ptr = data;

7
engines/chewy/timer.cpp
View file

@ -72,7 +72,8 @@ void Timer::calcTimer() {
}
int16 Timer::setNewTimer(int16 timerNr, int16 timerEndValue, int16 timerMode) {
int16 ret;
int16 ret = -1;
if (timerNr < _timerMax) {
ret = 1;
_timerBlk[timerNr]._timeCount = 0;
@ -81,8 +82,8 @@ int16 Timer::setNewTimer(int16 timerNr, int16 timerEndValue, int16 timerMode) {
_timerBlk[timerNr]._timeLast = _G(timer_count);
_timerBlk[timerNr]._timeMode = timerMode;
_timerBlk[timerNr]._timeStatus = true;
} else
ret = -1;
}
return ret;
}

4
engines/chewy/timer.h
View file

@ -24,12 +24,8 @@
namespace Chewy {
#define SEC_1000_MODE 0
#define SEC_100_MODE 1
#define SEC_10_MODE 2
#define SEC_MODE 3
#define MIN_MODE 4
#define STD_MODE 5
#define TIMER_STOP 0
#define TIMER_START 1

1
engines/chewy/types.cpp
View file

@ -20,6 +20,7 @@
*/
#include "chewy/types.h"
#include "chewy/detail.h"
#include "common/algorithm.h"
namespace Chewy {

1
engines/chewy/types.h
View file

@ -25,7 +25,6 @@
#include "common/serializer.h"
#include "chewy/defines.h"
#include "chewy/object_extra.h"
#include "chewy/detail.h"
namespace Chewy {