M4: Make M4Surface member w, h, pixels protected; some cleanup

svn-id: r46280

1 files changed, 4 insertions, 4 deletions

diff --git a/engines/m4/actor.cpp b/engines/m4/actor.cpp
index ab670f5a55..bfb4a14615 100644
--- a/engines/m4/actor.cpp
+++ b/engines/m4/actor.cpp
@@ -44,8 +44,8 @@ Actor::~Actor() {
 	unloadWalkers();
 }
 
-int Actor::getWalkerWidth() { return _walkerSprites[kFacingSouth]->getFrame(0)->w; }
-int Actor::getWalkerHeight() { return _walkerSprites[kFacingSouth]->getFrame(0)->h; }
+int Actor::getWalkerWidth() { return _walkerSprites[kFacingSouth]->getFrame(0)->width(); }
+int Actor::getWalkerHeight() { return _walkerSprites[kFacingSouth]->getFrame(0)->height(); }
 
 void Actor::placeWalkerSpriteAt(int spriteNum, int x, int y) {
 	if (_direction < 1 || _direction > 9) {
@@ -55,8 +55,8 @@ void Actor::placeWalkerSpriteAt(int spriteNum, int x, int y) {
 	SpriteInfo info;
 	info.sprite = _walkerSprites[_direction]->getFrame(spriteNum);
 	info.hotX = info.hotY = 0;
-	info.width = info.sprite->w;
-	info.height = info.sprite->h;
+	info.width = info.sprite->width();
+	info.height = info.sprite->height();
 	info.scaleX = info.scaleY = _scaling;
 	info.palette = _walkerSprites[_direction]->getPalette();
 	info.inverseColorTable = _vm->_scene->getInverseColorTable();