diff options
| author | Travis Howell | 2009-07-11 22:58:29 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-07-11 22:58:29 +0000 |
| commit | 6e45d0c4aee7d129d6f68013c3f09e8a7087f552 (patch) | |
| tree | 735b1bbcd41595735c88154d42333783bc1ef728 /engines/scumm | |
| parent | e3398c0cc73999524e92774fb889a0d22eea552b (diff) | |
| parent | 116d2254119476f58b6b135b7a06a207f38fb5d0 (diff) | |
| download | scummvm-rg350-6e45d0c4aee7d129d6f68013c3f09e8a7087f552.tar.gz scummvm-rg350-6e45d0c4aee7d129d6f68013c3f09e8a7087f552.tar.bz2 scummvm-rg350-6e45d0c4aee7d129d6f68013c3f09e8a7087f552.zip | |
Merged revisions 42382,42385-42387,42393-42394 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
........
r42382 | Kirben | 2009-07-11 22:23:42 +1000 (Sat, 11 Jul 2009) | 1 line
Fix pinball type mini game in Putt-Putt Enters The Race.
........
r42385 | wjpalenstijn | 2009-07-12 01:00:40 +1000 (Sun, 12 Jul 2009) | 3 lines
SCI: don't let TimerSongIterator loop forever, and don't immediately
signal completion when starting it. This fixes a sync issue with
the departing spaceship at the start of SQ4CD (after the intro).
........
r42386 | thebluegr | 2009-07-12 02:07:14 +1000 (Sun, 12 Jul 2009) | 1 line
If we fail to auto-detect either the volume or the map version, set the one to be equal to the other
........
r42387 | thebluegr | 2009-07-12 03:25:49 +1000 (Sun, 12 Jul 2009) | 1 line
Removed the version parameter from GfxResManager
........
r42393 | thebluegr | 2009-07-12 05:00:56 +1000 (Sun, 12 Jul 2009) | 1 line
Some work on QFG1VGA (looks like a mix of SCI1 and SCI1.1)
........
r42394 | thebluegr | 2009-07-12 05:38:41 +1000 (Sun, 12 Jul 2009) | 1 line
Changed an incorrect warning back to scidprintf - the relevant message is for testing only
........
svn-id: r42397
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/he/logic_he.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/he/logic_he.cpp b/engines/scumm/he/logic_he.cpp index a095622173..a24f4d4665 100644 --- a/engines/scumm/he/logic_he.cpp +++ b/engines/scumm/he/logic_he.cpp @@ -357,8 +357,8 @@ int32 LogicHErace::op_1140(int32 *args) { const double scalarProduct = x * args[0] + y * args[1]; // Finally compute the projection of (arg2,arg3) onto (arg0,arg1) - double projX = args[0] - 2 * scalarProduct * args[2]; - double projY = args[1] - 2 * scalarProduct * args[3]; + double projX = args[0] - 2 * scalarProduct * x; + double projY = args[1] - 2 * scalarProduct * y; projX = projX * 20.0 / 23.0; // FIXME: Why is this here? |