aboutsummaryrefslogtreecommitdiff
path: root/engines/tucker/resource.cpp
diff options
context:
space:
mode:
authorAdrian Frühwirth2018-02-11 11:50:52 +0100
committerAdrian Frühwirth2018-02-11 11:50:52 +0100
commit43053644a8088deacd067616fb9b4f48bcb07878 (patch)
tree8e5d7f2bdf25c382cc265bd7da66a10a82827d3d /engines/tucker/resource.cpp
parent0ea996a0ffdc7946cfd05a9fe12ea99d04618132 (diff)
downloadscummvm-rg350-43053644a8088deacd067616fb9b4f48bcb07878.tar.gz
scummvm-rg350-43053644a8088deacd067616fb9b4f48bcb07878.tar.bz2
scummvm-rg350-43053644a8088deacd067616fb9b4f48bcb07878.zip
TUCKER: Remove superfluous arguments in loadBudSpr et al
Diffstat (limited to 'engines/tucker/resource.cpp')
-rw-r--r--engines/tucker/resource.cpp19
1 files changed, 9 insertions, 10 deletions
diff --git a/engines/tucker/resource.cpp b/engines/tucker/resource.cpp
index d7b75e39c1..2fe26fae28 100644
--- a/engines/tucker/resource.cpp
+++ b/engines/tucker/resource.cpp
@@ -380,14 +380,14 @@ void TuckerEngine::loadPanel() {
loadImage((_panelNum == 0) ? "panel1.pcx" : "panel2.pcx", _panelGfxBuf, 0);
}
-void TuckerEngine::loadBudSpr(int startOffset) {
+void TuckerEngine::loadBudSpr() {
int framesCount[20];
memset(framesCount, 0, sizeof(framesCount));
- int endOffset = loadCTable01(0, startOffset, framesCount);
- loadCTable02(0);
+ int endOffset = loadCTable01(framesCount);
+ loadCTable02();
int frame = 0;
int spriteOffset = 0;
- for (int i = startOffset; i < endOffset; ++i) {
+ for (int i = 0; i < endOffset; ++i) {
if (framesCount[frame] == i) {
Common::String filename;
switch (_flagsTable[137]) {
@@ -414,12 +414,12 @@ void TuckerEngine::loadBudSpr(int startOffset) {
}
}
-int TuckerEngine::loadCTable01(int index, int firstSpriteNum, int *framesCount) {
+int TuckerEngine::loadCTable01(int *framesCount) {
loadFile("ctable01.c", _loadTempBuf);
DataTokenizer t(_loadTempBuf, _fileLoadSize);
- int lastSpriteNum = firstSpriteNum;
+ int lastSpriteNum = 0;
int count = 0;
- if (t.findIndex(index)) {
+ if (t.findIndex(0)) {
while (t.findNextToken(kDataTokenDw)) {
const int x = t.getNextInteger();
if (x < 0) {
@@ -448,8 +448,7 @@ int TuckerEngine::loadCTable01(int index, int firstSpriteNum, int *framesCount)
return lastSpriteNum;
}
-void TuckerEngine::loadCTable02(int fl) {
- assert(fl == 0);
+void TuckerEngine::loadCTable02() {
int entry = 0;
int i = 0;
loadFile("ctable02.c", _loadTempBuf);
@@ -461,7 +460,7 @@ void TuckerEngine::loadCTable02(int fl) {
}
_spriteAnimationsTable[entry]._rotateFlag = t.getNextInteger();
int num = t.getNextInteger();
- if (num != fl) {
+ if (num != 0) {
continue;
}
int start = 0;