[Scummvm-cvs-logs] SF.net SVN: scummvm:[44946] scummvm/trunk/engines/kyra/script_lol.cpp
athrxx at users.sourceforge.net
athrxx at users.sourceforge.net
Sun Oct 11 22:29:38 CEST 2009
Revision: 44946
http://scummvm.svn.sourceforge.net/scummvm/?rev=44946&view=rev
Author: athrxx
Date: 2009-10-11 20:29:38 +0000 (Sun, 11 Oct 2009)
Log Message:
-----------
LOL/PC-98: cleanup
Modified Paths:
--------------
scummvm/trunk/engines/kyra/script_lol.cpp
Modified: scummvm/trunk/engines/kyra/script_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lol.cpp 2009-10-11 20:23:15 UTC (rev 44945)
+++ scummvm/trunk/engines/kyra/script_lol.cpp 2009-10-11 20:29:38 UTC (rev 44946)
@@ -2217,34 +2217,14 @@
Palette **tpal3 = &fadeTab[2];
Palette **tpal4 = 0;
- if (_flags.use16ColorMode) {
- const uint8 *s = _res->fileData("LITEPAL1.COL", 0);
- (*tpal1)->copy(s, 0, 16);
- delete[] s;
- } else {
- _screen->loadPalette("LITEPAL1.COL", **tpal1);
- }
-
+ int len = _flags.use16ColorMode ? 48 : 768;
+ _res->loadFileToBuf("LITEPAL1.COL", (*tpal1)->getData(), len);
tpal2 = _screen->generateFadeTable(tpal3, 0, *tpal1, 21);
- if (_flags.use16ColorMode) {
- const uint8 *s = _res->fileData("LITEPAL2.COL", 0);
- (*tpal2)->copy(s, 0, 16);
- delete[] s;
- } else {
- _screen->loadPalette("LITEPAL2.COL", **tpal2);
- }
-
+ _res->loadFileToBuf("LITEPAL2.COL", (*tpal2)->getData(), len);
tpal4 = tpal2++;
- if (_flags.use16ColorMode) {
- const uint8 *s = _res->fileData("LITEPAL3.COL", 0);
- (*tpal1)->copy(s, 0, 16);
- delete[] s;
- } else {
- _screen->loadPalette("LITEPAL3.COL", **tpal1);
- }
-
+ _res->loadFileToBuf("LITEPAL3.COL", (*tpal1)->getData(), len);
_screen->generateFadeTable(tpal2, *tpal4, *tpal1, 4);
for (int i = 0; i < 21; i++) {
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