aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorMatthew Hoops2012-09-05 11:45:25 -0400
committerMatthew Hoops2012-09-05 11:45:25 -0400
commitf35e820e9f2f4c2f8b9c6d3b572d588fccf99f19 (patch)
tree42510da50bdf8515a577fdd74622539ff829ef78 /engines/scumm
parent2f9b1b67b08f1b70cd95795aaf7816ca7f991649 (diff)
parent058b9b9aca066c886ceb4e454a5541be70c27cb6 (diff)
downloadscummvm-rg350-f35e820e9f2f4c2f8b9c6d3b572d588fccf99f19.tar.gz
scummvm-rg350-f35e820e9f2f4c2f8b9c6d3b572d588fccf99f19.tar.bz2
scummvm-rg350-f35e820e9f2f4c2f8b9c6d3b572d588fccf99f19.zip
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/costume.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index 6e7e9ff688..3f89bc9611 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -592,7 +592,7 @@ void ClassicCostumeRenderer::proc3_ami(Codec1 &v1) {
} while (1);
}
-void PCESetCostumeData(byte block[16][16], int index, byte value) {
+static void PCESetCostumeData(byte block[16][16], int index, byte value) {
int row = (index % 16);
int plane = (index / 16) % 4;
int colOffset = (index < 64) ? 8 : 0;