aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scumm/akos.cpp4
-rw-r--r--scumm/gfx.cpp6
-rw-r--r--scumm/scumm.h2
-rw-r--r--scumm/scummvm.cpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/scumm/akos.cpp b/scumm/akos.cpp
index a59bcf8252..8dfd847bda 100644
--- a/scumm/akos.cpp
+++ b/scumm/akos.cpp
@@ -206,7 +206,7 @@ void AkosRenderer::setPalette(byte *new_palette) {
if (color == 255) {
palette[0] = color;
} else {
- _vm->_bompActorPalletePtr = palette;
+ _vm->_bompActorPalettePtr = palette;
}
}
}
@@ -985,7 +985,7 @@ byte AkosRenderer::codec5() {
_vm->drawBomp(&bdd, decode_mode, 0);
}
- _vm->_bompActorPalletePtr = NULL;
+ _vm->_bompActorPalettePtr = NULL;
return 0;
}
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index 32dfde2e11..34a0cbf060 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -3738,12 +3738,12 @@ void Scumm::bompApplyShadow3(byte *line_buffer, byte *dst, int32 size) {
}
void Scumm::bompApplyActorPalette(byte *line_buffer, int32 size) {
- if (_bompActorPalletePtr != 0) {
- *(_bompActorPalletePtr + 255) = 255;
+ if (_bompActorPalettePtr != 0) {
+ *(_bompActorPalettePtr + 255) = 255;
while(1) {
if (size-- == 0)
break;
- *line_buffer = *(_bompActorPalletePtr + *line_buffer);
+ *line_buffer = *(_bompActorPalettePtr + *line_buffer);
line_buffer++;
}
}
diff --git a/scumm/scumm.h b/scumm/scumm.h
index b24ebaf6be..bfc801a034 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -895,7 +895,7 @@ protected:
public:
byte *_bompScallingXPtr, *_bompScallingYPtr;
byte *_bompMaskPtr;
- byte *_bompActorPalletePtr;
+ byte *_bompActorPalettePtr;
void drawBomp(BompDrawData *bd, int decode_mode, int mask);
protected:
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 055461675b..159398703e 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -339,7 +339,7 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst)
_bompScallingXPtr = NULL;
_bompScallingYPtr = NULL;
_bompMaskPtr = NULL;
- _bompActorPalletePtr = NULL;
+ _bompActorPalettePtr = NULL;
_shakeEnabled= false;
_shakeFrame = 0;
_screenStartStrip = 0;