thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCUMM: Use nullptr

Browse source 
Using clang-tidy modernize-use-nullptr
This commit is contained in:
Orgad Shaneh 2021-11-13 23:40:38 +02:00 • committed by Filippos Karapetis
parent 940c7bfc14
commit ed5489929c
71 changed files with 664 additions and 664 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/scumm/string.cpp
View file

@ -644,7 +644,7 @@ void ScummEngine::CHARSET_1() {
return;
}
a = NULL;
a = nullptr;
if (getTalkingActor() != 0xFF)
a = derefActorSafe(getTalkingActor(), "CHARSET_1");
@ -1107,13 +1107,13 @@ void ScummEngine::drawString(int a, const byte *msg) {
if (_game.version >= 4) {
// trim from the right
byte *tmp = buf;
space = NULL;
space = nullptr;
while (*tmp) {
if (*tmp == ' ') {
if (!space)
space = tmp;
} else {
space = NULL;
space = nullptr;
}
tmp++;
}
@ -1246,7 +1246,7 @@ int ScummEngine::convertMessageToString(const byte *msg, byte *dst, int dstSize)
start = dst;
end = dst + dstSize;
if (msg == NULL) {
if (msg == nullptr) {
debug(0, "Bad message in convertMessageToString, ignoring");
return 0;
}