fix virtual calls from constructors

jdratlif · Sep 17, 2022 · fa45817 · fa45817
1 parent aa1e40b
commit fa45817
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 30 deletions.
diff --git a/source/model/gbggrawcode.cc b/source/model/gbggrawcode.cc
@@ -24,18 +24,11 @@
 
 using namespace ggencoder;
 
-GBGGRawCode::GBGGRawCode(int address, int value, int compare) {
-    setAddress(address);
-    setValue(value);
-    setCompare(compare);
-}
-
-GBGGRawCode::GBGGRawCode(int address, int value) {
-    setAddress(address);
-    setValue(value);
+GBGGRawCode::GBGGRawCode(int address, int value, int compare)
+    : RawCode{address & 0xFFFF, value & 0xFF}, CompareRawCode{compare} {}
 
-    compare = -1;
-}
+GBGGRawCode::GBGGRawCode(int address, int value)
+    : RawCode{address & 0xFFFF, value & 0xFF}, CompareRawCode{-1} {}
 
 void GBGGRawCode::setAddress(int address) {
     this->address = (address & 0xFFFF);

diff --git a/source/model/genesisrawcode.cc b/source/model/genesisrawcode.cc
@@ -24,10 +24,8 @@
 
 using namespace ggencoder;
 
-GenesisRawCode::GenesisRawCode(int address, int value) {
-    setAddress(address);
-    setValue(value);
-}
+GenesisRawCode::GenesisRawCode(int address, int value)
+    : RawCode{address & 0xFFFFFF, value & 0xFFFF} {}
 
 void GenesisRawCode::setAddress(int address) {
     this->address = (address & 0xFFFFFF);

diff --git a/source/model/nesrawcode.cc b/source/model/nesrawcode.cc
@@ -24,18 +24,11 @@
 
 using namespace ggencoder;
 
-NESRawCode::NESRawCode(int address, int value, int compare) {
-    setAddress(address);
-    setValue(value);
-    setCompare(compare);
-}
-
-NESRawCode::NESRawCode(int address, int value) {
-    setAddress(address);
-    setValue(value);
+NESRawCode::NESRawCode(int address, int value, int compare)
+    : RawCode{address & 0xFFFF, value & 0xFF}, CompareRawCode{compare} {}
 
-    compare = -1;
-}
+NESRawCode::NESRawCode(int address, int value)
+    : RawCode{address & 0xFFFF, value & 0xFF}, CompareRawCode{-1} {}
 
 void NESRawCode::setAddress(int address) {
     this->address = (address & 0xFFFF);

diff --git a/source/model/snesrawcode.cc b/source/model/snesrawcode.cc
@@ -24,10 +24,8 @@
 
 using namespace ggencoder;
 
-SNESRawCode::SNESRawCode(int address, int value) {
-    setAddress(address);
-    setValue(value);
-}
+SNESRawCode::SNESRawCode(int address, int value)
+    : RawCode{address & 0xFFFFFF, value & 0xFF} {}
 
 void SNESRawCode::setAddress(int address) {
     this->address = (address & 0xFFFFFF);