[Scummvm-cvs-logs] SF.net SVN: scummvm: [31266] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Thu Mar 27 16:32:21 CET 2008
Revision: 31266
http://scummvm.svn.sourceforge.net/scummvm/?rev=31266&view=rev
Author: lordhoto
Date: 2008-03-27 08:32:20 -0700 (Thu, 27 Mar 2008)
Log Message:
-----------
Fixed palette loading debug command for amiga version.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/debugger.cpp
scummvm/trunk/engines/kyra/screen.cpp
scummvm/trunk/engines/kyra/screen.h
Modified: scummvm/trunk/engines/kyra/debugger.cpp
===================================================================
--- scummvm/trunk/engines/kyra/debugger.cpp 2008-03-27 15:27:31 UTC (rev 31265)
+++ scummvm/trunk/engines/kyra/debugger.cpp 2008-03-27 15:32:20 UTC (rev 31266)
@@ -72,7 +72,7 @@
_vm->screen()->loadBitmap(argv[1], 5, 5, 0);
memcpy(palette, _vm->screen()->getCPagePtr(5), 768);
_vm->screen()->loadPageFromDisk("TEMP", 5);
- } else if (!_vm->resource()->loadFileToBuf(argv[1], palette, 768)) {
+ } else if (!_vm->screen()->loadPalette(argv[1], palette)) {
DebugPrintf("Palette '%s' not found!", argv[1]);
return true;
}
Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp 2008-03-27 15:27:31 UTC (rev 31265)
+++ scummvm/trunk/engines/kyra/screen.cpp 2008-03-27 15:32:20 UTC (rev 31266)
@@ -2688,10 +2688,12 @@
delete [] srcData;
}
-void Screen::loadPalette(const char *filename, uint8 *palData) {
+bool Screen::loadPalette(const char *filename, uint8 *palData) {
debugC(9, kDebugLevelScreen, "Screen::loadPalette('%s' %p)", filename, (void *)palData);
uint32 fileSize = 0;
uint8 *srcData = _vm->resource()->fileData(filename, &fileSize);
+ if (!srcData)
+ return false;
if (palData && fileSize) {
debugC(9, kDebugLevelScreen,"Loading a palette of size %u from '%s'", fileSize, filename);
@@ -2712,6 +2714,7 @@
}
}
delete [] srcData;
+ return true;
}
void Screen::loadPalette(const byte *data, uint8 *palData, int bytes) {
Modified: scummvm/trunk/engines/kyra/screen.h
===================================================================
--- scummvm/trunk/engines/kyra/screen.h 2008-03-27 15:27:31 UTC (rev 31265)
+++ scummvm/trunk/engines/kyra/screen.h 2008-03-27 15:32:20 UTC (rev 31266)
@@ -195,7 +195,7 @@
// misc
void loadBitmap(const char *filename, int tempPage, int dstPage, uint8 *palData);
- void loadPalette(const char *filename, uint8 *palData);
+ bool loadPalette(const char *filename, uint8 *palData);
void loadPalette(const byte *data, uint8 *palData, int bytes);
void setAnimBlockPtr(int size);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list