libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 09:49:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HOPKINS: Removed spaces after asserts

Browse Source
This commit is contained in:
Paul Gilbert 2013-04-21 01:13:02 -04:00
parent 48c62cbb7d
commit 4518535968
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/hopkins/lines.cpp
View File

@ -209,7 +209,7 @@ void LinesManager::addZoneLine(int idx, int fromX, int fromY, int destX, int des
_bobZoneFl[bobZoneIdx] = true;
_bobZone[bobZoneIdx] = fromY;
} else {
assert (idx < MAX_LINES + 1);
assert(idx < MAX_LINES + 1);
_zoneLine[idx]._zoneData = (int16 *)_vm->_globals->freeMemory((byte *)_zoneLine[idx]._zoneData);
int distX = abs(fromX - destX);
@ -253,7 +253,7 @@ void LinesManager::addZoneLine(int idx, int fromX, int fromY, int destX, int des
* Add Line
*/
void LinesManager::addLine(int lineIdx, Directions direction, int fromX, int fromY, int destX, int destY) {
assert (lineIdx < MAX_LINES);
assert(lineIdx < MAX_LINES);
if (_linesNumb < lineIdx)
_linesNumb = lineIdx;
@ -266,7 +266,7 @@ void LinesManager::addLine(int lineIdx, Directions direction, int fromX, int fro
maxDist = distX;
byte *zoneData = _vm->_globals->allocMemory(4 * maxDist + 8);
assert (zoneData);
assert(zoneData);
Common::fill(zoneData, zoneData + 4 * maxDist + 8, 0);
_lineItem[lineIdx]._lineData = (int16 *)zoneData;
@ -2779,7 +2779,7 @@ void LinesManager::clearAllZones() {
* Remove Zone Line
*/
void LinesManager::removeZoneLine(int idx) {
assert (idx < MAX_LINES + 1);
assert(idx < MAX_LINES + 1);
_zoneLine[idx]._zoneData = (int16 *)_vm->_globals->freeMemory((byte *)_zoneLine[idx]._zoneData);
}
@ -2793,7 +2793,7 @@ void LinesManager::resetLines() {
// Remove Line
void LinesManager::removeLine(int idx) {
assert (idx < MAX_LINES);
assert(idx < MAX_LINES);
_lineItem[idx]._lineData = (int16 *)_vm->_globals->freeMemory((byte *)_lineItem[idx]._lineData);
}

24
engines/hopkins/objects.cpp
View File

@ -987,7 +987,7 @@ void ObjectsManager::computeSprite(int idx) {
// Before Sort
void ObjectsManager::beforeSort(SortMode sortMode, int index, int priority) {
++_sortedDisplayCount;
assert (_sortedDisplayCount <= 48);
assert(_sortedDisplayCount <= 48);
_sortedDisplay[_sortedDisplayCount]._sortMode = sortMode;
_sortedDisplay[_sortedDisplayCount]._index = index;
@ -1228,7 +1228,7 @@ void ObjectsManager::displayVBob() {
* Get Sprite X coordinate
*/
int ObjectsManager::getSpriteX(int idx) {
assert (idx <= MAX_SPRITE);
assert(idx <= MAX_SPRITE);
return _sprite[idx]._spritePos.x;
}
@ -1236,7 +1236,7 @@ int ObjectsManager::getSpriteX(int idx) {
* Get Sprite Y coordinate
*/
int ObjectsManager::getSpriteY(int idx) {
assert (idx <= MAX_SPRITE);
assert(idx <= MAX_SPRITE);
return _sprite[idx]._spritePos.y;
}
@ -1260,12 +1260,12 @@ void ObjectsManager::clearSprite() {
}
void ObjectsManager::animateSprite(int idx) {
assert (idx <= MAX_SPRITE);
assert(idx <= MAX_SPRITE);
_sprite[idx]._animationType = 1;
}
void ObjectsManager::addStaticSprite(const byte *spriteData, Common::Point pos, int idx, int spriteIndex, int zoomFactor, bool flipFl, int deltaX, int deltaY) {
assert (idx <= MAX_SPRITE);
assert(idx <= MAX_SPRITE);
SpriteItem *spr = &_sprite[idx];
spr->_spriteData = spriteData;
@ -1298,7 +1298,7 @@ void ObjectsManager::removeSprite(int idx) {
* Set Sprite X coordinate
*/
void ObjectsManager::setSpriteX(int idx, int xp) {
assert (idx <= MAX_SPRITE);
assert(idx <= MAX_SPRITE);
_sprite[idx]._spritePos.x = xp;
}
@ -1306,7 +1306,7 @@ void ObjectsManager::setSpriteX(int idx, int xp) {
* Set Sprite Y coordinate
*/
void ObjectsManager::setSpriteY(int idx, int yp) {
assert (idx <= MAX_SPRITE);
assert(idx <= MAX_SPRITE);
_sprite[idx]._spritePos.y = yp;
}
@ -1314,19 +1314,19 @@ void ObjectsManager::setSpriteY(int idx, int yp) {
* Set Sprite Index
*/
void ObjectsManager::setSpriteIndex(int idx, int spriteIndex) {
assert (idx <= MAX_SPRITE);
assert(idx <= MAX_SPRITE);
_sprite[idx]._spriteIndex = spriteIndex;
}
// Set Sprite Size
void ObjectsManager::setSpriteZoom(int idx, int zoomFactor) {
assert (idx <= MAX_SPRITE);
assert(idx <= MAX_SPRITE);
if (!_sprite[idx]._rleFl)
_sprite[idx]._zoomFactor = zoomFactor;
}
void ObjectsManager::setFlipSprite(int idx, bool flipFl) {
assert (idx <= MAX_SPRITE);
assert(idx <= MAX_SPRITE);
if (!_sprite[idx]._rleFl)
_sprite[idx]._flipFl = flipFl;
}
@ -3087,7 +3087,7 @@ void ObjectsManager::setBobAnimDataIdx(int idx, int animIdx) {
* Set Hopkins animation
*/
void ObjectsManager::setBobAnimation(int idx) {
assert (idx < 36);
assert(idx < 36);
BobItem *bob = &_bob[idx];
if (!bob->_disabledAnimationFl)
return;
@ -3103,7 +3103,7 @@ void ObjectsManager::setBobAnimation(int idx) {
* Stop Hopkins animation
*/
void ObjectsManager::stopBobAnimation(int idx) {
assert (idx < 36);
assert(idx < 36);
_bob[idx]._disabledAnimationFl = true;
}