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

Final part of V7 merging process. The FULL_THROTTLE define is not required any more

Browse source 
svn-id: r3660
This commit is contained in:
Vincent Hamm 2002-03-06 00:18:22 +00:00
parent e05f3534b4
commit c7d58aca84
8 changed files with 114 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

17
string.cpp
View file

@ -191,14 +191,15 @@ void Scumm::CHARSET_1() {
Actor *a;
byte *buffer;
#if !defined(FULL_THROTTLE)
if (!_haveMsg || (camera._dest.x>>3) != (camera._cur.x>>3) ||
camera._cur.x != camera._last.x
) return;
#else
if (!_haveMsg)
return;
#endif
if(!(_features & GF_AFTER_V7)) {
if (!_haveMsg || (camera._dest.x>>3) != (camera._cur.x>>3) ||
camera._cur.x != camera._last.x
) return;
} else {
if (!_haveMsg)
return;
}
a = NULL;
if (_vars[VAR_TALK_ACTOR] != 0xFF)
a = derefActorSafe(_vars[VAR_TALK_ACTOR], "CHARSET_1");