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

use FROM_LE_16, indentation cleanup

Browse source 
svn-id: r8239
This commit is contained in:
Oliver Kiehl 2003-06-01 13:29:28 +00:00
parent 4cef98bf6d
commit 3e87539b5c
1 changed files with 35 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

30
sky/screen.cpp
View file

@ -21,12 +21,6 @@
#include "screen.h"
#ifdef SCUMM_BIG_ENDIAN
#define ENDIAN16(x) ((x >> 8) | ((x & 0xFF) << 8))
#else
#define ENDIAN16(x) (x)
#endif
uint8 SkyScreen::_top16Colours[16*3] =
{
0, 0, 0,
@ -455,10 +449,10 @@ void SkyScreen::sortSprites(void) {
(dataFileHeader*)SkyState::fetchItem(spriteComp->frame >> 6);
if (!spriteData) {
printf("Missing file %d!\n",spriteComp->frame >> 6);
getchar();
//getchar();
spriteComp->status = 0;
} else {
sortList[spriteCnt].yCood = spriteComp->ycood + (int16)ENDIAN16(spriteData->s_offset_y) + (int16)ENDIAN16(spriteData->s_height);
sortList[spriteCnt].yCood = spriteComp->ycood + (int16)FROM_LE_16(spriteData->s_offset_y) + (int16)FROM_LE_16(spriteData->s_height);
sortList[spriteCnt].compact = spriteComp;
sortList[spriteCnt].sprite = spriteData;
spriteCnt++;
@ -540,12 +534,12 @@ void SkyScreen::drawSprite(uint8 *spriteInfo, Compact *sprCompact) {
return ;
}
dataFileHeader *sprDataFile = (dataFileHeader *)spriteInfo;
_sprWidth = ENDIAN16(sprDataFile->s_width);
_sprHeight = ENDIAN16(sprDataFile->s_height);
_sprWidth = FROM_LE_16(sprDataFile->s_width);
_sprHeight = FROM_LE_16(sprDataFile->s_height);
_maskX1 = _maskX2 = 0;
uint8 *spriteData = spriteInfo + (sprCompact->frame & 0x3F) * ENDIAN16(sprDataFile->s_sp_size);
uint8 *spriteData = spriteInfo + (sprCompact->frame & 0x3F) * FROM_LE_16(sprDataFile->s_sp_size);
spriteData += sizeof(dataFileHeader);
int32 spriteY = sprCompact->ycood + (int16)ENDIAN16(sprDataFile->s_offset_y) - TOP_LEFT_Y;
int32 spriteY = sprCompact->ycood + (int16)FROM_LE_16(sprDataFile->s_offset_y) - TOP_LEFT_Y;
if (spriteY < 0) {
spriteY = ~spriteY;
if (_sprHeight <= (uint32)spriteY) {
@ -553,10 +547,10 @@ void SkyScreen::drawSprite(uint8 *spriteInfo, Compact *sprCompact) {
return ;
}
_sprHeight -= spriteY;
spriteData += ENDIAN16(sprDataFile->s_width) * spriteY;
spriteData += FROM_LE_16(sprDataFile->s_width) * spriteY;
spriteY = 0;
} else {
int32 botClip = GAME_SCREEN_HEIGHT - ENDIAN16(sprDataFile->s_height) - spriteY;
int32 botClip = GAME_SCREEN_HEIGHT - FROM_LE_16(sprDataFile->s_height) - spriteY;
if (botClip < 0) {
if (botClip + _sprHeight <= 0) {
_sprWidth = 0;
@ -566,7 +560,7 @@ void SkyScreen::drawSprite(uint8 *spriteInfo, Compact *sprCompact) {
}
}
_sprY = (uint32)spriteY;
int32 spriteX = sprCompact->xcood + (int16)ENDIAN16(sprDataFile->s_offset_x) - TOP_LEFT_X;
int32 spriteX = sprCompact->xcood + (int16)FROM_LE_16(sprDataFile->s_offset_x) - TOP_LEFT_X;
if (spriteX < 0) {
spriteX = ~spriteX;
if (_sprWidth <= (uint32)spriteX) {
@ -577,7 +571,7 @@ void SkyScreen::drawSprite(uint8 *spriteInfo, Compact *sprCompact) {
_maskX1 = spriteX;
spriteX = 0;
} else {
int32 rightClip = GAME_SCREEN_WIDTH - ENDIAN16(sprDataFile->s_width) - spriteX;
int32 rightClip = GAME_SCREEN_WIDTH - FROM_LE_16(sprDataFile->s_width) - spriteX;
if (rightClip < 0) {
rightClip = ~rightClip;
if (_sprWidth <= (uint32)rightClip) {
@ -630,8 +624,8 @@ void SkyScreen::vertMaskSub(uint16 *grid, uint32 gridOfs, uint8 *screenPtr, uint
for (uint32 cntx = 0; cntx < _sprHeight; cntx++) { // start_x | block_loop
if (grid[gridOfs]) {
if (!(ENDIAN16(grid[gridOfs]) & 0x8000)) {
uint32 gridVal = ENDIAN16(grid[gridOfs]) - 1;
if (!(FROM_LE_16(grid[gridOfs]) & 0x8000)) {
uint32 gridVal = FROM_LE_16(grid[gridOfs]) - 1;
gridVal *= GRID_W * GRID_H;
uint8 *dataSrc = (uint8*)SkyState::fetchItem(SkyLogic::_scriptVariables[layerId]) + gridVal;
uint8 *dataTrg = screenPtr;