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

Rename a few vars

Browse source 
svn-id: r10927
This commit is contained in:
Travis Howell 2003-10-21 10:14:42 +00:00
parent 87fb27d02c
commit 54fc5335c0
4 changed files with 59 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

10
simon/charset.cpp
View file

@ -61,23 +61,23 @@ void SimonEngine::print_char_helper_6(uint i) {
} }
} }
void SimonEngine::render_string(uint num_1, uint color, uint width, uint height, const char *txt) { void SimonEngine::render_string(uint vga_struct_id, uint color, uint width, uint height, const char *txt) {
VgaPointersEntry *vpe = &_vga_buffer_pointers[2]; VgaPointersEntry *vpe = &_vga_buffer_pointers[2];
byte *src, *dst, *p, *dst_org, chr; byte *src, *dst, *p, *dst_org, chr;
uint count; uint count;
if (num_1 >= 100) { if (vga_struct_id >= 100) {
num_1 -= 100; vga_struct_id -= 100;
vpe++; vpe++;
} }
src = dst = vpe->vgaFile2; src = dst = vpe->vgaFile2;
count = 4000; count = 4000;
if (num_1 == 1) if (vga_struct_id == 1)
count *= 2; count *= 2;
p = dst + num_1 * 8; p = dst + vga_struct_id * 8;
*(uint16 *)(p + 4) = TO_BE_16(height); *(uint16 *)(p + 4) = TO_BE_16(height);
*(uint16 *)(p + 6) = TO_BE_16(width); *(uint16 *)(p + 6) = TO_BE_16(width);

54
simon/items.cpp
View file

@ -991,26 +991,26 @@ int SimonEngine::runScript() {
break; break;
case 179:{ /* conversation responses */ case 179:{ /* conversation responses */
uint b = getVarOrByte(); /* and room descriptions */ uint vga_struct_id = getVarOrByte(); /* and room descriptions */
uint c = getVarOrByte(); uint color = getVarOrByte();
uint a = getVarOrByte(); uint string_id = getVarOrByte();
uint d = 0; uint speech_id = 0;
const char *s = (const char *)getStringPtrByID(_stringid_array_3[a]); const char *string_ptr = (const char *)getStringPtrByID(_stringid_array_3[string_id]);
ThreeValues *tv = getThreeValues(b); ThreeValues *tv = getThreeValues(vga_struct_id);
if (_game & GF_TALKIE) if (_game & GF_TALKIE)
d = _array_4[a]; speech_id = _array_4[string_id];
if (_game & GF_SIMON2) { if (_game & GF_SIMON2) {
if (d != 0 && (_language == 20 || !_subtitles)) if (speech_id != 0 && (_language == 20 || !_subtitles))
talk_with_speech(d, b); talk_with_speech(speech_id, vga_struct_id);
if (s != NULL && _subtitles) if (string_ptr != NULL && _subtitles)
talk_with_text(b, c, s, tv->a, tv->b, tv->c); talk_with_text(vga_struct_id, color, string_ptr, tv->a, tv->b, tv->c);
} else { } else {
if (d != 0) if (speech_id != 0)
talk_with_speech(d, b); talk_with_speech(speech_id, vga_struct_id);
if (s != NULL && _subtitles) if (string_ptr != NULL && _subtitles)
talk_with_text(b, c, s, tv->a, tv->b, tv->c); talk_with_text(vga_struct_id, color, string_ptr, tv->a, tv->b, tv->c);
} }
} }
break; break;
@ -1238,16 +1238,16 @@ bool SimonEngine::o_unk_23(uint a) {
} }
void SimonEngine::o_inventory_descriptions() { void SimonEngine::o_inventory_descriptions() {
uint a = getVarOrByte(); uint vga_struct_id = getVarOrByte();
uint b = getVarOrByte(); uint color = getVarOrByte();
const char *s = NULL; const char *string_ptr = NULL;
ThreeValues *tv = NULL; ThreeValues *tv = NULL;
char buf[256]; char buf[256];
Child2 *child = (Child2 *)findChildOfType(getNextItemPtr(), 2); Child2 *child = (Child2 *)findChildOfType(getNextItemPtr(), 2);
if (child != NULL && child->avail_props & 1) { if (child != NULL && child->avail_props & 1) {
s = (const char *)getStringPtrByID(child->array[0]); string_ptr = (const char *)getStringPtrByID(child->array[0]);
tv = getThreeValues(a); tv = getThreeValues(vga_struct_id);
} }
if ((_game & GF_SIMON2) && (_game & GF_TALKIE)) { if ((_game & GF_SIMON2) && (_game & GF_TALKIE)) {
@ -1299,26 +1299,26 @@ void SimonEngine::o_inventory_descriptions() {
} }
if (_language == 20 || !_subtitles) if (_language == 20 || !_subtitles)
talk_with_speech(var200, a); talk_with_speech(var200, vga_struct_id);
} }
} else if (_game & GF_TALKIE) { } else if (_game & GF_TALKIE) {
if (child != NULL && child->avail_props & 0x200) { if (child != NULL && child->avail_props & 0x200) {
uint offs = getOffsetOfChild2Param(child, 0x200); uint offs = getOffsetOfChild2Param(child, 0x200);
talk_with_speech(child->array[offs], a); talk_with_speech(child->array[offs], vga_struct_id);
} else if (child != NULL && child->avail_props & 0x100) { } else if (child != NULL && child->avail_props & 0x100) {
uint offs = getOffsetOfChild2Param(child, 0x100); uint offs = getOffsetOfChild2Param(child, 0x100);
talk_with_speech(child->array[offs] + 3550, a); talk_with_speech(child->array[offs] + 3550, vga_struct_id);
} }
} }
if (child != NULL && (child->avail_props & 1) && _subtitles) { if (child != NULL && (child->avail_props & 1) && _subtitles) {
if (child->avail_props & 0x100) { if (child->avail_props & 0x100) {
sprintf(buf, "%d%s", child->array[getOffsetOfChild2Param(child, 0x100)], s); sprintf(buf, "%d%s", child->array[getOffsetOfChild2Param(child, 0x100)], string_ptr);
s = buf; string_ptr = buf;
} }
if (s != NULL) if (string_ptr != NULL)
talk_with_text(a, b, s, tv->a, tv->b, tv->c); talk_with_text(vga_struct_id, color, string_ptr, tv->a, tv->b, tv->c);
} }
} }

48
simon/simon.cpp
View file

@ -2111,8 +2111,8 @@ ThreeValues *SimonEngine::getThreeValues(uint a) {
} }
void SimonEngine::o_print_str() { void SimonEngine::o_print_str() {
uint num_1 = getVarOrByte(); uint vga_struct_id = getVarOrByte();
uint num_2 = getVarOrByte(); uint color = getVarOrByte();
uint string_id = getNextStringID(); uint string_id = getNextStringID();
const byte *string_ptr = NULL; const byte *string_ptr = NULL;
uint speech_id = 0; uint speech_id = 0;
@ -2127,26 +2127,26 @@ void SimonEngine::o_print_str() {
string_ptr = getStringPtrByID(string_id); string_ptr = getStringPtrByID(string_id);
} }
tv = getThreeValues(num_1); tv = getThreeValues(vga_struct_id);
if ((_game & GF_SIMON2) && (_game & GF_TALKIE)) { if ((_game & GF_SIMON2) && (_game & GF_TALKIE)) {
if (speech_id != 0 && num_1 == 1 && (_language == 20 || !_subtitles)) if (speech_id != 0 && vga_struct_id == 1 && (_language == 20 || !_subtitles))
talk_with_speech(speech_id, num_1); talk_with_speech(speech_id, vga_struct_id);
if ((_game & GF_TALKIE) && (speech_id == 0)) if ((_game & GF_TALKIE) && (speech_id == 0))
o_kill_sprite_simon2(2, num_1 + 2); o_kill_sprite_simon2(2, vga_struct_id + 2);
if (string_ptr != NULL && (speech_id == 0 || _subtitles)) if (string_ptr != NULL && (speech_id == 0 || _subtitles))
talk_with_text(num_1, num_2, (const char *)string_ptr, tv->a, tv->b, tv->c); talk_with_text(vga_struct_id, color, (const char *)string_ptr, tv->a, tv->b, tv->c);
} else if (_game & GF_TALKIE) { } else if (_game & GF_TALKIE) {
if (speech_id != 0) if (speech_id != 0)
talk_with_speech(speech_id, num_1); talk_with_speech(speech_id, vga_struct_id);
if (string_ptr != NULL && (speech_id == 0 || _subtitles)) if (string_ptr != NULL && (speech_id == 0 || _subtitles))
talk_with_text(num_1, num_2, (const char *)string_ptr, tv->a, tv->b, tv->c); talk_with_text(vga_struct_id, color, (const char *)string_ptr, tv->a, tv->b, tv->c);
} else { } else {
talk_with_text(num_1, num_2, (const char *)string_ptr, tv->a, tv->b, tv->c); talk_with_text(vga_struct_id, color, (const char *)string_ptr, tv->a, tv->b, tv->c);
} }
@ -3910,7 +3910,7 @@ void SimonEngine::start_vga_code(uint b, uint vga_res, uint vga_struct_id, uint
_lock_word &= ~0x40; _lock_word &= ~0x40;
} }
void SimonEngine::talk_with_speech(uint speech_id, uint num_1) { void SimonEngine::talk_with_speech(uint speech_id, uint vga_struct_id) {
if (!(_game & GF_SIMON2)) { if (!(_game & GF_SIMON2)) {
if (speech_id == 9999) { if (speech_id == 9999) {
if (_subtitles) if (_subtitles)
@ -3928,9 +3928,9 @@ void SimonEngine::talk_with_speech(uint speech_id, uint num_1) {
o_wait_for_vga(204); o_wait_for_vga(204);
o_kill_sprite_simon1(204); o_kill_sprite_simon1(204);
} }
o_kill_sprite_simon1(num_1 + 201); o_kill_sprite_simon1(vga_struct_id + 201);
_sound->playVoice(speech_id); _sound->playVoice(speech_id);
start_vga_code(4, 2, num_1 + 201, 0, 0, 0); start_vga_code(4, 2, vga_struct_id + 201, 0, 0, 0);
} }
} else { } else {
if (speech_id == 0xFFFF) { if (speech_id == 0xFFFF) {
@ -3949,14 +3949,14 @@ void SimonEngine::talk_with_speech(uint speech_id, uint num_1) {
o_wait_for_vga(205); o_wait_for_vga(205);
o_kill_sprite_simon2(2, 5); o_kill_sprite_simon2(2, 5);
} }
o_kill_sprite_simon2(2, num_1 + 2); o_kill_sprite_simon2(2, vga_struct_id + 2);
_sound->playVoice(speech_id); _sound->playVoice(speech_id);
start_vga_code(4, 2, num_1 + 2, 0, 0, 0); start_vga_code(4, 2, vga_struct_id + 2, 0, 0, 0);
} }
} }
} }
void SimonEngine::talk_with_text(uint num_1, uint num_2, const char *string_ptr, uint threeval_a, int threeval_b, uint width) { void SimonEngine::talk_with_text(uint vga_struct_id, uint color, const char *string_ptr, uint threeval_a, int threeval_b, uint width) {
char print_str_buf[0x140]; char print_str_buf[0x140];
char *char_buf; char *char_buf;
const char *string_ptr_2, *string_ptr_3; const char *string_ptr_2, *string_ptr_3;
@ -3966,8 +3966,8 @@ void SimonEngine::talk_with_text(uint num_1, uint num_2, const char *string_ptr,
uint height; uint height;
// FIXME: Simon1dos Dwarf Mine - Fix text for dwarf song // FIXME: Simon1dos Dwarf Mine - Fix text for dwarf song
if (num_1 >= 100) if (vga_struct_id >= 100)
num_1 -= 100; vga_struct_id -= 100;
char_buf = print_str_buf; char_buf = print_str_buf;
string_ptr_3 = string_ptr_2 = string_ptr; string_ptr_3 = string_ptr_2 = string_ptr;
@ -4197,13 +4197,13 @@ void SimonEngine::talk_with_text(uint num_1, uint num_2, const char *string_ptr,
strcpy(char_buf, string_ptr_2); strcpy(char_buf, string_ptr_2);
if (!(_game & GF_SIMON2)) { if (!(_game & GF_SIMON2)) {
o_kill_sprite_simon1(199 + num_1); o_kill_sprite_simon1(199 + vga_struct_id);
} else { } else {
o_kill_sprite_simon2(2, num_1); o_kill_sprite_simon2(2, vga_struct_id);
} }
num_2 = num_2 * 3 + 192; color = color * 3 + 192;
render_string(num_1, num_2, width, height, print_str_buf); render_string(vga_struct_id, color, width, height, print_str_buf);
num_of_rows = 4; num_of_rows = 4;
if (!(_bit_array[8] & 0x20)) if (!(_bit_array[8] & 0x20))
num_of_rows = 3; num_of_rows = 3;
@ -4212,9 +4212,9 @@ void SimonEngine::talk_with_text(uint num_1, uint num_2, const char *string_ptr,
threeval_b = 2; threeval_b = 2;
if (!(_game & GF_SIMON2)) { if (!(_game & GF_SIMON2)) {
start_vga_code(num_of_rows, 2, 199 + num_1, threeval_a >> 3, threeval_b, 12); start_vga_code(num_of_rows, 2, 199 + vga_struct_id, threeval_a >> 3, threeval_b, 12);
} else { } else {
start_vga_code(num_of_rows, 2, num_1, threeval_a >> 3, threeval_b, 12); start_vga_code(num_of_rows, 2, vga_struct_id, threeval_a >> 3, threeval_b, 12);
} }
} }

6
simon/simon.h
View file

@ -574,11 +574,11 @@ protected:
void start_vga_code(uint b, uint vga_res, uint vga_struct_id, uint c, uint d, uint f); void start_vga_code(uint b, uint vga_res, uint vga_struct_id, uint c, uint d, uint f);
void o_unk26_helper(uint a, uint b, uint c, uint d, uint e, uint f, uint g, uint h); void o_unk26_helper(uint a, uint b, uint c, uint d, uint e, uint f, uint g, uint h);
void talk_with_speech(uint speech_id, uint num_1); void talk_with_speech(uint speech_id, uint vga_struct_id);
void talk_with_text(uint num_1, uint num_2, const char *string_ptr, uint a, int b, uint c); void talk_with_text(uint vga_struct_id, uint color, const char *string_ptr, uint threeval_a, int threeval_b, uint width);
FillOrCopyStruct *fcs_alloc(uint x, uint y, uint w, uint h, uint flags, uint fill_color, uint unk4); FillOrCopyStruct *fcs_alloc(uint x, uint y, uint w, uint h, uint flags, uint fill_color, uint unk4);
void render_string(uint num_1, uint color, uint width, uint height, const char *txt); void render_string(uint vga_struct_id, uint color, uint width, uint height, const char *txt);
void setup_hit_areas(FillOrCopyStruct *fcs, uint fcs_index); void setup_hit_areas(FillOrCopyStruct *fcs, uint fcs_index);