diff options
| author | Matthew Hoops | 2011-08-06 15:54:11 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-06 15:54:11 -0400 |
| commit | e43a6671fc04f2c67b8efa2c0fdfdd6ec0ea1023 (patch) | |
| tree | cc4210c6aa4cc23d930a88d6406716c4d5972f72 /engines/scumm/he | |
| parent | 605473d11724a41ab09b09288ee004cc4aba7d25 (diff) | |
| download | scummvm-rg350-e43a6671fc04f2c67b8efa2c0fdfdd6ec0ea1023.tar.gz scummvm-rg350-e43a6671fc04f2c67b8efa2c0fdfdd6ec0ea1023.tar.bz2 scummvm-rg350-e43a6671fc04f2c67b8efa2c0fdfdd6ec0ea1023.zip | |
SCUMM: Fix some soccer u32 code in op_1011
Spotted by fuzzie
Diffstat (limited to 'engines/scumm/he')
| -rw-r--r-- | engines/scumm/he/logic_he.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/he/logic_he.cpp b/engines/scumm/he/logic_he.cpp index f03a2b754b..91858b215b 100644 --- a/engines/scumm/he/logic_he.cpp +++ b/engines/scumm/he/logic_he.cpp @@ -1219,8 +1219,8 @@ int LogicHEsoccer::op_1011(int32 a1, int32 a2, int32 a3, int32 a4, int32 a5, int double v13 = _userDataD[523]; // x/y position of shadows - putInArray(a2, i + 22, 0, (int32)(atan2(v29, v31) * v13 + 640.0)); - putInArray(a2, i + 22, 1, v12); + putInArray(a2, i + ((_vm->_game.id == GID_SOCCER) ? 20 : 22), 0, (int32)(atan2(v29, v31) * v13 + 640.0)); + putInArray(a2, i + ((_vm->_game.id == GID_SOCCER) ? 20 : 22), 1, v12); } // soccer only uses one array here @@ -1293,10 +1293,10 @@ void LogicHEsoccer::op_1011_sub(int32 a1, int32 a2, int32 a3, int32 a4) { if (_vm->_game.id == GID_SOCCER) { // soccer gets to be different for (int i = 0; i < 13; i++) - v20[i] = distance(v13, v7[i], v14, v8[i]); + v20[i] = distance(v15, v7[i], v16, v8[i]); for (int i = 0; i < 13; i++) - v19[i] = distance(v15, v7[i], v16, v8[i]); + v19[i] = distance(v13, v7[i], v14, v8[i]); } else { // soccermls and soccer2004 use two other arrays here int v9 = getFromArray(a1, 20, 0); |