[Scummvm-cvs-logs] scummvm master -> b8eaefbf8a7d5e428c2eb9761d176e8f03e39994
bluegr
bluegr at gmail.com
Wed May 1 00:52:46 CEST 2013
This automated email contains information about 9 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
619baf67ae SCI: Initialize some members of GfxPaint16 - CID 1010057
2d90cc4ac3 SCI: Fix a non-initialized variable in GfxMenu - CID 1003110
abef7f64bd SCI: Fix a non-initialized variable in MessageReader - CID 1003120
70f1c4d315 SCI: Fix a non-initialized variable in MessageState - CID 1003119
66fce6d156 SCI: Fix some non-initialized variables in SegManager - CID 1003116
3012aaa14f SCI: Fix a non-initialized variable in GfxControls16 - CID 1003114
012a5ef040 SCI: Fix a non-initialized variable in GfxCursor - CID 1003112
5b25c40c40 SCI: Fix a non-initialized variable in GfxScreen - CID 1003105
b8eaefbf8a SCI: Silence some false positive warnings - CID 1003539, 1003540, 1003541, 1003542
Commit: 619baf67aebdf64981dd58040094eeb3def4a106
https://github.com/scummvm/scummvm/commit/619baf67aebdf64981dd58040094eeb3def4a106
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-04-30T15:51:10-07:00
Commit Message:
SCI: Initialize some members of GfxPaint16 - CID 1010057
Changed paths:
engines/sci/graphics/paint16.cpp
diff --git a/engines/sci/graphics/paint16.cpp b/engines/sci/graphics/paint16.cpp
index 25b373a..940a1ac 100644
--- a/engines/sci/graphics/paint16.cpp
+++ b/engines/sci/graphics/paint16.cpp
@@ -42,7 +42,13 @@
namespace Sci {
GfxPaint16::GfxPaint16(ResourceManager *resMan, SegManager *segMan, GfxCache *cache, GfxPorts *ports, GfxCoordAdjuster *coordAdjuster, GfxScreen *screen, GfxPalette *palette, GfxTransitions *transitions, AudioPlayer *audio)
- : _resMan(resMan), _segMan(segMan), _cache(cache), _ports(ports), _coordAdjuster(coordAdjuster), _screen(screen), _palette(palette), _transitions(transitions), _audio(audio) {
+ : _resMan(resMan), _segMan(segMan), _cache(cache), _ports(ports),
+ _coordAdjuster(coordAdjuster), _screen(screen), _palette(palette),
+ _transitions(transitions), _audio(audio), _EGAdrawingVisualize(false) {
+
+ // _animate and _text16 will be initialized later on
+ _animate = NULL;
+ _text16 = NULL;
}
GfxPaint16::~GfxPaint16() {
@@ -51,8 +57,6 @@ GfxPaint16::~GfxPaint16() {
void GfxPaint16::init(GfxAnimate *animate, GfxText16 *text16) {
_animate = animate;
_text16 = text16;
-
- _EGAdrawingVisualize = false;
}
void GfxPaint16::debugSetEGAdrawingVisualize(bool state) {
Commit: 2d90cc4ac32c1298742a224ba7afb1a87ab5c48d
https://github.com/scummvm/scummvm/commit/2d90cc4ac32c1298742a224ba7afb1a87ab5c48d
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-04-30T15:51:11-07:00
Commit Message:
SCI: Fix a non-initialized variable in GfxMenu - CID 1003110
Changed paths:
engines/sci/graphics/menu.cpp
diff --git a/engines/sci/graphics/menu.cpp b/engines/sci/graphics/menu.cpp
index e5b7347..d2416ab 100644
--- a/engines/sci/graphics/menu.cpp
+++ b/engines/sci/graphics/menu.cpp
@@ -46,6 +46,7 @@ GfxMenu::GfxMenu(EventManager *event, SegManager *segMan, GfxPorts *ports, GfxPa
_menuSaveHandle = NULL_REG;
_barSaveHandle = NULL_REG;
_oldPort = NULL;
+ _mouseOldState = false;
reset();
}
Commit: abef7f64bdeea54b254acb16055f903da76380f5
https://github.com/scummvm/scummvm/commit/abef7f64bdeea54b254acb16055f903da76380f5
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-04-30T15:51:11-07:00
Commit Message:
SCI: Fix a non-initialized variable in MessageReader - CID 1003120
Changed paths:
engines/sci/engine/message.cpp
diff --git a/engines/sci/engine/message.cpp b/engines/sci/engine/message.cpp
index 49be25d..8c5741f 100644
--- a/engines/sci/engine/message.cpp
+++ b/engines/sci/engine/message.cpp
@@ -56,7 +56,7 @@ public:
protected:
MessageReader(const byte *data, uint size, uint headerSize, uint recordSize)
- : _data(data), _size(size), _headerSize(headerSize), _recordSize(recordSize) { }
+ : _data(data), _size(size), _headerSize(headerSize), _recordSize(recordSize), _messageCount(0) { }
const byte *_data;
const uint _size;
Commit: 70f1c4d3159f54a9e3246696dce4cf5cbb468c7d
https://github.com/scummvm/scummvm/commit/70f1c4d3159f54a9e3246696dce4cf5cbb468c7d
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-04-30T15:51:11-07:00
Commit Message:
SCI: Fix a non-initialized variable in MessageState - CID 1003119
Changed paths:
engines/sci/engine/message.h
diff --git a/engines/sci/engine/message.h b/engines/sci/engine/message.h
index 4444ede..5bead82 100644
--- a/engines/sci/engine/message.h
+++ b/engines/sci/engine/message.h
@@ -60,7 +60,7 @@ typedef Common::Stack<CursorStack> CursorStackStack;
class MessageState {
public:
- MessageState(SegManager *segMan) : _segMan(segMan) { }
+ MessageState(SegManager *segMan) : _segMan(segMan), _lastReturnedModule(0) { }
int getMessage(int module, MessageTuple &t, reg_t buf);
int nextMessage(reg_t buf);
int messageSize(int module, MessageTuple &t);
Commit: 66fce6d15608670c0cc957af9c1f7158af39fa71
https://github.com/scummvm/scummvm/commit/66fce6d15608670c0cc957af9c1f7158af39fa71
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-04-30T15:51:11-07:00
Commit Message:
SCI: Fix some non-initialized variables in SegManager - CID 1003116
Changed paths:
engines/sci/engine/seg_manager.cpp
diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp
index 04c1dab..97e33f2 100644
--- a/engines/sci/engine/seg_manager.cpp
+++ b/engines/sci/engine/seg_manager.cpp
@@ -36,6 +36,9 @@ SegManager::SegManager(ResourceManager *resMan) {
_nodesSegId = 0;
_hunksSegId = 0;
+ _saveDirPtr = NULL_REG;
+ _parserPtr = NULL_REG;
+
#ifdef ENABLE_SCI32
_arraysSegId = 0;
_stringSegId = 0;
Commit: 3012aaa14f2fb4db2139214e9a7a838913ed9a6b
https://github.com/scummvm/scummvm/commit/3012aaa14f2fb4db2139214e9a7a838913ed9a6b
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-04-30T15:51:11-07:00
Commit Message:
SCI: Fix a non-initialized variable in GfxControls16 - CID 1003114
Changed paths:
engines/sci/graphics/controls16.cpp
engines/sci/graphics/controls16.h
diff --git a/engines/sci/graphics/controls16.cpp b/engines/sci/graphics/controls16.cpp
index 7c09969..0098f7b 100644
--- a/engines/sci/graphics/controls16.cpp
+++ b/engines/sci/graphics/controls16.cpp
@@ -42,16 +42,13 @@ namespace Sci {
GfxControls16::GfxControls16(SegManager *segMan, GfxPorts *ports, GfxPaint16 *paint16, GfxText16 *text16, GfxScreen *screen)
: _segMan(segMan), _ports(ports), _paint16(paint16), _text16(text16), _screen(screen) {
- init();
+ _texteditBlinkTime = 0;
+ _texteditCursorVisible = false;
}
GfxControls16::~GfxControls16() {
}
-void GfxControls16::init() {
- _texteditCursorVisible = false;
-}
-
const char controlListUpArrow[2] = { 0x18, 0 };
const char controlListDownArrow[2] = { 0x19, 0 };
diff --git a/engines/sci/graphics/controls16.h b/engines/sci/graphics/controls16.h
index 90bd7be..2cde86d 100644
--- a/engines/sci/graphics/controls16.h
+++ b/engines/sci/graphics/controls16.h
@@ -63,7 +63,6 @@ public:
void kernelTexteditChange(reg_t controlObject, reg_t eventObject);
private:
- void init();
void texteditSetBlinkTime();
void drawListControl(Common::Rect rect, reg_t obj, int16 maxChars, int16 count, const char **entries, GuiResourceId fontId, int16 upperPos, int16 cursorPos, bool isAlias);
Commit: 012a5ef040d32312a0626fe0be6dbdaf1a2424e4
https://github.com/scummvm/scummvm/commit/012a5ef040d32312a0626fe0be6dbdaf1a2424e4
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-04-30T15:51:12-07:00
Commit Message:
SCI: Fix a non-initialized variable in GfxCursor - CID 1003112
Changed paths:
engines/sci/graphics/cursor.cpp
diff --git a/engines/sci/graphics/cursor.cpp b/engines/sci/graphics/cursor.cpp
index 6b986ce..a9c7416 100644
--- a/engines/sci/graphics/cursor.cpp
+++ b/engines/sci/graphics/cursor.cpp
@@ -69,6 +69,10 @@ GfxCursor::GfxCursor(ResourceManager *resMan, GfxPalette *palette, GfxScreen *sc
_useSilverSQ4CDCursors = ConfMan.getBool("silver_cursors");
else
_useSilverSQ4CDCursors = false;
+
+ // _coordAdjuster and _event will be initialized later on
+ _coordAdjuster = NULL;
+ _event = NULL;
}
GfxCursor::~GfxCursor() {
Commit: 5b25c40c4041538f7e050211039b81af8cf77eba
https://github.com/scummvm/scummvm/commit/5b25c40c4041538f7e050211039b81af8cf77eba
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-04-30T15:51:12-07:00
Commit Message:
SCI: Fix a non-initialized variable in GfxScreen - CID 1003105
Changed paths:
engines/sci/graphics/screen.cpp
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index 246b6bf..74503c0 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -115,6 +115,8 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) {
_controlScreen = (byte *)calloc(_pixels, 1);
_displayScreen = (byte *)calloc(_displayPixels, 1);
+ memset(&_ditheredPicColors, 0, sizeof(_ditheredPicColors));
+
// Sets display screen to be actually displayed
_activeScreen = _displayScreen;
Commit: b8eaefbf8a7d5e428c2eb9761d176e8f03e39994
https://github.com/scummvm/scummvm/commit/b8eaefbf8a7d5e428c2eb9761d176e8f03e39994
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-04-30T15:51:12-07:00
Commit Message:
SCI: Silence some false positive warnings - CID 1003539, 1003540, 1003541, 1003542
Changed paths:
engines/sci/sound/drivers/adlib.cpp
engines/sci/sound/drivers/cms.cpp
engines/sci/sound/drivers/fb01.cpp
diff --git a/engines/sci/sound/drivers/adlib.cpp b/engines/sci/sound/drivers/adlib.cpp
index 191e13d..3229fd7 100644
--- a/engines/sci/sound/drivers/adlib.cpp
+++ b/engines/sci/sound/drivers/adlib.cpp
@@ -512,7 +512,7 @@ int MidiDriver_AdLib::findVoiceBasic(int channel) {
}
if (voice == -1) {
- if (oldestVoice != -1) {
+ if (oldestVoice >= 0) {
voiceOff(oldestVoice);
voice = oldestVoice;
} else {
@@ -550,7 +550,7 @@ int MidiDriver_AdLib::findVoice(int channel) {
}
if (voice == -1) {
- if (oldestVoice != -1) {
+ if (oldestVoice >= 0) {
voiceOff(oldestVoice);
voice = oldestVoice;
} else {
diff --git a/engines/sci/sound/drivers/cms.cpp b/engines/sci/sound/drivers/cms.cpp
index dbcbf3d..fd60863 100644
--- a/engines/sci/sound/drivers/cms.cpp
+++ b/engines/sci/sound/drivers/cms.cpp
@@ -422,7 +422,7 @@ int MidiDriver_CMS::findVoiceBasic(int channel) {
}
if (voice == -1) {
- if (oldestVoice != -1) {
+ if (oldestVoice >= 0) {
voiceOff(oldestVoice);
voice = oldestVoice;
} else {
diff --git a/engines/sci/sound/drivers/fb01.cpp b/engines/sci/sound/drivers/fb01.cpp
index 9f3945b..b16473e 100644
--- a/engines/sci/sound/drivers/fb01.cpp
+++ b/engines/sci/sound/drivers/fb01.cpp
@@ -250,7 +250,7 @@ int MidiPlayer_Fb01::findVoice(int channel) {
}
if (voice == -1) {
- if (oldestVoice != -1) {
+ if (oldestVoice >= 0) {
voiceOff(oldestVoice);
voice = oldestVoice;
} else {
More information about the Scummvm-git-logs
mailing list