diff options
author | Peter Kohaut | 2018-02-04 18:01:19 +0100 |
---|---|---|
committer | Peter Kohaut | 2018-02-04 18:28:04 +0100 |
commit | 19bd3fead832efe2a7fe0fbca4a5e34f2207e3c5 (patch) | |
tree | 1fef1368279f6174426b3117268fa1b73ebdb4b2 /engines/bladerunner/ui/esper.h | |
parent | 6e9a340640686fe7dd95efbea34cbf3b7f4209af (diff) | |
download | scummvm-rg350-19bd3fead832efe2a7fe0fbca4a5e34f2207e3c5.tar.gz scummvm-rg350-19bd3fead832efe2a7fe0fbca4a5e34f2207e3c5.tar.bz2 scummvm-rg350-19bd3fead832efe2a7fe0fbca4a5e34f2207e3c5.zip |
BLADERUNNER: Fixed compilation warnings
Diffstat (limited to 'engines/bladerunner/ui/esper.h')
-rw-r--r-- | engines/bladerunner/ui/esper.h | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/engines/bladerunner/ui/esper.h b/engines/bladerunner/ui/esper.h index 9d0dd6d012..d63efa31bd 100644 --- a/engines/bladerunner/ui/esper.h +++ b/engines/bladerunner/ui/esper.h @@ -73,19 +73,19 @@ class ESPER { static const Common::Rect kScreen; struct Photo { - bool isPresent; - char name[13]; - int photoId; - int shapeId; + bool isPresent; + int photoId; + int shapeId; + Common::String name; }; struct Region { - bool isPresent; - int regionId; - Common::Rect rectInner; - Common::Rect rectOuter; - Common::Rect rectSelection; - char name[13]; + bool isPresent; + int regionId; + Common::Rect rectInner; + Common::Rect rectOuter; + Common::Rect rectSelection; + Common::String name; }; BladeRunnerEngine *_vm; @@ -135,6 +135,8 @@ class ESPER { bool _isZoomingOut; int _timeZoomOutNext; + Common::Rect _screen; + Common::Rect _viewport; Common::Rect _viewportNext; int _viewportPositionX; @@ -153,9 +155,9 @@ class ESPER { int _flash; - Common::Rect _selectionRect; - Common::Rect _selectionRectTarget; - Common::Rect _selectionRectDelta; + Common::Rect _selection; + Common::Rect _selectionTarget; + Common::Rect _selectionDelta; int _selectionCrosshairX; int _selectionCrosshairY; @@ -277,7 +279,6 @@ private: int viewportXToScreenX(int x); int viewportYToScreenY(int y); - }; } // End of namespace BladeRunner |