aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorMatthew Hoops2012-05-25 00:21:51 -0400
committerMatthew Hoops2012-05-25 00:35:38 -0400
commitf1f6a82cd57fceb52afdd393f44a80c40f3c9a15 (patch)
tree06a04072df44bd5f337ff79b43684d8109a72f59 /engines/scumm
parentb2506abccf6aa64da31b497b45fe0e1949530053 (diff)
parentbeef27fc10bb714fe37f2ee0c35cd143dc706829 (diff)
downloadscummvm-rg350-f1f6a82cd57fceb52afdd393f44a80c40f3c9a15.tar.gz
scummvm-rg350-f1f6a82cd57fceb52afdd393f44a80c40f3c9a15.tar.bz2
scummvm-rg350-f1f6a82cd57fceb52afdd393f44a80c40f3c9a15.zip
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/he/resource_he.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp
index 42748d08ed..ce4b2239d2 100644
--- a/engines/scumm/he/resource_he.cpp
+++ b/engines/scumm/he/resource_he.cpp
@@ -129,7 +129,7 @@ bool Win32ResExtractor::extractResource(int id, CachedCursor *cc) {
if (!group)
return false;
- Graphics::WinCursor *cursor = group->cursors[0].cursor;
+ Graphics::Cursor *cursor = group->cursors[0].cursor;
cc->bitmap = new byte[cursor->getWidth() * cursor->getHeight()];
cc->width = cursor->getWidth();