- Merge voxels back into trunk. Even if it needs further tweaking, it should at least be stable now.

SVN r3086 (trunk)
This commit is contained in:
Randy Heit 2011-01-02 18:02:27 +00:00
commit 2add3fb381
24 changed files with 2555 additions and 205 deletions

View file

@ -234,6 +234,7 @@ void FTextureManager::AddTiles (void *tiles)
rot.Texture[8] =
rot.Texture[9] = texnum.GetIndex() + 4;
rot.Flip = 0x00FC;
rot.Voxel = NULL;
tex->Rotations = SpriteFrames.Push (rot);
}
else if (rotType == 2)
@ -247,6 +248,7 @@ void FTextureManager::AddTiles (void *tiles)
rot.Texture[17-j*2] = texnum.GetIndex() + j;
}
rot.Flip = 0;
rot.Voxel = NULL;
tex->Rotations = SpriteFrames.Push (rot);
}
}