diff --git a/src/level.h b/src/level.h index 5adcc99..ef9953c 100644 --- a/src/level.h +++ b/src/level.h @@ -1368,11 +1368,11 @@ struct Level : IGame { } for (int i = 0; i < level.objectTexturesCount; i++) { - TR::ObjectTexture &t = level.objectTextures[i]; + TR::TextureInfo &t = level.objectTextures[i]; short4 uv = t.getMinMax(); uv.z++; uv.w++; - level.fillObjectTexture((TR::Tile32*)tiles[t.tile.index].data, uv, t.tile.index, t.clut); + level.fillObjectTexture((TR::Tile32*)tiles[t.tile].data, uv, &t); } for (int i = 0; i < level.spriteTexturesCount; i++) { @@ -1380,7 +1380,7 @@ struct Level : IGame { short4 uv = t.getMinMax(); uv.z++; uv.w++; - level.fillObjectTexture((TR::Tile32*)tiles[t.tile].data, uv, t.tile, t.clut); + level.fillObjectTexture((TR::Tile32*)tiles[t.tile].data, uv, &t); } for (int i = 0; i < level.tilesCount; i++) { diff --git a/src/video.h b/src/video.h index 7fade37..b047e3d 100644 --- a/src/video.h +++ b/src/video.h @@ -896,7 +896,6 @@ struct Video { if (sector.chunkIndex == sector.chunksCount - 1) { videoChunksCount++; - LOG("video %d\n", videoChunksCount); return true; } @@ -908,8 +907,6 @@ struct Video { chunk->size = AUDIO_SECTOR_SIZE; stream->seek(24); - LOG("audio %d\n", audioChunksCount); - if (!hasSyncHeader) stream->seek(2048 - (AUDIO_SECTOR_SIZE + 24));