libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-17 23:44:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ULTIMA: ULTIMA4: Fix warnings

Browse Source
This commit is contained in:
Eugene Sandulenko 2020-11-14 14:46:33 +01:00
parent f2a6b34182
commit b6945a834b
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/ultima/ultima4/game/armor.cpp
View File

@ -81,7 +81,7 @@ void Armors::loadConf() {
/*-------------------------------------------------------------------*/
Armor::Armor(ArmorType armorType, const ConfigElement &conf) :
_type(armorType), _canUse(0xff), _mask(0) {
_type(armorType), _canUse(0xff) /*, _mask(0) */ {
_name = conf.getString("name");
_defense = conf.getInt("defense");

2
engines/ultima/ultima4/game/armor.h
View File

@ -58,7 +58,7 @@ private:
Common::String _name;
byte _canUse;
int _defense;
unsigned short _mask;
//unsigned short _mask;
};
class Armors : public Std::vector<Armor *> {

4
engines/ultima/ultima4/gfx/screen.cpp
View File

@ -58,8 +58,8 @@ Screen *g_screen;
Screen::Screen() : _filterScaler(nullptr), _currentMouseCursor(-1),
_gemLayout(nullptr), _tileAnims(nullptr), _charSetInfo(nullptr),
_gemTilesInfo(nullptr), _needPrompt(1), _currentCycle(0),
_cursorStatus(0), _cursorEnabled(1), _priorFrameTime(0),
_continueScreenRefresh(true) {
_cursorStatus(0), _cursorEnabled(1), _priorFrameTime(0)
/* , _continueScreenRefresh(true) */ {
g_screen = this;
Common::fill(&_mouseCursors[0], &_mouseCursors[5], (MouseCursorSurface *)nullptr);
Common::fill(&_los[0][0], &_los[0][0] + (VIEWPORT_W * VIEWPORT_H), 0);

2
engines/ultima/ultima4/gfx/screen.h
View File

@ -118,7 +118,7 @@ private:
int _cursorStatus;
int _cursorEnabled;
int _los[VIEWPORT_W][VIEWPORT_H];
bool _continueScreenRefresh;
//bool _continueScreenRefresh;
uint32 _priorFrameTime;
public: