From b6242d0ea5603f73b488ed144ee3807b89829072 Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Thu, 18 Apr 2013 17:45:50 +0200 Subject: WINTERMUTE: Use int32 instead of int in classes. --- engines/wintermute/ad/ad_actor.h | 2 +- engines/wintermute/ad/ad_game.h | 8 ++-- engines/wintermute/ad/ad_inventory.h | 2 +- engines/wintermute/ad/ad_inventory_box.h | 10 ++--- engines/wintermute/ad/ad_item.h | 6 +-- engines/wintermute/ad/ad_layer.h | 4 +- engines/wintermute/ad/ad_object.h | 10 ++--- engines/wintermute/ad/ad_path.h | 2 +- engines/wintermute/ad/ad_path_point.h | 2 +- engines/wintermute/ad/ad_response_box.h | 6 +-- engines/wintermute/ad/ad_response_context.h | 2 +- engines/wintermute/ad/ad_scene.h | 8 ++-- engines/wintermute/ad/ad_sentence.h | 4 +- engines/wintermute/ad/ad_waypoint_group.h | 6 +-- engines/wintermute/base/base_active_rect.h | 4 +- engines/wintermute/base/base_frame.h | 4 +- engines/wintermute/base/base_game.cpp | 6 +-- engines/wintermute/base/base_game.h | 48 +++++++++++----------- engines/wintermute/base/base_game_music.h | 4 +- engines/wintermute/base/base_object.h | 4 +- engines/wintermute/base/base_parser.cpp | 6 +-- engines/wintermute/base/base_parser.h | 8 ++-- engines/wintermute/base/base_point.h | 4 +- engines/wintermute/base/base_region.cpp | 2 +- engines/wintermute/base/base_region.h | 8 ++-- engines/wintermute/base/base_scriptable.h | 2 +- engines/wintermute/base/base_sprite.h | 10 ++--- engines/wintermute/base/base_sub_frame.h | 2 +- engines/wintermute/base/base_viewport.h | 4 +- engines/wintermute/base/file/base_package.h | 2 +- engines/wintermute/base/gfx/base_renderer.h | 32 +++++++-------- engines/wintermute/base/gfx/base_surface.h | 6 +-- engines/wintermute/base/particles/part_emitter.h | 10 ++--- engines/wintermute/base/particles/part_particle.h | 12 +++--- engines/wintermute/base/scriptables/script.h | 4 +- .../wintermute/base/scriptables/script_ext_array.h | 2 +- .../wintermute/base/scriptables/script_ext_file.h | 2 +- .../base/scriptables/script_ext_mem_buffer.h | 2 +- .../base/scriptables/script_ext_string.h | 2 +- engines/wintermute/base/scriptables/script_stack.h | 2 +- engines/wintermute/base/scriptables/script_value.h | 2 +- engines/wintermute/base/sound/base_sound.h | 2 +- engines/wintermute/base/sound/base_sound_buffer.h | 4 +- engines/wintermute/base/sound/base_sound_manager.h | 4 +- engines/wintermute/ui/ui_edit.h | 10 ++--- engines/wintermute/ui/ui_object.h | 4 +- engines/wintermute/video/video_player.h | 6 +-- engines/wintermute/video/video_theora_player.h | 10 ++--- 48 files changed, 153 insertions(+), 153 deletions(-) (limited to 'engines/wintermute') diff --git a/engines/wintermute/ad/ad_actor.h b/engines/wintermute/ad/ad_actor.h index ebf686f74b..49ee39b65d 100644 --- a/engines/wintermute/ad/ad_actor.h +++ b/engines/wintermute/ad/ad_actor.h @@ -100,7 +100,7 @@ private: double _pFStepY; double _pFX; double _pFY; - int _pFCount; + int32 _pFCount; }; } // end of namespace Wintermute diff --git a/engines/wintermute/ad/ad_game.h b/engines/wintermute/ad/ad_game.h index dfb7f1fe8e..8361dad1cb 100644 --- a/engines/wintermute/ad/ad_game.h +++ b/engines/wintermute/ad/ad_game.h @@ -86,10 +86,10 @@ public: AdSceneState *getSceneState(const char *filename, bool saving); BaseViewport *_sceneViewport; - int _texItemLifeTime; - int _texWalkLifeTime; - int _texStandLifeTime; - int _texTalkLifeTime; + int32 _texItemLifeTime; + int32 _texWalkLifeTime; + int32 _texStandLifeTime; + int32 _texTalkLifeTime; TTalkSkipButton _talkSkipButton; diff --git a/engines/wintermute/ad/ad_inventory.h b/engines/wintermute/ad/ad_inventory.h index f226a65612..999200b465 100644 --- a/engines/wintermute/ad/ad_inventory.h +++ b/engines/wintermute/ad/ad_inventory.h @@ -44,7 +44,7 @@ public: AdInventory(BaseGame *inGame); virtual ~AdInventory(); BaseArray _takenItems; - int _scrollOffset; + int32 _scrollOffset; }; } // end of namespace Wintermute diff --git a/engines/wintermute/ad/ad_inventory_box.h b/engines/wintermute/ad/ad_inventory_box.h index cb6d084562..efbec2d851 100644 --- a/engines/wintermute/ad/ad_inventory_box.h +++ b/engines/wintermute/ad/ad_inventory_box.h @@ -43,8 +43,8 @@ public: bool _visible; virtual bool display(); UIButton *_closeButton; - int _spacing; - int _scrollOffset; + int32 _spacing; + int32 _scrollOffset; Rect32 _itemsArea; bool listen(BaseScriptHolder *param1, uint32 param2); UIWindow *_window; @@ -55,9 +55,9 @@ public: virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent); private: bool _exclusive; - int _scrollBy; - int _itemHeight; - int _itemWidth; + int32 _scrollBy; + int32 _itemHeight; + int32 _itemWidth; }; } // end of namespace Wintermute diff --git a/engines/wintermute/ad/ad_item.h b/engines/wintermute/ad/ad_item.h index 79978f9f72..4c9b8d998f 100644 --- a/engines/wintermute/ad/ad_item.h +++ b/engines/wintermute/ad/ad_item.h @@ -57,9 +57,9 @@ public: virtual const char *scToString(); private: bool _displayAmount; - int _amount; - int _amountOffsetX; - int _amountOffsetY; + int32 _amount; + int32 _amountOffsetX; + int32 _amountOffsetY; TTextAlign _amountAlign; char *_amountString; }; diff --git a/engines/wintermute/ad/ad_layer.h b/engines/wintermute/ad/ad_layer.h index de65e2822f..95f96617f5 100644 --- a/engines/wintermute/ad/ad_layer.h +++ b/engines/wintermute/ad/ad_layer.h @@ -36,8 +36,8 @@ public: bool _closeUp; DECLARE_PERSISTENT(AdLayer, BaseObject) bool _active; - int _height; - int _width; + int32 _height; + int32 _width; bool _main; AdLayer(BaseGame *inGame); virtual ~AdLayer(); diff --git a/engines/wintermute/ad/ad_object.h b/engines/wintermute/ad/ad_object.h index 39480e3446..81ecaf11f2 100644 --- a/engines/wintermute/ad/ad_object.h +++ b/engines/wintermute/ad/ad_object.h @@ -109,13 +109,13 @@ protected: bool getScale(float *scaleX, float *scaleY); private: bool _partFollowParent; - int _partOffsetX; - int _partOffsetY; + int32 _partOffsetX; + int32 _partOffsetY; bool _subtitlesModRelative; bool _subtitlesModXCenter; - int _subtitlesModX; - int _subtitlesModY; - int _subtitlesWidth; + int32 _subtitlesModX; + int32 _subtitlesModY; + int32 _subtitlesWidth; AdRegion *_currentRegions[MAX_NUM_REGIONS]; BaseArray _attachmentsPre; BaseArray _attachmentsPost; diff --git a/engines/wintermute/ad/ad_path.h b/engines/wintermute/ad/ad_path.h index 6b043197aa..3f38355b94 100644 --- a/engines/wintermute/ad/ad_path.h +++ b/engines/wintermute/ad/ad_path.h @@ -47,7 +47,7 @@ public: AdPath(BaseGame *inGame); virtual ~AdPath(); BaseArray _points; - int _currIndex; + int32 _currIndex; bool _ready; }; diff --git a/engines/wintermute/ad/ad_path_point.h b/engines/wintermute/ad/ad_path_point.h index 58457976c8..04648b1733 100644 --- a/engines/wintermute/ad/ad_path_point.h +++ b/engines/wintermute/ad/ad_path_point.h @@ -42,7 +42,7 @@ public: virtual ~AdPathPoint(); AdPathPoint *_origin; bool _marked; - int _distance; + int32 _distance; }; } // end of namespace Wintermute diff --git a/engines/wintermute/ad/ad_response_box.h b/engines/wintermute/ad/ad_response_box.h index e1b766cbdb..d7b2931ef6 100644 --- a/engines/wintermute/ad/ad_response_box.h +++ b/engines/wintermute/ad/ad_response_box.h @@ -78,13 +78,13 @@ public: UIWindow *getResponseWindow(); uint32 getNumResponses() const; private: - int _spacing; - int _scrollOffset; + int32 _spacing; + int32 _scrollOffset; BaseFont *_fontHover; BaseFont *_font; bool _horizontal; Rect32 _responseArea; - int _verticalAlign; + int32 _verticalAlign; TTextAlign _align; BaseArray _respButtons; BaseArray _responses; diff --git a/engines/wintermute/ad/ad_response_context.h b/engines/wintermute/ad/ad_response_context.h index f2e2a45b21..dd0008a728 100644 --- a/engines/wintermute/ad/ad_response_context.h +++ b/engines/wintermute/ad/ad_response_context.h @@ -38,7 +38,7 @@ class AdResponseContext : public BaseClass { public: void setContext(const char *context); const char *getContext() const { return _context; } - int _id; + int32 _id; DECLARE_PERSISTENT(AdResponseContext, BaseClass) AdResponseContext(BaseGame *inGame); diff --git a/engines/wintermute/ad/ad_scene.h b/engines/wintermute/ad/ad_scene.h index a820157361..a8cf9b4e28 100644 --- a/engines/wintermute/ad/ad_scene.h +++ b/engines/wintermute/ad/ad_scene.h @@ -125,12 +125,12 @@ public: BaseArray _waypointGroups; bool loadFile(const char *filename); bool loadBuffer(byte *buffer, bool complete = true); - int _width; - int _height; + int32 _width; + int32 _height; bool addObject(AdObject *Object); bool removeObject(AdObject *Object); - int _editorMarginH; - int _editorMarginV; + int32 _editorMarginH; + int32 _editorMarginV; uint32 _editorColFrame; uint32 _editorColEntity; uint32 _editorColRegion; diff --git a/engines/wintermute/ad/ad_sentence.h b/engines/wintermute/ad/ad_sentence.h index e7c94030b9..6f255578f7 100644 --- a/engines/wintermute/ad/ad_sentence.h +++ b/engines/wintermute/ad/ad_sentence.h @@ -56,14 +56,14 @@ public: BaseSound *_sound; TTextAlign _align; bool display(); - int _width; + int32 _width; Point32 _pos; BaseFont *_font; char *getNextStance(); char *getCurrentStance(); void setStances(const char *stances); void setText(const char *text); - int _currentStance; + int32 _currentStance; uint32 _startTime; char *_stances; char *_text; diff --git a/engines/wintermute/ad/ad_waypoint_group.h b/engines/wintermute/ad/ad_waypoint_group.h index 7e427313e6..c44967c38e 100644 --- a/engines/wintermute/ad/ad_waypoint_group.h +++ b/engines/wintermute/ad/ad_waypoint_group.h @@ -50,10 +50,10 @@ public: virtual ScValue *scGetProperty(const Common::String &name); virtual bool scSetProperty(const char *name, ScValue *value); private: - int _editorSelectedPoint; + int32 _editorSelectedPoint; float _lastMimicScale; - int _lastMimicX; - int _lastMimicY; + int32 _lastMimicX; + int32 _lastMimicY; }; } // end of namespace Wintermute diff --git a/engines/wintermute/base/base_active_rect.h b/engines/wintermute/base/base_active_rect.h index 7ef8374814..982a0902d0 100644 --- a/engines/wintermute/base/base_active_rect.h +++ b/engines/wintermute/base/base_active_rect.h @@ -45,8 +45,8 @@ public: BaseSubFrame *_frame; BaseObject *_owner; BaseRegion *_region; - int _offsetX; - int _offsetY; + int32 _offsetX; + int32 _offsetY; Rect32 _rect; BaseActiveRect(BaseGame *inGameOwner = nullptr); BaseActiveRect(BaseGame *inGameOwner, BaseObject *owner, BaseSubFrame *frame, int x, int y, int width, int height, float zoomX = 100, float zoomY = 100, bool precise = true); diff --git a/engines/wintermute/base/base_frame.h b/engines/wintermute/base/base_frame.h index 5ed0b92bba..63e253de8a 100644 --- a/engines/wintermute/base/base_frame.h +++ b/engines/wintermute/base/base_frame.h @@ -47,8 +47,8 @@ public: bool getBoundingRect(Rect32 *rect, int x, int y, float scaleX = 100, float scaleY = 100); bool saveAsText(BaseDynamicBuffer *buffer, int indent); - int _moveY; - int _moveX; + int32 _moveY; + int32 _moveX; uint32 _delay; BaseArray _subframes; bool draw(int x, int y, BaseObject *registerOwner = nullptr, float zoomX = 100, float zoomY = 100, bool precise = true, uint32 alpha = 0xFFFFFFFF, bool allFrames = false, float rotate = 0.0f, TSpriteBlendMode blendMode = BLEND_NORMAL); diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp index 4f8d099506..0f2a3d1260 100644 --- a/engines/wintermute/base/base_game.cpp +++ b/engines/wintermute/base/base_game.cpp @@ -3001,7 +3001,7 @@ bool BaseGame::saveGame(int slot, const char *desc, bool quickSave) { ////////////////////////////////////////////////////////////////////////// -bool BaseGame::loadGame(int slot) { +bool BaseGame::loadGame(uint32 slot) { //_gameRef->LOG(0, "Load start %d", BaseUtils::GetUsedMemMB()); _loading = false; @@ -3223,7 +3223,7 @@ void BaseGame::handleKeyRelease(Common::Event *event) { ////////////////////////////////////////////////////////////////////////// -bool BaseGame::handleMouseWheel(int delta) { +bool BaseGame::handleMouseWheel(int32 delta) { bool handled = false; if (_focusedWindow) { handled = _gameRef->_focusedWindow->handleMouseWheel(delta); @@ -3879,7 +3879,7 @@ void BaseGame::autoSaveOnExit() { } ////////////////////////////////////////////////////////////////////////// -void BaseGame::addMem(int bytes) { +void BaseGame::addMem(int32 bytes) { _usedMem += bytes; } diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h index a0af2164b1..ec5a29e32f 100644 --- a/engines/wintermute/base/base_game.h +++ b/engines/wintermute/base/base_game.h @@ -108,16 +108,16 @@ public: void DEBUG_DumpClassRegistry(); bool setWaitCursor(const char *filename); - int getSaveThumbWidth() const { return _thumbnailWidth; } - int getSaveThumbHeight() const { return _thumbnailHeight; } + uint32 getSaveThumbWidth() const { return _thumbnailWidth; } + uint32 getSaveThumbHeight() const { return _thumbnailHeight; } bool _editorMode; void getOffset(int *offsetX, int *offsetY) const; - void setOffset(int offsetX, int offsetY); + void setOffset(int32 offsetX, int32 offsetY); int getSequence(); - int _offsetY; - int _offsetX; + int32 _offsetY; + int32 _offsetX; float _offsetPercentX; float _offsetPercentY; @@ -155,11 +155,11 @@ public: bool _debugDebugMode; - int _sequence; + int32 _sequence; virtual bool loadFile(const char *filename); virtual bool loadBuffer(byte *buffer, bool complete = true); - int _viewportSP; + int32 _viewportSP; bool _suppressScriptErrors; bool _mouseLeftDown; // TODO: Hide @@ -179,11 +179,11 @@ public: bool _smartCache; // RO bool _subtitles; // RO - int _scheduledLoadSlot; + int32 _scheduledLoadSlot; bool getIsLoading() const { return _loading; } - virtual bool handleMouseWheel(int delta); + virtual bool handleMouseWheel(int32 delta); bool _quitting; virtual bool getVersion(byte *verMajor, byte *verMinor, byte *extMajor, byte *extMinor) const; @@ -204,9 +204,9 @@ public: bool displayWindows(bool inGame = false); bool _useD3D; virtual bool cleanup(); - bool loadGame(int slot); + bool loadGame(uint32 slot); bool loadGame(const char *filename); - bool saveGame(int slot, const char *desc, bool quickSave = false); + bool saveGame(int32 slot, const char *desc, bool quickSave = false); virtual bool showCursor(); BaseObject *_activeObject; @@ -235,7 +235,7 @@ public: virtual bool displayContentSimple(); bool _forceNonStreamedSounds; void resetMousePos(); - int _subtitlesSpeed; + int32 _subtitlesSpeed; void setInteractive(bool state); virtual bool windowLoadHook(UIWindow *win, char **buf, char **params); virtual bool windowScriptMethodHook(UIWindow *win, ScScript *script, ScStack *stack, const char *name); @@ -248,7 +248,7 @@ public: bool drawCursor(BaseSprite *Cursor); SaveThumbHelper *_cachedThumbnail; - void addMem(int bytes); + void addMem(int32 bytes); bool _touchInterface; bool _constrainedMemory; protected: @@ -256,13 +256,13 @@ protected: BaseFont *_videoFont; BaseSprite *_loadingIcon; - int _loadingIconX; - int _loadingIconY; - int _loadingIconPersistent; + int32 _loadingIconX; + int32 _loadingIconY; + int32 _loadingIconPersistent; BaseFader *_fader; - int _freezeLevel; + int32 _freezeLevel; VideoPlayer *_videoPlayer; VideoTheoraPlayer *_theoraPlayer; private: @@ -278,7 +278,7 @@ private: BaseGameSettings *_settings; - int _soundBufferSizeSec; + int32 _soundBufferSizeSec; virtual bool invalidateDeviceObjects(); virtual bool restoreDeviceObjects(); @@ -305,8 +305,8 @@ private: bool _personalizedSave; - int _thumbnailWidth; - int _thumbnailHeight; + uint32 _thumbnailWidth; + uint32 _thumbnailHeight; void setWindowTitle(); @@ -334,13 +334,13 @@ private: time = 0; } - int posX; - int posY; + int32 posX; + int32 posY; uint32 time; }; LastClickInfo _lastClick[2]; - bool isDoubleClick(int buttonIndex); + bool isDoubleClick(int32 buttonIndex); uint32 _usedMem; @@ -348,7 +348,7 @@ private: protected: // WME Lite specific bool _autoSaveOnExit; - int _autoSaveSlot; + uint32 _autoSaveSlot; bool _cursorHidden; public: diff --git a/engines/wintermute/base/base_game_music.h b/engines/wintermute/base/base_game_music.h index 058a8cadef..0ac904b8c1 100644 --- a/engines/wintermute/base/base_game_music.h +++ b/engines/wintermute/base/base_game_music.h @@ -64,8 +64,8 @@ private: bool _musicCrossfadeSwap; uint32 _musicCrossfadeStartTime; uint32 _musicCrossfadeLength; - int _musicCrossfadeChannel1; - int _musicCrossfadeChannel2; + int32 _musicCrossfadeChannel1; + int32 _musicCrossfadeChannel2; }; } // end of namespace Wintermute diff --git a/engines/wintermute/base/base_object.h b/engines/wintermute/base/base_object.h index c8491c2cf6..9593c98032 100644 --- a/engines/wintermute/base/base_object.h +++ b/engines/wintermute/base/base_object.h @@ -72,7 +72,7 @@ protected: bool _ready; Rect32 _rect; bool _rectSet; - int _iD; + int32 _iD; char *_soundEvent; public: TSpriteBlendMode _blendMode; @@ -84,7 +84,7 @@ public: virtual bool resetSoundPan(); virtual bool updateSounds(); bool updateOneSound(BaseSound *sound); - int _sFXVolume; + int32 _sFXVolume; virtual bool handleMouseWheel(int delta); virtual bool handleMouse(TMouseEvent event, TMouseButton button); diff --git a/engines/wintermute/base/base_parser.cpp b/engines/wintermute/base/base_parser.cpp index aaa376fe56..a7e3bd5efb 100644 --- a/engines/wintermute/base/base_parser.cpp +++ b/engines/wintermute/base/base_parser.cpp @@ -275,7 +275,7 @@ float BaseParser::getTokenFloat(char **buf) { ////////////////////////////////////////////////////////////////////// -int BaseParser::getTokenInt(char **buf) { +int32 BaseParser::getTokenInt(char **buf) { Common::String token = getToken(buf); const char *t = token.c_str(); if (!((*t >= '0' && *t <= '9') || *t == '-')) { @@ -298,11 +298,11 @@ void BaseParser::skipToken(char **buf, char *tok, char * /*msg*/) { ////////////////////////////////////////////////////////////////////// -int BaseParser::scanStr(const char *in, const char *format, ...) { +int32 BaseParser::scanStr(const char *in, const char *format, ...) { va_list arg; va_start(arg, format); - int num = 0; + int32 num = 0; in += strspn(in, " \t\n\f"); while (*format && *in) { diff --git a/engines/wintermute/base/base_parser.h b/engines/wintermute/base/base_parser.h index 87a936c624..4953ac3c0b 100644 --- a/engines/wintermute/base/base_parser.h +++ b/engines/wintermute/base/base_parser.h @@ -59,26 +59,26 @@ namespace Wintermute { class BaseParser { public: struct TokenDesc { - int32 id; + int32 id; const char *token; }; public: - int scanStr(const char *in, const char *format, ...); + int32 scanStr(const char *in, const char *format, ...); int32 getCommand(char **buf, const TokenDesc *tokens, char **params); BaseParser(); virtual ~BaseParser(); private: char *getLastOffender(); void skipToken(char **buf, char *tok, char *msg = nullptr); - int getTokenInt(char **buf); + int32 getTokenInt(char **buf); float getTokenFloat(char **buf); Common::String getToken(char **buf); char *getAssignmentText(char **buf); char *getSubText(char **buf, char open, char close); void skipCharacters(char **buf, const char *toSkip); int32 getObject(char **buf, const TokenDesc *tokens, char **name, char **data); - int _parserLine; + int32 _parserLine; char _lastOffender[255]; char *_whiteSpace; }; diff --git a/engines/wintermute/base/base_point.h b/engines/wintermute/base/base_point.h index c0bbd3102e..26568d5d0b 100644 --- a/engines/wintermute/base/base_point.h +++ b/engines/wintermute/base/base_point.h @@ -39,8 +39,8 @@ public: DECLARE_PERSISTENT(BasePoint, BaseClass) BasePoint(); BasePoint(int initX, int initY); - int y; - int x; + int32 y; + int32 x; virtual ~BasePoint(); }; diff --git a/engines/wintermute/base/base_region.cpp b/engines/wintermute/base/base_region.cpp index 8bdb726cde..51d222be4c 100644 --- a/engines/wintermute/base/base_region.cpp +++ b/engines/wintermute/base/base_region.cpp @@ -446,7 +446,7 @@ typedef struct { } dPoint; ////////////////////////////////////////////////////////////////////////// -bool BaseRegion::ptInPolygon(int x, int y) { +bool BaseRegion::ptInPolygon(int32 x, int32 y) { if (_points.size() < 3) { return false; } diff --git a/engines/wintermute/base/base_region.h b/engines/wintermute/base/base_region.h index 6b7905fe53..dcf1fb53ce 100644 --- a/engines/wintermute/base/base_region.h +++ b/engines/wintermute/base/base_region.h @@ -39,10 +39,10 @@ public: void cleanup(); bool mimic(BaseRegion *region, float scale = 100.0f, int x = 0, int y = 0); bool getBoundingRect(Rect32 *rect); - bool ptInPolygon(int x, int y); + bool ptInPolygon(int32 x, int32 y); DECLARE_PERSISTENT(BaseRegion, BaseObject) bool _active; - int _editorSelectedPoint; + int32 _editorSelectedPoint; BaseRegion(BaseGame *inGame); virtual ~BaseRegion(); bool pointInRegion(int x, int y); @@ -61,8 +61,8 @@ public: virtual const char *scToString(); private: float _lastMimicScale; - int _lastMimicX; - int _lastMimicY; + int32 _lastMimicX; + int32 _lastMimicY; }; } // end of namespace Wintermute diff --git a/engines/wintermute/base/base_scriptable.h b/engines/wintermute/base/base_scriptable.h index b0b4e77ed2..f23d7faa5b 100644 --- a/engines/wintermute/base/base_scriptable.h +++ b/engines/wintermute/base/base_scriptable.h @@ -63,7 +63,7 @@ public: virtual void scSetBool(bool val); virtual int scCompare(BaseScriptable *val); virtual void scDebuggerDesc(char *buf, int bufSize); - int _refCount; + int32 _refCount; ScValue *_scValue; ScValue *_scProp; }; diff --git a/engines/wintermute/base/base_sprite.h b/engines/wintermute/base/base_sprite.h index ac1a0e919b..63c235fc41 100644 --- a/engines/wintermute/base/base_sprite.h +++ b/engines/wintermute/base/base_sprite.h @@ -45,8 +45,8 @@ public: DECLARE_PERSISTENT(BaseSprite, BaseScriptHolder) bool getBoundingRect(Rect32 *rect, int x, int y, float scaleX = 100, float scaleY = 100); - int _moveY; - int _moveX; + int32 _moveY; + int32 _moveX; bool display(int x, int y, BaseObject *registerOwner = nullptr, float zoomX = 100, float zoomY = 100, uint32 alpha = 0xFFFFFFFF, float rotate = 0.0f, TSpriteBlendMode blendMode = BLEND_NORMAL); bool getCurrentFrame(float zoomX = 100, float zoomY = 100); void reset(); @@ -74,9 +74,9 @@ private: bool _changed; bool _editorAllFrames; char *_editorBgFile; - int _editorBgOffsetX; - int _editorBgOffsetY; - int _editorBgAlpha; + int32 _editorBgOffsetX; + int32 _editorBgOffsetY; + int32 _editorBgAlpha; bool _editorMuted; bool _finished; bool _continuous; diff --git a/engines/wintermute/base/base_sub_frame.h b/engines/wintermute/base/base_sub_frame.h index 2888761bb3..1ecf6c671d 100644 --- a/engines/wintermute/base/base_sub_frame.h +++ b/engines/wintermute/base/base_sub_frame.h @@ -72,7 +72,7 @@ public: byte _cKRed; byte _cKGreen; byte _cKBlue; - int _lifeTime; + int32 _lifeTime; bool _keepLoaded; bool _2DOnly; diff --git a/engines/wintermute/base/base_viewport.h b/engines/wintermute/base/base_viewport.h index 636c9c5642..75b9989080 100644 --- a/engines/wintermute/base/base_viewport.h +++ b/engines/wintermute/base/base_viewport.h @@ -43,8 +43,8 @@ public: Rect32 *getRect(); bool setRect(int left, int top, int right, int bottom, bool noCheck = false); DECLARE_PERSISTENT(BaseViewport, BaseClass) - int _offsetY; - int _offsetX; + int32 _offsetY; + int32 _offsetX; BaseObject *_mainObject; BaseViewport(BaseGame *inGame = nullptr); virtual ~BaseViewport(); diff --git a/engines/wintermute/base/file/base_package.h b/engines/wintermute/base/file/base_package.h index 2882eb03b7..bcf088aaea 100644 --- a/engines/wintermute/base/file/base_package.h +++ b/engines/wintermute/base/file/base_package.h @@ -41,7 +41,7 @@ public: bool _boundToExe; byte _priority; Common::String _name; - int _cd; + int32 _cd; BasePackage(); }; diff --git a/engines/wintermute/base/gfx/base_renderer.h b/engines/wintermute/base/gfx/base_renderer.h index 971d0dfb55..bfef29a5ed 100644 --- a/engines/wintermute/base/gfx/base_renderer.h +++ b/engines/wintermute/base/gfx/base_renderer.h @@ -169,7 +169,7 @@ public: bool isReady() const { return _ready; } bool isWindowed() const { return _windowed; } - int getBPP() const { return _bPP; } + int32 getBPP() const { return _bPP; } uint32 _window; uint32 _forceAlphaColor; @@ -188,33 +188,33 @@ public: bool displayIndicator(); - int getWidth() const { return _width; } - int getHeight() const { return _height; } + int32 getWidth() const { return _width; } + int32 getHeight() const { return _height; } protected: - int _height; - int _width; + int32 _height; + int32 _width; bool _windowed; - int _bPP; + int32 _bPP; Common::String _loadImageName; Common::String _saveImageName; - int _saveImageX; - int _saveImageY; - int _loadImageX; - int _loadImageY; + int32 _saveImageX; + int32 _saveImageY; + int32 _loadImageX; + int32 _loadImageY; BaseSurface *_saveLoadImage; bool _hasDrawnSaveLoadImage; - int _indicatorWidthDrawn; + int32 _indicatorWidthDrawn; uint32 _indicatorColor; - int _indicatorX; - int _indicatorY; - int _indicatorWidth; - int _indicatorHeight; + int32 _indicatorX; + int32 _indicatorY; + int32 _indicatorWidth; + int32 _indicatorHeight; bool _loadInProgress; bool _indicatorDisplay; - int _indicatorProgress; + int32 _indicatorProgress; uint32 _clipperWindow; diff --git a/engines/wintermute/base/gfx/base_surface.h b/engines/wintermute/base/gfx/base_surface.h index 1ada900161..b83efa0bb8 100644 --- a/engines/wintermute/base/gfx/base_surface.h +++ b/engines/wintermute/base/gfx/base_surface.h @@ -41,7 +41,7 @@ public: virtual bool prepareToDraw(); uint32 _lastUsedTime; bool _valid; - int _lifeTime; + int32 _lifeTime; bool _pixelOpReady; BaseSurface(BaseGame *inGame); @@ -90,8 +90,8 @@ protected: bool _keepLoaded; Common::String _filename; - int _height; - int _width; + int32 _height; + int32 _width; }; diff --git a/engines/wintermute/base/particles/part_emitter.h b/engines/wintermute/base/particles/part_emitter.h index 54a49df230..cbc0aa49b4 100644 --- a/engines/wintermute/base/particles/part_emitter.h +++ b/engines/wintermute/base/particles/part_emitter.h @@ -43,7 +43,7 @@ public: PartEmitter(BaseGame *inGame, BaseScriptHolder *Owner); virtual ~PartEmitter(void); - int _fadeOutTime; + int32 _fadeOutTime; bool start(); @@ -70,11 +70,11 @@ public: private: - int _width; - int _height; + int32 _width; + int32 _height; - int _angle1; - int _angle2; + int32 _angle1; + int32 _angle2; float _rotation1; float _rotation2; diff --git a/engines/wintermute/base/particles/part_particle.h b/engines/wintermute/base/particles/part_particle.h index 4b8c2f131e..8cca6b4057 100644 --- a/engines/wintermute/base/particles/part_particle.h +++ b/engines/wintermute/base/particles/part_particle.h @@ -55,8 +55,8 @@ public: float _rotation; float _angVelocity; - int _alpha1; - int _alpha2; + int32 _alpha1; + int32 _alpha2; Rect32 _border; Vector2 _pos; @@ -65,7 +65,7 @@ public: float _scale; BaseSprite *_sprite; uint32 _creationTime; - int _lifeTime; + int32 _lifeTime; bool _isDead; TParticleState _state; @@ -80,9 +80,9 @@ public: bool persist(BasePersistenceManager *PersistMgr); private: uint32 _fadeStart; - int _fadeTime; - int _currentAlpha; - int _fadeStartAlpha; + int32 _fadeTime; + int32 _currentAlpha; + int32 _fadeStartAlpha; }; } // end of namespace Wintermute diff --git a/engines/wintermute/base/scriptables/script.h b/engines/wintermute/base/scriptables/script.h index 428eb9a17e..ee9f45e204 100644 --- a/engines/wintermute/base/scriptables/script.h +++ b/engines/wintermute/base/scriptables/script.h @@ -113,7 +113,7 @@ public: char *dll_name; TCallType call_type; TExternalType returns; - int nu_params; + int32 nu_params; TExternalType *params; } TExternalFunction; @@ -124,7 +124,7 @@ public: ScStack *_stack; ScValue *_globals; ScEngine *_engine; - int _currentLine; + int32 _currentLine; bool executeInstruction(); char *getString(); uint32 getDWORD(); diff --git a/engines/wintermute/base/scriptables/script_ext_array.h b/engines/wintermute/base/scriptables/script_ext_array.h index 284c547a27..68f808641e 100644 --- a/engines/wintermute/base/scriptables/script_ext_array.h +++ b/engines/wintermute/base/scriptables/script_ext_array.h @@ -46,7 +46,7 @@ public: bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name); const char *scToString(); private: - int _length; + int32 _length; ScValue *_values; Common::String _strRep; }; diff --git a/engines/wintermute/base/scriptables/script_ext_file.h b/engines/wintermute/base/scriptables/script_ext_file.h index f7c72fcfb3..fa2384109f 100644 --- a/engines/wintermute/base/scriptables/script_ext_file.h +++ b/engines/wintermute/base/scriptables/script_ext_file.h @@ -49,7 +49,7 @@ public: private: Common::SeekableReadStream *_readFile; Common::WriteStream *_writeFile; - int _mode; // 0..none, 1..read, 2..write, 3..append + int32 _mode; // 0..none, 1..read, 2..write, 3..append bool _textMode; void close(); void cleanup(); diff --git a/engines/wintermute/base/scriptables/script_ext_mem_buffer.h b/engines/wintermute/base/scriptables/script_ext_mem_buffer.h index 1527a323dc..6700a03f50 100644 --- a/engines/wintermute/base/scriptables/script_ext_mem_buffer.h +++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.h @@ -47,7 +47,7 @@ public: virtual ~SXMemBuffer(); virtual void *scToMemBuffer(); private: - int _size; + int32 _size; bool resize(int newSize); void *_buffer; diff --git a/engines/wintermute/base/scriptables/script_ext_string.h b/engines/wintermute/base/scriptables/script_ext_string.h index 00bffab3a9..50b61deba4 100644 --- a/engines/wintermute/base/scriptables/script_ext_string.h +++ b/engines/wintermute/base/scriptables/script_ext_string.h @@ -50,7 +50,7 @@ public: private: char *_string; - int _capacity; + int32 _capacity; }; } // end of namespace Wintermute diff --git a/engines/wintermute/base/scriptables/script_stack.h b/engines/wintermute/base/scriptables/script_stack.h index 86d246cf34..82c3debefa 100644 --- a/engines/wintermute/base/scriptables/script_stack.h +++ b/engines/wintermute/base/scriptables/script_stack.h @@ -57,7 +57,7 @@ public: ScStack(BaseGame *inGame); virtual ~ScStack(); BaseArray _values; - int _sP; + int32 _sP; }; diff --git a/engines/wintermute/base/scriptables/script_value.h b/engines/wintermute/base/scriptables/script_value.h index bf7d9cd8a1..e8173474d6 100644 --- a/engines/wintermute/base/scriptables/script_value.h +++ b/engines/wintermute/base/scriptables/script_value.h @@ -87,7 +87,7 @@ public: ScValue *_valRef; private: bool _valBool; - int _valInt; + int32 _valInt; double _valFloat; char *_valString; public: diff --git a/engines/wintermute/base/sound/base_sound.h b/engines/wintermute/base/sound/base_sound.h index 637061b7cc..3412e6c3a3 100644 --- a/engines/wintermute/base/sound/base_sound.h +++ b/engines/wintermute/base/sound/base_sound.h @@ -67,7 +67,7 @@ private: Common::String _soundFilename; bool _soundStreamed; Audio::Mixer::SoundType _soundType; - int _soundPrivateVolume; + int32 _soundPrivateVolume; uint32 _soundLoopStart; uint32 _soundPosition; bool _soundPlaying; diff --git a/engines/wintermute/base/sound/base_sound_buffer.h b/engines/wintermute/base/sound/base_sound_buffer.h index 9c39f4c34b..e78d062cd4 100644 --- a/engines/wintermute/base/sound/base_sound_buffer.h +++ b/engines/wintermute/base/sound/base_sound_buffer.h @@ -86,13 +86,13 @@ public: Audio::Mixer::SoundType _type; bool _looping; - int _privateVolume; + int32 _privateVolume; private: uint32 _startPos; Common::String _filename; bool _streamed; Common::SeekableReadStream *_file; - int _volume; + int32 _volume; }; } // end of namespace Wintermute diff --git a/engines/wintermute/base/sound/base_sound_manager.h b/engines/wintermute/base/sound/base_sound_manager.h index 33f0ffd8e1..602571765f 100644 --- a/engines/wintermute/base/sound/base_sound_manager.h +++ b/engines/wintermute/base/sound/base_sound_manager.h @@ -49,7 +49,7 @@ public: byte getVolumePercent(Audio::Mixer::SoundType type); bool setVolumePercent(Audio::Mixer::SoundType type, byte percent); bool setVolume(Audio::Mixer::SoundType type, int volume); - int _volumeMaster; + int32 _volumeMaster; bool removeSound(BaseSoundBuffer *sound); BaseSoundBuffer *addSound(const Common::String &filename, Audio::Mixer::SoundType type = Audio::Mixer::kSFXSoundType, bool streamed = false); bool addSound(BaseSoundBuffer *sound, Audio::Mixer::SoundType type = Audio::Mixer::kSFXSoundType); @@ -60,7 +60,7 @@ public: Common::Array _sounds; void saveSettings(); private: - int _volumeMasterPercent; // Necessary to avoid round-offs. + int32 _volumeMasterPercent; // Necessary to avoid round-offs. bool setMasterVolume(byte percent); }; diff --git a/engines/wintermute/ui/ui_edit.h b/engines/wintermute/ui/ui_edit.h index 5bb31422b6..ad26ab5b23 100644 --- a/engines/wintermute/ui/ui_edit.h +++ b/engines/wintermute/ui/ui_edit.h @@ -38,20 +38,20 @@ class BaseFont; class UIEdit : public UIObject { public: DECLARE_PERSISTENT(UIEdit, UIObject) - int _maxLength; + int32 _maxLength; int insertChars(int pos, const byte *chars, int num); int deleteChars(int start, int end); bool _cursorVisible; uint32 _lastBlinkTime; virtual bool display(int offsetX, int offsetY); virtual bool handleKeypress(Common::Event *event, bool printable = false); - int _scrollOffset; - int _frameWidth; + int32 _scrollOffset; + int32 _frameWidth; uint32 _cursorBlinkRate; void setCursorChar(const char *character); char *_cursorChar; - int _selEnd; - int _selStart; + int32 _selEnd; + int32 _selStart; BaseFont *_fontSelected; UIEdit(BaseGame *inGame); virtual ~UIEdit(); diff --git a/engines/wintermute/ui/ui_object.h b/engines/wintermute/ui/ui_object.h index c77acfef41..1f117dac19 100644 --- a/engines/wintermute/ui/ui_object.h +++ b/engines/wintermute/ui/ui_object.h @@ -62,8 +62,8 @@ public: bool _disable; UIObject(BaseGame *inGame = nullptr); virtual ~UIObject(); - int _width; - int _height; + int32 _width; + int32 _height; TUIObjectType _type; BaseSprite *_image; void setListener(BaseScriptHolder *object, BaseScriptHolder *listenerObject, uint32 listenerParam); diff --git a/engines/wintermute/video/video_player.h b/engines/wintermute/video/video_player.h index a49e910b0c..033ab50dfa 100644 --- a/engines/wintermute/video/video_player.h +++ b/engines/wintermute/video/video_player.h @@ -42,7 +42,7 @@ namespace Wintermute { class VideoPlayer : public BaseClass { public: bool _showSubtitle; - int _currentSubtitle; + int32 _currentSubtitle; bool loadSubtitles(const char *filename, const char *subtitleFile); bool _slowRendering; bool isPlaying(); @@ -76,8 +76,8 @@ public: PGETFRAME _videoPGF;*/ uint32 _videoEndTime; - int _playPosX; - int _playPosY; + int32 _playPosX; + int32 _playPosY; float _playZoom; /* LPBITMAPV4HEADER _targetFormat; diff --git a/engines/wintermute/video/video_theora_player.h b/engines/wintermute/video/video_theora_player.h index 91ba2453bc..364509a080 100644 --- a/engines/wintermute/video/video_theora_player.h +++ b/engines/wintermute/video/video_theora_player.h @@ -99,22 +99,22 @@ public: bool resetStream(); // video properties - int _posX; - int _posY; + int32 _posX; + int32 _posY; bool _dontDropFrames; private: - int _state; + int32 _state; uint32 _startTime; - int _savedState; + int32 _savedState; uint32 _savedPos; // video properties TVideoPlayback _playbackType; bool _looping; float _playZoom; - int _volume; + int32 _volume; bool _freezeGame; uint32 _currentTime; -- cgit v1.2.3