aboutsummaryrefslogtreecommitdiff
path: root/engines/made/scriptfuncs.cpp
diff options
context:
space:
mode:
authorMatthew Hoops2012-06-24 09:37:53 -0400
committerMatthew Hoops2012-06-24 09:37:53 -0400
commit91efe792d5b231752dd16888729a94f323363fa0 (patch)
treee7346f83d4966ff4f3cf7e593a7f0cfa16c45b20 /engines/made/scriptfuncs.cpp
parent915a8399c910fb5c8e35de58857ce1577c1a0151 (diff)
parent20b677080881580706652b17dd5a4c3ed3e36c07 (diff)
downloadscummvm-rg350-91efe792d5b231752dd16888729a94f323363fa0.tar.gz
scummvm-rg350-91efe792d5b231752dd16888729a94f323363fa0.tar.bz2
scummvm-rg350-91efe792d5b231752dd16888729a94f323363fa0.zip
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/made/scriptfuncs.cpp')
-rw-r--r--engines/made/scriptfuncs.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/made/scriptfuncs.cpp b/engines/made/scriptfuncs.cpp
index de7b5b70f9..c57778fb71 100644
--- a/engines/made/scriptfuncs.cpp
+++ b/engines/made/scriptfuncs.cpp
@@ -574,7 +574,7 @@ int16 ScriptFunctions::sfLoadMouseCursor(int16 argc, int16 *argv) {
PictureResource *flex = _vm->_res->getPicture(argv[2]);
if (flex) {
Graphics::Surface *surf = flex->getPicture();
- CursorMan.replaceCursor((const byte *)surf->pixels, surf->w, surf->h, argv[1], argv[0], 0);
+ CursorMan.replaceCursor(surf->pixels, surf->w, surf->h, argv[1], argv[0], 0);
_vm->_res->freeResource(flex);
}
return 0;