diff options
| author | Max Horn | 2006-02-20 14:18:30 +0000 |
|---|---|---|
| committer | Max Horn | 2006-02-20 14:18:30 +0000 |
| commit | 0712b468a35fa663578a31807da831a9fa67aafa (patch) | |
| tree | adeec8c262dc7a890d823c0e393ca1467993288b /engines/sword2/router.cpp | |
| parent | d2cf43d6faa218276176c32c11b2c55263df5652 (diff) | |
| download | scummvm-rg350-0712b468a35fa663578a31807da831a9fa67aafa.tar.gz scummvm-rg350-0712b468a35fa663578a31807da831a9fa67aafa.tar.bz2 scummvm-rg350-0712b468a35fa663578a31807da831a9fa67aafa.zip | |
Fix for bug #1428261 (Solaris x86 build fails: variable name collision)
svn-id: r20787
Diffstat (limited to 'engines/sword2/router.cpp')
| -rw-r--r-- | engines/sword2/router.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/engines/sword2/router.cpp b/engines/sword2/router.cpp index 2840c68c2a..3976bdb179 100644 --- a/engines/sword2/router.cpp +++ b/engines/sword2/router.cpp @@ -435,23 +435,17 @@ int32 Router::smoothestPath() { // Rate each option. Split routes look crap so weight against // them - - int32 SS = dS + dSS + 3; - int32 SD = dS + dDD; - int32 DS = dD + dSS; - int32 DD = dD + dDD + 3; - - // set up turns as a sorted array of the turn values - - tempturns[0] = SS; + tempturns[0] = dS + dSS + 3; turns[0] = 0; - tempturns[1] = SD; + tempturns[1] = dS + dDD; turns[1] = 1; - tempturns[2] = DS; + tempturns[2] = dD + dSS; turns[2] = 2; - tempturns[3] = DD; + tempturns[3] = dD + dDD + 3; turns[3] = 3; + // set up turns as a sorted array of the turn values + for (i = 0; i < 3; i++) { for (int j = 0; j < 3; j++) { if (tempturns[j] > tempturns[j + 1]) { |