[Scummvm-cvs-logs] SF.net SVN: scummvm:[35910] scummvm/trunk
athrxx at users.sourceforge.net
athrxx at users.sourceforge.net
Sun Jan 18 19:20:33 CET 2009
Revision: 35910
http://scummvm.svn.sourceforge.net/scummvm/?rev=35910&view=rev
Author: athrxx
Date: 2009-01-18 18:20:33 +0000 (Sun, 18 Jan 2009)
Log Message:
-----------
LOL: fix some valgrind warnings
Modified Paths:
--------------
scummvm/trunk/dists/engine-data/kyra.dat
scummvm/trunk/engines/kyra/gui_lol.cpp
scummvm/trunk/engines/kyra/lol.cpp
scummvm/trunk/engines/kyra/lol.h
scummvm/trunk/engines/kyra/resource.h
scummvm/trunk/engines/kyra/scene_lol.cpp
scummvm/trunk/engines/kyra/staticres.cpp
scummvm/trunk/tools/create_kyradat/create_kyradat.cpp
scummvm/trunk/tools/create_kyradat/create_kyradat.h
scummvm/trunk/tools/create_kyradat/lol_cd.h
scummvm/trunk/tools/create_kyradat/misc.h
Modified: scummvm/trunk/dists/engine-data/kyra.dat
===================================================================
(Binary files differ)
Modified: scummvm/trunk/engines/kyra/gui_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.cpp 2009-01-18 17:42:46 UTC (rev 35909)
+++ scummvm/trunk/engines/kyra/gui_lol.cpp 2009-01-18 18:20:33 UTC (rev 35910)
@@ -150,10 +150,12 @@
_screen->printText(getLangString(0x4254), 39, 1, 152, 0);
int spellLevels = 0;
- for (int i = 0; i < 4; i++) {
- if (_spellProperties[_availableSpells[_selectedSpell]].mpRequired[i] <= _characters[charNum].magicPointsCur &&
- _spellProperties[_availableSpells[_selectedSpell] + 1].unkArr[i] <= _characters[charNum].hitPointsCur)
- spellLevels++;
+ if (_availableSpells[_selectedSpell] != -1) {
+ for (int i = 0; i < 4; i++) {
+ if (_spellProperties[_availableSpells[_selectedSpell]].mpRequired[i] <= _characters[charNum].magicPointsCur &&
+ _spellProperties[_availableSpells[_selectedSpell] + 1].unkArr[i] <= _characters[charNum].hitPointsCur)
+ spellLevels++;
+ }
}
if (_characters[charNum].flags & 0x10) {
Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp 2009-01-18 17:42:46 UTC (rev 35909)
+++ scummvm/trunk/engines/kyra/lol.cpp 2009-01-18 18:20:33 UTC (rev 35910)
@@ -137,7 +137,7 @@
_dscDoorShpIndex = 0;
_dscDim1 = 0;
_dscDim2 = 0;
- _dscBlockMap = _dscDoor1 = _dscDoor2 = _dscShapeOvlIndex = 0;
+ _dscBlockMap = _dscDoor1 = _dscShapeOvlIndex = 0;
_dscBlockIndex = 0;
_dscDimMap = 0;
_dscDoorX = _dscDoorY = 0;
Modified: scummvm/trunk/engines/kyra/lol.h
===================================================================
--- scummvm/trunk/engines/kyra/lol.h 2009-01-18 17:42:46 UTC (rev 35909)
+++ scummvm/trunk/engines/kyra/lol.h 2009-01-18 18:20:33 UTC (rev 35910)
@@ -575,8 +575,6 @@
int _dscBlockMapSize;
const uint8 *_dscDimMap;
int _dscDimMapSize;
- const uint8 *_dscDoor2;
- int _dscDoor2Size;
const uint16 *_dscDoorScaleTable;
int _dscDoorScaleTableSize;
const uint16 *_dscDoor4;
Modified: scummvm/trunk/engines/kyra/resource.h
===================================================================
--- scummvm/trunk/engines/kyra/resource.h 2009-01-18 17:42:46 UTC (rev 35909)
+++ scummvm/trunk/engines/kyra/resource.h 2009-01-18 18:20:33 UTC (rev 35910)
@@ -237,7 +237,6 @@
lolDscBlockMap,
lolDscDimMap,
lolDscDoor1,
- lolDscDoor2,
lolDscDoorScale,
lolDscDoor4,
lolDscDoorX,
Modified: scummvm/trunk/engines/kyra/scene_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_lol.cpp 2009-01-18 17:42:46 UTC (rev 35909)
+++ scummvm/trunk/engines/kyra/scene_lol.cpp 2009-01-18 18:20:33 UTC (rev 35910)
@@ -1209,7 +1209,7 @@
uint16 scaleH = _dscShapeScaleH[s];
int8 ix = _dscShapeIndex[s];
uint8 shpIx = ABS(ix);
- uint8 ovlIndex = _dscShapeOvlIndex[_dscDimMap[index] * 5] + 2;
+ uint8 ovlIndex = _dscShapeOvlIndex[4 + _dscDimMap[index] * 5] + 2;
if (ovlIndex > 7)
ovlIndex = 7;
@@ -1290,7 +1290,7 @@
void LoLEngine::drawDoor(uint8 *shape, uint8 *table, int index, int unk2, int w, int h, int flags) {
uint8 c = _dscDoor1[(_unkPara2 << 5) + unk2];
int r = (c / 5) + 5 * _dscDimMap[index];
- uint16 d = _dscDoor2[r];
+ uint16 d = _dscShapeOvlIndex[r];
uint16 t = (index << 5) + c;
_shpDoorY = _dscDoorY[t] + 120;
Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp 2009-01-18 17:42:46 UTC (rev 35909)
+++ scummvm/trunk/engines/kyra/staticres.cpp 2009-01-18 18:20:33 UTC (rev 35910)
@@ -43,7 +43,7 @@
namespace Kyra {
-#define RESFILE_VERSION 33
+#define RESFILE_VERSION 34
namespace {
bool checkKyraDat(Common::SeekableReadStream *file) {
@@ -394,7 +394,6 @@
{ lolDscBlockMap, kRawData, "DSCBLOCK1.DEF" },
{ lolDscDimMap, kRawData, "DSCDIM.DEF" },
{ lolDscDoorScale, lolRawDataBe16, "DSCDOOR3.DEF" },
- { lolDscDoor2, kRawData, "DSCDOOR2.DEF" },
{ lolDscDoor4, lolRawDataBe16, "DSCDOOR4.DEF" },
{ lolDscOvlIndex, kRawData, "DSCBLOCK2.DEF" },
{ lolDscBlockIndex, kRawData, "DSCBLOCKX.DEF" },
@@ -1652,7 +1651,6 @@
_dscBlockMap = _staticres->loadRawData(lolDscBlockMap, _dscBlockMapSize);
_dscDimMap = _staticres->loadRawData(lolDscDimMap, _dscDimMapSize);
_dscDoorScaleTable = (const uint16 *)_staticres->loadRawDataBe16(lolDscDoorScale, _dscDoorScaleTableSize);
- _dscDoor2 = _staticres->loadRawData(lolDscDoor2, _dscDoor2Size);
_dscShapeOvlIndex = _staticres->loadRawData(lolDscOvlIndex, _dscShapeOvlIndexSize);
_dscDoor4 = (const uint16 *)_staticres->loadRawDataBe16(lolDscDoor4, _dscDoor4Size);
_dscBlockIndex = (const int8 *)_staticres->loadRawData(lolDscBlockIndex, _dscBlockIndexSize);
Modified: scummvm/trunk/tools/create_kyradat/create_kyradat.cpp
===================================================================
--- scummvm/trunk/tools/create_kyradat/create_kyradat.cpp 2009-01-18 17:42:46 UTC (rev 35909)
+++ scummvm/trunk/tools/create_kyradat/create_kyradat.cpp 2009-01-18 18:20:33 UTC (rev 35910)
@@ -31,7 +31,7 @@
#include "md5.h"
enum {
- kKyraDatVersion = 33,
+ kKyraDatVersion = 34,
kIndexSize = 12
};
@@ -289,7 +289,6 @@
{ lolDscBlockMap, kTypeRawData, "DSCBLOCK1.DEF" },
{ lolDscDimMap, kTypeRawData, "DSCDIM.DEF" },
{ lolDscDoorScale, lolTypeRaw16, "DSCDOOR3.DEF" },
- { lolDscDoor2, k3TypeRaw16to8, "DSCDOOR2.DEF" },
{ lolDscShapeOvlIndex, k3TypeRaw16to8, "DSCBLOCK2.DEF" },
{ lolDscBlockIndex, kTypeRawData, "DSCBLOCKX.DEF" },
{ lolDscDoor4, lolTypeRaw16, "DSCDOOR4.DEF" },
Modified: scummvm/trunk/tools/create_kyradat/create_kyradat.h
===================================================================
--- scummvm/trunk/tools/create_kyradat/create_kyradat.h 2009-01-18 17:42:46 UTC (rev 35909)
+++ scummvm/trunk/tools/create_kyradat/create_kyradat.h 2009-01-18 18:20:33 UTC (rev 35910)
@@ -204,7 +204,6 @@
lolDscShapeOvlIndex,
lolDscBlockIndex,
lolDscDoor1,
- lolDscDoor2,
lolDscDoorScale,
lolDscDoor4,
lolDscDoorX,
Modified: scummvm/trunk/tools/create_kyradat/lol_cd.h
===================================================================
--- scummvm/trunk/tools/create_kyradat/lol_cd.h 2009-01-18 17:42:46 UTC (rev 35909)
+++ scummvm/trunk/tools/create_kyradat/lol_cd.h 2009-01-18 18:20:33 UTC (rev 35910)
@@ -25,8 +25,7 @@
{ lolDscBlockMap, 0x00031B64, 0x00031B70 },
{ lolDscDimMap, 0x00031B70, 0x00031B82 },
{ lolDscDoorScale, 0x00031B82, 0x00031B92 },
- { lolDscDoor2, 0x00031B92, 0x00031B9A },
- { lolDscShapeOvlIndex, 0x00031B9A, 0x00031BBA },
+ { lolDscShapeOvlIndex, 0x00031B92, 0x00031BBA },
{ lolDscDoor4, 0x00031BBA, 0x00031BC2 },
{ lolDscBlockIndex, 0x00033B53, 0x00033B9B },
{ lolDscDoor1, 0x0002B550, 0x0002B5D0 },
Modified: scummvm/trunk/tools/create_kyradat/misc.h
===================================================================
--- scummvm/trunk/tools/create_kyradat/misc.h 2009-01-18 17:42:46 UTC (rev 35909)
+++ scummvm/trunk/tools/create_kyradat/misc.h 2009-01-18 18:20:33 UTC (rev 35910)
@@ -506,11 +506,9 @@
lolDscDimData2,
lolDscBlockMap,
lolDscDimMap,
- lolDscDoor2,
lolDscShapeOvlIndex,
lolDscBlockIndex,
lolDscDoor1,
- lolDscDoor2,
lolDscDoorScale,
lolDscDoor4,
lolDscDoorX,
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