and more cleanup
svn-id: r6718
This commit is contained in:
parent
90680fe9bb
commit
093428ae9a
37 changed files with 1317 additions and 2385 deletions
|
@ -21,8 +21,7 @@
|
|||
#include "scumm.h"
|
||||
#include "usage_bits.h"
|
||||
|
||||
void Scumm::upgradeGfxUsageBits()
|
||||
{
|
||||
void Scumm::upgradeGfxUsageBits() {
|
||||
int i;
|
||||
|
||||
for (i = 409; i >= 0; i--) {
|
||||
|
@ -37,29 +36,25 @@ void Scumm::upgradeGfxUsageBits()
|
|||
}
|
||||
}
|
||||
|
||||
void Scumm::setGfxUsageBit(int strip, int bit)
|
||||
{
|
||||
void Scumm::setGfxUsageBit(int strip, int bit) {
|
||||
assert(1 <= bit && bit <= 96);
|
||||
bit--;
|
||||
gfxUsageBits[3 * strip + bit / 32] |= (1 << (bit % 32));
|
||||
}
|
||||
|
||||
void Scumm::clearGfxUsageBit(int strip, int bit)
|
||||
{
|
||||
void Scumm::clearGfxUsageBit(int strip, int bit) {
|
||||
assert(1 <= bit && bit <= 96);
|
||||
bit--;
|
||||
gfxUsageBits[3 * strip + bit / 32] &= ~(1 << (bit % 32));
|
||||
}
|
||||
|
||||
bool Scumm::testGfxUsageBit(int strip, int bit)
|
||||
{
|
||||
bool Scumm::testGfxUsageBit(int strip, int bit) {
|
||||
assert(1 <= bit && bit <= 96);
|
||||
bit--;
|
||||
return (gfxUsageBits[3 * strip + bit / 32] & (1 << (bit % 32))) != 0;
|
||||
}
|
||||
|
||||
bool Scumm::testGfxAnyUsageBits(int strip)
|
||||
{
|
||||
bool Scumm::testGfxAnyUsageBits(int strip) {
|
||||
// Exclude the DIRTY and RESTORED bits from the test
|
||||
uint32 bitmask[3] = { 0xFFFFFFFF, 0xFFFFFFFF, 0x3FFFFFFF };
|
||||
int i;
|
||||
|
@ -71,8 +66,7 @@ bool Scumm::testGfxAnyUsageBits(int strip)
|
|||
return false;
|
||||
}
|
||||
|
||||
bool Scumm::testGfxOtherUsageBits(int strip, int bit)
|
||||
{
|
||||
bool Scumm::testGfxOtherUsageBits(int strip, int bit) {
|
||||
// Don't exclude the DIRTY and RESTORED bits from the test
|
||||
uint32 bitmask[3] = { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF };
|
||||
int i;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue