Ticket #8274: scummvm.patch

common/file.cpp

@@ -28 +28 @@
         char buf[512];
         char *ptr;
 
-        assert(directory);
+        assert(directory != NULL);
         strcpy(buf, directory);
 
 #ifdef WIN32

common/util.cpp

@@ -178 +178 @@
 }
 
 void StackLock::lock() {
-        assert(_syst);
+        assert(_syst != NULL);
         _syst->lock_mutex(_mutex);
 }
 
 void StackLock::unlock() {
-        assert(_syst);
+        assert(_syst != NULL);
         _syst->unlock_mutex(_mutex);
 }
 

gui/newgui.cpp

@@ -451 +451 @@
 void NewGui::blitFromBuffer(int x, int y, int w, int h, const byte *buf, int pitch) {
         NewGuiColor *ptr = getBasePtr(x, y);
 
-        assert(buf);
+        assert(buf != NULL);
         while (h--) {
                 memcpy(ptr, buf, w*2);
                 ptr += _screenPitch;
@@ -465 +465 @@
 void NewGui::blitToBuffer(int x, int y, int w, int h, byte *buf, int pitch) {
         NewGuiColor *ptr = getBasePtr(x, y);
 
-        assert(buf);
+        assert(buf != NULL);
         while (h--) {
                 memcpy(buf, ptr, w*2);
                 ptr += _screenPitch;

scumm/actor.cpp

@@ -1035 +1035 @@
 
                 if (_vm->_features & GF_NEW_COSTUMES) {
                         byte *akos = _vm->getResourceAddress(rtCostume, costume);
-                        assert(akos);
+                        assert(akos != NULL);
                         if (_vm->akos_increaseAnims(akos, this)) {
                                 needRedraw = true;
                         }
@@ -1067 +1067 @@
                 const byte *aksq, *akfo;
                 uint size;
                 byte *akos = _vm->getResourceAddress(rtCostume, costume);
-                assert(akos);
+                assert(akos != NULL);
 
                 aksq = _vm->findResourceData(MKID('AKSQ'), akos);
                 akfo = _vm->findResourceData(MKID('AKFO'), akos);

scumm/akos.cpp

@@ -117 +117 @@
         const AkosHeader *akhd;
 
         akos = getResourceAddress(rtCostume, a->costume);
-        assert(akos);
+        assert(akos != NULL);
 
         akhd = (const AkosHeader *)findResourceData(MKID('AKHD'), akos);
         return (akhd->flags & 2) != 0;
@@ -146 +146 @@
         anim = akos_frameToAnim(a, frame);
 
         akos = getResourceAddress(rtCostume, a->costume);
-        assert(akos);
+        assert(akos != NULL);
 
         akhd = (const AkosHeader *)findResourceData(MKID('AKHD'), akos);
 
@@ -154 +154 @@
                 return;
 
         r = findResourceData(MKID('AKCH'), akos);
-        assert(r);
+        assert(r != NULL);
 
         offs = READ_LE_UINT16(r + anim * sizeof(uint16));
         if (offs == 0)
@@ -231 +231 @@
 
 void AkosRenderer::setCostume(int costume) {
         akos = _vm->getResourceAddress(rtCostume, costume);
-        assert(akos);
+        assert(akos != NULL);
 
         akhd = (const AkosHeader *) _vm->findResourceData(MKID('AKHD'), akos);
         akof = (const AkosOffset *) _vm->findResourceData(MKID('AKOF'), akos);

scumm/bomp.cpp

@@ -242 +242 @@
 
         // Setup vertical scaling
         if (bd.scale_y != 255) {
-                assert(scalingYPtr);
+                assert(scalingYPtr != NULL);
 
                 skip_y_new = *scalingYPtr++;
                 skip_y_bits = 0x80;
@@ -254 +254 @@
 
         // Setup horizontal scaling
         if (bd.scale_x != 255) {
-                assert(bd.scalingXPtr);
+                assert(bd.scalingXPtr != NULL);
                 if (clip_right > bd.scaleRight) {
                         clip_right = bd.scaleRight;
                 }

scumm/boxes.cpp

@@ -109 +109 @@
                 _extraBoxFlags[box] = val;
         } else {
                 Box *ptr = getBoxBaseAddr(box);
-                assert(ptr);
+                assert(ptr != NULL);
                 if (_version == 8)
                         ptr->v8.flags = TO_LE_32(val);
                 else if (_version <= 2)
@@ -133 +133 @@
 
 void Scumm::setBoxScale(int box, int scale) {
         Box *ptr = getBoxBaseAddr(box);
-        assert(ptr);
+        assert(ptr != NULL);
         if (_version == 8)
                 ptr->v8.scale = TO_LE_32(scale);
         else if (_version <= 2)
@@ -144 +144 @@
 
 void Scumm::setBoxScaleSlot(int box, int slot) {
         Box *ptr = getBoxBaseAddr(box);
-        assert(ptr);
+        assert(ptr != NULL);
         ptr->v8.scaleSlot = TO_LE_32(slot);
 }
 
@@ -373 +373 @@
 
 void Scumm::getBoxCoordinates(int boxnum, BoxCoords *box) {
         Box *bp = getBoxBaseAddr(boxnum);
-        assert(bp);
+        assert(bp != NULL);
 
         if (_version == 8) {
                 box->ul.x = (short)FROM_LE_32(bp->v8.ulx);
@@ -601 +601 @@
 
 byte *Scumm::getBoxMatrixBaseAddr() {
         byte *ptr = getResourceAddress(rtMatrix, 1);
-        assert(ptr);
+        assert(ptr != NULL);
         if (*ptr == 0xFF)
                 ptr++;
         return ptr;

scumm/charset.cpp

@@ -1242 +1242 @@
         assert(id < 5);
         _curId = id;
         _current = _fr[id];
-        assert(_current);
+        assert(_current != NULL);
 }
 
 int CharsetRendererNut::getCharWidth(byte chr) {
-        assert(_current);
+        assert(_current != NULL);
         return _current->getCharWidth(chr);
 }
 
 int CharsetRendererNut::getFontHeight() {
         // FIXME / TODO: how to implement this properly???
-        assert(_current);
+        assert(_current != NULL);
         return _current->getCharHeight('|');
 }
 
 void CharsetRendererNut::printChar(int chr) {
         int shadow_left, shadow_right, shadow_top, shadow_bottom;
 
-        assert(_current);
+        assert(_current != NULL);
         if (chr == '@')
                 return;
 

scumm/gfx.cpp

@@ -894 +894 @@
  */
 void Gdi::drawBitmap(const byte *ptr, VirtScreen *vs, int x, int y, const int width, const int height,
                      int stripnr, int numstrip, byte flag, StripTable *table) {
-        assert(ptr);
+        assert(ptr != NULL);
         assert(height > 0);
         byte *backbuff_ptr, *bgbak_ptr;
         const byte *smap_ptr;
@@ -921 +921 @@
         else
                 smap_ptr = findResource(MKID('SMAP'), ptr);
 
-        assert(smap_ptr);
+        assert(smap_ptr != NULL);
 
         zplane_list[0] = smap_ptr;
 
@@ -3309 +3309 @@
         const byte *cptr;
 
         cptr = getResourceAddress(rtRoom, _roomResource);
-        assert(cptr);
+        assert(cptr != NULL);
         if (_CLUT_offs) {
                 cptr += _CLUT_offs;
         } else {
                 cptr = findPalInPals(cptr + _PALS_offs, _curPalIndex);
         }
-        assert(cptr);
+        assert(cptr != NULL);
         return cptr;
 }
 

scumm/object.cpp

@@ -244 +244 @@
                         return;
                 }
                 imhd = (const ImageHeader *)findResourceData(MKID('IMHD'), ptr);
-                assert(imhd);
+                assert(imhd != NULL);
                 if (_version == 8) {
                         x = od.x_pos + (int32)READ_LE_UINT32(&imhd->v8.hotspot[state].x);
                         y = od.y_pos + (int32)READ_LE_UINT32(&imhd->v8.hotspot[state].y);
@@ -501 +501 @@
                 searchptr = rootptr = getResourceAddress(rtRoomScripts, _roomResource);
         else
                 searchptr = rootptr = room;
-        assert(searchptr);
+        assert(searchptr != NULL);
 
         // Load in new room objects
         ResourceIterator        obcds(searchptr, false);
@@ -666 +666 @@
         const CodeHeader *cdhd = NULL;
         const ImageHeader *imhd = NULL;
 
-        assert(room);
+        assert(room != NULL);
 
         if (_features & GF_SMALL_HEADER) {
 
@@ -941 +941 @@
                                         ptr = getResourceAddress(rtRoomScripts, _roomResource);
                                 else
                                         ptr = getResourceAddress(rtRoom, _roomResource);
-                                assert(ptr);
+                                assert(ptr != NULL);
                                 return ptr + _objs[i].OBCDoffset;
                         }
                 }
@@ -964 +964 @@
 }
 
 const byte *Scumm::getObjectImage(const byte *ptr, int state) {
-        assert(ptr);
+        assert(ptr != NULL);
         if (_features & GF_OLD_BUNDLE)
                 ptr += 0;
         else if (_features & GF_SMALL_HEADER) {
@@ -1023 +1023 @@
         slot = getInventorySlot();
         _inventory[slot] = obj;
         dst = createResource(rtInventory, slot, size);
-        assert(dst);
+        assert(dst != NULL);
         memcpy(dst, ptr, size);
 
         CHECK_HEAP
@@ -1046 +1046 @@
                         error("findObjectInRoom foCheckAlreadyLoaded NYI for GF_OLD_BUNDLE (id = %d, room = %d)", id, room);
                 }
                 fo->obcd = obcdptr = getOBCDFromObject(id);
-                assert(obcdptr);
+                assert(obcdptr != NULL);
                 fo->obim = obimptr = obcdptr + RES_SIZE(obcdptr);
                 fo->cdhd = (const CodeHeader *)findResourceData(MKID('CDHD'), obcdptr);
                 fo->imhd = (const ImageHeader *)findResourceData(MKID('IMHD'), obimptr);
@@ -1107 +1107 @@
                         searchptr = getResourceAddress(rtRoomScripts, room);
                 else
                         searchptr = roomptr;
-                assert(searchptr);
+                assert(searchptr != NULL);
                 ResourceIterator        obcds(searchptr, (_features & GF_SMALL_HEADER) != 0);
                 for (i = 0;;) {
                         obcdptr = obcds.findNext(MKID('OBCD'));
@@ -1359 +1359 @@
         }
 
         dataptr = getObjectImage(foir.obim, imgindex);
-        assert(dataptr);
+        assert(dataptr != NULL);
         if (_version == 8) {
                 bomp = dataptr;
         } else {
@@ -1458 +1458 @@
 
         const byte *img = getObjectImage(ptr, eo->image);
         if (_version == 8) {
-                assert(img);
+                assert(img != NULL);
                 bomp = img + 8;
         } else {
                 if (!img)
                         img = getObjectImage(ptr, 1);   // Backward compatibility with samnmax blast objects
-                assert(img);
+                assert(img != NULL);
                 bomp = findResourceData(MKID('BOMP'), img);
         }
 
@@ -1636 +1636 @@
         // Allocate slot & memory for floating object
         slot = findFlObjectSlot();
         flob = createResource(rtFlObject, slot, flob_size);
-        assert(flob);
+        assert(flob != NULL);
 
         // Copy object code + object image to floating object
         ((uint32 *)flob)[0] = MKID('FLOB');

scumm/resource.cpp

@@ -2052 +2052 @@
 
 ResourceIterator::ResourceIterator(const byte *searchin, bool smallHeader)
         : _ptr(searchin), _smallHeader(smallHeader) {
-        assert(searchin);
+        assert(searchin != NULL);
         if (_smallHeader) {
                 _size = READ_LE_UINT32(searchin);
                 _pos = 6;
@@ -2104 +2104 @@
 const byte *findResource(uint32 tag, const byte *searchin) {
         uint32 curpos, totalsize, size;
 
-        assert(searchin);
+        assert(searchin != NULL);
 
         searchin += 4;
         totalsize = READ_BE_UINT32(searchin);
@@ -2137 +2137 @@
         if (smallTag == 0)
                 return NULL;
 
-        assert(searchin);
+        assert(searchin != NULL);
 
         totalsize = READ_LE_UINT32(searchin);
         searchin += 6;

scumm/script.cpp

@@ -139 +139 @@
                 return 0;
 
         objptr = getOBCDFromObject(obj);
-        assert(objptr);
+        assert(objptr != NULL);
 
         if (_version <= 2)
                 verbptr = objptr + 15;
@@ -150 +150 @@
         else
                 verbptr = findResource(MKID('VERB'), objptr);
 
-        assert(verbptr);
+        assert(verbptr != NULL);
 
         verboffs = verbptr - objptr;
 

scumm/script_v2.cpp

@@ -971 +971 @@
                 if ((_gameId == GID_MANIAC && _version == 1) && (VAR(VAR_SENTENCE_PREPOSITION) == 0)) {
                         if (_verbs[slot].prep == 0xFF) {
                                 byte *ptr = getOBCDFromObject(VAR(VAR_SENTENCE_OBJECT1));
-                                assert(ptr);
+                                assert(ptr != NULL);
                                 VAR(VAR_SENTENCE_PREPOSITION) = (*(ptr+12) >> 5);
                         } else
                                 VAR(VAR_SENTENCE_PREPOSITION) = _verbs[slot].prep;

scumm/script_v5.cpp

@@ -821 +821 @@
         getResultPos();
         string = getVarOrDirectByte(0x80);
         ptr = getResourceAddress(rtString, string);
-        assert(ptr);
+        assert(ptr != NULL);
 
         width = _charset->getStringWidth(0, ptr);
         
@@ -1952 +1952 @@
                 byte *searchin = objptr;
                 uint32 curpos, totalsize;
         
-                assert(searchin);
+                assert(searchin != NULL);
         
                 searchin += 4;
                 totalsize = READ_BE_UINT32(searchin);

scumm/script_v6.cpp

@@ -2386 +2386 @@
 //                                      _imuseDigital->stopAll();
 //                              }
                                 uint32 speed;
-                                assert(getStringAddressVar(VAR_VIDEONAME));
+                                assert(getStringAddressVar(VAR_VIDEONAME) != NULL);
                                 if (strcmp((char *)getStringAddressVar(VAR_VIDEONAME), "sq3.san") == 0)
                                         speed = 71000;
                                 else {

scumm/script_v8.cpp

@@ -1111 +1111 @@
 
         assert(0 <= _curVerbSlot && _curVerbSlot < _maxVerbs);
         vs = &_verbs[_curVerbSlot];
-        assert(vs);
+        assert(vs != NULL);
 
         switch (subOp) {
         case 0x96:              // SO_VERB_INIT Choose verb number for editing

scumm/smush/imuse_channel.cpp

@@ -189 +189 @@
         byte *keep, *decoded;
         uint32 value;
         keep = decoded = new byte[new_size * 2];
-        assert(keep);
+        assert(keep != NULL);
         unsigned char * source = _sbuffer;
                 while (loop_size--) {
                 byte v1 =  *source++;

scumm/smush/smush_font.cpp

@@ -33 +33 @@
 }
 
 int SmushFont::getStringWidth(const char *str) {
-        assert(str);
+        assert(str != NULL);
         if (!_loaded) {
                 warning("SmushFont::getStringWidth() Font is not loaded");
                 return 0;
@@ -47 +47 @@
 }
 
 int SmushFont::getStringHeight(const char *str) {
-        assert(str);
+        assert(str != NULL);
         if (!_loaded) {
                 warning("SmushFont::getStringHeight() Font is not loaded");
                 return 0;

scumm/smush/smush_player.cpp

@@ -110 +110 @@
                         data_end -= 2;
                         assert(data_end > data_start);
                         char *value = new char[data_end - data_start + 1];
-                        assert(value);
+                        assert(value != NULL);
                         memcpy(value, data_start, data_end - data_start);
                         value[data_end - data_start] = 0;
                         char *line_start = value;
@@ -163 +163 @@
         }
         int32 length = theFile.size();
         char *filebuffer = new char [length + 1];
-        assert(filebuffer);
+        assert(filebuffer != NULL);
         theFile.read(filebuffer, length);
         filebuffer[length] = 0;
 
@@ -187 +187 @@
                 length -= ETRS_HEADER_LENGTH;
         }
         StringResource *sr = new StringResource;
-        assert(sr);
+        assert(sr != NULL);
         sr->init(filebuffer, length);
         delete []filebuffer;
         return sr;
@@ -707 +707 @@
 
         int32 chunk_size = b.getSize() - 14;
         byte *chunk_buffer = (byte *)malloc(chunk_size);
-        assert(chunk_buffer);
+        assert(chunk_buffer != NULL);
         b.read(chunk_buffer, chunk_size);
 
         switch (codec) {

scumm/sound.cpp

@@ -179 +179 @@
         ptr = _scumm->getResourceAddress(rtSound, soundID);
         if (ptr) {
                 if (READ_UINT32(ptr) == MKID('iMUS')){
-                        assert(_scumm->_imuseDigital);
+                        assert(_scumm->_imuseDigital != NULL);
                         _scumm->_imuseDigital->startSound(soundID);
                         return;
                 }
                 else if (READ_UINT32(ptr) == MKID('Crea')) {
-                        assert(_scumm->_imuseDigital);
+                        assert(_scumm->_imuseDigital != NULL);
                         _scumm->_imuseDigital->startSound(soundID);
                         return;
                 }

scumm/verbs.cpp

@@ -226 +226 @@
 
                 _string[1].color = v2_mouseover_boxes[i].color;
                 _messagePtr = getObjOrActorName(obj);
-                assert(_messagePtr);
+                assert(_messagePtr != NULL);
 
                 // Prevent inventory entries from overflowing by truncating the text
                 // after 144/8 = 18 chars
@@ -397 +397 @@
                 _messagePtr = getResourceAddress(rtVerb, verb);
                 if (!_messagePtr)
                         return;
-                assert(_messagePtr);
+        /* this seems strange, the check above already does this for us, no? */
+                assert(_messagePtr != NULL);
 
                 if ((_version == 8) && (_messagePtr[0] == '/')) {
                         translateText(_messagePtr, _transText);
@@ -453 +454 @@
         ydiff = y - vs->topline;
 
         obim = getResourceAddress(rtVerb, verb);
-        assert(obim);
+        assert(obim != NULL);
         if (_features & GF_OLD_BUNDLE) {
                 imgw = obim[0];
                 imgh = obim[1] >> 3;
@@ -475 +476 @@
                 }
                 imptr = getObjectImage(obim, 1);
         }
-        assert(imptr);
+        assert(imptr != NULL);
         if (_version == 1) {
                 gdi._C64ObjectMode = true;
                 gdi.decodeC64Gfx(imptr, gdi._C64ObjectMap, imgw * imgh * 3);

sound/mixer.cpp

@@ -49 +49 @@
 
         Channel(SoundMixer *mixer, PlayingSoundHandle *handle)
                 : _mixer(mixer), _handle(handle), _converter(0), _input(0), _id(-1) {
-                assert(mixer);
+                assert(mixer != NULL);
         }
         virtual ~Channel();
         void destroy();
@@ -247 +247 @@
 }
 
 void SoundMixer::mixCallback(void *s, byte *samples, int len) {
-        assert(s);
-        assert(samples);
+        assert(s != NULL);
+        assert(samples != NULL);
         // Len is the number of bytes in the buffer; we divide it by
         // four to get the number of samples (stereo 16 bit).
         ((SoundMixer *)s)->mix((int16 *)samples, len >> 2);
@@ -383 +383 @@
    16 bits, for a total of 40 bytes.
  */
 void Channel::mix(int16 *data, uint len) {
-        assert(_input);
+        assert(_input != NULL);
         if (_input->eos()) {
                 // TODO: call drain method
                 destroy();
         } else {
-                assert(_converter);
+                assert(_converter != NULL);
                 _converter->flow(*_input, data, len, getVolume());
         }
 }
@@ -445 +445 @@
 }
 
 void ChannelStream::mix(int16 *data, uint len) {
-        assert(_input);
+        assert(_input != NULL);
         if (_input->eos()) {
                 // TODO: call drain method
 
@@ -460 +460 @@
                 return;
         }
 
-        assert(_converter);
+        assert(_converter != NULL);
         _converter->flow(*_input, data, len, getVolume());
 }