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

and more cleanup ....

Browse source 
svn-id: r6720
This commit is contained in:
Paweł Kołodziejski 2003-03-06 19:16:24 +00:00
parent a8c3057875
commit 4fe8dcd671
12 changed files with 427 additions and 866 deletions
Download patch file Download diff file Expand all files Collapse all files

80
simon/items.cpp
View file

@ -32,8 +32,7 @@ extern void force_keyboard(bool);
#endif
int SimonState::runScript()
{
int SimonState::runScript() {
byte opcode;
bool flag, condition;
@ -1090,8 +1089,7 @@ int SimonState::runScript()
return 0;
}
int SimonState::startSubroutine(Subroutine *sub)
{
int SimonState::startSubroutine(Subroutine *sub) {
int result = -1;
SubroutineLine *sl;
byte *old_code_ptr;
@ -1137,14 +1135,12 @@ int SimonState::startSubroutine(Subroutine *sub)
return result;
}
int SimonState::startSubroutineEx(Subroutine *sub)
{
int SimonState::startSubroutineEx(Subroutine *sub) {
_item_1_ptr = _item_1;
return startSubroutine(sub);
}
bool SimonState::checkIfToRunSubroutineLine(SubroutineLine *sl, Subroutine *sub)
{
bool SimonState::checkIfToRunSubroutineLine(SubroutineLine *sl, Subroutine *sub) {
if (sub->id)
return true;
@ -1163,8 +1159,7 @@ bool SimonState::checkIfToRunSubroutineLine(SubroutineLine *sl, Subroutine *sub)
return true;
}
void SimonState::o_83_helper()
{
void SimonState::o_83_helper() {
if (_exit_cutscene) {
if (vc_get_bit(9)) {
startSubroutine170();
@ -1174,8 +1169,7 @@ void SimonState::o_83_helper()
}
}
void SimonState::o_190_helper(uint i)
{
void SimonState::o_190_helper(uint i) {
_exit_cutscene = false;
while (!(_op_189_flags & (1 << i))) {
if (_exit_cutscene) {
@ -1192,8 +1186,7 @@ void SimonState::o_190_helper(uint i)
}
bool SimonState::o_unk_23(uint a)
{
bool SimonState::o_unk_23(uint a) {
if (a == 0)
return 0;
@ -1222,8 +1215,7 @@ bool SimonState::o_unk_23(uint a)
return 0;
}
void SimonState::o_177()
{
void SimonState::o_177() {
uint a = getVarOrByte();
uint b = getVarOrByte();
const char *s = NULL;
@ -1309,8 +1301,7 @@ void SimonState::o_177()
}
}
void SimonState::o_quit_if_user_presses_y()
{
void SimonState::o_quit_if_user_presses_y() {
for (;;) {
delay(1);
if (_key_pressed == 'f' && _language == 20) // Hebrew
@ -1332,8 +1323,7 @@ void SimonState::o_quit_if_user_presses_y()
get_out:;
}
void SimonState::o_unk_137(uint fcs_index)
{
void SimonState::o_unk_137(uint fcs_index) {
FillOrCopyStruct *fcs;
fcs = _fcs_ptr_array_3[fcs_index & 7];
@ -1342,37 +1332,30 @@ void SimonState::o_unk_137(uint fcs_index)
fcs_unk_proc_1(fcs_index, fcs->fcs_data->item_ptr, fcs->fcs_data->unk1, fcs->fcs_data->unk2);
}
void SimonState::o_unk_138()
{
void SimonState::o_unk_138() {
_vga_buf_start = _vga_buf_free_start;
_vga_file_buf_org = _vga_buf_free_start;
}
void SimonState::o_unk_186()
{
void SimonState::o_unk_186() {
_vga_buf_free_start = _vga_file_buf_org_2;
_vga_buf_start = _vga_file_buf_org_2;
_vga_file_buf_org = _vga_file_buf_org_2;
}
void SimonState::o_unk_175()
{
void SimonState::o_unk_175() {
_vga_buf_start = _vga_buf_free_start;
}
void SimonState::o_unk_176()
{
void SimonState::o_unk_176() {
_vga_buf_free_start = _vga_file_buf_org;
_vga_buf_start = _vga_file_buf_org;
}
int SimonState::o_unk_132_helper(bool *b, char *buf)
{
int SimonState::o_unk_132_helper(bool *b, char *buf) {
HitArea *ha;
*b = true;
if (!_saveload_flag) {
strange_jump:;
_saveload_flag = false;
@ -1429,14 +1412,12 @@ start_over_2:;
return ha->id - 208;
}
void SimonState::o_unk_132_helper_3()
{
void SimonState::o_unk_132_helper_3() {
for (int i = 208; i != 208 + 6; i++)
set_hitarea_bit_0x40(i);
}
void SimonState::o_unk_132_helper_2(FillOrCopyStruct *fcs, int x)
{
void SimonState::o_unk_132_helper_2(FillOrCopyStruct *fcs, int x) {
byte old_text;
video_putchar(fcs, x);
@ -1452,8 +1433,7 @@ void SimonState::o_unk_132_helper_2(FillOrCopyStruct *fcs, int x)
video_putchar(fcs, 8);
}
void SimonState::o_unk_127()
{
void SimonState::o_unk_127() {
uint a = getVarOrWord();
uint b = getVarOrWord();
if (_game & GF_SIMON2) {
@ -1491,8 +1471,7 @@ void SimonState::o_unk_127()
}
}
void SimonState::o_unk_120(uint a)
{
void SimonState::o_unk_120(uint a) {
uint16 id = TO_BE_16(a);
if (_game & GF_SIMON2) {
_lock_word |= 0x8000;
@ -1507,29 +1486,25 @@ void SimonState::o_unk_120(uint a)
}
}
void SimonState::o_unk_163(uint a)
{
void SimonState::o_unk_163(uint a) {
if (_game == GAME_SIMON1DOS)
playSting(a);
else
_sound->playEffects(a);
}
void SimonState::o_unk_160(uint a)
{
void SimonState::o_unk_160(uint a) {
fcs_setTextColor(_fcs_ptr_array_3[_fcs_unk_1], a);
}
void SimonState::o_unk_103()
{
void SimonState::o_unk_103() {
lock();
fcs_unk1(_fcs_unk_1);
showMessageFormat("\x0C");
unlock();
}
void SimonState::o_unk_99_simon1(uint a)
{
void SimonState::o_unk_99_simon1(uint a) {
uint16 b = TO_BE_16(a);
_lock_word |= 0x4000;
_vc_ptr = (byte *)&b;
@ -1537,8 +1512,7 @@ void SimonState::o_unk_99_simon1(uint a)
_lock_word &= ~0x4000;
}
void SimonState::o_unk_99_simon2(uint a, uint b)
{
void SimonState::o_unk_99_simon2(uint a, uint b) {
uint16 items[2];
items[0] = TO_BE_16(a);
@ -1551,8 +1525,7 @@ void SimonState::o_unk_99_simon2(uint a, uint b)
}
/* OK */
void SimonState::o_unk26_helper(uint a, uint b, uint c, uint d, uint e, uint f, uint g, uint h)
{
void SimonState::o_unk26_helper(uint a, uint b, uint c, uint d, uint e, uint f, uint g, uint h) {
a &= 7;
if (_fcs_ptr_array_3[a])
@ -1562,7 +1535,6 @@ void SimonState::o_unk26_helper(uint a, uint b, uint c, uint d, uint e, uint f,
if (a == _fcs_unk_1) {
_fcs_ptr_1 = _fcs_ptr_array_3[a];
showmessage_helper_3(_fcs_ptr_1->textLength,
_fcs_ptr_1->textMaxLength);
showmessage_helper_3(_fcs_ptr_1->textLength, _fcs_ptr_1->textMaxLength);
}
}