aboutsummaryrefslogtreecommitdiff
path: root/sword2/layers.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2003-12-28 15:08:12 +0000
committerTorbjörn Andersson2003-12-28 15:08:12 +0000
commit6ae8218d537a2b627a0abad597d5084c796d1de8 (patch)
tree13941f5a83d4594739f665b364cb4d05154be6fc /sword2/layers.cpp
parent302c9f72fcf76cde76a3ee467b0fe5771a5faa3f (diff)
downloadscummvm-rg350-6ae8218d537a2b627a0abad597d5084c796d1de8.tar.gz
scummvm-rg350-6ae8218d537a2b627a0abad597d5084c796d1de8.tar.bz2
scummvm-rg350-6ae8218d537a2b627a0abad597d5084c796d1de8.zip
Hopefully the last big renaming. Now the datatypes have names like
"StandardHeader" instead of "_standardHeader". svn-id: r11997
Diffstat (limited to 'sword2/layers.cpp')
-rw-r--r--sword2/layers.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/sword2/layers.cpp b/sword2/layers.cpp
index 9da7507506..531fdfdfbe 100644
--- a/sword2/layers.cpp
+++ b/sword2/layers.cpp
@@ -40,10 +40,10 @@ int32 Logic::fnInitBackground(int32 *params) {
}
int32 Sword2Engine::initBackground(int32 res, int32 new_palette) {
- _multiScreenHeader *screenLayerTable;
- _screenHeader *screen_head;
- _layerHeader *layer;
- _spriteInfo spriteInfo;
+ MultiScreenHeader *screenLayerTable;
+ ScreenHeader *screen_head;
+ LayerHeader *layer;
+ SpriteInfo spriteInfo;
uint8 *file;
uint32 rv;
@@ -154,7 +154,7 @@ int32 Sword2Engine::initBackground(int32 res, int32 new_palette) {
// shading mask
- screenLayerTable = (_multiScreenHeader *) ((uint8 *) file + sizeof(_standardHeader));
+ screenLayerTable = (MultiScreenHeader *) (file + sizeof(StandardHeader));
if (screenLayerTable->maskOffset) {
spriteInfo.x = 0;
@@ -192,8 +192,8 @@ int32 Sword2Engine::initBackground(int32 res, int32 new_palette) {
// called from fnInitBackground and also from control panel
void Sword2Engine::setUpBackgroundLayers(void) {
- _multiScreenHeader *screenLayerTable;
- _screenHeader *screen_head;
+ MultiScreenHeader *screenLayerTable;
+ ScreenHeader *screen_head;
uint8 *file;
int i;
@@ -207,7 +207,7 @@ void Sword2Engine::setUpBackgroundLayers(void) {
screen_head = fetchScreenHeader(file);
- screenLayerTable = (_multiScreenHeader *) ((uint8 *) file + sizeof(_standardHeader));
+ screenLayerTable = (MultiScreenHeader *) (file + sizeof(StandardHeader));
// Background parallax layers