libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-06 00:31:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fixes layer order

Browse Source 
svn-id: r8102
This commit is contained in:
Robert Göffringmann 2003-05-29 14:34:40 +00:00
parent a8d6ac05da
commit 007352ce6b
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sky/screen.cpp
View File

@ -434,7 +434,6 @@ void SkyScreen::sortSprites(void) {
currDrawList++; currDrawList++;
do { // a_new_draw_list: do { // a_new_draw_list:
//printf("loading drawlist %d\n",loadDrawList);
uint16 *drawListData = (uint16*)SkyState::fetchCompact(loadDrawList); uint16 *drawListData = (uint16*)SkyState::fetchCompact(loadDrawList);
nextDrawList = false; nextDrawList = false;
while ((!nextDrawList) && (drawListData[0])) { while ((!nextDrawList) && (drawListData[0])) {
@ -446,13 +445,11 @@ void SkyScreen::sortSprites(void) {
Compact *spriteComp = SkyState::fetchCompact(drawListData[0]); Compact *spriteComp = SkyState::fetchCompact(drawListData[0]);
if ((spriteComp->status & 4) && // is it sortable playfield?(!?!) if ((spriteComp->status & 4) && // is it sortable playfield?(!?!)
(spriteComp->screen == SkyLogic::_scriptVariables[SCREEN])) { // on current screen (spriteComp->screen == SkyLogic::_scriptVariables[SCREEN])) { // on current screen
//printf("Adding to drawlist. status = %X, screen = %X\n",spriteComp->status,spriteComp->screen);
dataFileHeader *spriteData = dataFileHeader *spriteData =
(dataFileHeader*)SkyState::fetchItem(spriteComp->frame >> 6); (dataFileHeader*)SkyState::fetchItem(spriteComp->frame >> 6);
//printf("ycood = %d, s_offset_y = %d, height = %d\n",spriteComp->ycood,spriteData->s_offset_y,spriteData->s_height);
//printf("xcood = %d, s_offset_x = %d, width = %d\n",spriteComp->xcood,spriteData->s_offset_x,spriteData->s_width);
if (!spriteData) { if (!spriteData) {
printf("Missing file %d!\n",spriteComp->frame >> 6); printf("Missing file %d!\n",spriteComp->frame >> 6);
getchar();
spriteComp->status = 0; spriteComp->status = 0;
} else { } else {
sortList[spriteCnt].yCood = spriteComp->ycood + spriteData->s_offset_y + spriteData->s_height; sortList[spriteCnt].yCood = spriteComp->ycood + spriteData->s_offset_y + spriteData->s_height;
@ -500,7 +497,6 @@ void SkyScreen::doSprites(uint8 layer) {
idNum = SkyLogic::_scriptVariables[drawListNum]; idNum = SkyLogic::_scriptVariables[drawListNum];
drawListNum++; drawListNum++;
//printf("std_sp: New DrawList: %d\n",idNum); getchar();
drawList = (uint16*)SkyState::fetchCompact(idNum); drawList = (uint16*)SkyState::fetchCompact(idNum);
while(drawList[0]) { while(drawList[0]) {
// new_draw_list: // new_draw_list:
@ -512,16 +508,20 @@ void SkyScreen::doSprites(uint8 layer) {
if ((spriteData->status & (1 << layer)) && if ((spriteData->status & (1 << layer)) &&
(spriteData->screen == SkyLogic::_scriptVariables[SCREEN])) { (spriteData->screen == SkyLogic::_scriptVariables[SCREEN])) {
uint8 *toBeDrawn = (uint8*)SkyState::fetchItem(spriteData->frame >> 6); uint8 *toBeDrawn = (uint8*)SkyState::fetchItem(spriteData->frame >> 6);
drawSprite(toBeDrawn, spriteData); if (!toBeDrawn) {
if (layer == FORE) verticalMask(); printf("Spritedata %d not loaded!\n",spriteData->frame >> 6);
if (spriteData->status & 8) vectorToGame(0x81); getchar();
else vectorToGame(1); spriteData->status = 0;
} else {
drawSprite(toBeDrawn, spriteData);
if (layer == BACK) verticalMask();
if (spriteData->status & 8) vectorToGame(0x81);
else vectorToGame(1);
}
} }
} }
if (drawList[0] == 0xFFFF) { if (drawList[0] == 0xFFFF)
//printf("sub: New DrawList: %d\n",drawList[1]); getchar();
drawList = (uint16*)SkyState::fetchCompact(drawList[1]); drawList = (uint16*)SkyState::fetchCompact(drawList[1]);
}
} }
} }
} }
@ -584,7 +584,7 @@ void SkyScreen::drawSprite(uint8 *spriteInfo, Compact *sprCompact) {
} }
_sprX = (uint32)spriteX; _sprX = (uint32)spriteX;
uint8 *screenPtr = _backScreen + _sprY * GAME_SCREEN_WIDTH + _sprX; uint8 *screenPtr = _backScreen + _sprY * GAME_SCREEN_WIDTH + _sprX;
if ((_sprX + _sprWidth >= 320) || (_sprY + _sprHeight >= 192)) { if ((_sprX + _sprWidth > 320) || (_sprY + _sprHeight > 192)) {
warning("SkyScreen::drawSprite fatal error: got x = %d, y = %d, w = %d, h = %d\n",_sprX, _sprY, _sprWidth, _sprHeight); warning("SkyScreen::drawSprite fatal error: got x = %d, y = %d, w = %d, h = %d\n",_sprX, _sprY, _sprWidth, _sprHeight);
_sprWidth = 0; _sprWidth = 0;
return ; return ;