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

48
engines/scumm/object.cpp
View file

@ -203,7 +203,7 @@ void ScummEngine::clearOwnerOf(int obj) {
// FIXME FIXME FIXME: This is incomplete, as we do not touch flags, status... BUG
_res->_types[rtInventory][i]._address = _res->_types[rtInventory][i + 1]._address;
_res->_types[rtInventory][i]._size = _res->_types[rtInventory][i + 1]._size;
_res->_types[rtInventory][i + 1]._address = NULL;
_res->_types[rtInventory][i + 1]._address = nullptr;
_res->_types[rtInventory][i + 1]._size = 0;
}
}
@ -481,8 +481,8 @@ int ScummEngine::getDist(int x, int y, int x2, int y2) {
int ScummEngine::getObjActToObjActDist(int a, int b) {
int x, y, x2, y2;
Actor *acta = NULL;
Actor *actb = NULL;
Actor *acta = nullptr;
Actor *actb = nullptr;
if (objIsActor(a))
acta = derefActorSafe(objToActor(a), "getObjActToObjActDist");
@ -775,7 +775,7 @@ void ScummEngine::resetRoomObjects() {
od = &_objs[findLocalObjectSlot()];
ptr = obcds.findNext(MKTAG('O','B','C','D'));
if (ptr == NULL)
if (ptr == nullptr)
error("Room %d missing object code block(s)", _roomResource);
od->OBCDoffset = ptr - rootptr;
@ -801,7 +801,7 @@ void ScummEngine::resetRoomObjects() {
ResourceIterator obims(room, false);
for (i = 0; i < _numObjectsInRoom; i++) {
ptr = obims.findNext(MKTAG('O','B','I','M'));
if (ptr == NULL)
if (ptr == nullptr)
error("Room %d missing image blocks(s)", _roomResource);
obim_id = getObjectIdFromOBIM(ptr);
@ -882,7 +882,7 @@ void ScummEngine_v4::resetRoomObjects() {
od = &_objs[findLocalObjectSlot()];
ptr = obcds.findNext(MKTAG('O','B','C','D'));
if (ptr == NULL)
if (ptr == nullptr)
error("Room %d missing object code block(s)", _roomResource);
od->OBCDoffset = ptr - room;
@ -899,7 +899,7 @@ void ScummEngine_v4::resetRoomObjects() {
// In the PC Engine version of Loom, there aren't image blocks
// for all objects.
ptr = obims.findNext(MKTAG('O','B','I','M'));
if (ptr == NULL)
if (ptr == nullptr)
break;
obim_id = READ_LE_UINT16(ptr + 6);
@ -989,12 +989,12 @@ void ScummEngine_v4::resetRoomObject(ObjectData *od, const byte *room, const byt
}
void ScummEngine::resetRoomObject(ObjectData *od, const byte *room, const byte *searchptr) {
const CodeHeader *cdhd = NULL;
const ImageHeader *imhd = NULL;
const CodeHeader *cdhd = nullptr;
const ImageHeader *imhd = nullptr;
assert(room);
if (searchptr == NULL) {
if (searchptr == nullptr) {
if (_game.version == 8) {
searchptr = getResourceAddress(rtRoomScripts, _roomResource);
assert(searchptr);
@ -1004,7 +1004,7 @@ void ScummEngine::resetRoomObject(ObjectData *od, const byte *room, const byte *
}
cdhd = (const CodeHeader *)findResourceData(MKTAG('C','D','H','D'), searchptr + od->OBCDoffset);
if (cdhd == NULL)
if (cdhd == nullptr)
error("Room %d missing CDHD blocks(s)", _roomResource);
if (od->OBIMoffset)
imhd = (const ImageHeader *)findResourceData(MKTAG('I','M','H','D'), room + od->OBIMoffset);
@ -1187,8 +1187,8 @@ const byte *ScummEngine::getObjOrActorName(int obj) {
}
objptr = getOBCDFromObject(obj, true);
if (objptr == NULL)
return NULL;
if (objptr == nullptr)
return nullptr;
if (_game.features & GF_SMALL_HEADER) {
byte offset = 0;
@ -1226,7 +1226,7 @@ void ScummEngine::setObjectName(int obj) {
for (i = 0; i < _numNewNames; i++) {
if (_newNames[i] == 0) {
loadPtrToResource(rtObjectName, i, NULL);
loadPtrToResource(rtObjectName, i, nullptr);
_newNames[i] = obj;
runInventoryScript(0);
return;
@ -1261,7 +1261,7 @@ byte *ScummEngine::getOBCDFromObject(int obj, bool v0CheckInventory) {
_objectOwnerTable[obj] != OF_OWNER_ROOM)
{
if (_game.version == 0 && !v0CheckInventory)
return 0;
return nullptr;
for (i = 0; i < _numInventory; i++) {
if (_inventory[i] == obj)
return getResourceAddress(rtInventory, i);
@ -1281,7 +1281,7 @@ byte *ScummEngine::getOBCDFromObject(int obj, bool v0CheckInventory) {
}
}
}
return 0;
return nullptr;
}
const byte *ScummEngine::getOBIMFromObjectData(const ObjectData &od) {
@ -1330,15 +1330,15 @@ const byte *ScummEngine::getObjectImage(const byte *ptr, int state) {
// we use the offsets in the OFFS chunk,
ptr = findResource(MKTAG('I','M','A','G'), ptr);
if (!ptr)
return 0;
return nullptr;
ptr = findResource(MKTAG('W','R','A','P'), ptr);
if (!ptr)
return 0;
return nullptr;
ptr = findResource(MKTAG('O','F','F','S'), ptr);
if (!ptr)
return 0;
return nullptr;
// Get the address of the specified SMAP (corresponding to IMxx)
ptr += READ_LE_UINT32(ptr + 4 + 4*state);
@ -1479,7 +1479,7 @@ void ScummEngine::findObjectInRoom(FindObjectInRoom *fo, byte findWhat, uint id,
ResourceIterator obcds(searchptr, (_game.features & GF_SMALL_HEADER) != 0);
for (i = 0; i < numobj; i++) {
obcdptr = obcds.findNext(MKTAG('O','B','C','D'));
if (obcdptr == NULL)
if (obcdptr == nullptr)
error("findObjectInRoom: Not enough code blocks in room %d", room);
cdhd = (const CodeHeader *)findResourceData(MKTAG('C','D','H','D'), obcdptr);
@ -1507,7 +1507,7 @@ void ScummEngine::findObjectInRoom(FindObjectInRoom *fo, byte findWhat, uint id,
ResourceIterator obims(roomptr, (_game.features & GF_SMALL_HEADER) != 0);
for (i = 0; i < numobj; i++) {
obimptr = obims.findNext(MKTAG('O','B','I','M'));
if (obimptr == NULL)
if (obimptr == nullptr)
error("findObjectInRoom: Not enough image blocks in room %d", room);
obim_id = getObjectIdFromOBIM(obimptr);
@ -1767,7 +1767,7 @@ void ScummEngine_v6::drawBlastObject(BlastObject *eo) {
bdd.scale_x = (byte)eo->scaleX;
bdd.scale_y = (byte)eo->scaleY;
bdd.maskPtr = NULL;
bdd.maskPtr = nullptr;
bdd.numStrips = _gdi->_numStrips;
if ((bdd.scale_x != 255) || (bdd.scale_y != 255)) {
@ -1777,7 +1777,7 @@ void ScummEngine_v6::drawBlastObject(BlastObject *eo) {
}
bdd.shadowPalette = _shadowPalette;
bdd.actorPalette = 0;
bdd.actorPalette = nullptr;
bdd.mirror = false;
drawBomp(bdd);
@ -1839,7 +1839,7 @@ int ScummEngine::findLocalObjectSlot() {
int ScummEngine::findFlObjectSlot() {
int i;
for (i = 1; i < _numFlObject; i++) {
if (_res->_types[rtFlObject][i]._address == NULL)
if (_res->_types[rtFlObject][i]._address == nullptr)
return i;
}
error("findFlObjectSlot: Out of FLObject slots");