aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2014-03-15 13:36:35 +0100
committerStrangerke2014-03-15 13:36:35 +0100
commit7363009cd50175d4651bca306c7edfbc18830ca4 (patch)
tree99a1035fd353a35ec8a6a3e376b844de027d20b0
parentf30246187ec7eff903501ba4902ad5f89aaa3f60 (diff)
downloadscummvm-rg350-7363009cd50175d4651bca306c7edfbc18830ca4.tar.gz
scummvm-rg350-7363009cd50175d4651bca306c7edfbc18830ca4.tar.bz2
scummvm-rg350-7363009cd50175d4651bca306c7edfbc18830ca4.zip
TUCKER: Initialize some more pointers with nullptr instead of 0
-rw-r--r--engines/tucker/resource.cpp4
-rw-r--r--engines/tucker/sequences.cpp2
-rw-r--r--engines/tucker/tucker.cpp8
3 files changed, 7 insertions, 7 deletions
diff --git a/engines/tucker/resource.cpp b/engines/tucker/resource.cpp
index c8ed0737f9..5f06334720 100644
--- a/engines/tucker/resource.cpp
+++ b/engines/tucker/resource.cpp
@@ -127,7 +127,7 @@ public:
}
bool findNextToken(DataToken t) {
- const char *token = 0;
+ const char *token = nullptr;
switch (t) {
case kDataTokenDw:
token = "dw";
@@ -924,7 +924,7 @@ void TuckerEngine::loadSound(Audio::Mixer::SoundType type, int num, int volume,
return;
}
if (!stream) {
- const char *fmt = 0;
+ const char *fmt = nullptr;
switch (type) {
case Audio::Mixer::kSFXSoundType:
fmt = "fx/fx%d.wav";
diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp
index b82bb9ca5c..137f58dac5 100644
--- a/engines/tucker/sequences.cpp
+++ b/engines/tucker/sequences.cpp
@@ -736,7 +736,7 @@ void AnimationSequencePlayer::unloadAnimation() {
}
uint8 *AnimationSequencePlayer::loadPicture(const char *fileName) {
- uint8 *p = 0;
+ uint8 *p = nullptr;
Common::File f;
if (f.open(fileName)) {
const int sz = f.size();
diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index 64908bdb5c..e920ebe7ea 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -1842,8 +1842,8 @@ void TuckerEngine::redrawPanelItems() {
--_redrawPanelItemsCounter;
}
- const uint8 *src = 0;
- uint8 *dst = 0;
+ const uint8 *src = nullptr;
+ uint8 *dst = nullptr;
int sz = 0;
switch (_panelState) {
@@ -1945,7 +1945,7 @@ void TuckerEngine::drawPausedInfoBar() {
}
const uint8 *TuckerEngine::getStringBuf(int type) const {
- const uint8 *p = 0;
+ const uint8 *p = nullptr;
switch (type) {
case 0:
p = _data5Buf;
@@ -3103,7 +3103,7 @@ int TuckerEngine::readTableInstructionParam(int len) {
++_tableInstructionsPtr;
--len;
}
- char *end = 0;
+ char *end = nullptr;
const int param = strtol((const char *)_tableInstructionsPtr, &end, 10);
if (end != (const char *)_tableInstructionsPtr + len) {
warning("Unexpected instruction parameter length %d (%d)", (int)(end - (const char *)_tableInstructionsPtr), len);