[Scummvm-cvs-logs] scummvm master -> 0b71a296e38f9717e5477f473b72674da64bb0e1

dreammaster dreammaster at scummvm.org
Tue Aug 4 01:51:36 CEST 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0b71a296e3 SHERLOCK: RT: Fix GCC complaint about nullptr type casting


Commit: 0b71a296e38f9717e5477f473b72674da64bb0e1
    https://github.com/scummvm/scummvm/commit/0b71a296e38f9717e5477f473b72674da64bb0e1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-03T19:50:43-04:00

Commit Message:
SHERLOCK: RT: Fix GCC complaint about nullptr type casting

Changed paths:
    engines/sherlock/tattoo/widget_foolscap.cpp



diff --git a/engines/sherlock/tattoo/widget_foolscap.cpp b/engines/sherlock/tattoo/widget_foolscap.cpp
index 0ec7fb2..8246e9a 100644
--- a/engines/sherlock/tattoo/widget_foolscap.cpp
+++ b/engines/sherlock/tattoo/widget_foolscap.cpp
@@ -31,9 +31,10 @@ namespace Sherlock {
 namespace Tattoo {
 
 WidgetFoolscap::WidgetFoolscap(TattooEngine *vm) : WidgetBase(vm) {
-	for (int idx = 0; idx < 3; ++idx)
+	for (int idx = 0; idx < 3; ++idx) {
 		Common::fill(&_answers[idx][0], &_answers[idx][10], 0);
-	Common::fill(&_solutions[0], &_solutions[3], nullptr);
+		_solutions[idx] = nullptr;
+	}
 	_images = nullptr;
 	_numWide = 0;
 	_spacing = 0;






More information about the Scummvm-git-logs mailing list