[Scummvm-cvs-logs] scummvm master -> 511b37bcb0bc086712138da25cbbefd6dab272be
Strangerke
Strangerke at scummvm.org
Tue May 24 21:58:35 CEST 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
511b37bcb0 GNAP: Remove some more duplicate code
Commit: 511b37bcb0bc086712138da25cbbefd6dab272be
https://github.com/scummvm/scummvm/commit/511b37bcb0bc086712138da25cbbefd6dab272be
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-05-24T21:50:26+02:00
Commit Message:
GNAP: Remove some more duplicate code
Changed paths:
engines/gnap/character.cpp
diff --git a/engines/gnap/character.cpp b/engines/gnap/character.cpp
index 407ecb1..36d849a 100644
--- a/engines/gnap/character.cpp
+++ b/engines/gnap/character.cpp
@@ -906,6 +906,7 @@ int PlayerGnap::getShowSequenceId(int index, int gridX, int gridY) {
sequenceId = 0x890;
break;
case 8:
+ case 12:
if (_idleFacing == kDirUpRight)
sequenceId = 0x87D;
else
@@ -918,23 +919,12 @@ int PlayerGnap::getShowSequenceId(int index, int gridX, int gridY) {
sequenceId = 0x897;
break;
case 10:
- if (_idleFacing == kDirUpRight)
- sequenceId = 0x87C;
- else
- sequenceId = 0x891;
- break;
case 11:
if (_idleFacing == kDirUpRight)
sequenceId = 0x87C;
else
sequenceId = 0x891;
break;
- case 12:
- if (_idleFacing == kDirUpRight)
- sequenceId = 0x87D;
- else
- sequenceId = 0x892;
- break;
case 13:
if (_idleFacing == kDirUpRight)
sequenceId = 0x888;
@@ -964,6 +954,7 @@ int PlayerGnap::getShowSequenceId(int index, int gridX, int gridY) {
sequenceId = 0x887;
break;
case 19:
+ case 25:
if (_idleFacing == kDirUpRight)
sequenceId = 0x87A;
else
@@ -999,12 +990,6 @@ int PlayerGnap::getShowSequenceId(int index, int gridX, int gridY) {
else
sequenceId = 0x89B;
break;
- case 25:
- if (_idleFacing == kDirUpRight)
- sequenceId = 0x87A;
- else
- sequenceId = 0x88F;
- break;
//Skip 26
//Skip 27
//Skip 28
More information about the Scummvm-git-logs
mailing list