aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2016-03-11 07:30:15 +0200
committerFilippos Karapetis2016-03-11 07:30:15 +0200
commit48b53aa4c6aa01ec113fa0342eb77bc3f0c3abbe (patch)
treed4efb81385a7aea1af12ce99fb7155a6879b618c
parentea52dc498c4b079b52ec507f46ed502b015e0310 (diff)
downloadscummvm-rg350-48b53aa4c6aa01ec113fa0342eb77bc3f0c3abbe.tar.gz
scummvm-rg350-48b53aa4c6aa01ec113fa0342eb77bc3f0c3abbe.tar.bz2
scummvm-rg350-48b53aa4c6aa01ec113fa0342eb77bc3f0c3abbe.zip
SCI32: Avoid usage of delegated constructors
Although this feature reduces code duplication, GCC throws the following: "warning: delegating constructors only available with -std=c++11 or -std=gnu++11".
-rw-r--r--engines/sci/graphics/remap.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/engines/sci/graphics/remap.h b/engines/sci/graphics/remap.h
index 7ee9962ba3..eb7718d507 100644
--- a/engines/sci/graphics/remap.h
+++ b/engines/sci/graphics/remap.h
@@ -85,7 +85,17 @@ struct RemapParams {
byte remap[256];
bool colorChanged[256];
- RemapParams() : RemapParams(0, 0, 0, 0, 100, kRemappingNone) {
+ RemapParams() {
+ from = to = base = gray = oldGray = percent = oldPercent = 0;
+ type = kRemappingNone;
+
+ // curColor and targetColor are initialized in GfxRemap32::initColorArrays
+ memset(curColor, 0, 256 * sizeof(Color));
+ memset(targetColor, 0, 256 * sizeof(Color));
+ memset(distance, 0, 256);
+ for (int i = 0; i < 236; i++)
+ remap[i] = i;
+ memset(colorChanged, true, 256);
}
RemapParams(byte from_, byte to_, byte base_, byte gray_, byte percent_, ColorRemappingType type_) {