aboutsummaryrefslogtreecommitdiff
path: root/engines/m4/viewmgr.cpp
diff options
context:
space:
mode:
authorMax Horn2009-12-07 18:22:18 +0000
committerMax Horn2009-12-07 18:22:18 +0000
commitf8126d9da676e69dff384b8a8f7136ad27fb014d (patch)
treedf1b86f98b4792fa4c44f71237f0722aca762584 /engines/m4/viewmgr.cpp
parent6d1e4dd0344f9baef12709e2c90ac98e17392786 (diff)
downloadscummvm-rg350-f8126d9da676e69dff384b8a8f7136ad27fb014d.tar.gz
scummvm-rg350-f8126d9da676e69dff384b8a8f7136ad27fb014d.tar.bz2
scummvm-rg350-f8126d9da676e69dff384b8a8f7136ad27fb014d.zip
M4: Make M4Surface member w, h, pixels protected; some cleanup
svn-id: r46280
Diffstat (limited to 'engines/m4/viewmgr.cpp')
-rw-r--r--engines/m4/viewmgr.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/m4/viewmgr.cpp b/engines/m4/viewmgr.cpp
index 108f97e979..6d91a12a9b 100644
--- a/engines/m4/viewmgr.cpp
+++ b/engines/m4/viewmgr.cpp
@@ -68,8 +68,7 @@ int RectList::find(const Common::Point &pt) {
//--------------------------------------------------------------------------
-HotkeyList::HotkeyList(View *owner) {
- _view = owner;
+HotkeyList::HotkeyList(View *owner) : _view(owner) {
}
HotkeyList::~HotkeyList() {
@@ -106,14 +105,15 @@ bool HotkeyList::call(uint32 key) {
// View constructor
-View::View(M4Engine *vm, const Common::Rect &viewBounds, bool transparent):
- _hotkeys(HotkeyList(this)), M4Surface(viewBounds.width(), viewBounds.height()), _vm(vm) {
+View::View(M4Engine *vm, const Common::Rect &viewBounds, bool transparent)
+ : M4Surface(viewBounds.width(), viewBounds.height()), _hotkeys(this), _vm(vm) {
SCREEN_FLAGS_DEFAULT;
_coords = viewBounds;
_transparent = transparent;
}
-View::View(M4Engine *vm, int x, int y, bool transparent): _hotkeys(HotkeyList(this)), M4Surface(), _vm(vm) {
+View::View(M4Engine *vm, int x, int y, bool transparent)
+ : M4Surface(), _hotkeys(this), _vm(vm) {
SCREEN_FLAGS_DEFAULT;
_coords.left = x;
_coords.top = y;