libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-02 08:19:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clean up

Browse Source 
svn-id: r17104
This commit is contained in:
Max Horn 2005-03-12 18:02:19 +00:00
parent 848a6bcaea
commit 65551ca83e
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scumm/resource_v7he.cpp
View File

@ -99,33 +99,27 @@ Win32ResExtractor::CachedCursor *Win32ResExtractor::getCachedCursorSlot() {
void Win32ResExtractor::setCursor(int id) {
char buf[20];
byte *cursorRes = 0, *cursor = 0;
byte *cursorRes = 0;
int cursorsize;
int w = 0, h = 0, hotspot_x = 0, hotspot_y = 0, keycolor = 0;
int keycolor = 0;
CachedCursor *cc = findCachedCursor(id);
if (cc != NULL) {
debug(7, "Found cursor %d in cache slot %d", id, cc - _cursorCache);
_vm->setCursorHotspot(cc->hotspot_x, cc->hotspot_y);
_vm->setCursorFromBuffer(cc->bitmap, cc->w, cc->h, cc->w);
} else {
snprintf(buf, 20, "%d", id);
cursorsize = extractResource("group_cursor", buf, &cursorRes);
convertIcons(cursorRes, cursorsize, &cursor, &w, &h, &hotspot_x, &hotspot_y, &keycolor);
snprintf(buf, sizeof(buf), "%d", id);
cc = getCachedCursorSlot();
assert(cc && !cc->valid);
cursorsize = extractResource("group_cursor", buf, &cursorRes);
convertIcons(cursorRes, cursorsize, &cc->bitmap, &cc->w, &cc->h, &cc->hotspot_x, &cc->hotspot_y, &keycolor);
debug(7, "Adding cursor %d to cache slot %d", id, cc - _cursorCache);
_vm->setCursorHotspot(hotspot_x, hotspot_y);
_vm->setCursorFromBuffer(cursor, w, h, w);
free(cursorRes);
cc->valid = true;
cc->id = id;
cc->bitmap = cursor;
cc->w = w;
cc->h = h;
cc->hotspot_x = hotspot_x;
cc->hotspot_y = hotspot_y;
cc->last_used = g_system->getMillis();
}
_vm->setCursorHotspot(cc->hotspot_x, cc->hotspot_y);
_vm->setCursorFromBuffer(cc->bitmap, cc->w, cc->h, cc->w);
}
int Win32ResExtractor::extractResource(const char *resType, char *resName, byte **data) {