[Scummvm-git-logs] scummvm master -> a1b70355c27e252a08852dc21be753026798e072
dreammaster
paulfgilbert at gmail.com
Mon Feb 17 03:53:24 UTC 2020
This automated email contains information about 7 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
8c8f87b47f ULTIMA8: Renaming games folder class fields
6eb9c79457 ULTIMA8: Renaming conf folder class fields
de4dc993a1 ULTIMA8: Renaming render surface class fields
f3ebc99d3d ULTIMA8: Renaming palette and other graphic class fields
f9a084cee1 ULTIMA8: Rename more graphics folder class fields
076c763523 NEWS: Fix incorrect wording
a1b70355c2 ULTIMA8: Rename remaining graphics folder class fields
Commit: 8c8f87b47f8f1df21bc8bd9f362622a31f1bcd79
https://github.com/scummvm/scummvm/commit/8c8f87b47f8f1df21bc8bd9f362622a31f1bcd79
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-16T17:26:48-08:00
Commit Message:
ULTIMA8: Renaming games folder class fields
Changed paths:
engines/ultima/ultima8/games/game.cpp
engines/ultima/ultima8/games/game.h
engines/ultima/ultima8/games/game_data.cpp
engines/ultima/ultima8/games/game_data.h
engines/ultima/ultima8/games/game_detector.cpp
engines/ultima/ultima8/games/game_info.cpp
engines/ultima/ultima8/games/game_info.h
engines/ultima/ultima8/games/remorse_game.h
engines/ultima/ultima8/games/u8_game.cpp
engines/ultima/ultima8/gumps/pentagram_menu_gump.cpp
engines/ultima/ultima8/gumps/readable_gump.cpp
engines/ultima/ultima8/gumps/widgets/game_widget.cpp
engines/ultima/ultima8/kernel/core_app.cpp
engines/ultima/ultima8/kernel/core_app.h
engines/ultima/ultima8/ultima8.cpp
engines/ultima/ultima8/world/item.cpp
diff --git a/engines/ultima/ultima8/games/game.cpp b/engines/ultima/ultima8/games/game.cpp
index e9b9fcf..2d6a578 100644
--- a/engines/ultima/ultima8/games/game.cpp
+++ b/engines/ultima/ultima8/games/game.cpp
@@ -21,7 +21,6 @@
*/
#include "ultima/ultima8/misc/pent_include.h"
-
#include "ultima/ultima8/games/game.h"
#include "ultima/ultima8/games/u8_game.h"
#include "ultima/ultima8/games/remorse_game.h"
@@ -33,27 +32,27 @@
namespace Ultima {
namespace Ultima8 {
-Game *Game::game = 0;
+Game *Game::_game = 0;
Game::Game() {
- game = this;
+ _game = this;
}
Game::~Game() {
- assert(game == this);
- game = 0;
+ assert(_game == this);
+ _game = 0;
}
// static
Game *Game::createGame(GameInfo *info) {
- switch (info->type) {
+ switch (info->_type) {
case GameInfo::GAME_U8:
return new U8Game();
case GameInfo::GAME_REMORSE:
return new RemorseGame();
default:
- CANT_HAPPEN_MSG("createGame: invalid game");
+ CANT_HAPPEN_MSG("createGame: invalid _game");
}
return 0;
diff --git a/engines/ultima/ultima8/games/game.h b/engines/ultima/ultima8/games/game.h
index 77ac96d..f11cf0d 100644
--- a/engines/ultima/ultima8/games/game.h
+++ b/engines/ultima/ultima8/games/game.h
@@ -37,7 +37,7 @@ public:
virtual ~Game();
static Game *get_instance() {
- return game;
+ return _game;
}
//! load/init game's data files
@@ -62,7 +62,7 @@ public:
INTRINSIC(I_playEndgame);
protected:
- static Game *game;
+ static Game *_game;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/games/game_data.cpp b/engines/ultima/ultima8/games/game_data.cpp
index 182a1bd..4032133 100644
--- a/engines/ultima/ultima8/games/game_data.cpp
+++ b/engines/ultima/ultima8/games/game_data.cpp
@@ -21,7 +21,6 @@
*/
#include "ultima/ultima8/misc/pent_include.h"
-
#include "ultima/ultima8/misc/util.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/filesys/file_system.h"
@@ -48,64 +47,64 @@
namespace Ultima {
namespace Ultima8 {
-GameData *GameData::gamedata = 0;
+GameData *GameData::_gameData = 0;
-GameData::GameData(GameInfo *gameinfo_)
- : fixed(0), mainshapes(0), mainusecode(0), globs(), fonts(0), gumps(0),
- mouse(0), music(0), weaponoverlay(0), soundflex(0), speech(1024), gameinfo(gameinfo_) {
+GameData::GameData(GameInfo *gameInfo)
+ : _fixed(0), _mainShapes(0), _mainUsecode(0), _globs(), _fonts(0), _gumps(0),
+ _mouse(0), _music(0), _weaponOverlay(0), _soundFlex(0), _speech(1024), _gameInfo(gameInfo) {
con->Print(MM_INFO, "Creating GameData...\n");
- gamedata = this;
+ _gameData = this;
}
GameData::~GameData() {
con->Print(MM_INFO, "Destroying GameData...\n");
- delete fixed;
- fixed = 0;
+ delete _fixed;
+ _fixed = 0;
- delete mainshapes;
- mainshapes = 0;
+ delete _mainShapes;
+ _mainShapes = 0;
- delete mainusecode;
- mainusecode = 0;
+ delete _mainUsecode;
+ _mainUsecode = 0;
- for (unsigned int i = 0; i < globs.size(); ++i)
- delete globs[i];
- globs.clear();
+ for (unsigned int i = 0; i < _globs.size(); ++i)
+ delete _globs[i];
+ _globs.clear();
- delete fonts;
- fonts = 0;
+ delete _fonts;
+ _fonts = 0;
- delete gumps;
- gumps = 0;
+ delete _gumps;
+ _gumps = 0;
- delete mouse;
- mouse = 0;
+ delete _mouse;
+ _mouse = 0;
- delete music;
- music = 0;
+ delete _music;
+ _music = 0;
- delete weaponoverlay;
- weaponoverlay = 0;
+ delete _weaponOverlay;
+ _weaponOverlay = 0;
- delete soundflex;
- soundflex = 0;
+ delete _soundFlex;
+ _soundFlex = 0;
- gamedata = 0;
+ _gameData = 0;
- for (unsigned int i = 0; i < speech.size(); ++i) {
- SpeechFlex **s = speech[i];
+ for (unsigned int i = 0; i < _speech.size(); ++i) {
+ SpeechFlex **s = _speech[i];
if (s) delete *s;
delete s;
}
- speech.clear();
+ _speech.clear();
}
MapGlob *GameData::getGlob(uint32 glob) const {
- if (glob < globs.size())
- return globs[glob];
+ if (glob < _globs.size())
+ return _globs[glob];
else
return 0;
}
@@ -113,9 +112,9 @@ MapGlob *GameData::getGlob(uint32 glob) const {
ShapeArchive *GameData::getShapeFlex(uint16 flexId) const {
switch (flexId) {
case MAINSHAPES:
- return mainshapes;
+ return _mainShapes;
case GUMPS:
- return gumps;
+ return _gumps;
default:
break;
};
@@ -140,8 +139,8 @@ void GameData::loadTranslation() {
ConfigFileManager *config = ConfigFileManager::get_instance();
Std::string translationfile;
- if (gameinfo->type == GameInfo::GAME_U8) {
- switch (gameinfo->language) {
+ if (_gameInfo->_type == GameInfo::GAME_U8) {
+ switch (_gameInfo->_language) {
case GameInfo::GAMELANG_ENGLISH:
// default. Don't need to do anything
break;
@@ -194,7 +193,7 @@ FrameID GameData::translate(FrameID f) {
istring key = "language/";
switch (f._flexId) {
case GUMPS:
- key += "gumps/";
+ key += "_gumps/";
break;
default:
return f;
@@ -228,9 +227,9 @@ void GameData::loadU8Data() {
if (!fd)
error("Unable to load static/fixed.dat");;
- fixed = new RawArchive(fd);
+ _fixed = new RawArchive(fd);
- char langletter = gameinfo->getLanguageUsecodeLetter();
+ char langletter = _gameInfo->getLanguageUsecodeLetter();
if (!langletter)
error("Unknown language. Unable to open usecode");;
@@ -243,7 +242,7 @@ void GameData::loadU8Data() {
if (!uds)
error("Unable to load %s", filename.c_str());
- mainusecode = new UsecodeFlex(uds);
+ _mainUsecode = new UsecodeFlex(uds);
// Load main shapes
pout << "Load Shapes" << Std::endl;
@@ -253,7 +252,7 @@ void GameData::loadU8Data() {
if (!sf)
error("Unable to load static/u8shapes.flx or static/u8shapes.cmp");;
- mainshapes = new MainShapeArchive(sf, MAINSHAPES,
+ _mainShapes = new MainShapeArchive(sf, MAINSHAPES,
PaletteManager::get_instance()->getPalette(PaletteManager::Pal_Game));
// Load weapon, armour info
@@ -268,7 +267,7 @@ void GameData::loadU8Data() {
if (!tfs)
error("Unable to load static/typeflag.dat");
- mainshapes->loadTypeFlags(tfs);
+ _mainShapes->loadTypeFlags(tfs);
delete tfs;
// Load animdat
@@ -276,7 +275,7 @@ void GameData::loadU8Data() {
if (!af)
error("Unable to load static/anim.dat");
- mainshapes->loadAnimDat(af);
+ _mainShapes->loadAnimDat(af);
delete af;
// Load weapon overlay data
@@ -285,18 +284,18 @@ void GameData::loadU8Data() {
error("Unable to load static/wpnovlay.dat");
RawArchive *overlayflex = new RawArchive(wod);
- weaponoverlay = new WpnOvlayDat();
- weaponoverlay->load(overlayflex);
+ _weaponOverlay = new WpnOvlayDat();
+ _weaponOverlay->load(overlayflex);
delete overlayflex;
- // Load globs
+ // Load _globs
IDataSource *gds = filesystem->ReadFile("@game/static/glob.flx");
if (!gds)
error("Unable to load static/glob.flx");
RawArchive *globflex = new RawArchive(gds);
- globs.clear();
- globs.resize(globflex->getCount());
+ _globs.clear();
+ _globs.resize(globflex->getCount());
for (unsigned int i = 0; i < globflex->getCount(); ++i) {
MapGlob *glob = 0;
IDataSource *globds = globflex->get_datasource(i);
@@ -307,40 +306,40 @@ void GameData::loadU8Data() {
}
delete globds;
- globs[i] = glob;
+ _globs[i] = glob;
}
delete globflex;
- // Load fonts
+ // Load _fonts
IDataSource *fds = filesystem->ReadFile("@game/static/u8fonts.flx");
if (!fds)
error("Unable to load static/u8fonts.flx");
- fonts = new FontShapeArchive(fds, OTHER,
+ _fonts = new FontShapeArchive(fds, OTHER,
PaletteManager::get_instance()->getPalette(PaletteManager::Pal_Game));
- fonts->setHVLeads();
+ _fonts->setHVLeads();
- // Load mouse
+ // Load _mouse
IDataSource *msds = filesystem->ReadFile("@game/static/u8mouse.shp");
if (!msds)
error("Unable to load static/u8mouse.shp");
- mouse = new Shape(msds, 0);
- mouse->setPalette(PaletteManager::get_instance()->getPalette(PaletteManager::Pal_Game));
+ _mouse = new Shape(msds, 0);
+ _mouse->setPalette(PaletteManager::get_instance()->getPalette(PaletteManager::Pal_Game));
delete msds;
IDataSource *gumpds = filesystem->ReadFile("@game/static/u8gumps.flx");
if (!gumpds)
error("Unable to load static/u8gumps.flx");
- gumps = new GumpShapeArchive(gumpds, GUMPS,
+ _gumps = new GumpShapeArchive(gumpds, GUMPS,
PaletteManager::get_instance()->getPalette(PaletteManager::Pal_Game));
IDataSource *gumpageds = filesystem->ReadFile("@game/static/gumpage.dat");
if (!gumpageds)
error("Unable to load static/gumpage.dat");
- gumps->loadGumpage(gumpageds);
+ _gumps->loadGumpage(gumpageds);
delete gumpageds;
@@ -348,13 +347,13 @@ void GameData::loadU8Data() {
if (!mf)
error("Unable to load sound/music.flx");
- music = new MusicFlex(mf);
+ _music = new MusicFlex(mf);
IDataSource *sndflx = filesystem->ReadFile("@game/sound/sound.flx");
if (!sndflx)
error("Unable to load sound/sound.flx");
- soundflex = new SoundFlex(sndflx);
+ _soundFlex = new SoundFlex(sndflx);
loadTranslation();
}
@@ -362,7 +361,7 @@ void GameData::loadU8Data() {
void GameData::setupFontOverrides() {
setupTTFOverrides("game/fontoverride", false);
- if (gameinfo->language == GameInfo::GAMELANG_JAPANESE)
+ if (_gameInfo->_language == GameInfo::GAMELANG_JAPANESE)
setupJPOverrides();
}
@@ -437,9 +436,9 @@ void GameData::setupTTFOverrides(const char *configkey, bool SJIS) {
}
SpeechFlex *GameData::getSpeechFlex(uint32 _shapeNum) {
- if (_shapeNum >= speech.size()) return 0;
+ if (_shapeNum >= _speech.size()) return 0;
- SpeechFlex **s = speech[_shapeNum];
+ SpeechFlex **s = _speech[_shapeNum];
if (s) return *s;
s = new SpeechFlex*;
@@ -451,7 +450,7 @@ SpeechFlex *GameData::getSpeechFlex(uint32 _shapeNum) {
char num_flx [32];
snprintf(num_flx , 32, "%i.flx", _shapeNum);
- char langletter = gameinfo->getLanguageFileLetter();
+ char langletter = _gameInfo->getLanguageFileLetter();
if (!langletter) {
perr << "GameData::getSpeechFlex: Unknown language." << Std::endl;
return 0;
@@ -462,7 +461,7 @@ SpeechFlex *GameData::getSpeechFlex(uint32 _shapeNum) {
*s = new SpeechFlex(sflx);
}
- speech[_shapeNum] = s;
+ _speech[_shapeNum] = s;
return *s;
}
@@ -471,13 +470,13 @@ SpeechFlex *GameData::getSpeechFlex(uint32 _shapeNum) {
void GameData::loadRemorseData() {
FileSystem *filesystem = FileSystem::get_instance();
- IDataSource *fd = filesystem->ReadFile("@game/static/fixed.dat");
+ IDataSource *fd = filesystem->ReadFile("@game/static/_fixed.dat");
if (!fd)
- error("Unable to load static/fixed.dat");
+ error("Unable to load static/_fixed.dat");
- fixed = new RawArchive(fd);
+ _fixed = new RawArchive(fd);
- char langletter = gameinfo->getLanguageUsecodeLetter();
+ char langletter = _gameInfo->getLanguageUsecodeLetter();
if (!langletter)
error("Unknown language. Unable to open usecode");
@@ -490,7 +489,7 @@ void GameData::loadRemorseData() {
if (!uds)
error("Unable to load %s", filename.c_str());
- mainusecode = new UsecodeFlex(uds);
+ _mainUsecode = new UsecodeFlex(uds);
// Load main shapes
pout << "Load Shapes" << Std::endl;
@@ -499,7 +498,7 @@ void GameData::loadRemorseData() {
if (!sf)
error("Unable to load static/shapes.flx");
- mainshapes = new MainShapeArchive(sf, MAINSHAPES,
+ _mainShapes = new MainShapeArchive(sf, MAINSHAPES,
PaletteManager::get_instance()->getPalette(PaletteManager::Pal_Game),
&CrusaderShapeFormat);
@@ -517,7 +516,7 @@ void GameData::loadRemorseData() {
if (!tfs)
error("Unable to load static/typeflag.dat");
- mainshapes->loadTypeFlags(tfs);
+ _mainShapes->loadTypeFlags(tfs);
delete tfs;
// Load animdat
@@ -525,7 +524,7 @@ void GameData::loadRemorseData() {
if (!af)
error("Unable to load static/anim.dat");
- mainshapes->loadAnimDat(af);
+ _mainShapes->loadAnimDat(af);
delete af;
// Load weapon overlay data
@@ -534,18 +533,18 @@ void GameData::loadRemorseData() {
error("Unable to load static/wpnovlay.dat");
RawArchive *overlayflex = new RawArchive(wod);
- weaponoverlay = new WpnOvlayDat();
- weaponoverlay->load(overlayflex);
+ _weaponOverlay = new WpnOvlayDat();
+ _weaponOverlay->load(overlayflex);
delete overlayflex;
- // Load globs
+ // Load _globs
IDataSource *gds = filesystem->ReadFile("@game/static/glob.flx");
if (!gds)
error("Unable to load static/glob.flx");
RawArchive *globflex = new RawArchive(gds);
- globs.clear();
- globs.resize(globflex->getCount());
+ _globs.clear();
+ _globs.resize(globflex->getCount());
for (unsigned int i = 0; i < globflex->getCount(); ++i) {
MapGlob *glob = 0;
IDataSource *globds = globflex->get_datasource(i);
@@ -556,33 +555,33 @@ void GameData::loadRemorseData() {
}
delete globds;
- globs[i] = glob;
+ _globs[i] = glob;
}
delete globflex;
- // Load fonts
- IDataSource *fds = filesystem->ReadFile("@game/static/fonts.flx");
+ // Load _fonts
+ IDataSource *fds = filesystem->ReadFile("@game/static/_fonts.flx");
if (!fds)
- error("Unable to load static/fonts.flx");
+ error("Unable to load static/_fonts.flx");
- fonts = new FontShapeArchive(fds, OTHER,
+ _fonts = new FontShapeArchive(fds, OTHER,
PaletteManager::get_instance()->getPalette(PaletteManager::Pal_Game));
- fonts->setHVLeads();
+ _fonts->setHVLeads();
- // Load mouse
- IDataSource *msds = filesystem->ReadFile("@game/static/mouse.shp");
+ // Load _mouse
+ IDataSource *msds = filesystem->ReadFile("@game/static/_mouse.shp");
if (!msds)
- error("Unable to load static/mouse.shp");
+ error("Unable to load static/_mouse.shp");
- mouse = new Shape(msds, 0);
- mouse->setPalette(PaletteManager::get_instance()->getPalette(PaletteManager::Pal_Game));
+ _mouse = new Shape(msds, 0);
+ _mouse->setPalette(PaletteManager::get_instance()->getPalette(PaletteManager::Pal_Game));
delete msds;
- IDataSource *gumpds = filesystem->ReadFile("@game/static/gumps.flx");
+ IDataSource *gumpds = filesystem->ReadFile("@game/static/_gumps.flx");
if (!gumpds)
- error("Unable to load static/gumps.flx");
+ error("Unable to load static/_gumps.flx");
- gumps = new GumpShapeArchive(gumpds, GUMPS,
+ _gumps = new GumpShapeArchive(gumpds, GUMPS,
PaletteManager::get_instance()->getPalette(PaletteManager::Pal_Game));
#if 0
@@ -590,30 +589,30 @@ void GameData::loadRemorseData() {
if (!gumpageds)
error("Unable to load static/gumpage.dat");
- gumps->loadGumpage(gumpageds);
+ _gumps->loadGumpage(gumpageds);
delete gumpageds;
#endif
IDataSource *dummyds = filesystem->ReadFile("@data/empty.flx");
- music = 0; //new MusicFlex(dummyds);
+ _music = 0; //new MusicFlex(dummyds);
delete dummyds;
#if 0
- IDataSource *mf = filesystem->ReadFile("@game/sound/music.flx");
+ IDataSource *mf = filesystem->ReadFile("@game/sound/_music.flx");
if (!mf)
- error("Unable to load sound/music.flx");
+ error("Unable to load sound/_music.flx");
- music = new MusicFlex(mf);
+ _music = new MusicFlex(mf);
#endif
dummyds = filesystem->ReadFile("@data/empty.flx");
- soundflex = new SoundFlex(dummyds);
+ _soundFlex = new SoundFlex(dummyds);
delete dummyds;
#if 0
IDataSource *sndflx = filesystem->ReadFile("@game/sound/sound.flx");
if (!sndflx)
error("Unable to load sound/sound.flx");
- soundflex = new SoundFlex(sndflx);
+ _soundFlex = new SoundFlex(sndflx);
#endif
loadTranslation();
diff --git a/engines/ultima/ultima8/games/game_data.h b/engines/ultima/ultima8/games/game_data.h
index 790ef06..3cedf28 100644
--- a/engines/ultima/ultima8/games/game_data.h
+++ b/engines/ultima/ultima8/games/game_data.h
@@ -50,7 +50,7 @@ public:
~GameData();
static GameData *get_instance() {
- return gamedata;
+ return _gameData;
}
void loadU8Data();
@@ -58,32 +58,32 @@ public:
void setupFontOverrides();
Usecode *getMainUsecode() const {
- return mainusecode;
+ return _mainUsecode;
}
MainShapeArchive *getMainShapes() const {
- return mainshapes;
+ return _mainShapes;
}
RawArchive *getFixed() const {
- return fixed;
+ return _fixed;
}
MapGlob *getGlob(uint32 glob) const;
FontShapeArchive *getFonts() const {
- return fonts;
+ return _fonts;
}
GumpShapeArchive *getGumps() const {
- return gumps;
+ return _gumps;
}
Shape *getMouse() const {
- return mouse;
+ return _mouse;
}
MusicFlex *getMusic() const {
- return music;
+ return _music;
}
WpnOvlayDat *getWeaponOverlay() const {
- return weaponoverlay;
+ return _weaponOverlay;
}
SoundFlex *getSoundFlex() const {
- return soundflex;
+ return _soundFlex;
}
SpeechFlex *getSpeechFlex(uint32 shapenum);
@@ -104,21 +104,21 @@ private:
void setupTTFOverrides(const char *configkey, bool SJIS);
void setupJPOverrides();
- RawArchive *fixed;
- MainShapeArchive *mainshapes;
- Usecode *mainusecode;
- Std::vector<MapGlob *> globs;
- FontShapeArchive *fonts;
- GumpShapeArchive *gumps;
- Shape *mouse;
- MusicFlex *music;
- WpnOvlayDat *weaponoverlay;
-
- SoundFlex *soundflex;
- Std::vector<SpeechFlex **> speech;
- GameInfo *gameinfo;
-
- static GameData *gamedata;
+ RawArchive *_fixed;
+ MainShapeArchive *_mainShapes;
+ Usecode *_mainUsecode;
+ Std::vector<MapGlob *> _globs;
+ FontShapeArchive *_fonts;
+ GumpShapeArchive *_gumps;
+ Shape *_mouse;
+ MusicFlex *_music;
+ WpnOvlayDat *_weaponOverlay;
+
+ SoundFlex *_soundFlex;
+ Std::vector<SpeechFlex **> _speech;
+ GameInfo *_gameInfo;
+
+ static GameData *_gameData;
};
#define _TL_(x) (GameData::get_instance()->translate(x))
diff --git a/engines/ultima/ultima8/games/game_detector.cpp b/engines/ultima/ultima8/games/game_detector.cpp
index 6976ca4..f05f539 100644
--- a/engines/ultima/ultima8/games/game_detector.cpp
+++ b/engines/ultima/ultima8/games/game_detector.cpp
@@ -55,7 +55,7 @@ bool GameDetector::detect(Std::string path, GameInfo *info) {
if (!ids)
return false; // all games have usecode
- md5_file(ids, info->md5, 0);
+ md5_file(ids, info->_md5, 0);
delete ids;
Std::string md5s = info->getPrintableMD5();
@@ -63,8 +63,8 @@ bool GameDetector::detect(Std::string path, GameInfo *info) {
int i = 0;
while (md5table[i].md5) {
if (md5s == md5table[i].md5) {
- info->type = md5table[i].type;
- info->language = md5table[i].language;
+ info->_type = md5table[i].type;
+ info->_language = md5table[i].language;
info->version = md5table[i].version;
return true;
}
@@ -77,33 +77,33 @@ bool GameDetector::detect(Std::string path, GameInfo *info) {
// game type
- if (info->type == GameInfo::GAME_UNKNOWN) {
+ if (info->_type == GameInfo::GAME_UNKNOWN) {
ids = fs->ReadFile("@detect/static/u8gumps.flx"); // random U8 file
if (ids) {
- info->type = GameInfo::GAME_U8;
+ info->_type = GameInfo::GAME_U8;
delete ids;
ids = 0;
}
}
- if (info->type == GameInfo::GAME_UNKNOWN) {
+ if (info->_type == GameInfo::GAME_UNKNOWN) {
ids = fs->ReadFile("@detect/static/help1.dat"); // random remorse file
if (ids) {
- info->type = GameInfo::GAME_REMORSE;
+ info->_type = GameInfo::GAME_REMORSE;
delete ids;
ids = 0;
}
}
- if (info->type == GameInfo::GAME_UNKNOWN) {
+ if (info->_type == GameInfo::GAME_UNKNOWN) {
ids = fs->ReadFile("@detect/static/help1.bmp"); // random regret file
if (ids) {
- info->type = GameInfo::GAME_REGRET;
+ info->_type = GameInfo::GAME_REGRET;
delete ids;
ids = 0;
}
@@ -117,10 +117,10 @@ bool GameDetector::detect(Std::string path, GameInfo *info) {
// game language
// detect using eusecode/fusecode/gusecode
- if (info->language == GameInfo::GAMELANG_UNKNOWN) {
+ if (info->_language == GameInfo::GAMELANG_UNKNOWN) {
ids = fs->ReadFile("@detect/usecode/eusecode.flx");
if (ids) {
- if (info->type == GameInfo::GAME_U8) {
+ if (info->_type == GameInfo::GAME_U8) {
// distinguish between english and spanish
RawArchive *f = new RawArchive(ids);
const char *buf = reinterpret_cast<const char *>((f->get_object_nodel(183)));
@@ -128,11 +128,11 @@ bool GameDetector::detect(Std::string path, GameInfo *info) {
if (buf) {
for (i = 0; i + 9 < size; ++i) {
if (strncmp(buf + i, "tableware", 9) == 0) {
- info->language = GameInfo::GAMELANG_ENGLISH;
+ info->_language = GameInfo::GAMELANG_ENGLISH;
break;
}
if (strncmp(buf + i, "vajilla", 7) == 0) {
- info->language = GameInfo::GAMELANG_SPANISH;
+ info->_language = GameInfo::GAMELANG_SPANISH;
break;
}
}
@@ -142,33 +142,33 @@ bool GameDetector::detect(Std::string path, GameInfo *info) {
}
// if still unsure, English
- if (info->language == GameInfo::GAMELANG_UNKNOWN)
- info->language = GameInfo::GAMELANG_ENGLISH;
+ if (info->_language == GameInfo::GAMELANG_UNKNOWN)
+ info->_language = GameInfo::GAMELANG_ENGLISH;
delete ids;
ids = 0;
}
}
- if (info->language == GameInfo::GAMELANG_UNKNOWN) {
+ if (info->_language == GameInfo::GAMELANG_UNKNOWN) {
ids = fs->ReadFile("@detect/usecode/fusecode.flx");
if (ids) {
- info->language = GameInfo::GAMELANG_FRENCH;
+ info->_language = GameInfo::GAMELANG_FRENCH;
delete ids;
ids = 0;
}
}
- if (info->language == GameInfo::GAMELANG_UNKNOWN) {
+ if (info->_language == GameInfo::GAMELANG_UNKNOWN) {
ids = fs->ReadFile("@detect/usecode/gusecode.flx");
if (ids) {
- info->language = GameInfo::GAMELANG_GERMAN;
+ info->_language = GameInfo::GAMELANG_GERMAN;
delete ids;
ids = 0;
}
}
- if (info->language == GameInfo::GAMELANG_UNKNOWN) {
+ if (info->_language == GameInfo::GAMELANG_UNKNOWN) {
ids = fs->ReadFile("@detect/usecode/jusecode.flx");
if (ids) {
- info->language = GameInfo::GAMELANG_JAPANESE;
+ info->_language = GameInfo::GAMELANG_JAPANESE;
delete ids;
ids = 0;
}
@@ -176,9 +176,9 @@ bool GameDetector::detect(Std::string path, GameInfo *info) {
fs->RemoveVirtualPath("@detect");
- return (info->type != GameInfo::GAME_UNKNOWN &&
+ return (info->_type != GameInfo::GAME_UNKNOWN &&
/* info->version != 0 && */
- info->language != GameInfo::GAMELANG_UNKNOWN);
+ info->_language != GameInfo::GAMELANG_UNKNOWN);
}
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/games/game_info.cpp b/engines/ultima/ultima8/games/game_info.cpp
index b84ea08..1ce102c 100644
--- a/engines/ultima/ultima8/games/game_info.cpp
+++ b/engines/ultima/ultima8/games/game_info.cpp
@@ -63,16 +63,15 @@ static const GameLangDesc gamelangs[] = {
};
-GameInfo::GameInfo()
- : type(GAME_UNKNOWN), version(0), language(GAMELANG_UNKNOWN) {
+GameInfo::GameInfo() : _type(GAME_UNKNOWN), version(0), _language(GAMELANG_UNKNOWN) {
for (int i = 0; i < 16; ++i)
- md5[i] = 0;
+ _md5[i] = 0;
}
char GameInfo::getLanguageFileLetter() const {
- switch (type) {
+ switch (_type) {
case GAME_U8: {
- unsigned int l = static_cast<unsigned int>(language);
+ unsigned int l = static_cast<unsigned int>(_language);
assert(l < (sizeof(gamelangs) / sizeof(gamelangs[0])) - 1);
return gamelangs[l].letter;
@@ -86,9 +85,9 @@ char GameInfo::getLanguageFileLetter() const {
}
char GameInfo::getLanguageUsecodeLetter() const {
- switch (type) {
+ switch (_type) {
case GAME_U8: {
- unsigned int l = static_cast<unsigned int>(language);
+ unsigned int l = static_cast<unsigned int>(_language);
assert(l < (sizeof(gamelangs) / sizeof(gamelangs[0])) - 1);
return gamelangs[l].usecodeletter;
@@ -102,14 +101,14 @@ char GameInfo::getLanguageUsecodeLetter() const {
}
Std::string GameInfo::getLanguage() const {
- unsigned int l = static_cast<unsigned int>(language);
+ unsigned int l = static_cast<unsigned int>(_language);
assert(l < (sizeof(gamelangs) / sizeof(gamelangs[0])) - 1);
return gamelangs[l].name;
}
Std::string GameInfo::getGameTitle() const {
- unsigned int t = static_cast<unsigned int>(type);
+ unsigned int t = static_cast<unsigned int>(_type);
assert(t < (sizeof(gametypes) / sizeof(gametypes[0])) - 1);
return gametypes[t].longname;
@@ -133,7 +132,7 @@ Std::string GameInfo::getPrintDetails() const {
if (lang == "") lang = "Unknown";
ret += lang;
- if (type != GAME_PENTAGRAM_MENU) {
+ if (_type != GAME_PENTAGRAM_MENU) {
// version, md5 don't make sense for the pentagram menu
ret += ", version ";
@@ -152,7 +151,7 @@ Std::string GameInfo::getPrintableMD5() const {
char buf[33];
for (int i = 0; i < 16; ++i) {
- sprintf(buf + 2 * i, "%02x", md5[i]);
+ sprintf(buf + 2 * i, "%02x", _md5[i]);
}
ret = buf;
@@ -161,19 +160,19 @@ Std::string GameInfo::getPrintableMD5() const {
}
bool GameInfo::match(GameInfo &other, bool ignoreMD5) const {
- if (type != other.type) return false;
- if (language != other.language) return false;
+ if (_type != other._type) return false;
+ if (_language != other._language) return false;
if (version != other.version) return false;
if (ignoreMD5) return true;
- return (Std::memcmp(md5, other.md5, 16) == 0);
+ return (Std::memcmp(_md5, other._md5, 16) == 0);
}
void GameInfo::save(ODataSource *ods) {
- unsigned int l = static_cast<unsigned int>(language);
+ unsigned int l = static_cast<unsigned int>(_language);
assert(l < (sizeof(gamelangs) / sizeof(gamelangs[0])) - 1);
- unsigned int t = static_cast<unsigned int>(type);
+ unsigned int t = static_cast<unsigned int>(_type);
assert(t < (sizeof(gametypes) / sizeof(gametypes[0])) - 1);
Std::string game = gametypes[t].shortname;
@@ -199,7 +198,7 @@ bool GameInfo::load(IDataSource *ids, uint32 version_) {
int i = 0;
while (gametypes[i].shortname) {
if (parts[0] == gametypes[i].shortname) {
- type = static_cast<GameType>(i);
+ _type = static_cast<GameType>(i);
break;
}
i++;
@@ -209,7 +208,7 @@ bool GameInfo::load(IDataSource *ids, uint32 version_) {
i = 0;
while (gamelangs[i].name) {
if (parts[1] == gamelangs[i].name) {
- language = static_cast<GameLanguage>(i);
+ _language = static_cast<GameLanguage>(i);
break;
}
i++;
@@ -224,7 +223,7 @@ bool GameInfo::load(IDataSource *ids, uint32 version_) {
buf[1] = parts[3][2 * i + 1];
buf[2] = 0;
long x = Std::strtol(buf, 0, 16);
- md5[i] = static_cast<uint8>(x);
+ _md5[i] = static_cast<uint8>(x);
}
return true;
diff --git a/engines/ultima/ultima8/games/game_info.h b/engines/ultima/ultima8/games/game_info.h
index 85913f7..afb8f70 100644
--- a/engines/ultima/ultima8/games/game_info.h
+++ b/engines/ultima/ultima8/games/game_info.h
@@ -35,7 +35,7 @@ class ODataSource;
struct GameInfo {
GameInfo();
- istring name;
+ istring _name;
enum GameType {
GAME_UNKNOWN = 0,
@@ -43,7 +43,7 @@ struct GameInfo {
GAME_REMORSE,
GAME_REGRET,
GAME_PENTAGRAM_MENU
- } type;
+ } _type;
//! version number, encoded as 100*major + minor
//! so, 2.12 becomes 212
@@ -57,9 +57,9 @@ struct GameInfo {
GAMELANG_GERMAN,
GAMELANG_SPANISH,
GAMELANG_JAPANESE
- } language;
+ } _language;
- uint8 md5[16];
+ uint8 _md5[16];
char getLanguageFileLetter() const;
char getLanguageUsecodeLetter() const;
diff --git a/engines/ultima/ultima8/games/remorse_game.h b/engines/ultima/ultima8/games/remorse_game.h
index e1f67e9..ad67a14 100644
--- a/engines/ultima/ultima8/games/remorse_game.h
+++ b/engines/ultima/ultima8/games/remorse_game.h
@@ -49,7 +49,7 @@ public:
static Game *createGame(GameInfo *info);
protected:
- static Game *game;
+ static Game *_game;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/games/u8_game.cpp b/engines/ultima/ultima8/games/u8_game.cpp
index ec1ddf7..e15d1ad 100644
--- a/engines/ultima/ultima8/games/u8_game.cpp
+++ b/engines/ultima/ultima8/games/u8_game.cpp
@@ -53,7 +53,7 @@ U8Game::U8Game() : Game() {
settingman->setDefault("targetedjump", true);
GameInfo *info = Ultima8Engine::get_instance()->getGameInfo();
- if (info->language == GameInfo::GAMELANG_JAPANESE) {
+ if (info->_language == GameInfo::GAMELANG_JAPANESE) {
settingman->setDefault("textdelay", 20);
} else {
settingman->setDefault("textdelay", 8);
diff --git a/engines/ultima/ultima8/gumps/pentagram_menu_gump.cpp b/engines/ultima/ultima8/gumps/pentagram_menu_gump.cpp
index 91db774..e991a29 100644
--- a/engines/ultima/ultima8/gumps/pentagram_menu_gump.cpp
+++ b/engines/ultima/ultima8/gumps/pentagram_menu_gump.cpp
@@ -157,7 +157,7 @@ void PentagramMenuGump::ChildNotify(Gump *child, uint32 message) {
break;
case GameWidget::GAME_LOAD: {
GameInfo *info = Ultima8Engine::get_instance()->getGameInfo(gamename);
- if (info && info->type == GameInfo::GAME_U8) {
+ if (info && info->_type == GameInfo::GAME_U8) {
Ultima8Engine::get_instance()->menuInitMinimal(gamename);
Gump *gump = U8SaveGump::showLoadSaveGump(0, false);
if (gump) {
diff --git a/engines/ultima/ultima8/gumps/readable_gump.cpp b/engines/ultima/ultima8/gumps/readable_gump.cpp
index fcde806..ad0e8d8 100644
--- a/engines/ultima/ultima8/gumps/readable_gump.cpp
+++ b/engines/ultima/ultima8/gumps/readable_gump.cpp
@@ -69,7 +69,7 @@ void ReadableGump::InitGump(Gump *newparent, bool take_focus) {
_dims.w = sf->_width;
_dims.h = sf->_height;
- if (CoreApp::get_instance()->getGameInfo()->language ==
+ if (CoreApp::get_instance()->getGameInfo()->_language ==
GameInfo::GAMELANG_JAPANESE) {
// Japanese subtitles
Std::string::size_type pos;
diff --git a/engines/ultima/ultima8/gumps/widgets/game_widget.cpp b/engines/ultima/ultima8/gumps/widgets/game_widget.cpp
index 6e95af7..12e9733 100644
--- a/engines/ultima/ultima8/gumps/widgets/game_widget.cpp
+++ b/engines/ultima/ultima8/gumps/widgets/game_widget.cpp
@@ -47,7 +47,7 @@ GameWidget::~GameWidget() {
}
istring GameWidget::getGameName() {
- return info->name;
+ return info->_name;
}
void GameWidget::InitGump(Gump *newparent, bool take_focus) {
Gump::InitGump(newparent, take_focus);
@@ -60,7 +60,7 @@ void GameWidget::InitGump(Gump *newparent, bool take_focus) {
// FIXME: localize these strings
Std::string gamename = "Game:";
gamename += " ";
- gamename += info->name;
+ gamename += info->_name;
w = new TextWidget(65, 29, gamename, false, 0, 350, 180);
w->InitGump(this, false);
@@ -145,14 +145,14 @@ void GameWidget::PaintThis(RenderSurface *surf, int32 lerp_factor, bool /*scaled
// box graphics
// surf->Fill32(0xFFAFAFFF,1,1,56,80);
- surf->Blit(coversImage, (info->type - 1) * 56, 0, 56, 80, 1, 1); // HACK...
+ surf->Blit(coversImage, (info->_type - 1) * 56, 0, 56, 80, 1, 1); // HACK...
if (highlight)
surf->Fill32(0xFF30308F, 58, 1, 443 - 57 - 2, 22);
// flag
// surf->Fill32(0xFFAFFFAF,415,4,24,16);
- surf->Blit(flagsImage, (info->language - 1) * 24, 0, 24, 16, 415, 4); // HACK...
+ surf->Blit(flagsImage, (info->_language - 1) * 24, 0, 24, 16, 415, 4); // HACK...
#if 0
diff --git a/engines/ultima/ultima8/kernel/core_app.cpp b/engines/ultima/ultima8/kernel/core_app.cpp
index 79648b1..7bd12ac 100644
--- a/engines/ultima/ultima8/kernel/core_app.cpp
+++ b/engines/ultima/ultima8/kernel/core_app.cpp
@@ -188,12 +188,12 @@ GameInfo *CoreApp::getDefaultGame() {
} else if (_games.size() == 2) {// TODO - Do this in a better method
// only one game in config file, so pick that
for (GameMap::iterator i = _games.begin(); i != _games.end(); ++i) {
- if (i->_value->name != "pentagram")
- gamename = i->_value->name;
+ if (i->_value->_name != "pentagram")
+ gamename = i->_value->_name;
}
} else if (_games.size() == 1) {
- gamename = _games.begin()->_value->name;
+ gamename = _games.begin()->_value->_name;
} else {
perr << "Multiple games found in configuration, but no default "
@@ -219,16 +219,16 @@ GameInfo *CoreApp::getDefaultGame() {
bool CoreApp::setupGame(GameInfo *info) {
if (!info) return false;
- assert(info->name != "");
+ assert(info->_name != "");
_gameInfo = info;
- pout << "Selected game: " << info->name << Std::endl;
+ pout << "Selected game: " << info->_name << Std::endl;
pout << info->getPrintDetails() << Std::endl;
setupGamePaths(info);
- return info->name != "pentagram";
+ return info->_name != "pentagram";
}
void CoreApp::killGame() {
@@ -256,38 +256,38 @@ bool CoreApp::getGameInfo(istring &game, GameInfo *ginfo) {
// first try getting the information from the config file
// if that fails, try to autodetect it
- ginfo->name = game;
- ginfo->type = GameInfo::GAME_UNKNOWN;
+ ginfo->_name = game;
+ ginfo->_type = GameInfo::GAME_UNKNOWN;
ginfo->version = 0;
- ginfo->language = GameInfo::GAMELANG_UNKNOWN;
+ ginfo->_language = GameInfo::GAMELANG_UNKNOWN;
istring gamekey = "settings/";
gamekey += game;
if (game == "pentagram") {
- ginfo->type = GameInfo::GAME_PENTAGRAM_MENU;
- ginfo->language = GameInfo::GAMELANG_ENGLISH;
+ ginfo->_type = GameInfo::GAME_PENTAGRAM_MENU;
+ ginfo->_language = GameInfo::GAMELANG_ENGLISH;
} else {
assert(game == "ultima8");
- ginfo->type = GameInfo::GAME_U8;
+ ginfo->_type = GameInfo::GAME_U8;
switch (_gameDesc->desc.language) {
case Common::EN_ANY:
- ginfo->language = GameInfo::GAMELANG_ENGLISH;
+ ginfo->_language = GameInfo::GAMELANG_ENGLISH;
break;
case Common::FR_FRA:
- ginfo->language = GameInfo::GAMELANG_FRENCH;
+ ginfo->_language = GameInfo::GAMELANG_FRENCH;
break;
case Common::DE_DEU:
- ginfo->language = GameInfo::GAMELANG_GERMAN;
+ ginfo->_language = GameInfo::GAMELANG_GERMAN;
break;
case Common::ES_ESP:
- ginfo->language = GameInfo::GAMELANG_SPANISH;
+ ginfo->_language = GameInfo::GAMELANG_SPANISH;
break;
case Common::JA_JPN:
- ginfo->language = GameInfo::GAMELANG_JAPANESE;
+ ginfo->_language = GameInfo::GAMELANG_JAPANESE;
break;
default:
error("Unknown language");
@@ -295,16 +295,16 @@ bool CoreApp::getGameInfo(istring &game, GameInfo *ginfo) {
}
}
- return ginfo->type != GameInfo::GAME_UNKNOWN;
+ return ginfo->_type != GameInfo::GAME_UNKNOWN;
}
void CoreApp::setupGamePaths(GameInfo *ginfo) {
- if (!ginfo || ginfo->name == "pentagram") {
+ if (!ginfo || ginfo->_name == "pentagram") {
_settingMan->setCurrentDomain(SettingManager::DOM_GLOBAL);
return;
}
- istring game = ginfo->name;
+ istring game = ginfo->_name;
_settingMan->setDomainName(SettingManager::DOM_GAME, game);
_settingMan->setCurrentDomain(SettingManager::DOM_GAME);
diff --git a/engines/ultima/ultima8/kernel/core_app.h b/engines/ultima/ultima8/kernel/core_app.h
index 1c16eeb..7e62e27 100644
--- a/engines/ultima/ultima8/kernel/core_app.h
+++ b/engines/ultima/ultima8/kernel/core_app.h
@@ -39,9 +39,9 @@ class SettingManager;
struct GameInfo;
-#define GAME_IS_U8 (CoreApp::get_instance()->getGameInfo()->type == GameInfo::GAME_U8)
-#define GAME_IS_REMORSE (CoreApp::get_instance()->getGameInfo()->type == GameInfo::GAME_REMORSE)
-#define GAME_IS_REGRET (CoreApp::get_instance()->getGameInfo()->type == GameInfo::GAME_REGRET)
+#define GAME_IS_U8 (CoreApp::get_instance()->getGameInfo()->_type == GameInfo::GAME_U8)
+#define GAME_IS_REMORSE (CoreApp::get_instance()->getGameInfo()->_type == GameInfo::GAME_REMORSE)
+#define GAME_IS_REGRET (CoreApp::get_instance()->getGameInfo()->_type == GameInfo::GAME_REGRET)
#define GAME_IS_CRUSADER (GAME_IS_REMORSE || GAME_IS_REGRET)
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index b91c760..a86ad30 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -447,7 +447,7 @@ void Ultima8Engine::startup() {
void Ultima8Engine::startupGame() {
con->SetAutoPaint(conAutoPaint);
- pout << Std::endl << "-- Initializing Game: " << _gameInfo->name << " --" << Std::endl;
+ pout << Std::endl << "-- Initializing Game: " << _gameInfo->_name << " --" << Std::endl;
GraphicSysInit();
@@ -549,7 +549,7 @@ void Ultima8Engine::startupGame() {
con->SetAutoPaint(0);
// Create Midi Driver for Ultima 8
- if (getGameInfo()->type == GameInfo::GAME_U8)
+ if (getGameInfo()->_type == GameInfo::GAME_U8)
_audioMixer->openMidiOutput();
int saveSlot = ConfMan.hasKey("save_slot") ? ConfMan.getInt("save_slot") : -1;
@@ -691,12 +691,12 @@ void Ultima8Engine::changeGame(istring newgame) {
void Ultima8Engine::menuInitMinimal(istring gamename) {
// Only if in the pentagram menu
- if (_gameInfo->name != "pentagram") return;
+ if (_gameInfo->_name != "pentagram") return;
GameInfo *info = getGameInfo(gamename);
if (!info) info = getGameInfo("pentagram");
assert(info);
- pout << Std::endl << "-- Loading minimal _game data for: " << info->name << " --" << Std::endl;
+ pout << Std::endl << "-- Loading minimal _game data for: " << info->_name << " --" << Std::endl;
FORGET_OBJECT(_game);
FORGET_OBJECT(_gameData);
@@ -704,7 +704,7 @@ void Ultima8Engine::menuInitMinimal(istring gamename) {
setupGamePaths(info);
- if (info->name == "pentagram") return;
+ if (info->_name == "pentagram") return;
_gameData = new GameData(info);
_game = Game::createGame(info);
@@ -1823,7 +1823,7 @@ void Ultima8Engine::ConCmd_engineStats(const Console::ArgvType &argv) {
void Ultima8Engine::ConCmd_changeGame(const Console::ArgvType &argv) {
if (argv.size() == 1) {
- pout << "Current _game is: " << Ultima8Engine::get_instance()->_gameInfo->name << Std::endl;
+ pout << "Current _game is: " << Ultima8Engine::get_instance()->_gameInfo->_name << Std::endl;
} else {
Ultima8Engine::get_instance()->changeGame(argv[1]);
}
diff --git a/engines/ultima/ultima8/world/item.cpp b/engines/ultima/ultima8/world/item.cpp
index f425565..c4819f4 100644
--- a/engines/ultima/ultima8/world/item.cpp
+++ b/engines/ultima/ultima8/world/item.cpp
@@ -1738,7 +1738,7 @@ bool Item::canMergeWith(Item *other) {
// dirt: frame 9
// ex.hood: frame 10-12
// blackmoor: frame 14-15
- if (CoreApp::get_instance()->getGameInfo()->type == GameInfo::GAME_U8) {
+ if (CoreApp::get_instance()->getGameInfo()->_type == GameInfo::GAME_U8) {
if (getShape() != 395) return false;
if (frame1 <= 5 && frame2 <= 5)
Commit: 6eb9c794573adc1a391f87c149318cd11b4eacf7
https://github.com/scummvm/scummvm/commit/6eb9c794573adc1a391f87c149318cd11b4eacf7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-16T17:59:55-08:00
Commit Message:
ULTIMA8: Renaming conf folder class fields
Changed paths:
engines/ultima/ultima8/conf/config_file_manager.cpp
engines/ultima/ultima8/conf/config_file_manager.h
engines/ultima/ultima8/conf/ini_file.cpp
engines/ultima/ultima8/conf/ini_file.h
engines/ultima/ultima8/conf/setting_manager.cpp
engines/ultima/ultima8/conf/setting_manager.h
diff --git a/engines/ultima/ultima8/conf/config_file_manager.cpp b/engines/ultima/ultima8/conf/config_file_manager.cpp
index 16a3584..5676a52 100644
--- a/engines/ultima/ultima8/conf/config_file_manager.cpp
+++ b/engines/ultima/ultima8/conf/config_file_manager.cpp
@@ -25,19 +25,19 @@ namespace Ultima8 {
using Std::string;
-ConfigFileManager *ConfigFileManager::configfilemanager = 0;
+ConfigFileManager *ConfigFileManager::_configFileManager = 0;
ConfigFileManager::ConfigFileManager() {
con->Print(MM_INFO, "Creating ConfigFileManager...\n");
- configfilemanager = this;
+ _configFileManager = this;
}
ConfigFileManager::~ConfigFileManager() {
con->Print(MM_INFO, "Destroying ConfigFileManager...\n");
clear();
- configfilemanager = 0;
+ _configFileManager = 0;
}
bool ConfigFileManager::readConfigFile(string fname, istring root,
@@ -51,7 +51,7 @@ bool ConfigFileManager::readConfigFile(string fname, istring root,
if (readonly)
inifile->setReadonly();
- inifiles.push_back(inifile);
+ _iniFiles.push_back(inifile);
return true;
}
@@ -66,33 +66,33 @@ bool ConfigFileManager::readConfigString(string config, istring root,
if (readonly)
inifile->setReadonly();
- inifiles.push_back(inifile);
+ _iniFiles.push_back(inifile);
return true;
}
void ConfigFileManager::write(istring root) {
- for (Std::vector<INIFile *>::iterator i = inifiles.begin();
- i != inifiles.end(); ++i) {
+ for (Std::vector<INIFile *>::iterator i = _iniFiles.begin();
+ i != _iniFiles.end(); ++i) {
if (!(*i)->isReadonly() && (root == "" || (*i)->checkRoot(root)))
(*i)->write();
}
}
void ConfigFileManager::clear() {
- for (Std::vector<INIFile *>::iterator i = inifiles.begin();
- i != inifiles.end(); ++i) {
+ for (Std::vector<INIFile *>::iterator i = _iniFiles.begin();
+ i != _iniFiles.end(); ++i) {
delete(*i);
}
- inifiles.clear();
+ _iniFiles.clear();
}
void ConfigFileManager::clearRoot(istring root) {
- Std::vector<INIFile *>::iterator i = inifiles.begin();
+ Std::vector<INIFile *>::iterator i = _iniFiles.begin();
- while (i != inifiles.end()) {
+ while (i != _iniFiles.end()) {
if ((*i)->checkRoot(root)) {
delete(*i);
- i = inifiles.erase(i);
+ i = _iniFiles.erase(i);
} else {
++i;
}
@@ -172,8 +172,8 @@ Std::vector<istring> ConfigFileManager::listKeys(istring section,
Std::set<istring> keyset;
Std::set<istring>::iterator iter;
- for (Std::vector<INIFile *>::iterator i = inifiles.begin();
- i != inifiles.end(); ++i) {
+ for (Std::vector<INIFile *>::iterator i = _iniFiles.begin();
+ i != _iniFiles.end(); ++i) {
if ((*i)->checkRoot(section)) {
(*i)->listKeys(keyset, section, longformat);
}
@@ -193,8 +193,8 @@ Std::vector<istring> ConfigFileManager::listSections(istring root,
Std::set<istring> sectionset;
Std::set<istring>::iterator iter;
- for (Std::vector<INIFile *>::iterator i = inifiles.begin();
- i != inifiles.end(); ++i) {
+ for (Std::vector<INIFile *>::iterator i = _iniFiles.begin();
+ i != _iniFiles.end(); ++i) {
if ((*i)->checkRoot(root)) {
(*i)->listSections(sectionset, longformat);
}
@@ -211,8 +211,8 @@ KeyMap ConfigFileManager::listKeyValues(istring section,
bool longformat) {
KeyMap values;
- for (Std::vector<INIFile *>::iterator i = inifiles.begin();
- i != inifiles.end(); ++i) {
+ for (Std::vector<INIFile *>::iterator i = _iniFiles.begin();
+ i != _iniFiles.end(); ++i) {
if ((*i)->checkRoot(section)) {
(*i)->listKeyValues(values, section, longformat);
}
@@ -223,8 +223,8 @@ KeyMap ConfigFileManager::listKeyValues(istring section,
INIFile *ConfigFileManager::findKeyINI(istring key) {
- for (Std::vector<INIFile *>::reverse_iterator i = inifiles.rbegin();
- i != inifiles.rend(); ++i) {
+ for (Std::vector<INIFile *>::reverse_iterator i = _iniFiles.rbegin();
+ i != _iniFiles.rend(); ++i) {
if ((*i)->hasKey(key))
return (*i);
}
@@ -233,8 +233,8 @@ INIFile *ConfigFileManager::findKeyINI(istring key) {
}
INIFile *ConfigFileManager::findWriteINI(istring key) {
- for (Std::vector<INIFile *>::reverse_iterator i = inifiles.rbegin();
- i != inifiles.rend(); ++i) {
+ for (Std::vector<INIFile *>::reverse_iterator i = _iniFiles.rbegin();
+ i != _iniFiles.rend(); ++i) {
if (!(*i)->isReadonly() && (*i)->checkRoot(key))
return (*i);
}
diff --git a/engines/ultima/ultima8/conf/config_file_manager.h b/engines/ultima/ultima8/conf/config_file_manager.h
index 0434b3b..530714f 100644
--- a/engines/ultima/ultima8/conf/config_file_manager.h
+++ b/engines/ultima/ultima8/conf/config_file_manager.h
@@ -33,7 +33,7 @@ public:
~ConfigFileManager();
static ConfigFileManager *get_instance() {
- return configfilemanager;
+ return _configFileManager;
}
//! read a config file. Multiple files may be read. Order is important.
@@ -104,9 +104,9 @@ private:
INIFile *findKeyINI(istring key);
INIFile *findWriteINI(istring key);
- Std::vector<INIFile *> inifiles;
+ Std::vector<INIFile *> _iniFiles;
- static ConfigFileManager *configfilemanager;
+ static ConfigFileManager *_configFileManager;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/conf/ini_file.cpp b/engines/ultima/ultima8/conf/ini_file.cpp
index 58e80e8..9c8a9b5 100644
--- a/engines/ultima/ultima8/conf/ini_file.cpp
+++ b/engines/ultima/ultima8/conf/ini_file.cpp
@@ -28,12 +28,12 @@ namespace Ultima8 {
using Std::string;
INIFile::INIFile()
- : is_file(false), readonly(false) {
+ : _isFile(false), _readOnly(false) {
}
-INIFile::INIFile(string fname, istring root_)
- : root(root_), is_file(false), readonly(false) {
+INIFile::INIFile(string fname, istring root)
+ : _root(root), _isFile(false), _readOnly(false) {
readConfigFile(fname);
}
@@ -47,8 +47,8 @@ bool INIFile::Section::hasKey(istring key) {
INIFile::KeyValue *INIFile::Section::getKey(istring key) {
Std::list<KeyValue>::iterator i;
- for (i = keys.begin(); i != keys.end(); ++i) {
- if (i->key == key) {
+ for (i = _keys.begin(); i != _keys.end(); ++i) {
+ if (i->_key == key) {
return &(*i);
}
}
@@ -58,33 +58,33 @@ INIFile::KeyValue *INIFile::Section::getKey(istring key) {
void INIFile::Section::setKey(istring key, string value) {
KeyValue *kv = getKey(key);
if (kv) {
- kv->value = value;
+ kv->_value = value;
return;
}
KeyValue newkey;
- newkey.key = key;
- newkey.value = value;
- newkey.comment = "";
- keys.push_back(newkey);
+ newkey._key = key;
+ newkey._value = value;
+ newkey._comment = "";
+ _keys.push_back(newkey);
}
void INIFile::Section::unsetKey(istring key) {
Std::list<KeyValue>::iterator i;
- for (i = keys.begin(); i != keys.end(); ++i) {
- if (i->key == key) {
- i = keys.erase(i);
+ for (i = _keys.begin(); i != _keys.end(); ++i) {
+ if (i->_key == key) {
+ i = _keys.erase(i);
}
}
}
string INIFile::Section::dump() {
- string s = comment;
- s += "[" + name + "]\n";
+ string s = _comment;
+ s += "[" + _name + "]\n";
Std::list<KeyValue>::iterator i;
- for (i = keys.begin(); i != keys.end(); ++i) {
- s += i->comment;
- s += i->key + "=" + i->value + "\n";
+ for (i = _keys.begin(); i != _keys.end(); ++i) {
+ s += i->_comment;
+ s += i->_key + "=" + i->_value + "\n";
}
return s;
@@ -110,8 +110,8 @@ bool INIFile::readConfigFile(string fname) {
if (!readConfigString(sbuf))
return false;
- is_file = true; // readConfigString sets is_file = false
- filename = fname;
+ _isFile = true; // readConfigString sets _isFile = false
+ _filename = fname;
return true;
}
@@ -142,7 +142,7 @@ static void ltrim(string &s) {
// http://www.scummvm.org/
bool INIFile::readConfigString(string config) {
- is_file = false;
+ _isFile = false;
string line;
string comment;
@@ -195,16 +195,16 @@ bool INIFile::readConfigString(string config) {
return false;
}
- if (!section.name.empty()) {
+ if (!section._name.empty()) {
// save previous section
- sections.push_back(section);
+ _sections.push_back(section);
}
- section.name.clear();
- section.comment.clear();
- section.keys.clear();
+ section._name.clear();
+ section._comment.clear();
+ section._keys.clear();
- section.name = line.substr(1, p - 1);
- section.comment = comment;
+ section._name = line.substr(1, p - 1);
+ section._comment = comment;
comment.clear();
} else {
@@ -217,7 +217,7 @@ bool INIFile::readConfigString(string config) {
continue;
// If no section has been set, this config file is invalid!
- if (section.name.empty()) {
+ if (section._name.empty()) {
perr << "Config file buggy: Key/value pair found outside "
<< "a section in line " << lineno << Std::endl;
return false;
@@ -235,49 +235,49 @@ bool INIFile::readConfigString(string config) {
string t = line.substr(0, p);
rtrim(t);
- v.key = t;
+ v._key = t;
if (p + 1 < line.size())
t = line.substr(p + 1);
else
t = "";
ltrim(t);
- v.value = t;
+ v._value = t;
- v.comment = comment;
+ v._comment = comment;
comment.clear();
#if 0
- pout << "section: " << section.name << ", key: " << v.key
- << ", value: " << v.value << Std::endl;
+ pout << "section: " << section._name << ", key: " << v._key
+ << ", value: " << v._value << Std::endl;
#endif
- section.keys.push_back(v);
+ section._keys.push_back(v);
}
}
- if (!section.name.empty()) {
+ if (!section._name.empty()) {
// save last section
- sections.push_back(section);
+ _sections.push_back(section);
}
return true;
}
void INIFile::clear(istring root_) {
- sections.clear();
- root = root_;
- is_file = false;
- readonly = false;
- filename = "";
+ _sections.clear();
+ _root = root_;
+ _isFile = false;
+ _readOnly = false;
+ _filename = "";
}
string INIFile::dump() {
string s;
Std::list<Section>::iterator i;
- for (i = sections.begin(); i != sections.end(); ++i) {
- if (i != sections.begin())
+ for (i = _sections.begin(); i != _sections.end(); ++i) {
+ if (i != _sections.begin())
s += "\n";
s += i->dump();
@@ -287,10 +287,10 @@ string INIFile::dump() {
}
void INIFile::write() {
- if (!is_file || readonly)
+ if (!_isFile || _readOnly)
return;
- ODataSource *f = FileSystem::get_instance()->WriteFile(filename, true);
+ ODataSource *f = FileSystem::get_instance()->WriteFile(_filename, true);
if (!f) return;
Std::string s = dump();
@@ -305,7 +305,7 @@ bool INIFile::stripRoot(istring &key) {
if (pos == istring::npos) return false;
istring keyroot = key.substr(0, pos);
- if (keyroot != root) return false;
+ if (keyroot != _root) return false;
key.erase(0, pos + 1);
@@ -314,8 +314,8 @@ bool INIFile::stripRoot(istring &key) {
INIFile::Section *INIFile::getSection(istring section) {
Std::list<Section>::iterator i;
- for (i = sections.begin(); i != sections.end(); ++i) {
- if (i->name == section) {
+ for (i = _sections.begin(); i != _sections.end(); ++i) {
+ if (i->_name == section) {
return &(*i);
}
}
@@ -352,7 +352,7 @@ bool INIFile::hasKey(istring key) {
}
bool INIFile::checkRoot(istring key) {
- return (root == key || stripRoot(key));
+ return (_root == key || stripRoot(key));
}
bool INIFile::value(istring key, string &ret) {
@@ -366,7 +366,7 @@ bool INIFile::value(istring key, string &ret) {
KeyValue *kv = section->getKey(k);
if (!kv) return false;
- ret = kv->value;
+ ret = kv->_value;
return true;
}
@@ -398,9 +398,9 @@ void INIFile::set(istring key, string value) {
Section *section = getSection(s);
if (!section) {
Section newsec;
- newsec.name = s;
- newsec.comment = "";
- sections.push_back(newsec);
+ newsec._name = s;
+ newsec._comment = "";
+ _sections.push_back(newsec);
section = getSection(s);
assert(section);
}
@@ -437,7 +437,7 @@ void INIFile::unset(istring key) {
}
}
-void INIFile::listKeys(Std::set<istring> &keys, istring section_,
+void INIFile::listKeys(Std::set<istring> &_keys, istring section_,
bool longformat) {
if (!stripRoot(section_)) return;
@@ -445,25 +445,25 @@ void INIFile::listKeys(Std::set<istring> &keys, istring section_,
if (!section) return;
Std::list<KeyValue>::iterator i;
- for (i = section->keys.begin(); i != section->keys.end(); ++i) {
+ for (i = section->_keys.begin(); i != section->_keys.end(); ++i) {
istring k;
if (longformat)
- k = root + "/" + section->name + "/" + i->key;
+ k = _root + "/" + section->_name + "/" + i->_key;
else
- k = i->key;
+ k = i->_key;
- keys.insert(k);
+ _keys.insert(k);
}
}
void INIFile::listSections(Std::set<istring> §ions_, bool longformat) {
Std::list<Section>::iterator i;
- for (i = sections.begin(); i != sections.end(); ++i) {
+ for (i = _sections.begin(); i != _sections.end(); ++i) {
istring s;
if (longformat)
- s = root + "/" + i->name;
+ s = _root + "/" + i->_name;
else
- s = i->name;
+ s = i->_name;
sections_.insert(s);
}
@@ -476,14 +476,14 @@ void INIFile::listKeyValues(KeyMap &keyvalues, istring section_, bool longformat
if (!section) return;
Std::list<KeyValue>::iterator i;
- for (i = section->keys.begin(); i != section->keys.end(); ++i) {
+ for (i = section->_keys.begin(); i != section->_keys.end(); ++i) {
istring k;
if (longformat)
- k = root + "/" + section->name + "/" + i->key;
+ k = _root + "/" + section->_name + "/" + i->_key;
else
- k = i->key;
+ k = i->_key;
- keyvalues[k] = i->value;
+ keyvalues[k] = i->_value;
}
}
diff --git a/engines/ultima/ultima8/conf/ini_file.h b/engines/ultima/ultima8/conf/ini_file.h
index 4877d33..020e77b 100644
--- a/engines/ultima/ultima8/conf/ini_file.h
+++ b/engines/ultima/ultima8/conf/ini_file.h
@@ -43,10 +43,10 @@ public:
void write();
void setReadonly() {
- readonly = true;
+ _readOnly = true;
}
bool isReadonly() const {
- return readonly;
+ return _readOnly;
}
bool hasSection(istring section);
@@ -79,21 +79,21 @@ public:
bool longformat = false);
private:
- Std::string filename;
- istring root;
- bool is_file;
- bool readonly;
+ Std::string _filename;
+ istring _root;
+ bool _isFile;
+ bool _readOnly;
struct KeyValue {
- istring key;
- Std::string value;
- Std::string comment;
+ istring _key;
+ Std::string _value;
+ Std::string _comment;
};
struct Section {
- istring name;
- Std::list<KeyValue> keys;
- Std::string comment;
+ istring _name;
+ Std::list<KeyValue> _keys;
+ Std::string _comment;
bool hasKey(istring key);
KeyValue *getKey(istring key);
@@ -103,7 +103,7 @@ private:
Std::string dump();
};
- Std::list<Section> sections;
+ Std::list<Section> _sections;
bool stripRoot(istring &key);
diff --git a/engines/ultima/ultima8/conf/setting_manager.cpp b/engines/ultima/ultima8/conf/setting_manager.cpp
index 162fb00..d8ed7bc 100644
--- a/engines/ultima/ultima8/conf/setting_manager.cpp
+++ b/engines/ultima/ultima8/conf/setting_manager.cpp
@@ -24,25 +24,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
namespace Ultima {
namespace Ultima8 {
-SettingManager *SettingManager::settingmanager = 0;
+SettingManager *SettingManager::_settingManager = 0;
SettingManager::SettingManager() {
con->Print(MM_INFO, "Creating SettingManager...\n");
- settingmanager = this;
+ _settingManager = this;
- domains.resize(DOM_GAME + 1);
+ _domains.resize(DOM_GAME + 1);
- conffileman = ConfigFileManager::get_instance();
+ _confFileMan = ConfigFileManager::get_instance();
- conffileman->readConfigString("", "defaultsettings", false);
+ _confFileMan->readConfigString("", "defaultsettings", false);
// Setup ScummVM configuration settings
setupScummVMSettings();
}
void SettingManager::setupScummVMSettings() {
- conffileman->readConfigString("", "ScummVM", false);
+ _confFileMan->readConfigString("", "ScummVM", false);
int saveSlot = ConfMan.hasKey("save_slot") ? ConfMan.getInt("save_slot") : -1;
if (saveSlot != -1)
@@ -52,15 +52,15 @@ void SettingManager::setupScummVMSettings() {
SettingManager::~SettingManager() {
con->Print(MM_INFO, "Destroying SettingManager...\n");
- settingmanager = 0;
+ _settingManager = 0;
}
bool SettingManager::readConfigFile(Std::string fname, bool readonly) {
- return conffileman->readConfigFile(fname, "settings", readonly);
+ return _confFileMan->readConfigFile(fname, "settings", readonly);
}
void SettingManager::write() {
- conffileman->write("settings");
+ _confFileMan->write("settings");
}
bool SettingManager::exists(istring key, Domain dom) {
@@ -74,7 +74,7 @@ bool SettingManager::get(istring key, Std::string &ret, Domain dom) {
bool found = findKeyDomain(key, dom, keydom);
if (!found) return false;
- conffileman->get(getConfigKey(key, keydom), ret);
+ _confFileMan->get(getConfigKey(key, keydom), ret);
return true;
}
@@ -84,7 +84,7 @@ bool SettingManager::get(istring key, int &ret, Domain dom) {
bool found = findKeyDomain(key, dom, keydom);
if (!found) return false;
- conffileman->get(getConfigKey(key, keydom), ret);
+ _confFileMan->get(getConfigKey(key, keydom), ret);
return true;
}
@@ -94,38 +94,38 @@ bool SettingManager::get(istring key, bool &ret, Domain dom) {
bool found = findKeyDomain(key, dom, keydom);
if (!found) return false;
- conffileman->get(getConfigKey(key, keydom), ret);
+ _confFileMan->get(getConfigKey(key, keydom), ret);
return true;
}
void SettingManager::set(istring key, Std::string value, Domain dom) {
- conffileman->set(getConfigKey(key, dom), value);
+ _confFileMan->set(getConfigKey(key, dom), value);
callCallbacks(key);
}
void SettingManager::set(istring key, const char *value, Domain dom) {
- conffileman->set(getConfigKey(key, dom), value);
+ _confFileMan->set(getConfigKey(key, dom), value);
callCallbacks(key);
}
void SettingManager::set(istring key, int value, Domain dom) {
- conffileman->set(getConfigKey(key, dom), value);
+ _confFileMan->set(getConfigKey(key, dom), value);
callCallbacks(key);
}
void SettingManager::set(istring key, bool value, Domain dom) {
- conffileman->set(getConfigKey(key, dom), value);
+ _confFileMan->set(getConfigKey(key, dom), value);
callCallbacks(key);
}
void SettingManager::unset(istring key, Domain dom) {
- conffileman->unset(getConfigKey(key, dom));
+ _confFileMan->unset(getConfigKey(key, dom));
callCallbacks(key);
}
@@ -152,23 +152,24 @@ void SettingManager::setDefault(istring key, bool value) {
void SettingManager::setCurrentDomain(Domain dom) {
- currentDomain = dom;
+ _currentDomain = dom;
}
void SettingManager::setDomainName(Domain dom, istring section) {
unsigned int d = static_cast<unsigned int>(dom);
- if (domains.size() <= d) domains.resize(d + 1);
- domains[d] = section;
+ if (_domains.size() <= d)
+ _domains.resize(d + 1);
+ _domains[d] = section;
}
void SettingManager::registerCallback(istring key, ConfigCallback callback) {
- callbacks[key].push_back(callback);
+ _callbacks[key].push_back(callback);
}
void SettingManager::unregisterCallback(istring key, ConfigCallback callback) {
- Callbacks::iterator i = callbacks.find(key);
- if (i == callbacks.end())
+ Callbacks::iterator i = _callbacks.find(key);
+ if (i == _callbacks.end())
return;
Std::vector<ConfigCallback> &cb = (*i)._value;
@@ -190,26 +191,26 @@ Std::vector<istring> SettingManager::listGames() {
}
Std::vector<istring> SettingManager::listDataKeys(istring section) {
- istring csection = "settings/" + domains[DOM_GAME] + ":" + section;
+ istring csection = "settings/" + _domains[DOM_GAME] + ":" + section;
- return conffileman->listKeys(csection, false);
+ return _confFileMan->listKeys(csection, false);
}
KeyMap SettingManager::listDataValues(istring section) {
- istring csection = "settings/" + domains[DOM_GAME] + ":" + section;
+ istring csection = "settings/" + _domains[DOM_GAME] + ":" + section;
- return conffileman->listKeyValues(csection, false);
+ return _confFileMan->listKeyValues(csection, false);
}
bool SettingManager::findKeyDomain(istring key, Domain dom, Domain &keydom) {
- // if domain is DOM_CURRENT we search through all domains below the
+ // if domain is DOM_CURRENT we search through all _domains below the
// current domain.
// otherwise, we search only the domain passed
if (dom == DOM_CURRENT) {
- int d = static_cast<int>(currentDomain);
+ int d = static_cast<int>(_currentDomain);
for (; d >= 0; --d) {
- if (conffileman->exists(getConfigKey(key, static_cast<Domain>(d)))) {
+ if (_confFileMan->exists(getConfigKey(key, static_cast<Domain>(d)))) {
keydom = static_cast<Domain>(d);
return true;
}
@@ -217,21 +218,21 @@ bool SettingManager::findKeyDomain(istring key, Domain dom, Domain &keydom) {
return false;
} else {
keydom = dom;
- return conffileman->exists(getConfigKey(key, dom));
+ return _confFileMan->exists(getConfigKey(key, dom));
}
}
istring SettingManager::getConfigKey(istring key, Domain dom) {
istring ckey;
- if (dom == DOM_CURRENT) dom = currentDomain;
+ if (dom == DOM_CURRENT) dom = _currentDomain;
if (dom == DOM_DEFAULTS) {
ckey = "defaultsettings/";
} else if (dom == DOM_SCUMMVM) {
ckey = "ScummVM/";
} else {
- ckey = "settings/" + domains[dom];
+ ckey = "settings/" + _domains[dom];
}
istring::size_type pos = key.find('/');
@@ -247,9 +248,9 @@ istring SettingManager::getConfigKey(istring key, Domain dom) {
void SettingManager::callCallbacks(istring key) {
Callbacks::iterator i;
- i = callbacks.find(key);
+ i = _callbacks.find(key);
- if (i == callbacks.end()) return;
+ if (i == _callbacks.end()) return;
Std::vector<ConfigCallback> &cb = (*i)._value;
Std::vector<ConfigCallback>::iterator iter;
diff --git a/engines/ultima/ultima8/conf/setting_manager.h b/engines/ultima/ultima8/conf/setting_manager.h
index 811b7ce..c558b7d 100644
--- a/engines/ultima/ultima8/conf/setting_manager.h
+++ b/engines/ultima/ultima8/conf/setting_manager.h
@@ -40,7 +40,7 @@ public:
~SettingManager();
static SettingManager *get_instance() {
- return settingmanager;
+ return _settingManager;
}
enum Domain {
@@ -124,14 +124,14 @@ private:
void callCallbacks(istring key);
void setupScummVMSettings();
- Callbacks callbacks;
- Std::vector<istring> domains;
+ Callbacks _callbacks;
+ Std::vector<istring> _domains;
- Domain currentDomain;
+ Domain _currentDomain;
- ConfigFileManager *conffileman;
+ ConfigFileManager *_confFileMan;
- static SettingManager *settingmanager;
+ static SettingManager *_settingManager;
};
} // End of namespace Ultima8
Commit: de4dc993a14f7a092f968c78b61e91ceedee342c
https://github.com/scummvm/scummvm/commit/de4dc993a14f7a092f968c78b61e91ceedee342c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-16T18:12:50-08:00
Commit Message:
ULTIMA8: Renaming render surface class fields
Changed paths:
engines/ultima/ultima8/graphics/anim_dat.cpp
engines/ultima/ultima8/graphics/anim_dat.h
engines/ultima/ultima8/graphics/base_soft_render_surface.cpp
engines/ultima/ultima8/graphics/base_soft_render_surface.h
engines/ultima/ultima8/graphics/soft_render_surface.cpp
engines/ultima/ultima8/graphics/soft_render_surface.inl
diff --git a/engines/ultima/ultima8/graphics/anim_dat.cpp b/engines/ultima/ultima8/graphics/anim_dat.cpp
index 78b06a8..880860c 100644
--- a/engines/ultima/ultima8/graphics/anim_dat.cpp
+++ b/engines/ultima/ultima8/graphics/anim_dat.cpp
@@ -39,22 +39,22 @@ AnimDat::AnimDat() {
AnimDat::~AnimDat() {
- for (unsigned int i = 0; i < anims.size(); i++)
- delete anims[i];
- anims.clear();
+ for (unsigned int i = 0; i < _anims.size(); i++)
+ delete _anims[i];
+ _anims.clear();
}
ActorAnim *AnimDat::getAnim(uint32 shape) const {
- if (shape >= anims.size()) return 0;
+ if (shape >= _anims.size()) return 0;
- return anims[shape];
+ return _anims[shape];
}
AnimAction *AnimDat::getAnim(uint32 shape, uint32 action) const {
- if (shape >= anims.size()) return 0;
- if (anims[shape] == 0) return 0;
+ if (shape >= _anims.size()) return 0;
+ if (_anims[shape] == 0) return 0;
- return anims[shape]->getAction(action);
+ return _anims[shape]->getAction(action);
}
@@ -62,18 +62,18 @@ void AnimDat::load(IDataSource *ds) {
AnimFrame f;
// CONSTANT !
- anims.resize(2048);
+ _anims.resize(2048);
unsigned int actioncount = 64;
if (GAME_IS_CRUSADER)
actioncount = 256;
- for (unsigned int shape = 0; shape < anims.size(); shape++) {
+ for (unsigned int shape = 0; shape < _anims.size(); shape++) {
ds->seek(4 * shape);
uint32 offset = ds->read4();
if (offset == 0) {
- anims[shape] = 0;
+ _anims[shape] = 0;
continue;
}
@@ -146,7 +146,7 @@ void AnimDat::load(IDataSource *ds) {
}
}
- anims[shape] = a;
+ _anims[shape] = a;
}
}
diff --git a/engines/ultima/ultima8/graphics/anim_dat.h b/engines/ultima/ultima8/graphics/anim_dat.h
index 4040939..451c597 100644
--- a/engines/ultima/ultima8/graphics/anim_dat.h
+++ b/engines/ultima/ultima8/graphics/anim_dat.h
@@ -43,7 +43,7 @@ public:
AnimAction *getAnim(uint32 shape, uint32 action) const;
private:
- Std::vector<ActorAnim *> anims;
+ Std::vector<ActorAnim *> _anims;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/base_soft_render_surface.cpp b/engines/ultima/ultima8/graphics/base_soft_render_surface.cpp
index b402671..b4f9da6 100644
--- a/engines/ultima/ultima8/graphics/base_soft_render_surface.cpp
+++ b/engines/ultima/ultima8/graphics/base_soft_render_surface.cpp
@@ -41,39 +41,39 @@ namespace Ultima8 {
// Desc: Constructor for BaseSoftRenderSurface from a SDL_Surface
//
BaseSoftRenderSurface::BaseSoftRenderSurface(Graphics::ManagedSurface *s) :
- pixels(0), pixels00(0), zbuffer(0), zbuffer00(0),
- bytes_per_pixel(0), bits_per_pixel(0), format_type(0),
- ox(0), oy(0), width(0), height(0), pitch(0), zpitch(0),
- flipped(false), clip_window(0, 0, 0, 0), lock_count(0),
- sdl_surf(s), rtt_tex(0) {
- clip_window.ResizeAbs(width = sdl_surf->w, height = sdl_surf->h);
- pitch = sdl_surf->pitch;
- bits_per_pixel = sdl_surf->format.bpp();
- bytes_per_pixel = sdl_surf->format.bytesPerPixel;
-
- RenderSurface::format.s_bpp = bits_per_pixel;
- RenderSurface::format.s_bytes_per_pixel = bytes_per_pixel;
- RenderSurface::format.r_loss = sdl_surf->format.rLoss;
- RenderSurface::format.g_loss = sdl_surf->format.gLoss;
- RenderSurface::format.b_loss = sdl_surf->format.bLoss;
- RenderSurface::format.a_loss = sdl_surf->format.aLoss;
+ _pixels(0), _pixels00(0), _zBuffer(0), _zBuffer00(0),
+ _bytesPerPixel(0), _bitsPerPixel(0), _formatType(0),
+ _ox(0), _oy(0), _width(0), _height(0), _pitch(0), _zPitch(0),
+ _flipped(false), _clipWindow(0, 0, 0, 0), _lockCount(0),
+ _sdlSurf(s), _rttTex(0) {
+ _clipWindow.ResizeAbs(_width = _sdlSurf->w, _height = _sdlSurf->h);
+ _pitch = _sdlSurf->pitch;
+ _bitsPerPixel = _sdlSurf->format.bpp();
+ _bytesPerPixel = _sdlSurf->format.bytesPerPixel;
+
+ RenderSurface::format.s_bpp = _bitsPerPixel;
+ RenderSurface::format.s_bytes_per_pixel = _bytesPerPixel;
+ RenderSurface::format.r_loss = _sdlSurf->format.rLoss;
+ RenderSurface::format.g_loss = _sdlSurf->format.gLoss;
+ RenderSurface::format.b_loss = _sdlSurf->format.bLoss;
+ RenderSurface::format.a_loss = _sdlSurf->format.aLoss;
RenderSurface::format.r_loss16 = format.r_loss + 8;
RenderSurface::format.g_loss16 = format.g_loss + 8;
RenderSurface::format.b_loss16 = format.b_loss + 8;
RenderSurface::format.a_loss16 = format.a_loss + 8;
- RenderSurface::format.r_shift = sdl_surf->format.rShift;
- RenderSurface::format.g_shift = sdl_surf->format.gShift;
- RenderSurface::format.b_shift = sdl_surf->format.bShift;
- RenderSurface::format.a_shift = sdl_surf->format.aShift;
- RenderSurface::format.r_mask = sdl_surf->format.rMax();
- RenderSurface::format.g_mask = sdl_surf->format.gMax();
- RenderSurface::format.b_mask = sdl_surf->format.bMax();
- RenderSurface::format.a_mask = sdl_surf->format.aMax();
+ RenderSurface::format.r_shift = _sdlSurf->format.rShift;
+ RenderSurface::format.g_shift = _sdlSurf->format.gShift;
+ RenderSurface::format.b_shift = _sdlSurf->format.bShift;
+ RenderSurface::format.a_shift = _sdlSurf->format.aShift;
+ RenderSurface::format.r_mask = _sdlSurf->format.rMax();
+ RenderSurface::format.g_mask = _sdlSurf->format.gMax();
+ RenderSurface::format.b_mask = _sdlSurf->format.bMax();
+ RenderSurface::format.a_mask = _sdlSurf->format.aMax();
SetPixelsPointer();
// Trickery to get the alpha channel
- if (format.a_mask == 0 && bytes_per_pixel == 4) {
+ if (format.a_mask == 0 && _bytesPerPixel == 4) {
uint32 mask = ~(format.r_mask | format.g_mask | format.b_mask);
// Using all bits????
@@ -118,11 +118,11 @@ BaseSoftRenderSurface::BaseSoftRenderSurface(Graphics::ManagedSurface *s) :
//
BaseSoftRenderSurface::BaseSoftRenderSurface(int w, int h, int bpp,
int rsft, int gsft, int bsft, int asft) :
- pixels(0), pixels00(0), zbuffer(0), zbuffer00(0),
- bytes_per_pixel(0), bits_per_pixel(0), format_type(0),
- ox(0), oy(0), width(0), height(0), pitch(0), zpitch(0),
- flipped(false), clip_window(0, 0, 0, 0), lock_count(0), sdl_surf(0), rtt_tex(0) {
- clip_window.ResizeAbs(width = w, height = h);
+ _pixels(0), _pixels00(0), _zBuffer(0), _zBuffer00(0),
+ _bytesPerPixel(0), _bitsPerPixel(0), _formatType(0),
+ _ox(0), _oy(0), _width(0), _height(0), _pitch(0), _zPitch(0),
+ _flipped(false), _clipWindow(0, 0, 0, 0), _lockCount(0), _sdlSurf(0), _rttTex(0) {
+ _clipWindow.ResizeAbs(_width = w, _height = h);
switch (bpp) {
case 15:
@@ -151,12 +151,12 @@ BaseSoftRenderSurface::BaseSoftRenderSurface(int w, int h, int bpp,
break;
}
- pitch = w * bpp / 8;
- bits_per_pixel = bpp;
- bytes_per_pixel = bpp / 8;
+ _pitch = w * bpp / 8;
+ _bitsPerPixel = bpp;
+ _bytesPerPixel = bpp / 8;
RenderSurface::format.s_bpp = bpp;
- RenderSurface::format.s_bytes_per_pixel = bytes_per_pixel;
+ RenderSurface::format.s_bytes_per_pixel = _bytesPerPixel;
RenderSurface::format.r_loss16 = format.r_loss + 8;
RenderSurface::format.g_loss16 = format.g_loss + 8;
RenderSurface::format.b_loss16 = format.b_loss + 8;
@@ -180,18 +180,18 @@ BaseSoftRenderSurface::BaseSoftRenderSurface(int w, int h, int bpp,
// Desc: Constructor for Generic BaseSoftRenderSurface which matches screen params
//
BaseSoftRenderSurface::BaseSoftRenderSurface(int w, int h, uint8 *buf) :
- pixels(0), pixels00(0), zbuffer(0), zbuffer00(0),
- bytes_per_pixel(0), bits_per_pixel(0), format_type(0),
- ox(0), oy(0), width(0), height(0), pitch(0), zpitch(0),
- flipped(false), clip_window(0, 0, 0, 0), lock_count(0), sdl_surf(0), rtt_tex(0) {
- clip_window.ResizeAbs(width = w, height = h);
+ _pixels(0), _pixels00(0), _zBuffer(0), _zBuffer00(0),
+ _bytesPerPixel(0), _bitsPerPixel(0), _formatType(0),
+ _ox(0), _oy(0), _width(0), _height(0), _pitch(0), _zPitch(0),
+ _flipped(false), _clipWindow(0, 0, 0, 0), _lockCount(0), _sdlSurf(0), _rttTex(0) {
+ _clipWindow.ResizeAbs(_width = w, _height = h);
int bpp = RenderSurface::format.s_bpp;
- pitch = w * bpp / 8;
- bits_per_pixel = bpp;
- bytes_per_pixel = bpp / 8;
- pixels00 = buf;
+ _pitch = w * bpp / 8;
+ _bitsPerPixel = bpp;
+ _bytesPerPixel = bpp / 8;
+ _pixels00 = buf;
SetPixelsPointer();
}
@@ -202,25 +202,25 @@ BaseSoftRenderSurface::BaseSoftRenderSurface(int w, int h, uint8 *buf) :
// Desc: Constructor for Generic BaseSoftRenderSurface which matches screen params
//
BaseSoftRenderSurface::BaseSoftRenderSurface(int w, int h) :
- pixels(0), pixels00(0), zbuffer(0), zbuffer00(0),
- bytes_per_pixel(0), bits_per_pixel(0), format_type(0),
- ox(0), oy(0), width(0), height(0), pitch(0), zpitch(0),
- flipped(false), clip_window(0, 0, 0, 0), lock_count(0), sdl_surf(0), rtt_tex(0) {
- clip_window.ResizeAbs(width = w, height = h);
+ _pixels(0), _pixels00(0), _zBuffer(0), _zBuffer00(0),
+ _bytesPerPixel(0), _bitsPerPixel(0), _formatType(0),
+ _ox(0), _oy(0), _width(0), _height(0), _pitch(0), _zPitch(0),
+ _flipped(false), _clipWindow(0, 0, 0, 0), _lockCount(0), _sdlSurf(0), _rttTex(0) {
+ _clipWindow.ResizeAbs(_width = w, _height = h);
int bpp = RenderSurface::format.s_bpp;
- pitch = w * bpp / 8;
- bits_per_pixel = bpp;
- bytes_per_pixel = bpp / 8;
- pixels00 = new uint8[pitch * height];
+ _pitch = w * bpp / 8;
+ _bitsPerPixel = bpp;
+ _bytesPerPixel = bpp / 8;
+ _pixels00 = new uint8[_pitch * _height];
- rtt_tex = new Texture;
- rtt_tex->buffer = reinterpret_cast<uint32 *>(pixels00);
- rtt_tex->width = width;
- rtt_tex->height = height;
- rtt_tex->format = TEX_FMT_NATIVE;
- rtt_tex->CalcLOG2s();
+ _rttTex = new Texture;
+ _rttTex->buffer = reinterpret_cast<uint32 *>(_pixels00);
+ _rttTex->width = _width;
+ _rttTex->height = _height;
+ _rttTex->format = TEX_FMT_NATIVE;
+ _rttTex->CalcLOG2s();
SetPixelsPointer();
}
@@ -232,15 +232,15 @@ BaseSoftRenderSurface::BaseSoftRenderSurface(int w, int h) :
// Desc: Destructor
//
BaseSoftRenderSurface::~BaseSoftRenderSurface() {
- if (rtt_tex) {
- delete rtt_tex;
- rtt_tex = 0;
+ if (_rttTex) {
+ delete _rttTex;
+ _rttTex = 0;
- delete [] pixels00;
- pixels00 = 0;
+ delete [] _pixels00;
+ _pixels00 = 0;
- delete [] zbuffer00;
- zbuffer00 = 0;
+ delete [] _zBuffer00;
+ _zBuffer00 = 0;
}
}
@@ -252,26 +252,26 @@ BaseSoftRenderSurface::~BaseSoftRenderSurface() {
// Returns: Non Zero on error
//
ECode BaseSoftRenderSurface::BeginPainting() {
- if (!lock_count) {
+ if (!_lockCount) {
- if (sdl_surf) {
+ if (_sdlSurf) {
// Pixels pointer
- Graphics::Surface s = sdl_surf->getSubArea(Common::Rect(0, 0, sdl_surf->w, sdl_surf->h));
- pixels00 = static_cast<uint8 *>(s.getPixels());
+ Graphics::Surface s = _sdlSurf->getSubArea(Common::Rect(0, 0, _sdlSurf->w, _sdlSurf->h));
+ _pixels00 = static_cast<uint8 *>(s.getPixels());
- pitch = sdl_surf->pitch;
- if (flipped) pitch = -pitch;
+ _pitch = _sdlSurf->pitch;
+ if (_flipped) _pitch = -_pitch;
} else {
ECode ret = GenericLock();
if (ret.failed()) return ret;
}
}
- lock_count++;
+ _lockCount++;
- if (pixels00 == 0) {
- // TODO: SetLastError(GR_SOFT_ERROR_LOCKED_NULL_PIXELS, "Surface Locked with NULL BaseSoftRenderSurface::pixels pointer!");
- perr << "Error: Surface Locked with NULL BaseSoftRenderSurface::pixels pointer!" << Std::endl;
+ if (_pixels00 == 0) {
+ // TODO: SetLastError(GR_SOFT_ERROR_LOCKED_NULL_PIXELS, "Surface Locked with NULL BaseSoftRenderSurface::_pixels pointer!");
+ perr << "Error: Surface Locked with NULL BaseSoftRenderSurface::_pixels pointer!" << Std::endl;
return GR_SOFT_ERROR_LOCKED_NULL_PIXELS;
}
@@ -291,22 +291,22 @@ ECode BaseSoftRenderSurface::BeginPainting() {
//
ECode BaseSoftRenderSurface::EndPainting() {
// Already Unlocked
- if (!lock_count) {
+ if (!_lockCount) {
// TODO: SetLastError(GR_SOFT_ERROR_BEGIN_END_MISMATCH, "BeginPainting()/EndPainting() Mismatch!");
perr << "Error: BeginPainting()/EndPainting() Mismatch!" << Std::endl;
return GR_SOFT_ERROR_BEGIN_END_MISMATCH;
}
// Decrement counter
- --lock_count;
+ --_lockCount;
- if (!lock_count) {
- if (sdl_surf) {
+ if (!_lockCount) {
+ if (_sdlSurf) {
// Clear pointers
- pixels = pixels00 = 0;
+ _pixels = _pixels00 = 0;
// Render the screen
- Graphics::Screen *screen = dynamic_cast<Graphics::Screen *>(sdl_surf);
+ Graphics::Screen *screen = dynamic_cast<Graphics::Screen *>(_sdlSurf);
assert(screen);
screen->update();
@@ -326,11 +326,11 @@ ECode BaseSoftRenderSurface::EndPainting() {
// Desc: Get the surface as a Texture. Only valid for SecondaryRenderSurfaces
//
Texture *BaseSoftRenderSurface::GetSurfaceAsTexture() {
- if (!rtt_tex) {
+ if (!_rttTex) {
perr << "Error: GetSurfaceAsTexture(): Surface doesn't render-to-texture" << Std::endl;
}
- return rtt_tex;
+ return _rttTex;
}
//
@@ -413,7 +413,7 @@ void BaseSoftRenderSurface::CreateNativePalette(Palette *palette) {
// r: Rect object to fill
//
void BaseSoftRenderSurface::GetSurfaceDims(Rect &r) const {
- r.Set(ox, oy, width, height);
+ r.Set(_ox, _oy, _width, _height);
}
//
@@ -423,11 +423,11 @@ void BaseSoftRenderSurface::GetSurfaceDims(Rect &r) const {
//
void BaseSoftRenderSurface::SetOrigin(int32 x, int32 y) {
// Adjust the clipping window
- clip_window.MoveRel(ox - x, oy - y);
+ _clipWindow.MoveRel(_ox - x, _oy - y);
// Set the origin
- ox = x;
- oy = y;
+ _ox = x;
+ _oy = y;
// The new pointers
SetPixelsPointer();
@@ -440,8 +440,8 @@ void BaseSoftRenderSurface::SetOrigin(int32 x, int32 y) {
//
void BaseSoftRenderSurface::GetOrigin(int32 &x, int32 &y) const {
// Set the origin
- x = ox;
- y = oy;
+ x = _ox;
+ y = _oy;
}
//
@@ -451,7 +451,7 @@ void BaseSoftRenderSurface::GetOrigin(int32 &x, int32 &y) const {
// r: Rect object to fill
//
void BaseSoftRenderSurface::GetClippingRect(Rect &r) const {
- r = clip_window;
+ r = _clipWindow;
}
//
@@ -462,8 +462,8 @@ void BaseSoftRenderSurface::GetClippingRect(Rect &r) const {
//
void BaseSoftRenderSurface::SetClippingRect(const Rect &r) {
// What we need to do is to clip the clipping rect to the phyiscal screen
- clip_window = r;
- clip_window.Intersect(-ox, -oy, width, height);
+ _clipWindow = r;
+ _clipWindow.Intersect(-_ox, -_oy, _width, _height);
}
//
@@ -476,7 +476,7 @@ void BaseSoftRenderSurface::SetClippingRect(const Rect &r) {
//
int16 BaseSoftRenderSurface::CheckClipped(const Rect &c) const {
Rect r = c;
- r.Intersect(clip_window);
+ r.Intersect(_clipWindow);
// Clipped away to the void
if (!r.IsValid()) return -1;
@@ -485,7 +485,7 @@ int16 BaseSoftRenderSurface::CheckClipped(const Rect &c) const {
}
//
-// void BaseSoftRenderSurface::SetFlipped(bool flipped)
+// void BaseSoftRenderSurface::SetFlipped(bool _flipped)
//
// Desc: Flip the surface
//
@@ -493,20 +493,20 @@ void BaseSoftRenderSurface::SetFlipped(bool wantFlipped) {
// Flipping is not terrible complex
// But is a bit of a pain to set up
- // First we check to see if we are currently flipped
- if (wantFlipped == flipped) return;
+ // First we check to see if we are currently _flipped
+ if (wantFlipped == _flipped) return;
- flipped = wantFlipped;
+ _flipped = wantFlipped;
// What we 'need' to do is negate the pitches, and flip the clipping window
// We keep the 'origin' in the same position relative to the clipping window
- oy -= clip_window.y;
- clip_window.y = height - (clip_window.y + clip_window.h);
- oy += clip_window.y;
+ _oy -= _clipWindow.y;
+ _clipWindow.y = _height - (_clipWindow.y + _clipWindow.h);
+ _oy += _clipWindow.y;
- pitch = -pitch;
- zpitch = -zpitch;
+ _pitch = -_pitch;
+ _zPitch = -_zPitch;
SetPixelsPointer();
@@ -515,10 +515,10 @@ void BaseSoftRenderSurface::SetFlipped(bool wantFlipped) {
//
// bool BaseSoftRenderSurface::IsFlipped() const
//
-// Desc: Has the render surface been flipped?
+// Desc: Has the render surface been _flipped?
//
bool BaseSoftRenderSurface::IsFlipped() const {
- return flipped;
+ return _flipped;
}
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/base_soft_render_surface.h b/engines/ultima/ultima8/graphics/base_soft_render_surface.h
index 2070449..3c09bfc 100644
--- a/engines/ultima/ultima8/graphics/base_soft_render_surface.h
+++ b/engines/ultima/ultima8/graphics/base_soft_render_surface.h
@@ -38,35 +38,35 @@ namespace Ultima8 {
class BaseSoftRenderSurface : public RenderSurface {
protected:
// Frame buffer
- uint8 *pixels; // Pointer to logical pixel 0,0
- uint8 *pixels00; // Pointer to physical pixel 0,0
+ uint8 *_pixels; // Pointer to logical pixel 0,0
+ uint8 *_pixels00; // Pointer to physical pixel 0,0
// Depth Buffer
- uint16 *zbuffer; // Pointer to logical pixel 0,0
- uint8 *zbuffer00; // Pointer to physical pixel 0,0
+ uint16 *_zBuffer; // Pointer to logical pixel 0,0
+ uint8 *_zBuffer00; // Pointer to physical pixel 0,0
// Pixel Format (also see 'Colour shifting values' later)
- int bytes_per_pixel; // 2 or 4
- int bits_per_pixel; // 16 or 32
- int format_type; // 16, 555, 565, 32 or 888
+ int _bytesPerPixel; // 2 or 4
+ int _bitsPerPixel; // 16 or 32
+ int _formatType; // 16, 555, 565, 32 or 888
// Dimensions
- int32 ox, oy; // Physical Pixel for Logical Origin
- int32 width, height; // Width and height
- int32 pitch; // Frame buffer pitch (bytes) (could be negated)
- int32 zpitch; // Z Buffer pitch (bytes) (could be negated)
- bool flipped;
+ int32 _ox, _oy; // Physical Pixel for Logical Origin
+ int32 _width, _height; // Width and height
+ int32 _pitch; // Frame buffer pitch (bytes) (could be negated)
+ int32 _zPitch; // Z Buffer pitch (bytes) (could be negated)
+ bool _flipped;
// Clipping Rectangle
- Rect clip_window;
+ Rect _clipWindow;
// Locking count
- uint32 lock_count; // Number of locks on surface
+ uint32 _lockCount; // Number of locks on surface
- Graphics::ManagedSurface *sdl_surf;
+ Graphics::ManagedSurface *_sdlSurf;
// Renderint to a texture
- Texture *rtt_tex;
+ Texture *_rttTex;
// Create from a SDL_Surface
BaseSoftRenderSurface(Graphics::ManagedSurface *);
@@ -86,16 +86,16 @@ protected:
// Update the Pixels Pointer
void SetPixelsPointer() {
- uint8 *pix00 = pixels00;
- uint8 *zbuf00 = zbuffer00;
+ uint8 *pix00 = _pixels00;
+ uint8 *zbuf00 = _zBuffer00;
- if (flipped) {
- pix00 += -pitch * (height - 1);
- zbuf00 += -zpitch * (height - 1);
+ if (_flipped) {
+ pix00 += -_pitch * (_height - 1);
+ zbuf00 += -_zPitch * (_height - 1);
}
- pixels = pix00 + ox * bytes_per_pixel + oy * pitch;
- zbuffer = reinterpret_cast<uint16 *>(zbuf00 + ox + oy * zpitch);
+ _pixels = pix00 + _ox * _bytesPerPixel + _oy * _pitch;
+ _zBuffer = reinterpret_cast<uint16 *>(zbuf00 + _ox + _oy * _zPitch);
}
public:
@@ -167,7 +167,7 @@ public:
void CreateNativePalette(Palette *palette) override;
Graphics::ManagedSurface *getRawSurface() const override {
- return sdl_surf;
+ return _sdlSurf;
}
};
diff --git a/engines/ultima/ultima8/graphics/soft_render_surface.cpp b/engines/ultima/ultima8/graphics/soft_render_surface.cpp
index 6183dd4..fa53b14 100644
--- a/engines/ultima/ultima8/graphics/soft_render_surface.cpp
+++ b/engines/ultima/ultima8/graphics/soft_render_surface.cpp
@@ -98,22 +98,22 @@ template<class uintX> void SoftRenderSurface<uintX>::Fill8(uint8 /*index*/, int3
//
template<class uintX> void SoftRenderSurface<uintX>::Fill32(uint32 rgb, int32 sx, int32 sy, int32 w, int32 h) {
- clip_window.IntersectOther(sx, sy, w, h);
+ _clipWindow.IntersectOther(sx, sy, w, h);
if (!w || !h) return;
// An optimization.
- if ((w * sizeof(uintX)) == pitch) {
+ if ((w * sizeof(uintX)) == _pitch) {
w *= h;
h = 1;
}
- uint8 *pixel = pixels + sy * pitch + sx * sizeof(uintX);
- uint8 *end = pixel + h * pitch;
+ uint8 *pixel = _pixels + sy * _pitch + sx * sizeof(uintX);
+ uint8 *end = pixel + h * _pitch;
rgb = PACK_RGB8((rgb >> 16) & 0xFF , (rgb >> 8) & 0xFF , rgb & 0xFF);
uint8 *line_end = pixel + w * sizeof(uintX);
- int diff = pitch - w * sizeof(uintX);
+ int diff = _pitch - w * sizeof(uintX);
while (pixel != end) {
while (pixel != line_end) {
@@ -121,52 +121,52 @@ template<class uintX> void SoftRenderSurface<uintX>::Fill32(uint32 rgb, int32 sx
pixel += sizeof(uintX);
}
- line_end += pitch;
+ line_end += _pitch;
pixel += diff;
}
}
// 16 bit version
template<> void SoftRenderSurface<uint16>::Fill32(uint32 rgb, int32 sx, int32 sy, int32 w, int32 h) {
- clip_window.IntersectOther(sx, sy, w, h);
+ _clipWindow.IntersectOther(sx, sy, w, h);
if (!w || !h) return;
// An optimization.
- if (2 * w == pitch) {
+ if (2 * w == _pitch) {
w *= h;
h = 1;
}
- uint8 *pixel = pixels + sy * pitch + sx * sizeof(uint16);
- uint8 *end = pixel + h * pitch;
+ uint8 *pixel = _pixels + sy * _pitch + sx * sizeof(uint16);
+ uint8 *end = pixel + h * _pitch;
rgb = PACK_RGB8((rgb >> 16) & 0xFF , (rgb >> 8) & 0xFF , rgb & 0xFF);
while (pixel != end) {
memset_16(pixel, rgb, w);
- pixel += pitch;
+ pixel += _pitch;
}
}
// 32 bit version
template<> void SoftRenderSurface<uint32>::Fill32(uint32 rgb, int32 sx, int32 sy, int32 w, int32 h) {
- clip_window.IntersectOther(sx, sy, w, h);
+ _clipWindow.IntersectOther(sx, sy, w, h);
if (!w || !h) return;
// An optimization.
- if (4 * w == pitch) {
+ if (4 * w == _pitch) {
w *= h;
h = 1;
}
- uint8 *pixel = pixels + sy * pitch + sx * sizeof(uint32);
- uint8 *end = pixel + h * pitch;
+ uint8 *pixel = _pixels + sy * _pitch + sx * sizeof(uint32);
+ uint8 *end = pixel + h * _pitch;
rgb = PACK_RGB8((rgb >> 16) & 0xFF , (rgb >> 8) & 0xFF , rgb & 0xFF);
while (pixel != end) {
memset_32(pixel, rgb, w);
- pixel += pitch;
+ pixel += _pitch;
}
}
@@ -180,20 +180,20 @@ template<> void SoftRenderSurface<uint32>::Fill32(uint32 rgb, int32 sx, int32 sy
//#define CHECK_ALPHA_FILLS
template<class uintX> void SoftRenderSurface<uintX>::FillAlpha(uint8 alpha, int32 sx, int32 sy, int32 w, int32 h) {
- clip_window.IntersectOther(sx, sy, w, h);
+ _clipWindow.IntersectOther(sx, sy, w, h);
if (!w || !h || !RenderSurface::format.a_mask) return;
// An optimization.
- if ((int)(w * sizeof(uintX)) == pitch) {
+ if ((int)(w * sizeof(uintX)) == _pitch) {
w *= h;
h = 1;
}
- uint8 *pixel = pixels + sy * pitch + sx * sizeof(uintX);
- uint8 *end = pixel + h * pitch;
+ uint8 *pixel = _pixels + sy * _pitch + sx * sizeof(uintX);
+ uint8 *end = pixel + h * _pitch;
uint8 *line_end = pixel + w * sizeof(uintX);
- int diff = pitch - w * sizeof(uintX);
+ int diff = _pitch - w * sizeof(uintX);
uintX a = (((uintX)alpha) << RenderSurface::format.a_shift)&RenderSurface::format.a_mask;
@@ -219,7 +219,7 @@ template<class uintX> void SoftRenderSurface<uintX>::FillAlpha(uint8 alpha, int3
pixel += sizeof(uintX);
}
- line_end += pitch;
+ line_end += _pitch;
pixel += diff;
}
}
@@ -232,20 +232,20 @@ template<class uintX> void SoftRenderSurface<uintX>::FillBlended(uint32 rgba, in
return;
}
- clip_window.IntersectOther(sx, sy, w, h);
+ _clipWindow.IntersectOther(sx, sy, w, h);
if (!w || !h) return;
// An optimization.
- if ((int)(w * sizeof(uintX)) == pitch) {
+ if ((int)(w * sizeof(uintX)) == _pitch) {
w *= h;
h = 1;
}
- uint8 *pixel = pixels + sy * pitch + sx * sizeof(uintX);
- uint8 *end = pixel + h * pitch;
+ uint8 *pixel = _pixels + sy * _pitch + sx * sizeof(uintX);
+ uint8 *end = pixel + h * _pitch;
uint8 *line_end = pixel + w * sizeof(uintX);
- int diff = pitch - w * sizeof(uintX);
+ int diff = _pitch - w * sizeof(uintX);
int alpha = TEX32_A(rgba) + 1;
rgba = TEX32_PACK_RGBA16(TEX32_R(rgba) * alpha, TEX32_G(rgba) * alpha, TEX32_B(rgba) * alpha, 255 * alpha);
@@ -258,7 +258,7 @@ template<class uintX> void SoftRenderSurface<uintX>::FillBlended(uint32 rgba, in
pixel += sizeof(uintX);
}
- line_end += pitch;
+ line_end += _pitch;
pixel += diff;
}
}
@@ -348,17 +348,17 @@ template<class uintX> void SoftRenderSurface<uintX>::Blit(Texture *tex, int32 sx
// Clip to window
int px = dx, py = dy;
- clip_window.IntersectOther(dx, dy, w, h);
+ _clipWindow.IntersectOther(dx, dy, w, h);
if (!w || !h) return;
// Adjust source x and y
if (px != dx) sx += dx - px;
if (py != dy) sy += dy - py;
- uint8 *pixel = pixels + dy * pitch + dx * sizeof(uintX);
+ uint8 *pixel = _pixels + dy * _pitch + dx * sizeof(uintX);
uint8 *line_end = pixel + w * sizeof(uintX);
- uint8 *end = pixel + h * pitch;
- int diff = pitch - w * sizeof(uintX);
+ uint8 *end = pixel + h * _pitch;
+ int diff = _pitch - w * sizeof(uintX);
if (tex->format == TEX_FMT_STANDARD) {
uint32 *texel = tex->buffer + (sy * tex->width + sx);
@@ -384,7 +384,7 @@ template<class uintX> void SoftRenderSurface<uintX>::Blit(Texture *tex, int32 sx
texel++;
}
- line_end += pitch;
+ line_end += _pitch;
pixel += diff;
texel += tex_diff;
}
@@ -403,7 +403,7 @@ template<class uintX> void SoftRenderSurface<uintX>::Blit(Texture *tex, int32 sx
texel++;
}
- line_end += pitch;
+ line_end += _pitch;
pixel += diff;
texel += tex_diff;
}
@@ -430,17 +430,17 @@ template<class uintX> void SoftRenderSurface<uintX>::Blit(Texture *tex, int32 sx
// Clip to window
int px = dx, py = dy;
- clip_window.IntersectOther(dx,dy,w,h);
+ _clipWindow.IntersectOther(dx,dy,w,h);
if (!w || !h) return;
// Adjust source x and y
if (px != dx) sx += dx - px;
if (py != dy) sy += dy - py;
- uint8 *pixel = pixels + dy * pitch + dx * sizeof(uintX);
+ uint8 *pixel = _pixels + dy * _pitch + dx * sizeof(uintX);
uint8 *line_end = pixel + w*sizeof(uintX);
- uint8 *end = pixel + h * pitch;
- int diff = pitch - w*sizeof(uintX);
+ uint8 *end = pixel + h * _pitch;
+ int diff = _pitch - w*sizeof(uintX);
uint32 *texel = tex->buffer + (sy * tex->width + sx);
#ifdef BLIT_WRAP
@@ -468,7 +468,7 @@ template<class uintX> void SoftRenderSurface<uintX>::Blit(Texture *tex, int32 sx
#endif
}
- line_end += pitch;
+ line_end += _pitch;
pixel += diff;
texel+= tex_diff;
#ifdef BLIT_WRAP
@@ -498,17 +498,17 @@ template<class uintX> void SoftRenderSurface<uintX>::FadedBlit(Texture *tex, int
// Clip to window
int px = dx, py = dy;
- clip_window.IntersectOther(dx, dy, w, h);
+ _clipWindow.IntersectOther(dx, dy, w, h);
if (!w || !h) return;
// Adjust source x and y
if (px != dx) sx += dx - px;
if (py != dy) sy += dy - py;
- uint8 *pixel = pixels + dy * pitch + dx * sizeof(uintX);
+ uint8 *pixel = _pixels + dy * _pitch + dx * sizeof(uintX);
uint8 *line_end = pixel + w * sizeof(uintX);
- uint8 *end = pixel + h * pitch;
- int diff = pitch - w * sizeof(uintX);
+ uint8 *end = pixel + h * _pitch;
+ int diff = _pitch - w * sizeof(uintX);
uint32 a = TEX32_A(col32);
uint32 ia = 256 - a;
@@ -564,7 +564,7 @@ template<class uintX> void SoftRenderSurface<uintX>::FadedBlit(Texture *tex, int
texel++;
}
- line_end += pitch;
+ line_end += _pitch;
pixel += diff;
texel += tex_diff;
}
@@ -583,7 +583,7 @@ template<class uintX> void SoftRenderSurface<uintX>::FadedBlit(Texture *tex, int
texel++;
}
- line_end += pitch;
+ line_end += _pitch;
pixel += diff;
texel += tex_diff;
}
@@ -608,17 +608,17 @@ template<class uintX> void SoftRenderSurface<uintX>::MaskedBlit(Texture *tex, in
// Clip to window
int px = dx, py = dy;
- clip_window.IntersectOther(dx, dy, w, h);
+ _clipWindow.IntersectOther(dx, dy, w, h);
if (!w || !h) return;
// Adjust source x and y
if (px != dx) sx += dx - px;
if (py != dy) sy += dy - py;
- uint8 *pixel = pixels + dy * pitch + dx * sizeof(uintX);
+ uint8 *pixel = _pixels + dy * _pitch + dx * sizeof(uintX);
uint8 *line_end = pixel + w * sizeof(uintX);
- uint8 *end = pixel + h * pitch;
- int diff = pitch - w * sizeof(uintX);
+ uint8 *end = pixel + h * _pitch;
+ int diff = _pitch - w * sizeof(uintX);
uint32 a = TEX32_A(col32);
uint32 ia = 256 - a;
@@ -678,7 +678,7 @@ template<class uintX> void SoftRenderSurface<uintX>::MaskedBlit(Texture *tex, in
texel++;
}
- line_end += pitch;
+ line_end += _pitch;
pixel += diff;
texel += tex_diff;
}
@@ -699,7 +699,7 @@ template<class uintX> void SoftRenderSurface<uintX>::MaskedBlit(Texture *tex, in
texel++;
}
- line_end += pitch;
+ line_end += _pitch;
pixel += diff;
texel += tex_diff;
}
@@ -727,8 +727,8 @@ template<class uintX> void SoftRenderSurface<uintX>::StretchBlit(Texture *textur
return;
}
- uint8 *pixel = pixels + dy * pitch + dx * sizeof(uintX);
- Ultima8Engine::get_instance()->point_scaler.Scale(texture, sx, sy, sw, sh, pixel, dw, dh, pitch, clampedges);
+ uint8 *pixel = _pixels + dy * _pitch + dx * sizeof(uintX);
+ Ultima8Engine::get_instance()->point_scaler.Scale(texture, sx, sy, sw, sh, pixel, dw, dh, _pitch, clampedges);
}
//
@@ -747,9 +747,9 @@ template<class uintX> bool SoftRenderSurface<uintX>::ScalerBlit(Texture *texture
return true;
}
- uint8 *pixel = pixels + dy * pitch + dx * sizeof(uintX);
+ uint8 *pixel = _pixels + dy * _pitch + dx * sizeof(uintX);
- return scaler->Scale(texture, sx, sy, sw, sh, pixel, dw, dh, pitch, clampedges);
+ return scaler->Scale(texture, sx, sy, sw, sh, pixel, dw, dh, _pitch, clampedges);
}
//
diff --git a/engines/ultima/ultima8/graphics/soft_render_surface.inl b/engines/ultima/ultima8/graphics/soft_render_surface.inl
index c53a4bb..60cc24e 100644
--- a/engines/ultima/ultima8/graphics/soft_render_surface.inl
+++ b/engines/ultima/ultima8/graphics/soft_render_surface.inl
@@ -102,7 +102,7 @@ const int32 neg = (FLIP_CONDITIONAL)?-1:0;
#define LINE_END_ASSIGN()
#define NOT_CLIPPED_X (1)
#define NOT_CLIPPED_Y (1)
-#define OFFSET_PIXELS (pixels)
+#define OFFSET_PIXELS (_pixels)
//
// No Clipping = FALSE
@@ -113,15 +113,15 @@ const int32 neg = (FLIP_CONDITIONAL)?-1:0;
#define NOT_CLIPPED_Y (line >= 0 && line < scrn_height)
#define NOT_CLIPPED_X (pixptr >= line_start && pixptr < line_end)
- int scrn_width = clip_window.w;
- int scrn_height = clip_window.h;
+ int scrn_width = _clipWindow.w;
+ int scrn_height = _clipWindow.h;
uintX *line_end;
#define OFFSET_PIXELS (off_pixels)
- uint8 *off_pixels = static_cast<uint8*>(pixels) + static_cast<sintptr>(clip_window.x)*sizeof(uintX) + static_cast<sintptr>(clip_window.y)*pitch;
- x -= clip_window.x;
- y -= clip_window.y;
+ uint8 *off_pixels = static_cast<uint8*>(_pixels) + static_cast<sintptr>(_clipWindow.x)*sizeof(uintX) + static_cast<sintptr>(_clipWindow.y)*_pitch;
+ x -= _clipWindow.x;
+ y -= _clipWindow.y;
#endif
@@ -201,21 +201,18 @@ const int32 neg = (FLIP_CONDITIONAL)?-1:0;
y -= frame->_yoff;
// Do it this way if compressed
- if (frame->_compressed) for (int i=0; i<height_; i++)
- {
+ if (frame->_compressed) for (int i=0; i<height_; i++) {
xpos = 0;
line = y+i;
- if (NOT_CLIPPED_Y)
- {
+ if (NOT_CLIPPED_Y) {
linedata = rle_data + line_offsets[i];
- line_start = reinterpret_cast<uintX *>(static_cast<uint8*>(OFFSET_PIXELS) + pitch*line);
+ line_start = reinterpret_cast<uintX *>(static_cast<uint8*>(OFFSET_PIXELS) + _pitch*line);
LINE_END_ASSIGN();
- do
- {
+ do {
xpos += *linedata++;
if (xpos == width_) break;
@@ -227,18 +224,13 @@ const int32 neg = (FLIP_CONDITIONAL)?-1:0;
pixptr= line_start+x+XNEG(xpos);
endrun = pixptr + XNEG(dlen);
- if (!type)
- {
- while (pixptr != endrun)
- {
- if (NOT_CLIPPED_X && NOT_DESTINATION_MASKED)
- {
+ if (!type) {
+ while (pixptr != endrun) {
+ if (NOT_CLIPPED_X && NOT_DESTINATION_MASKED) {
#ifdef XFORM_SHAPES
- if (USE_XFORM_FUNC)
- {
+ if (USE_XFORM_FUNC) {
*pixptr = CUSTOM_BLEND(BlendPreModulated(xform_pal[*linedata],*pixptr));
- }
- else
+ } else
#endif
{
*pixptr = CUSTOM_BLEND(pal[*linedata]);
@@ -247,20 +239,15 @@ const int32 neg = (FLIP_CONDITIONAL)?-1:0;
pixptr += XNEG(1);
linedata++;
}
- }
- else
- {
+ } else {
#ifdef XFORM_SHAPES
pix = xform_pal[*linedata];
- if (USE_XFORM_FUNC)
- {
- while (pixptr != endrun)
- {
+ if (USE_XFORM_FUNC) {
+ while (pixptr != endrun) {
if (NOT_CLIPPED_X && NOT_DESTINATION_MASKED) *pixptr = CUSTOM_BLEND(BlendPreModulated(xform_pal[*linedata],*pixptr));
pixptr += XNEG(1);
}
- }
- else
+ } else
#endif
{
pix = pal[*linedata];
@@ -282,19 +269,16 @@ const int32 neg = (FLIP_CONDITIONAL)?-1:0;
}
}
// Uncompressed
- else for (int i=0; i<height_; i++)
- {
+ else for (int i=0; i<height_; i++) {
linedata = rle_data + line_offsets[i];
xpos = 0;
line = y+i;
- if (NOT_CLIPPED_Y)
- {
- line_start = reinterpret_cast<uintX *>(static_cast<uint8*>(OFFSET_PIXELS) + pitch*line);
+ if (NOT_CLIPPED_Y) {
+ line_start = reinterpret_cast<uintX *>(static_cast<uint8*>(OFFSET_PIXELS) + _pitch*line);
LINE_END_ASSIGN();
- do
- {
+ do {
xpos += *linedata++;
if (xpos == width_) break;
@@ -304,13 +288,10 @@ const int32 neg = (FLIP_CONDITIONAL)?-1:0;
pixptr= line_start+x+XNEG(xpos);
endrun = pixptr + XNEG(dlen);
- while (pixptr != endrun)
- {
- if (NOT_CLIPPED_X && NOT_DESTINATION_MASKED)
- {
+ while (pixptr != endrun) {
+ if (NOT_CLIPPED_X && NOT_DESTINATION_MASKED) {
#ifdef XFORM_SHAPES
- if (USE_XFORM_FUNC)
- {
+ if (USE_XFORM_FUNC) {
*pixptr = CUSTOM_BLEND(BlendPreModulated(xform_pal[*linedata],*pixptr));
}
else
Commit: f3ebc99d3d409187968c08768838c48a929f3f4d
https://github.com/scummvm/scummvm/commit/f3ebc99d3d409187968c08768838c48a929f3f4d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-16T18:25:40-08:00
Commit Message:
ULTIMA8: Renaming palette and other graphic class fields
Changed paths:
engines/ultima/ultima8/graphics/base_soft_render_surface.cpp
engines/ultima/ultima8/graphics/fonts/font_manager.cpp
engines/ultima/ultima8/graphics/gump_shape_archive.cpp
engines/ultima/ultima8/graphics/gump_shape_archive.h
engines/ultima/ultima8/graphics/inverter_process.cpp
engines/ultima/ultima8/graphics/inverter_process.h
engines/ultima/ultima8/graphics/main_shape_archive.cpp
engines/ultima/ultima8/graphics/main_shape_archive.h
engines/ultima/ultima8/graphics/palette.cpp
engines/ultima/ultima8/graphics/palette.h
engines/ultima/ultima8/graphics/palette_fader_process.cpp
engines/ultima/ultima8/graphics/palette_fader_process.h
engines/ultima/ultima8/graphics/palette_manager.cpp
engines/ultima/ultima8/graphics/palette_manager.h
engines/ultima/ultima8/graphics/soft_render_surface.inl
engines/ultima/ultima8/gumps/minimap_gump.cpp
engines/ultima/ultima8/ultima8.cpp
diff --git a/engines/ultima/ultima8/graphics/base_soft_render_surface.cpp b/engines/ultima/ultima8/graphics/base_soft_render_surface.cpp
index b4f9da6..d642b8c 100644
--- a/engines/ultima/ultima8/graphics/base_soft_render_surface.cpp
+++ b/engines/ultima/ultima8/graphics/base_soft_render_surface.cpp
@@ -343,66 +343,66 @@ void BaseSoftRenderSurface::CreateNativePalette(Palette *palette) {
int32 r, g, b;
// Normal palette
- palette->native_untransformed[i] = PACK_RGB8(palette->palette[i * 3 + 0],
- palette->palette[i * 3 + 1],
- palette->palette[i * 3 + 2]);
-
- r = palette->matrix[0] * palette->palette[i * 3 + 0] +
- palette->matrix[1] * palette->palette[i * 3 + 1] +
- palette->matrix[2] * palette->palette[i * 3 + 2] +
- palette->matrix[3] * 255;
+ palette->_native_untransformed[i] = PACK_RGB8(palette->_palette[i * 3 + 0],
+ palette->_palette[i * 3 + 1],
+ palette->_palette[i * 3 + 2]);
+
+ r = palette->_matrix[0] * palette->_palette[i * 3 + 0] +
+ palette->_matrix[1] * palette->_palette[i * 3 + 1] +
+ palette->_matrix[2] * palette->_palette[i * 3 + 2] +
+ palette->_matrix[3] * 255;
if (r < 0) r = 0;
if (r > 0x7F800) r = 0x7F800;
- g = palette->matrix[4] * palette->palette[i * 3 + 0] +
- palette->matrix[5] * palette->palette[i * 3 + 1] +
- palette->matrix[6] * palette->palette[i * 3 + 2] +
- palette->matrix[7] * 255;
+ g = palette->_matrix[4] * palette->_palette[i * 3 + 0] +
+ palette->_matrix[5] * palette->_palette[i * 3 + 1] +
+ palette->_matrix[6] * palette->_palette[i * 3 + 2] +
+ palette->_matrix[7] * 255;
if (g < 0) g = 0;
if (g > 0x7F800) g = 0x7F800;
- b = palette->matrix[8] * palette->palette[i * 3 + 0] +
- palette->matrix[9] * palette->palette[i * 3 + 1] +
- palette->matrix[10] * palette->palette[i * 3 + 2] +
- palette->matrix[11] * 255;
+ b = palette->_matrix[8] * palette->_palette[i * 3 + 0] +
+ palette->_matrix[9] * palette->_palette[i * 3 + 1] +
+ palette->_matrix[10] * palette->_palette[i * 3 + 2] +
+ palette->_matrix[11] * 255;
if (b < 0) b = 0;
if (b > 0x7F800) b = 0x7F800;
// Transformed normal palette
// FIXME - Wont work on non SDL SRS Implementations
- palette->native[i] = PACK_RGB8(static_cast<uint8>(r >> 11),
+ palette->_native[i] = PACK_RGB8(static_cast<uint8>(r >> 11),
static_cast<uint8>(g >> 11),
static_cast<uint8>(b >> 11));
// Transformed XFORM palette (Uses the TEX32 format)
- if (TEX32_A(palette->xform_untransformed[i])) {
- r = palette->matrix[0] * TEX32_R(palette->xform_untransformed[i]) +
- palette->matrix[1] * TEX32_G(palette->xform_untransformed[i]) +
- palette->matrix[2] * TEX32_B(palette->xform_untransformed[i]) +
- palette->matrix[3] * 255;
+ if (TEX32_A(palette->_xform_untransformed[i])) {
+ r = palette->_matrix[0] * TEX32_R(palette->_xform_untransformed[i]) +
+ palette->_matrix[1] * TEX32_G(palette->_xform_untransformed[i]) +
+ palette->_matrix[2] * TEX32_B(palette->_xform_untransformed[i]) +
+ palette->_matrix[3] * 255;
if (r < 0) r = 0;
if (r > 0x7F800) r = 0x7F800;
- g = palette->matrix[4] * TEX32_R(palette->xform_untransformed[i]) +
- palette->matrix[5] * TEX32_G(palette->xform_untransformed[i]) +
- palette->matrix[6] * TEX32_B(palette->xform_untransformed[i]) +
- palette->matrix[7] * 255;
+ g = palette->_matrix[4] * TEX32_R(palette->_xform_untransformed[i]) +
+ palette->_matrix[5] * TEX32_G(palette->_xform_untransformed[i]) +
+ palette->_matrix[6] * TEX32_B(palette->_xform_untransformed[i]) +
+ palette->_matrix[7] * 255;
if (g < 0) g = 0;
if (g > 0x7F800) g = 0x7F800;
- b = palette->matrix[8] * TEX32_R(palette->xform_untransformed[i]) +
- palette->matrix[9] * TEX32_G(palette->xform_untransformed[i]) +
- palette->matrix[10] * TEX32_B(palette->xform_untransformed[i]) +
- palette->matrix[11] * 255;
+ b = palette->_matrix[8] * TEX32_R(palette->_xform_untransformed[i]) +
+ palette->_matrix[9] * TEX32_G(palette->_xform_untransformed[i]) +
+ palette->_matrix[10] * TEX32_B(palette->_xform_untransformed[i]) +
+ palette->_matrix[11] * 255;
if (b < 0) b = 0;
if (b > 0x7F800) b = 0x7F800;
- palette->xform[i] = TEX32_PACK_RGBA(static_cast<uint8>(r >> 11),
+ palette->_xform[i] = TEX32_PACK_RGBA(static_cast<uint8>(r >> 11),
static_cast<uint8>(g >> 11),
static_cast<uint8>(b >> 11),
- TEX32_A(palette->xform_untransformed[i]));
+ TEX32_A(palette->_xform_untransformed[i]));
} else
- palette->xform[i] = 0;
+ palette->_xform[i] = 0;
}
}
diff --git a/engines/ultima/ultima8/graphics/fonts/font_manager.cpp b/engines/ultima/ultima8/graphics/fonts/font_manager.cpp
index d5c9a34..a4f8c2f 100644
--- a/engines/ultima/ultima8/graphics/fonts/font_manager.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/font_manager.cpp
@@ -180,9 +180,9 @@ bool FontManager::addJPOverride(unsigned int fontnum,
// the main text uses index 3
// indices 1,2 and 3 are in use for the bullets for conversation options
for (int i = 1; i < 4; ++i) {
- pal->palette[3 * i + 0] = (rgb >> 16) & 0xFF;
- pal->palette[3 * i + 1] = (rgb >> 8) & 0xFF;
- pal->palette[3 * i + 2] = (rgb) & 0xFF;
+ pal->_palette[3 * i + 0] = (rgb >> 16) & 0xFF;
+ pal->_palette[3 * i + 1] = (rgb >> 8) & 0xFF;
+ pal->_palette[3 * i + 2] = (rgb) & 0xFF;
}
palman->updatedFont(fontpal);
diff --git a/engines/ultima/ultima8/graphics/gump_shape_archive.cpp b/engines/ultima/ultima8/graphics/gump_shape_archive.cpp
index 0ad4d97..04b1dc7 100644
--- a/engines/ultima/ultima8/graphics/gump_shape_archive.cpp
+++ b/engines/ultima/ultima8/graphics/gump_shape_archive.cpp
@@ -32,27 +32,27 @@ namespace Ultima8 {
DEFINE_RUNTIME_CLASSTYPE_CODE(GumpShapeArchive, ShapeArchive)
GumpShapeArchive::~GumpShapeArchive() {
- for (unsigned int i = 0; i < gumpItemArea.size(); ++i)
- delete gumpItemArea[i];
- gumpItemArea.clear();
+ for (unsigned int i = 0; i < _gumpItemArea.size(); ++i)
+ delete _gumpItemArea[i];
+ _gumpItemArea.clear();
}
void GumpShapeArchive::loadGumpage(IDataSource *ds) {
unsigned int total = ds->getSize() / 8;
- gumpItemArea.resize(total + 1);
+ _gumpItemArea.resize(total + 1);
for (unsigned int i = 1; i <= total; ++i) {
int x, y, w, h;
x = static_cast<int16>(ds->read2());
y = static_cast<int16>(ds->read2());
w = static_cast<int16>(ds->read2()) - x;
h = static_cast<int16>(ds->read2()) - y;
- gumpItemArea[i] = new Rect(x, y, w, h);
+ _gumpItemArea[i] = new Rect(x, y, w, h);
}
}
Rect *GumpShapeArchive::getGumpItemArea(uint32 shapenum) {
- if (shapenum >= gumpItemArea.size()) return 0;
- return gumpItemArea[shapenum];
+ if (shapenum >= _gumpItemArea.size()) return 0;
+ return _gumpItemArea[shapenum];
}
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/gump_shape_archive.h b/engines/ultima/ultima8/graphics/gump_shape_archive.h
index a8daff6..0174071 100644
--- a/engines/ultima/ultima8/graphics/gump_shape_archive.h
+++ b/engines/ultima/ultima8/graphics/gump_shape_archive.h
@@ -55,7 +55,7 @@ public:
Rect *getGumpItemArea(uint32 shapenum);
protected:
- Std::vector<Rect *> gumpItemArea;
+ Std::vector<Rect *> _gumpItemArea;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/inverter_process.cpp b/engines/ultima/ultima8/graphics/inverter_process.cpp
index 8930a76..6946638 100644
--- a/engines/ultima/ultima8/graphics/inverter_process.cpp
+++ b/engines/ultima/ultima8/graphics/inverter_process.cpp
@@ -44,7 +44,7 @@ static unsigned int states[] = { 0, 8, 63, 211, 493, 945, 1594, 2459, 3552,
64591, 65042, 65324, 65472, 65528, 65536
};
-InverterProcess *InverterProcess::inverter = 0;
+InverterProcess *InverterProcess::_inverter = 0;
// p_dynamic_class stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(InverterProcess, Process)
@@ -56,19 +56,19 @@ InverterProcess::InverterProcess()
InverterProcess::InverterProcess(unsigned int target)
: Process() {
- targetstate = target;
+ _targetState = target;
}
InverterProcess::~InverterProcess(void) {
- if (inverter == this)
- inverter = 0;
+ if (_inverter == this)
+ _inverter = 0;
}
void InverterProcess::run() {
Ultima8Engine *app = Ultima8Engine::get_instance();
unsigned int state = app->getInversion();
- if (state == targetstate) {
+ if (state == _targetState) {
terminate();
} else {
unsigned int i = 0;
@@ -80,31 +80,31 @@ void InverterProcess::run() {
void InverterProcess::saveData(ODataSource *ods) {
Process::saveData(ods);
- ods->write2(static_cast<uint16>(targetstate));
+ ods->write2(static_cast<uint16>(_targetState));
}
bool InverterProcess::loadData(IDataSource *ids, uint32 version) {
if (!Process::loadData(ids, version)) return false;
- targetstate = ids->read2();
+ _targetState = ids->read2();
- inverter = this; //static
+ _inverter = this; //static
return true;
}
// static
ProcId InverterProcess::invertScreen() {
- if (inverter) {
- if (inverter->targetstate == 0)
- inverter->setTarget(0x8000);
+ if (_inverter) {
+ if (_inverter->_targetState == 0)
+ _inverter->setTarget(0x8000);
else
- inverter->setTarget(0);
- return inverter->getPid();
+ _inverter->setTarget(0);
+ return _inverter->getPid();
} else {
unsigned int target = 0x8000;
if (Ultima8Engine::get_instance()->isInverted()) target = 0;
- inverter = new InverterProcess(target);
- return Kernel::get_instance()->addProcess(inverter);
+ _inverter = new InverterProcess(target);
+ return Kernel::get_instance()->addProcess(_inverter);
}
}
diff --git a/engines/ultima/ultima8/graphics/inverter_process.h b/engines/ultima/ultima8/graphics/inverter_process.h
index 31c8a8b..f723963 100644
--- a/engines/ultima/ultima8/graphics/inverter_process.h
+++ b/engines/ultima/ultima8/graphics/inverter_process.h
@@ -40,7 +40,7 @@ public:
ENABLE_RUNTIME_CLASSTYPE()
void setTarget(unsigned int target) {
- targetstate = target;
+ _targetState = target;
}
void run() override;
@@ -54,8 +54,8 @@ public:
protected:
void saveData(ODataSource *ods) override;
- static InverterProcess *inverter;
- unsigned int targetstate;
+ static InverterProcess *_inverter;
+ unsigned int _targetState;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/main_shape_archive.cpp b/engines/ultima/ultima8/graphics/main_shape_archive.cpp
index a0d5b82..d29bd25 100644
--- a/engines/ultima/ultima8/graphics/main_shape_archive.cpp
+++ b/engines/ultima/ultima8/graphics/main_shape_archive.cpp
@@ -21,7 +21,6 @@
*/
#include "ultima/ultima8/misc/pent_include.h"
-
#include "ultima/ultima8/graphics/main_shape_archive.h"
#include "ultima/ultima8/graphics/type_flags.h"
#include "ultima/ultima8/graphics/shape_info.h"
@@ -34,53 +33,53 @@ DEFINE_RUNTIME_CLASSTYPE_CODE(MainShapeArchive, ShapeArchive)
MainShapeArchive::~MainShapeArchive() {
- if (typeFlags) {
- delete typeFlags;
- typeFlags = 0;
+ if (_typeFlags) {
+ delete _typeFlags;
+ _typeFlags = 0;
}
- if (animdat) {
- delete animdat;
- animdat = 0;
+ if (_animDat) {
+ delete _animDat;
+ _animDat = 0;
}
}
void MainShapeArchive::loadTypeFlags(IDataSource *ds) {
- if (typeFlags) {
- delete typeFlags;
- typeFlags = 0;
+ if (_typeFlags) {
+ delete _typeFlags;
+ _typeFlags = 0;
}
- typeFlags = new TypeFlags;
- typeFlags->load(ds);
+ _typeFlags = new TypeFlags;
+ _typeFlags->load(ds);
}
ShapeInfo *MainShapeArchive::getShapeInfo(uint32 shapenum) {
- assert(typeFlags);
+ assert(_typeFlags);
- return typeFlags->getShapeInfo(shapenum);
+ return _typeFlags->getShapeInfo(shapenum);
}
void MainShapeArchive::loadAnimDat(IDataSource *ds) {
- if (animdat) {
- delete animdat;
- animdat = 0;
+ if (_animDat) {
+ delete _animDat;
+ _animDat = 0;
}
- animdat = new AnimDat;
- animdat->load(ds);
+ _animDat = new AnimDat;
+ _animDat->load(ds);
}
ActorAnim *MainShapeArchive::getAnim(uint32 shape) const {
- assert(animdat);
+ assert(_animDat);
- return animdat->getAnim(shape);
+ return _animDat->getAnim(shape);
}
AnimAction *MainShapeArchive::getAnim(uint32 shape, uint32 action) const {
- assert(animdat);
+ assert(_animDat);
- return animdat->getAnim(shape, action);
+ return _animDat->getAnim(shape, action);
}
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/main_shape_archive.h b/engines/ultima/ultima8/graphics/main_shape_archive.h
index 59770c2..e3a7a85 100644
--- a/engines/ultima/ultima8/graphics/main_shape_archive.h
+++ b/engines/ultima/ultima8/graphics/main_shape_archive.h
@@ -41,17 +41,17 @@ public:
MainShapeArchive(uint16 id_, Palette *pal_ = 0,
const ConvertShapeFormat *format_ = 0)
- : ShapeArchive(id_, pal_, format_), typeFlags(0), animdat(0) { }
+ : ShapeArchive(id_, pal_, format_), _typeFlags(0), _animDat(0) { }
MainShapeArchive(ArchiveFile *af, uint16 id_, Palette *pal_ = 0,
const ConvertShapeFormat *format_ = 0)
- : ShapeArchive(af, id_, pal_, format_), typeFlags(0), animdat(0) { }
+ : ShapeArchive(af, id_, pal_, format_), _typeFlags(0), _animDat(0) { }
MainShapeArchive(IDataSource *ds, uint16 id_, Palette *pal_ = 0,
const ConvertShapeFormat *format_ = 0)
- : ShapeArchive(ds, id_, pal_, format_), typeFlags(0), animdat(0) { }
+ : ShapeArchive(ds, id_, pal_, format_), _typeFlags(0), _animDat(0) { }
MainShapeArchive(const Std::string &path, uint16 id_,
Palette *pal_ = 0,
const ConvertShapeFormat *format_ = 0)
- : ShapeArchive(path, id_, pal_, format_), typeFlags(0), animdat(0) { }
+ : ShapeArchive(path, id_, pal_, format_), _typeFlags(0), _animDat(0) { }
~MainShapeArchive() override;
@@ -63,8 +63,8 @@ public:
AnimAction *getAnim(uint32 shape, uint32 action) const;
protected:
- TypeFlags *typeFlags;
- AnimDat *animdat;
+ TypeFlags *_typeFlags;
+ AnimDat *_animDat;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/palette.cpp b/engines/ultima/ultima8/graphics/palette.cpp
index 0e843ef..c1fa741 100644
--- a/engines/ultima/ultima8/graphics/palette.cpp
+++ b/engines/ultima/ultima8/graphics/palette.cpp
@@ -31,38 +31,38 @@ namespace Ultima8 {
void Palette::load(IDataSource &ds, IDataSource &xformds) {
load(ds);
for (int i = 0; i < 256; i++)
- xform_untransformed[i] = xformds.read4();
+ _xform_untransformed[i] = xformds.read4();
}
void Palette::load(IDataSource &ds) {
int i;
- ds.read(palette, 768);
+ ds.read(_palette, 768);
- // convert from 0-63 to 0-255 palette
+ // convert from 0-63 to 0-255 _palette
for (i = 0; i < 256; i++) {
- palette[i * 3] = (palette[i * 3] * 255) / 63;
- palette[i * 3 + 1] = (palette[i * 3 + 1] * 255) / 63;
- palette[i * 3 + 2] = (palette[i * 3 + 2] * 255) / 63;
+ _palette[i * 3] = (_palette[i * 3] * 255) / 63;
+ _palette[i * 3 + 1] = (_palette[i * 3 + 1] * 255) / 63;
+ _palette[i * 3 + 2] = (_palette[i * 3 + 2] * 255) / 63;
}
for (i = 0; i < 256; i++)
- xform_untransformed[i] = 0;
+ _xform_untransformed[i] = 0;
- // Setup the transformation matrix
- matrix[0] = 0x800;
- matrix[1] = 0;
- matrix[2] = 0;
- matrix[3] = 0;
- matrix[4] = 0;
- matrix[5] = 0x800;
- matrix[6] = 0;
- matrix[7] = 0;
- matrix[8] = 0;
- matrix[9] = 0;
- matrix[10] = 0x800;
- matrix[11] = 0;
+ // Setup the transformation _matrix
+ _matrix[0] = 0x800;
+ _matrix[1] = 0;
+ _matrix[2] = 0;
+ _matrix[3] = 0;
+ _matrix[4] = 0;
+ _matrix[5] = 0x800;
+ _matrix[6] = 0;
+ _matrix[7] = 0;
+ _matrix[8] = 0;
+ _matrix[9] = 0;
+ _matrix[10] = 0x800;
+ _matrix[11] = 0;
- transform = Transform_None;
+ _transform = Transform_None;
}
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/palette.h b/engines/ultima/ultima8/graphics/palette.h
index e94a627..7fd55c6 100644
--- a/engines/ultima/ultima8/graphics/palette.h
+++ b/engines/ultima/ultima8/graphics/palette.h
@@ -61,19 +61,19 @@ struct Palette {
void load(IDataSource &ds);
// 256 rgb entries
- uint8 palette[768];
+ uint8 _palette[768];
// Untransformed native format palette. Created by the RenderSurface
- uint32 native_untransformed[256];
+ uint32 _native_untransformed[256];
// Transformed native format palette. Created by the RenderSurface
- uint32 native[256];
+ uint32 _native[256];
// Untransformed XFORM ARGB palette
- uint32 xform_untransformed[256];
+ uint32 _xform_untransformed[256];
// Transformed XFORM ARGB palette. Created by the RenderSurface
- uint32 xform[256];
+ uint32 _xform[256];
// Colour transformation matrix (for fades, hue shifts)
// Applied by the RenderSurface (fixed -4.11)
@@ -81,10 +81,10 @@ struct Palette {
// G = R*matrix[4] + G*matrix[5] + B*matrix[6] + matrix[7];
// B = R*matrix[8] + G*matrix[9] + B*matrix[10] + matrix[11];
// A = A;
- int16 matrix[12];
+ int16 _matrix[12];
// The current palette transform
- PalTransforms transform;
+ PalTransforms _transform;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/palette_fader_process.cpp b/engines/ultima/ultima8/graphics/palette_fader_process.cpp
index 8929052..49c0e27 100644
--- a/engines/ultima/ultima8/graphics/palette_fader_process.cpp
+++ b/engines/ultima/ultima8/graphics/palette_fader_process.cpp
@@ -33,163 +33,162 @@ namespace Ultima8 {
#define PALETTEFADER_COUNTER 30
-PaletteFaderProcess *PaletteFaderProcess::fader = 0;
+PaletteFaderProcess *PaletteFaderProcess::_fader = 0;
// p_dynamic_class stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(PaletteFaderProcess, Process)
-PaletteFaderProcess::PaletteFaderProcess()
- : Process() {
+PaletteFaderProcess::PaletteFaderProcess() : Process() {
}
PaletteFaderProcess::PaletteFaderProcess(PalTransforms trans,
- int priority_, int frames) : priority(priority_),
- counter(frames), max_counter(frames) {
+ int priority_, int frames) : _priority(priority_),
+ _counter(frames), _maxCounter(frames) {
PaletteManager *pm = PaletteManager::get_instance();
Palette *pal = pm->getPalette(PaletteManager::Pal_Game);
- for (int i = 0; i < 12; i++) old_matrix[i] = pal->matrix[i];
- pm->getTransformMatrix(new_matrix, trans);
- pal->transform = trans;
+ for (int i = 0; i < 12; i++) _oldMatrix[i] = pal->_matrix[i];
+ pm->getTransformMatrix(_newMatrix, trans);
+ pal->_transform = trans;
}
PaletteFaderProcess::PaletteFaderProcess(uint32 col32, bool from,
- int priority_, int frames, bool current) : priority(priority_),
- counter(frames), max_counter(frames) {
+ int priority, int frames, bool current) : _priority(priority),
+ _counter(frames), _maxCounter(frames) {
PaletteManager *pm = PaletteManager::get_instance();
Palette *pal = pm->getPalette(PaletteManager::Pal_Game);
if (!from) {
if (current)
- for (int i = 0; i < 12; i++) old_matrix[i] = pal->matrix[i];
+ for (int i = 0; i < 12; i++) _oldMatrix[i] = pal->_matrix[i];
else
- pm->getTransformMatrix(old_matrix, pal->transform);
- pm->getTransformMatrix(new_matrix, col32);
+ pm->getTransformMatrix(_oldMatrix, pal->_transform);
+ pm->getTransformMatrix(_newMatrix, col32);
} else {
- pm->getTransformMatrix(old_matrix, col32);
+ pm->getTransformMatrix(_oldMatrix, col32);
if (current)
- for (int i = 0; i < 12; i++) new_matrix[i] = pal->matrix[i];
+ for (int i = 0; i < 12; i++) _newMatrix[i] = pal->_matrix[i];
else
- pm->getTransformMatrix(new_matrix, pal->transform);
+ pm->getTransformMatrix(_newMatrix, pal->_transform);
}
}
PaletteFaderProcess::PaletteFaderProcess(int16 from[12], int16 to[12],
- int priority_, int frames) : priority(priority_),
- counter(frames), max_counter(frames) {
+ int priority_, int frames) : _priority(priority_),
+ _counter(frames), _maxCounter(frames) {
int i;
- for (i = 0; i < 12; i++) old_matrix[i] = from[i];
- for (i = 0; i < 12; i++) new_matrix[i] = to[i];
+ for (i = 0; i < 12; i++) _oldMatrix[i] = from[i];
+ for (i = 0; i < 12; i++) _newMatrix[i] = to[i];
}
PaletteFaderProcess::~PaletteFaderProcess(void) {
- if (fader == this)
- fader = 0;
+ if (_fader == this)
+ _fader = 0;
}
void PaletteFaderProcess::run() {
int16 matrix[12];
for (int i = 0; i < 12; i++) {
- int32 o = old_matrix[i] * counter;
- int32 n = new_matrix[i] * (max_counter - counter);
- matrix[i] = static_cast<int16>((o + n) / max_counter);
+ int32 o = _oldMatrix[i] * _counter;
+ int32 n = _newMatrix[i] * (_maxCounter - _counter);
+ matrix[i] = static_cast<int16>((o + n) / _maxCounter);
}
PaletteManager::get_instance()->transformPalette(
PaletteManager::Pal_Game,
matrix);
- if (!counter--) terminate();
+ if (!_counter--) terminate();
}
void PaletteFaderProcess::saveData(ODataSource *ods) {
Process::saveData(ods);
- ods->write4(static_cast<uint32>(priority));
- ods->write4(static_cast<uint32>(counter));
- ods->write4(static_cast<uint32>(max_counter));
+ ods->write4(static_cast<uint32>(_priority));
+ ods->write4(static_cast<uint32>(_counter));
+ ods->write4(static_cast<uint32>(_maxCounter));
unsigned int i;
for (i = 0; i < 12; ++i)
- ods->write2(old_matrix[i]);
+ ods->write2(_oldMatrix[i]);
for (i = 0; i < 12; ++i)
- ods->write2(new_matrix[i]);
+ ods->write2(_newMatrix[i]);
}
bool PaletteFaderProcess::loadData(IDataSource *ids, uint32 version) {
if (!Process::loadData(ids, version)) return false;
- priority = static_cast<int>(ids->read4());
- counter = static_cast<int>(ids->read4());
- max_counter = static_cast<int>(ids->read4());
+ _priority = static_cast<int>(ids->read4());
+ _counter = static_cast<int>(ids->read4());
+ _maxCounter = static_cast<int>(ids->read4());
unsigned int i;
for (i = 0; i < 12; ++i)
- old_matrix[i] = ids->read2();
+ _oldMatrix[i] = ids->read2();
for (i = 0; i < 12; ++i)
- new_matrix[i] = ids->read2();
+ _newMatrix[i] = ids->read2();
- fader = this; //static
+ _fader = this; //static
return true;
}
uint32 PaletteFaderProcess::I_fadeToPaletteTransform(const uint8 *args,
unsigned int /*argsize*/) {
ARG_UINT16(transform);
- ARG_UINT16(priority);
+ ARG_UINT16(_priority);
- // If current fader has higher priority, we do nothing
- if (fader && fader->priority > priority) return 0;
- else if (fader) fader->terminate();
+ // If current _fader has higher _priority, we do nothing
+ if (_fader && _fader->_priority > _priority) return 0;
+ else if (_fader) _fader->terminate();
- fader = new PaletteFaderProcess(static_cast<PalTransforms>(transform),
- priority, 45);
+ _fader = new PaletteFaderProcess(static_cast<PalTransforms>(transform),
+ _priority, 45);
- return Kernel::get_instance()->addProcess(fader);
+ return Kernel::get_instance()->addProcess(_fader);
}
uint32 PaletteFaderProcess::I_fadeToBlack(const uint8 * /*args*/,
unsigned int /*argsize*/) {
- if (fader && fader->priority > 0x7FFF) return 0;
- else if (fader) fader->terminate();
+ if (_fader && _fader->_priority > 0x7FFF) return 0;
+ else if (_fader) _fader->terminate();
- fader = new PaletteFaderProcess(0x00000000, false, 0x7FFF, 30, true);
- return Kernel::get_instance()->addProcess(fader);
+ _fader = new PaletteFaderProcess(0x00000000, false, 0x7FFF, 30, true);
+ return Kernel::get_instance()->addProcess(_fader);
}
uint32 PaletteFaderProcess::I_fadeFromBlack(const uint8 * /*args*/,
unsigned int /*argsize*/) {
- if (fader && fader->priority > 0x7FFF) return 0;
- else if (fader) fader->terminate();
+ if (_fader && _fader->_priority > 0x7FFF) return 0;
+ else if (_fader) _fader->terminate();
- fader = new PaletteFaderProcess(0x00000000, true, 0x7FFF, 30, false);
- return Kernel::get_instance()->addProcess(fader);
+ _fader = new PaletteFaderProcess(0x00000000, true, 0x7FFF, 30, false);
+ return Kernel::get_instance()->addProcess(_fader);
}
uint32 PaletteFaderProcess::I_fadeToWhite(const uint8 * /*args*/,
unsigned int /*argsize*/) {
- if (fader && fader->priority > 0x7FFF) return 0;
- else if (fader) fader->terminate();
+ if (_fader && _fader->_priority > 0x7FFF) return 0;
+ else if (_fader) _fader->terminate();
- fader = new PaletteFaderProcess(0x00FFFFFF, false, 0x7FFF, 30, true);
- return Kernel::get_instance()->addProcess(fader);
+ _fader = new PaletteFaderProcess(0x00FFFFFF, false, 0x7FFF, 30, true);
+ return Kernel::get_instance()->addProcess(_fader);
}
uint32 PaletteFaderProcess::I_fadeFromWhite(const uint8 * /*args*/,
unsigned int /*argsize*/) {
- if (fader && fader->priority > 0x7FFF) return 0;
- else if (fader) fader->terminate();
+ if (_fader && _fader->_priority > 0x7FFF) return 0;
+ else if (_fader) _fader->terminate();
- fader = new PaletteFaderProcess(0x00FFFFFF, true, 0x7FFF, 30, false);
- return Kernel::get_instance()->addProcess(fader);
+ _fader = new PaletteFaderProcess(0x00FFFFFF, true, 0x7FFF, 30, false);
+ return Kernel::get_instance()->addProcess(_fader);
}
uint32 PaletteFaderProcess::I_lightningBolt(const uint8 * /*args*/,
unsigned int /*argsize*/) {
- if (fader && fader->priority > -1) return 0;
- else if (fader) fader->terminate();
+ if (_fader && _fader->_priority > -1) return 0;
+ else if (_fader) _fader->terminate();
- fader = new PaletteFaderProcess(0x3FCFCFCF, true, -1, 10, false);
- return Kernel::get_instance()->addProcess(fader);
+ _fader = new PaletteFaderProcess(0x3FCFCFCF, true, -1, 10, false);
+ return Kernel::get_instance()->addProcess(_fader);
}
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/palette_fader_process.h b/engines/ultima/ultima8/graphics/palette_fader_process.h
index 61987df..9e6c9aa 100644
--- a/engines/ultima/ultima8/graphics/palette_fader_process.h
+++ b/engines/ultima/ultima8/graphics/palette_fader_process.h
@@ -32,13 +32,13 @@ namespace Ultima {
namespace Ultima8 {
class PaletteFaderProcess : public Process {
- int priority;
- int32 counter;
- int32 max_counter;
- int16 old_matrix[12]; // Fixed point -4.11
- int16 new_matrix[12];
+ int _priority;
+ int32 _counter;
+ int32 _maxCounter;
+ int16 _oldMatrix[12]; // Fixed point -4.11
+ int16 _newMatrix[12];
public:
- static PaletteFaderProcess *fader;
+ static PaletteFaderProcess *_fader;
// p_dynamic_class stuff
ENABLE_RUNTIME_CLASSTYPE()
diff --git a/engines/ultima/ultima8/graphics/palette_manager.cpp b/engines/ultima/ultima8/graphics/palette_manager.cpp
index 2e53b17..7644d67 100644
--- a/engines/ultima/ultima8/graphics/palette_manager.cpp
+++ b/engines/ultima/ultima8/graphics/palette_manager.cpp
@@ -30,34 +30,34 @@
namespace Ultima {
namespace Ultima8 {
-PaletteManager *PaletteManager::palettemanager = 0;
+PaletteManager *PaletteManager::_paletteManager = 0;
PaletteManager::PaletteManager(RenderSurface *rs)
- : rendersurface(rs) {
+ : _renderSurface(rs) {
con->Print(MM_INFO, "Creating PaletteManager...\n");
- palettemanager = this;
+ _paletteManager = this;
}
PaletteManager::~PaletteManager() {
reset();
con->Print(MM_INFO, "Destroying PaletteManager...\n");
- palettemanager = 0;
+ _paletteManager = 0;
}
// Reset the Palette Manager
void PaletteManager::reset() {
con->Print(MM_INFO, "Resetting PaletteManager...\n");
- for (unsigned int i = 0; i < palettes.size(); ++i)
- delete palettes[i];
- palettes.clear();
+ for (unsigned int i = 0; i < _palettes.size(); ++i)
+ delete _palettes[i];
+ _palettes.clear();
}
void PaletteManager::updatedFont(PalIndex index) {
Palette *pal = getPalette(index);
if (pal)
- rendersurface->CreateNativePalette(pal); // convert to native format
+ _renderSurface->CreateNativePalette(pal); // convert to native format
}
// Reset all the transforms back to default
@@ -67,51 +67,51 @@ void PaletteManager::resetTransforms() {
int16 matrix[12];
getTransformMatrix(matrix, Transform_None);
- for (unsigned int i = 0; i < palettes.size(); ++i) {
- Palette *pal = palettes[i];
+ for (unsigned int i = 0; i < _palettes.size(); ++i) {
+ Palette *pal = _palettes[i];
if (!pal) continue;
- pal->transform = Transform_None;
- for (int j = 0; j < 12; j++) pal->matrix[j] = matrix[j];
- rendersurface->CreateNativePalette(pal); // convert to native format
+ pal->_transform = Transform_None;
+ for (int j = 0; j < 12; j++) pal->_matrix[j] = matrix[j];
+ _renderSurface->CreateNativePalette(pal); // convert to native format
}
}
// Change the Render Surface used by the PaletteManager
void PaletteManager::RenderSurfaceChanged(RenderSurface *rs) {
- rendersurface = rs;
+ _renderSurface = rs;
- // Create native palettes for all currently loaded palettes
- for (unsigned int i = 0; i < palettes.size(); ++i)
- if (palettes[i])
- rendersurface->CreateNativePalette(palettes[i]);
+ // Create native _palettes for all currently loaded _palettes
+ for (unsigned int i = 0; i < _palettes.size(); ++i)
+ if (_palettes[i])
+ _renderSurface->CreateNativePalette(_palettes[i]);
}
void PaletteManager::load(PalIndex index, IDataSource &ds, IDataSource &xformds) {
- if (palettes.size() <= static_cast<unsigned int>(index))
- palettes.resize(index + 1);
+ if (_palettes.size() <= static_cast<unsigned int>(index))
+ _palettes.resize(index + 1);
- if (palettes[index])
- delete palettes[index];
+ if (_palettes[index])
+ delete _palettes[index];
Palette *pal = new Palette;
pal->load(ds, xformds);
- rendersurface->CreateNativePalette(pal); // convert to native format
+ _renderSurface->CreateNativePalette(pal); // convert to native format
- palettes[index] = pal;
+ _palettes[index] = pal;
}
void PaletteManager::load(PalIndex index, IDataSource &ds) {
- if (palettes.size() <= static_cast<unsigned int>(index))
- palettes.resize(index + 1);
+ if (_palettes.size() <= static_cast<unsigned int>(index))
+ _palettes.resize(index + 1);
- if (palettes[index])
- delete palettes[index];
+ if (_palettes[index])
+ delete _palettes[index];
Palette *pal = new Palette;
pal->load(ds);
- rendersurface->CreateNativePalette(pal); // convert to native format
+ _renderSurface->CreateNativePalette(pal); // convert to native format
- palettes[index] = pal;
+ _palettes[index] = pal;
}
void PaletteManager::duplicate(PalIndex src, PalIndex dest) {
@@ -122,17 +122,17 @@ void PaletteManager::duplicate(PalIndex src, PalIndex dest) {
if (srcpal)
*newpal = *srcpal;
- rendersurface->CreateNativePalette(newpal); // convert to native format
- if (palettes.size() <= static_cast<unsigned int>(dest))
- palettes.resize(dest + 1);
- palettes[dest] = newpal;
+ _renderSurface->CreateNativePalette(newpal); // convert to native format
+ if (_palettes.size() <= static_cast<unsigned int>(dest))
+ _palettes.resize(dest + 1);
+ _palettes[dest] = newpal;
}
Palette *PaletteManager::getPalette(PalIndex index) {
- if (static_cast<unsigned int>(index) >= palettes.size())
+ if (static_cast<unsigned int>(index) >= _palettes.size())
return 0;
- return palettes[index];
+ return _palettes[index];
}
void PaletteManager::transformPalette(PalIndex index, int16 matrix[12]) {
@@ -140,8 +140,8 @@ void PaletteManager::transformPalette(PalIndex index, int16 matrix[12]) {
if (!pal) return;
- for (int i = 0; i < 12; i++) pal->matrix[i] = matrix[i];
- rendersurface->CreateNativePalette(pal); // convert to native format
+ for (int i = 0; i < 12; i++) pal->_matrix[i] = matrix[i];
+ _renderSurface->CreateNativePalette(pal); // convert to native format
}
void PaletteManager::untransformPalette(PalIndex index) {
@@ -149,7 +149,7 @@ void PaletteManager::untransformPalette(PalIndex index) {
if (!pal) return;
- pal->transform = Transform_None;
+ pal->_transform = Transform_None;
int16 matrix[12];
getTransformMatrix(matrix, Transform_None);
transformPalette(index, matrix);
diff --git a/engines/ultima/ultima8/graphics/palette_manager.h b/engines/ultima/ultima8/graphics/palette_manager.h
index 356ad25..3739809 100644
--- a/engines/ultima/ultima8/graphics/palette_manager.h
+++ b/engines/ultima/ultima8/graphics/palette_manager.h
@@ -38,7 +38,7 @@ public:
~PaletteManager();
static PaletteManager *get_instance() {
- return palettemanager;
+ return _paletteManager;
}
enum PalIndex {
@@ -80,10 +80,10 @@ public:
void resetTransforms();
private:
- Std::vector<Palette *> palettes;
- RenderSurface *rendersurface;
+ Std::vector<Palette *> _palettes;
+ RenderSurface *_renderSurface;
- static PaletteManager *palettemanager;
+ static PaletteManager *_paletteManager;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/soft_render_surface.inl b/engines/ultima/ultima8/graphics/soft_render_surface.inl
index 60cc24e..1fd5d60 100644
--- a/engines/ultima/ultima8/graphics/soft_render_surface.inl
+++ b/engines/ultima/ultima8/graphics/soft_render_surface.inl
@@ -185,14 +185,14 @@ const int32 neg = (FLIP_CONDITIONAL)?-1:0;
const uint8 *rle_data = frame->_rle_data;
const uint32 *line_offsets = frame->_line_offsets;
const uint32 *pal = untformed_pal?
- &(s->getPalette()->native_untransformed[0]):
- &(s->getPalette()->native[0]);
+ &(s->getPalette()->_native_untransformed[0]):
+ &(s->getPalette()->_native[0]);
#ifdef XFORM_SHAPES
const uint32 *xform_pal = untformed_pal?
- &(s->getPalette()->xform_untransformed[0]):
- &(s->getPalette()->xform[0]);
+ &(s->getPalette()->_xform_untransformed[0]):
+ &(s->getPalette()->_xform[0]);
#endif
int32 width_ = frame->_width;
diff --git a/engines/ultima/ultima8/gumps/minimap_gump.cpp b/engines/ultima/ultima8/gumps/minimap_gump.cpp
index 5dea341..7a0929c 100644
--- a/engines/ultima/ultima8/gumps/minimap_gump.cpp
+++ b/engines/ultima/ultima8/gumps/minimap_gump.cpp
@@ -156,7 +156,7 @@ uint32 MiniMapGump::sampleAtPoint(int x_, int y_, CurrentMap *currentmap) {
if (!frame->hasPoint(i - sx, j - sy)) continue;
uint16 r2, g2, b2;
- UNPACK_RGB8(pal->native_untransformed[frame->getPixelAtPoint(i - sx, j - sy)], r2, g2, b2);
+ UNPACK_RGB8(pal->_native_untransformed[frame->getPixelAtPoint(i - sx, j - sy)], r2, g2, b2);
r += RenderSurface::Gamma22toGamma10[r2];
g += RenderSurface::Gamma22toGamma10[g2];
b += RenderSurface::Gamma22toGamma10[b2];
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index a86ad30..08b4844 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -1735,8 +1735,8 @@ void Ultima8Engine::save(ODataSource *ods) {
ods->write2(_avatarMoverProcess->getPid());
Palette *pal = PaletteManager::get_instance()->getPalette(PaletteManager::Pal_Game);
- for (int i = 0; i < 12; i++) ods->write2(pal->matrix[i]);
- ods->write2(pal->transform);
+ for (int i = 0; i < 12; i++) ods->write2(pal->_matrix[i]);
+ ods->write2(pal->_transform);
ods->write2(static_cast<uint16>(_inversion));
@@ -1764,7 +1764,7 @@ bool Ultima8Engine::load(IDataSource *ids, uint32 version) {
PaletteManager::get_instance()->transformPalette(PaletteManager::Pal_Game, matrix);
Palette *pal = PaletteManager::get_instance()->getPalette(PaletteManager::Pal_Game);
- pal->transform = static_cast<PalTransforms>(ids->read2());
+ pal->_transform = static_cast<PalTransforms>(ids->read2());
_inversion = ids->read2();
Commit: f9a084cee1b916449f203348b41055cf0f7686b2
https://github.com/scummvm/scummvm/commit/f9a084cee1b916449f203348b41055cf0f7686b2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-16T19:26:11-08:00
Commit Message:
ULTIMA8: Rename more graphics folder class fields
Changed paths:
engines/ultima/ultima8/graphics/fonts/font_shape_archive.cpp
engines/ultima/ultima8/graphics/shape.cpp
engines/ultima/ultima8/graphics/shape.h
engines/ultima/ultima8/graphics/shape_archive.cpp
engines/ultima/ultima8/graphics/shape_archive.h
engines/ultima/ultima8/graphics/shape_info.cpp
engines/ultima/ultima8/graphics/shape_info.h
engines/ultima/ultima8/graphics/type_flags.cpp
engines/ultima/ultima8/gumps/container_gump.cpp
engines/ultima/ultima8/gumps/item_relative_gump.cpp
engines/ultima/ultima8/gumps/paperdoll_gump.cpp
engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
engines/ultima/ultima8/world/actors/actor.cpp
engines/ultima/ultima8/world/actors/animation_tracker.cpp
engines/ultima/ultima8/world/actors/combat_process.cpp
engines/ultima/ultima8/world/actors/main_actor.cpp
engines/ultima/ultima8/world/actors/quick_avatar_mover_process.cpp
engines/ultima/ultima8/world/container.cpp
engines/ultima/ultima8/world/current_map.cpp
engines/ultima/ultima8/world/item.cpp
engines/ultima/ultima8/world/item.h
engines/ultima/ultima8/world/item_factory.cpp
engines/ultima/ultima8/world/item_sorter.cpp
engines/ultima/ultima8/world/map.cpp
engines/ultima/ultima8/world/missile_tracker.cpp
diff --git a/engines/ultima/ultima8/graphics/fonts/font_shape_archive.cpp b/engines/ultima/ultima8/graphics/fonts/font_shape_archive.cpp
index 3ba4295..dd614b3 100644
--- a/engines/ultima/ultima8/graphics/fonts/font_shape_archive.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/font_shape_archive.cpp
@@ -38,9 +38,9 @@ ShapeFont *FontShapeArchive::getFont(uint32 fontnum) {
void FontShapeArchive::cache(uint32 shapenum) {
if (shapenum >= _count) return;
- if (shapes.empty()) shapes.resize(_count);
+ if (_shapes.empty()) _shapes.resize(_count);
- if (shapes[shapenum]) return;
+ if (_shapes[shapenum]) return;
uint32 shpsize;
uint8 *data = getRawObject(shapenum, &shpsize);
@@ -48,18 +48,19 @@ void FontShapeArchive::cache(uint32 shapenum) {
if (!data || shpsize == 0) return;
// Auto detect format
- if (!format) format = Shape::DetectShapeFormat(data, shpsize);
+ if (!_format)
+ _format = Shape::DetectShapeFormat(data, shpsize);
- if (!format) {
+ if (!_format) {
delete [] data;
perr << "Error: Unable to detect shape format for flex." << Std::endl;
return;
}
- Shape *shape = new ShapeFont(data, shpsize, format, id, shapenum);
- if (palette) shape->setPalette(palette);
+ Shape *shape = new ShapeFont(data, shpsize, _format, _id, shapenum);
+ if (_palette) shape->setPalette(_palette);
- shapes[shapenum] = shape;
+ _shapes[shapenum] = shape;
}
void FontShapeArchive::setHVLeads() {
diff --git a/engines/ultima/ultima8/graphics/shape.cpp b/engines/ultima/ultima8/graphics/shape.cpp
index e047b9d..63e6a1a 100644
--- a/engines/ultima/ultima8/graphics/shape.cpp
+++ b/engines/ultima/ultima8/graphics/shape.cpp
@@ -37,12 +37,12 @@ DEFINE_RUNTIME_CLASSTYPE_CODE_BASE_CLASS(Shape)
DEFINE_CUSTOM_MEMORY_ALLOCATION(Shape)
Shape::Shape(const uint8 *data_, uint32 size_, const ConvertShapeFormat *format,
- const uint16 id, const uint32 shape) : flexId(id), shapenum(shape) {
+ const uint16 id, const uint32 shape) : _flexId(id), _shapeNum(shape) {
// NB: U8 style!
- this->data = data_;
- this->size = size_;
- this->palette = 0;
+ this->_data = data_;
+ this->_size = size_;
+ this->_palette = 0;
if (!format) format = DetectShapeFormat(data_, size_);
@@ -62,16 +62,17 @@ Shape::Shape(const uint8 *data_, uint32 size_, const ConvertShapeFormat *format,
}
Shape::Shape(IDataSource *src, const ConvertShapeFormat *format)
- : flexId(0), shapenum(0) {
+ : _flexId(0), _shapeNum(0) {
// NB: U8 style!
- this->size = src->getSize();
- uint8 *d = new uint8[this->size];
- this->data = d;
- src->read(d, this->size);
- this->palette = 0;
+ this->_size = src->getSize();
+ uint8 *d = new uint8[this->_size];
+ this->_data = d;
+ src->read(d, this->_size);
+ this->_palette = 0;
- if (!format) format = DetectShapeFormat(data, size);
+ if (!format)
+ format = DetectShapeFormat(_data, _size);
if (!format) {
// Should be fatal?
@@ -81,23 +82,23 @@ Shape::Shape(IDataSource *src, const ConvertShapeFormat *format)
// Load it as u8
if (format == &U8ShapeFormat || format == &U82DShapeFormat)
- LoadU8Format(data, size, format);
+ LoadU8Format(_data, _size, format);
else if (format == &PentagramShapeFormat)
- LoadPentagramFormat(data, size, format);
+ LoadPentagramFormat(_data, _size, format);
else
- LoadGenericFormat(data, size, format);
+ LoadGenericFormat(_data, _size, format);
}
Shape::~Shape() {
- for (unsigned int i = 0; i < frames.size(); ++i)
- delete frames[i];
+ for (unsigned int i = 0; i < _frames.size(); ++i)
+ delete _frames[i];
- delete[] const_cast<uint8 *>(data);
+ delete[] const_cast<uint8 *>(_data);
}
void Shape::getShapeId(uint16 &id, uint32 &shape) {
- id = flexId;
- shape = shapenum;
+ id = _flexId;
+ shape = _shapeNum;
}
// Some macros to make things easier
@@ -115,13 +116,13 @@ void Shape::LoadU8Format(const uint8 *data_, uint32 size_, const ConvertShapeFor
return;
}
- frames.reserve(framecount);
+ _frames.reserve(framecount);
for (unsigned int i = 0; i < framecount; ++i) {
uint32 frameoffset = READ3(data_, 6 + 6 * i);
uint32 framesize = READ2(data_, 10 + 6 * i);
- frames.push_back(new ShapeFrame(data_ + frameoffset, framesize, format));
+ _frames.push_back(new ShapeFrame(data_ + frameoffset, framesize, format));
}
}
@@ -134,22 +135,22 @@ void Shape::LoadPentagramFormat(const uint8 *data_, uint32 size_, const ConvertS
return;
}
- frames.reserve(framecount);
+ _frames.reserve(framecount);
for (unsigned int i = 0; i < framecount; ++i) {
uint32 frameoffset = READ4(data_, 8 + 8 * i);
uint32 framesize = READ4(data_, 12 + 8 * i);
- frames.push_back(new ShapeFrame(data_ + frameoffset, framesize, format));
+ _frames.push_back(new ShapeFrame(data_ + frameoffset, framesize, format));
}
}
// This will load any sort of shape via a ConvertShapeFormat struct
-void Shape::LoadGenericFormat(const uint8 *data_, uint32 size_, const ConvertShapeFormat *format) {
+void Shape::LoadGenericFormat(const uint8 *data, uint32 size, const ConvertShapeFormat *format) {
uint32 framecount;
uint32 frameoffset;
uint32 framesize;
- IBufferDataSource ds(data_, size_);
+ IBufferDataSource ds(data, size);
if (format->_bytes_ident) {
uint8 *ident = new uint8[format->_bytes_ident];
@@ -158,7 +159,7 @@ void Shape::LoadGenericFormat(const uint8 *data_, uint32 size_, const ConvertSha
delete[] ident;
if (!match) {
- frames.clear();
+ _frames.clear();
return;
}
}
@@ -176,9 +177,9 @@ void Shape::LoadGenericFormat(const uint8 *data_, uint32 size_, const ConvertSha
// Read framecount, default 1 if no
if (format->_bytes_num_frames) framecount = ds.readX(format->_bytes_num_frames);
else framecount = 1;
- if (framecount == 0) framecount = ConvertShape::CalcNumFrames(&ds, format, size_, 0);
+ if (framecount == 0) framecount = ConvertShape::CalcNumFrames(&ds, format, size, 0);
- frames.reserve(framecount);
+ _frames.reserve(framecount);
for (unsigned int i = 0; i < framecount; ++i) {
// Read the offset
@@ -190,23 +191,23 @@ void Shape::LoadGenericFormat(const uint8 *data_, uint32 size_, const ConvertSha
// Read frame_length
if (format->_bytes_frame_length) framesize = ds.readX(format->_bytes_frame_length) + format->_bytes_frame_length_kludge;
- else framesize = size_ - frameoffset;
+ else framesize = size - frameoffset;
ConvertShapeFrame *prev = 0, p;
if (format->_bytes_special && i > 0) {
prev = &p;
- frames[i - 1]->getConvertShapeFrame(p);
+ _frames[i - 1]->getConvertShapeFrame(p);
}
- frames.push_back(new ShapeFrame(data_ + frameoffset, framesize, format, special, prev));
+ _frames.push_back(new ShapeFrame(data + frameoffset, framesize, format, special, prev));
}
}
// This will detect the format of a shape
-const ConvertShapeFormat *Shape::DetectShapeFormat(const uint8 *data_, uint32 size_) {
- IBufferDataSource ds(data_, size_);
- return Shape::DetectShapeFormat(&ds, size_);
+const ConvertShapeFormat *Shape::DetectShapeFormat(const uint8 *data, uint32 size) {
+ IBufferDataSource ds(data, size);
+ return Shape::DetectShapeFormat(&ds, size);
}
const ConvertShapeFormat *Shape::DetectShapeFormat(IDataSource *ds, uint32 size_) {
@@ -231,7 +232,7 @@ const ConvertShapeFormat *Shape::DetectShapeFormat(IDataSource *ds, uint32 size_
}
void Shape::getTotalDimensions(int32 &w, int32 &h, int32 &x, int32 &y) const {
- if (frames.empty()) {
+ if (_frames.empty()) {
w = 0;
h = 0;
x = 0;
@@ -242,8 +243,8 @@ void Shape::getTotalDimensions(int32 &w, int32 &h, int32 &x, int32 &y) const {
int32 minx = 1000000, maxx = -1000000;
int32 miny = 1000000, maxy = -1000000;
- for (unsigned int i = 0; i < frames.size(); ++i) {
- ShapeFrame *frame = frames[i];
+ for (unsigned int i = 0; i < _frames.size(); ++i) {
+ ShapeFrame *frame = _frames[i];
if (-frame->_xoff < minx)
minx = -frame->_xoff;
if (-frame->_yoff < miny)
diff --git a/engines/ultima/ultima8/graphics/shape.h b/engines/ultima/ultima8/graphics/shape.h
index 9fa611f..9b40310 100644
--- a/engines/ultima/ultima8/graphics/shape.h
+++ b/engines/ultima/ultima8/graphics/shape.h
@@ -45,14 +45,14 @@ public:
Shape(IDataSource *src, const ConvertShapeFormat *format);
virtual ~Shape();
void setPalette(const Palette *pal) {
- palette = pal;
+ _palette = pal;
}
const Palette *getPalette() const {
- return palette;
+ return _palette;
}
uint32 frameCount() const {
- return static_cast<uint32>(frames.size());
+ return static_cast<uint32>(_frames.size());
}
//! Returns the dimensions of all frames combined
@@ -61,7 +61,7 @@ public:
void getTotalDimensions(int32 &w, int32 &h, int32 &x, int32 &y) const;
ShapeFrame *getFrame(unsigned int frame) {
- if (frame < frames.size()) return frames[frame];
+ if (frame < _frames.size()) return _frames[frame];
else return 0;
}
@@ -87,14 +87,14 @@ protected:
// Crusader shapes must be loaded this way
void LoadGenericFormat(const uint8 *data, uint32 size, const ConvertShapeFormat *format);
- Std::vector<ShapeFrame *> frames;
+ Std::vector<ShapeFrame *> _frames;
- const Palette *palette;
+ const Palette *_palette;
- const uint8 *data;
- uint32 size;
- const uint16 flexId;
- const uint32 shapenum;
+ const uint8 *_data;
+ uint32 _size;
+ const uint16 _flexId;
+ const uint32 _shapeNum;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/shape_archive.cpp b/engines/ultima/ultima8/graphics/shape_archive.cpp
index 01e40c0..c594f22 100644
--- a/engines/ultima/ultima8/graphics/shape_archive.cpp
+++ b/engines/ultima/ultima8/graphics/shape_archive.cpp
@@ -40,14 +40,14 @@ Shape *ShapeArchive::getShape(uint32 shapenum) {
if (shapenum >= _count) return 0;
cache(shapenum);
- return shapes[shapenum];
+ return _shapes[shapenum];
}
void ShapeArchive::cache(uint32 shapenum) {
if (shapenum >= _count) return;
- if (shapes.empty()) shapes.resize(_count);
+ if (_shapes.empty()) _shapes.resize(_count);
- if (shapes[shapenum]) return;
+ if (_shapes[shapenum]) return;
uint32 shpsize;
uint8 *data = getRawObject(shapenum, &shpsize);
@@ -55,36 +55,36 @@ void ShapeArchive::cache(uint32 shapenum) {
if (!data || shpsize == 0) return;
// Auto detect format
- if (!format) {
- format = Shape::DetectShapeFormat(data, shpsize);
- if (format) pout << "Detected Shape Format: " << format->_name << Std::endl;
+ if (!_format) {
+ _format = Shape::DetectShapeFormat(data, shpsize);
+ if (_format) pout << "Detected Shape Format: " << _format->_name << Std::endl;
}
- if (!format) {
+ if (!_format) {
delete [] data;
perr << "Error: Unable to detect shape format for flex." << Std::endl;
return;
}
- Shape *shape = new Shape(data, shpsize, format, id, shapenum);
- if (palette) shape->setPalette(palette);
+ Shape *shape = new Shape(data, shpsize, _format, _id, shapenum);
+ if (_palette) shape->setPalette(_palette);
- shapes[shapenum] = shape;
+ _shapes[shapenum] = shape;
}
void ShapeArchive::uncache(uint32 shapenum) {
if (shapenum >= _count) return;
- if (shapes.empty()) return;
+ if (_shapes.empty()) return;
- delete shapes[shapenum];
- shapes[shapenum] = 0;
+ delete _shapes[shapenum];
+ _shapes[shapenum] = 0;
}
bool ShapeArchive::isCached(uint32 shapenum) {
if (shapenum >= _count) return false;
- if (shapes.empty()) return false;
+ if (_shapes.empty()) return false;
- return (shapes[shapenum] != 0);
+ return (_shapes[shapenum] != 0);
}
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/shape_archive.h b/engines/ultima/ultima8/graphics/shape_archive.h
index 324a9d5..f6b6139 100644
--- a/engines/ultima/ultima8/graphics/shape_archive.h
+++ b/engines/ultima/ultima8/graphics/shape_archive.h
@@ -37,19 +37,19 @@ class ShapeArchive : public Archive {
public:
ENABLE_RUNTIME_CLASSTYPE()
- ShapeArchive(uint16 id_, Palette *pal_ = 0,
- const ConvertShapeFormat *format_ = 0)
- : Archive(), id(id_), format(format_), palette(pal_) { }
- ShapeArchive(ArchiveFile *af, uint16 id_, Palette *pal_ = 0,
- const ConvertShapeFormat *format_ = 0)
- : Archive(af), id(id_), format(format_), palette(pal_) { }
- ShapeArchive(IDataSource *ds, uint16 id_, Palette *pal_ = 0,
- const ConvertShapeFormat *format_ = 0)
- : Archive(ds), id(id_), format(format_), palette(pal_) { }
- ShapeArchive(const Std::string &path, uint16 id_,
- Palette *pal_ = 0,
- const ConvertShapeFormat *format_ = 0)
- : Archive(path), id(id_), format(format_), palette(pal_) { }
+ ShapeArchive(uint16 id, Palette *pal = 0,
+ const ConvertShapeFormat *format = 0)
+ : Archive(), _id(id), _format(format), _palette(pal) { }
+ ShapeArchive(ArchiveFile *af, uint16 id, Palette *pal = 0,
+ const ConvertShapeFormat *format = 0)
+ : Archive(af), _id(id), _format(format), _palette(pal) { }
+ ShapeArchive(IDataSource *ds, uint16 id, Palette *pal = 0,
+ const ConvertShapeFormat *format = 0)
+ : Archive(ds), _id(id), _format(format), _palette(pal) { }
+ ShapeArchive(const Std::string &path, uint16 id,
+ Palette *pal = 0,
+ const ConvertShapeFormat *format = 0)
+ : Archive(path), _id(id), _format(format), _palette(pal) { }
~ShapeArchive() override;
@@ -60,10 +60,10 @@ public:
bool isCached(uint32 shapenum) override;
protected:
- uint16 id;
- const ConvertShapeFormat *format;
- Palette *palette;
- Std::vector<Shape *> shapes;
+ uint16 _id;
+ const ConvertShapeFormat *_format;
+ Palette *_palette;
+ Std::vector<Shape *> _shapes;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/shape_info.cpp b/engines/ultima/ultima8/graphics/shape_info.cpp
index 8dafc54..b2742a4 100644
--- a/engines/ultima/ultima8/graphics/shape_info.cpp
+++ b/engines/ultima/ultima8/graphics/shape_info.cpp
@@ -28,16 +28,16 @@
namespace Ultima {
namespace Ultima8 {
-bool ShapeInfo::getTypeFlag(int typeflag) {
+bool ShapeInfo::getTypeFlag(int typeFlag) {
if (GAME_IS_U8)
- return getTypeFlagU8(typeflag);
+ return getTypeFlagU8(typeFlag);
else if (GAME_IS_CRUSADER)
- return getTypeFlagCrusader(typeflag);
+ return getTypeFlagCrusader(typeFlag);
CANT_HAPPEN_MSG("Invalid game type");
return false;
}
-bool ShapeInfo::getTypeFlagU8(int typeflag) {
+bool ShapeInfo::getTypeFlagU8(int typeFlag) {
// This is not nice. The Typeflags in U8 were stored in an 8 byte array
// and they could access them with a number from 0 to 63
// Problem: We don't store them in an 8 byte array so we can't access
@@ -45,54 +45,54 @@ bool ShapeInfo::getTypeFlagU8(int typeflag) {
// So what we do is split the flag up into the bits
- if (typeflag <= 11) { // flags Byte 0, 1:0-3 Bits 0-11
- return (flags >> typeflag) & 1;
- } else if (typeflag <= 15) { // family Byte 1:4-7 Bits 11-15
- return (family >> (typeflag - 12)) & 1;
- } else if (typeflag <= 19) { // equiptype Byte 2:0-3 Bits 16-19
- return (equiptype >> (typeflag - 16)) & 1;
- } else if (typeflag <= 23) { // x Byte 2:4-7 Bits 20-23
- return (x >> (typeflag - 20)) & 1;
- } else if (typeflag <= 27) { // y Byte 3:0-3 Bits 24-27
- return (y >> (typeflag - 24)) & 1;
- } else if (typeflag <= 31) { // z Byte 3:4-7 Bits 28-31
- return (z >> (typeflag - 28)) & 1;
- } else if (typeflag <= 35) { // animtype Byte 4:0-3 Bits 32-35
- return (animtype >> (typeflag - 32)) & 1;
- } else if (typeflag <= 39) { // animdata Byte 4:4-7 Bits 36-49
- return (animdata >> (typeflag - 36)) & 1;
- } else if (typeflag <= 43) { // unknown Byte 5:0-3 Bits 40-43
- return (unknown >> (typeflag - 40)) & 1;
- } else if (typeflag <= 47) { // flags Byte 5:4-7 Bits 44-47
- return (flags >> (12 + typeflag - 44)) & 1;
- } else if (typeflag <= 55) { // weight Byte 6 Bits 48-55
- return (weight >> (typeflag - 48)) & 1;
- } else if (typeflag <= 63) { // volume Byte 7 Bits 56-63
- return (volume >> (typeflag - 56)) & 1;
+ if (typeFlag <= 11) { // flags Byte 0, 1:0-3 Bits 0-11
+ return (_flags >> typeFlag) & 1;
+ } else if (typeFlag <= 15) { // family Byte 1:4-7 Bits 11-15
+ return (_family >> (typeFlag - 12)) & 1;
+ } else if (typeFlag <= 19) { // equipType Byte 2:0-3 Bits 16-19
+ return (_equipType >> (typeFlag - 16)) & 1;
+ } else if (typeFlag <= 23) { // x Byte 2:4-7 Bits 20-23
+ return (_x >> (typeFlag - 20)) & 1;
+ } else if (typeFlag <= 27) { // y Byte 3:0-3 Bits 24-27
+ return (_y >> (typeFlag - 24)) & 1;
+ } else if (typeFlag <= 31) { // z Byte 3:4-7 Bits 28-31
+ return (_z >> (typeFlag - 28)) & 1;
+ } else if (typeFlag <= 35) { // animtype Byte 4:0-3 Bits 32-35
+ return (_animType >> (typeFlag - 32)) & 1;
+ } else if (typeFlag <= 39) { // animdata Byte 4:4-7 Bits 36-49
+ return (_animData >> (typeFlag - 36)) & 1;
+ } else if (typeFlag <= 43) { // unknown Byte 5:0-3 Bits 40-43
+ return (_unknown >> (typeFlag - 40)) & 1;
+ } else if (typeFlag <= 47) { // _flags Byte 5:4-7 Bits 44-47
+ return (_flags >> (12 + typeFlag - 44)) & 1;
+ } else if (typeFlag <= 55) { // weight Byte 6 Bits 48-55
+ return (_weight >> (typeFlag - 48)) & 1;
+ } else if (typeFlag <= 63) { // volume Byte 7 Bits 56-63
+ return (_volume >> (typeFlag - 56)) & 1;
}
return false;
}
-bool ShapeInfo::getTypeFlagCrusader(int typeflag) {
- if (typeflag <= 11) { // flags Byte 0, 1:0-3 Bits 0-11
- return (flags >> typeflag) & 1;
- } else if (typeflag <= 16) { // family Byte 1:4-7,2:0 Bits 12-16
- return (family >> (typeflag - 12)) & 1;
- } else if (typeflag <= 20) { // unknown Byte 2:0-3 Bits 17-20
- perr << "Warning: unknown typeflag requested." << Std::endl;
- } else if (typeflag <= 26) { // x Byte 2:4-7,3:0-1 Bits 21-26
- return (x >> (typeflag - 21)) & 1;
- } else if (typeflag <= 31) { // y Byte 3:2-6 Bits 27-31
- return (y >> (typeflag - 27)) & 1;
- } else if (typeflag <= 36) { // z Byte 3:7,4:0-3 Bits 32-36
- return (z >> (typeflag - 32)) & 1;
- } else if (typeflag <= 47) {
- perr << "Warning: unknown typeflag requested." << Std::endl;
- } else if (typeflag <= 55) { // flags Byte 6: 0-7 Bits 48-55
- return (flags >> (12 + typeflag - 55)) & 1;
- } else if (typeflag <= 71) {
- perr << "Warning: unknown typeflag requested." << Std::endl;
+bool ShapeInfo::getTypeFlagCrusader(int typeFlag) {
+ if (typeFlag <= 11) { // _flags Byte 0, 1:0-3 Bits 0-11
+ return (_flags >> typeFlag) & 1;
+ } else if (typeFlag <= 16) { // _family Byte 1:4-7,2:0 Bits 12-16
+ return (_family >> (typeFlag - 12)) & 1;
+ } else if (typeFlag <= 20) { // unknown Byte 2:0-3 Bits 17-20
+ perr << "Warning: unknown typeFlag requested." << Std::endl;
+ } else if (typeFlag <= 26) { // x Byte 2:4-7,3:0-1 Bits 21-26
+ return (_x >> (typeFlag - 21)) & 1;
+ } else if (typeFlag <= 31) { // y Byte 3:2-6 Bits 27-31
+ return (_y >> (typeFlag - 27)) & 1;
+ } else if (typeFlag <= 36) { // z Byte 3:7,4:0-3 Bits 32-36
+ return (_z >> (typeFlag - 32)) & 1;
+ } else if (typeFlag <= 47) {
+ perr << "Warning: unknown typeFlag requested." << Std::endl;
+ } else if (typeFlag <= 55) { // _flags Byte 6: 0-7 Bits 48-55
+ return (_flags >> (12 + typeFlag - 55)) & 1;
+ } else if (typeFlag <= 71) {
+ perr << "Warning: unknown typeFlag requested." << Std::endl;
}
return false;
diff --git a/engines/ultima/ultima8/graphics/shape_info.h b/engines/ultima/ultima8/graphics/shape_info.h
index f762ed2..5e5026d 100644
--- a/engines/ultima/ultima8/graphics/shape_info.h
+++ b/engines/ultima/ultima8/graphics/shape_info.h
@@ -82,94 +82,94 @@ public:
SE_WEAPON = 6
};
- uint32 flags;
- uint32 x, y, z;
- uint32 family;
- uint32 equiptype;
- uint32 animtype, animdata;
- uint32 unknown;
- uint32 weight, volume;
-
- WeaponInfo *weaponinfo;
- ArmourInfo *armourinfo;
- MonsterInfo *monsterinfo;
+ uint32 _flags;
+ uint32 _x, _y, _z;
+ uint32 _family;
+ uint32 _equipType;
+ uint32 _animType, _animData;
+ uint32 _unknown;
+ uint32 _weight, _volume;
+
+ WeaponInfo *_weaponInfo;
+ ArmourInfo *_armourInfo;
+ MonsterInfo *_monsterInfo;
inline bool is_fixed() const {
- return (flags & SI_FIXED) != 0;
+ return (_flags & SI_FIXED) != 0;
}
inline bool is_solid() const {
- return (flags & SI_SOLID) != 0;
+ return (_flags & SI_SOLID) != 0;
}
inline bool is_sea() const {
- return (flags & SI_SEA) != 0;
+ return (_flags & SI_SEA) != 0;
}
inline bool is_land() const {
- return (flags & SI_LAND) != 0;
+ return (_flags & SI_LAND) != 0;
}
inline bool is_occl() const {
- return (flags & SI_OCCL) != 0;
+ return (_flags & SI_OCCL) != 0;
}
inline bool is_bag() const {
- return (flags & SI_BAG) != 0;
+ return (_flags & SI_BAG) != 0;
}
inline bool is_damaging() const {
- return (flags & SI_DAMAGING) != 0;
+ return (_flags & SI_DAMAGING) != 0;
}
inline bool is_noisy() const {
- return (flags & SI_NOISY) != 0;
+ return (_flags & SI_NOISY) != 0;
}
inline bool is_draw() const {
- return (flags & SI_DRAW) != 0;
+ return (_flags & SI_DRAW) != 0;
}
inline bool is_ignore() const {
- return (flags & SI_IGNORE) != 0;
+ return (_flags & SI_IGNORE) != 0;
}
inline bool is_roof() const {
- return (flags & SI_ROOF) != 0;
+ return (_flags & SI_ROOF) != 0;
}
inline bool is_translucent() const {
- return (flags & SI_TRANSL) != 0;
+ return (_flags & SI_TRANSL) != 0;
}
inline bool is_editor() const {
- return (flags & SI_EDITOR) != 0;
+ return (_flags & SI_EDITOR) != 0;
}
inline bool is_explode() const {
- return (flags & SI_EXPLODE) != 0;
+ return (_flags & SI_EXPLODE) != 0;
}
bool hasQuantity() const {
- return (family == SF_QUANTITY || family == SF_REAGENT);
+ return (_family == SF_QUANTITY || _family == SF_REAGENT);
}
- bool getTypeFlag(int typeflag);
- bool getTypeFlagU8(int typeflag);
- bool getTypeFlagCrusader(int typeflag);
+ bool getTypeFlag(int typeFlag);
+ bool getTypeFlagU8(int typeFlag);
+ bool getTypeFlagCrusader(int typeFlag);
- inline void getFootpadWorld(int32 &X, int32 &Y, int32 &Z, uint16 flipped) const;
+ inline void getFootpadWorld(int32 &x, int32 &y, int32 &z, uint16 flipped) const;
ShapeInfo() :
- flags(0), x(0), y(0), z(0),
- family(0), equiptype(0), animtype(0), animdata(0),
- unknown(0), weight(0), volume(0),
- weaponinfo(0), armourinfo(0), monsterinfo(0) { }
+ _flags(0), _x(0), _y(0), _z(0),
+ _family(0), _equipType(0), _animType(0), _animData(0),
+ _unknown(0), _weight(0), _volume(0),
+ _weaponInfo(0), _armourInfo(0), _monsterInfo(0) { }
~ShapeInfo() {
- delete weaponinfo;
- delete[] armourinfo;
- delete monsterinfo;
+ delete _weaponInfo;
+ delete[] _armourInfo;
+ delete _monsterInfo;
}
};
-inline void ShapeInfo::getFootpadWorld(int32 &X, int32 &Y, int32 &Z, uint16 flipped) const {
- Z = z * 8;
+inline void ShapeInfo::getFootpadWorld(int32 &x, int32 &y, int32 &z, uint16 flipped) const {
+ z = _z * 8;
if (flipped) {
- X = y * 32;
- Y = x * 32;
+ x = _y * 32;
+ y = _x * 32;
} else {
- X = x * 32;
- Y = y * 32;
+ x = _x * 32;
+ y = _y * 32;
}
}
diff --git a/engines/ultima/ultima8/graphics/type_flags.cpp b/engines/ultima/ultima8/graphics/type_flags.cpp
index d3fae7b..f0f0abd 100644
--- a/engines/ultima/ultima8/graphics/type_flags.cpp
+++ b/engines/ultima/ultima8/graphics/type_flags.cpp
@@ -73,86 +73,86 @@ void TypeFlags::load(IDataSource *ds) {
ds->read(data, blocksize);
ShapeInfo si;
- si.flags = 0;
+ si._flags = 0;
if (GAME_IS_U8) {
- if (data[0] & 0x01) si.flags |= ShapeInfo::SI_FIXED;
- if (data[0] & 0x02) si.flags |= ShapeInfo::SI_SOLID;
- if (data[0] & 0x04) si.flags |= ShapeInfo::SI_SEA;
- if (data[0] & 0x08) si.flags |= ShapeInfo::SI_LAND;
- if (data[0] & 0x10) si.flags |= ShapeInfo::SI_OCCL;
- if (data[0] & 0x20) si.flags |= ShapeInfo::SI_BAG;
- if (data[0] & 0x40) si.flags |= ShapeInfo::SI_DAMAGING;
- if (data[0] & 0x80) si.flags |= ShapeInfo::SI_NOISY;
+ if (data[0] & 0x01) si._flags |= ShapeInfo::SI_FIXED;
+ if (data[0] & 0x02) si._flags |= ShapeInfo::SI_SOLID;
+ if (data[0] & 0x04) si._flags |= ShapeInfo::SI_SEA;
+ if (data[0] & 0x08) si._flags |= ShapeInfo::SI_LAND;
+ if (data[0] & 0x10) si._flags |= ShapeInfo::SI_OCCL;
+ if (data[0] & 0x20) si._flags |= ShapeInfo::SI_BAG;
+ if (data[0] & 0x40) si._flags |= ShapeInfo::SI_DAMAGING;
+ if (data[0] & 0x80) si._flags |= ShapeInfo::SI_NOISY;
- if (data[1] & 0x01) si.flags |= ShapeInfo::SI_DRAW;
- if (data[1] & 0x02) si.flags |= ShapeInfo::SI_IGNORE;
- if (data[1] & 0x04) si.flags |= ShapeInfo::SI_ROOF;
- if (data[1] & 0x08) si.flags |= ShapeInfo::SI_TRANSL;
- si.family = data[1] >> 4;
+ if (data[1] & 0x01) si._flags |= ShapeInfo::SI_DRAW;
+ if (data[1] & 0x02) si._flags |= ShapeInfo::SI_IGNORE;
+ if (data[1] & 0x04) si._flags |= ShapeInfo::SI_ROOF;
+ if (data[1] & 0x08) si._flags |= ShapeInfo::SI_TRANSL;
+ si._family = data[1] >> 4;
- si.equiptype = data[2] & 0x0F;
- si.x = data[2] >> 4;
+ si._equipType = data[2] & 0x0F;
+ si._x = data[2] >> 4;
- si.y = data[3] & 0x0F;
- si.z = data[3] >> 4;
+ si._y = data[3] & 0x0F;
+ si._z = data[3] >> 4;
- si.animtype = data[4] & 0x0F;
- si.animdata = data[4] >> 4;
+ si._animType = data[4] & 0x0F;
+ si._animData = data[4] >> 4;
- si.unknown = data[5] & 0x0F;
- if (data[5] & 0x10) si.flags |= ShapeInfo::SI_EDITOR;
- if (data[5] & 0x20) si.flags |= ShapeInfo::SI_EXPLODE;
- if (data[5] & 0x40) si.flags |= ShapeInfo::SI_UNKNOWN46;
- if (data[5] & 0x80) si.flags |= ShapeInfo::SI_UNKNOWN47;
+ si._unknown = data[5] & 0x0F;
+ if (data[5] & 0x10) si._flags |= ShapeInfo::SI_EDITOR;
+ if (data[5] & 0x20) si._flags |= ShapeInfo::SI_EXPLODE;
+ if (data[5] & 0x40) si._flags |= ShapeInfo::SI_UNKNOWN46;
+ if (data[5] & 0x80) si._flags |= ShapeInfo::SI_UNKNOWN47;
- si.weight = data[6];
+ si._weight = data[6];
- si.volume = data[7];
+ si._volume = data[7];
} else if (GAME_IS_CRUSADER) {
// might have to split up remorse/regret at some point
// unchecked
- if (data[0] & 0x01) si.flags |= ShapeInfo::SI_FIXED;
- if (data[0] & 0x02) si.flags |= ShapeInfo::SI_SOLID;
- if (data[0] & 0x04) si.flags |= ShapeInfo::SI_SEA;
- if (data[0] & 0x08) si.flags |= ShapeInfo::SI_LAND;
- if (data[0] & 0x10) si.flags |= ShapeInfo::SI_OCCL;
- if (data[0] & 0x20) si.flags |= ShapeInfo::SI_BAG;
- if (data[0] & 0x40) si.flags |= ShapeInfo::SI_DAMAGING;
- if (data[0] & 0x80) si.flags |= ShapeInfo::SI_NOISY;
+ if (data[0] & 0x01) si._flags |= ShapeInfo::SI_FIXED;
+ if (data[0] & 0x02) si._flags |= ShapeInfo::SI_SOLID;
+ if (data[0] & 0x04) si._flags |= ShapeInfo::SI_SEA;
+ if (data[0] & 0x08) si._flags |= ShapeInfo::SI_LAND;
+ if (data[0] & 0x10) si._flags |= ShapeInfo::SI_OCCL;
+ if (data[0] & 0x20) si._flags |= ShapeInfo::SI_BAG;
+ if (data[0] & 0x40) si._flags |= ShapeInfo::SI_DAMAGING;
+ if (data[0] & 0x80) si._flags |= ShapeInfo::SI_NOISY;
// unchecked
- if (data[1] & 0x01) si.flags |= ShapeInfo::SI_DRAW;
- if (data[1] & 0x02) si.flags |= ShapeInfo::SI_IGNORE;
- if (data[1] & 0x04) si.flags |= ShapeInfo::SI_ROOF;
- if (data[1] & 0x08) si.flags |= ShapeInfo::SI_TRANSL;
- si.family = data[1] >> 4;
- si.family += (data[2] & 1) << 4;
+ if (data[1] & 0x01) si._flags |= ShapeInfo::SI_DRAW;
+ if (data[1] & 0x02) si._flags |= ShapeInfo::SI_IGNORE;
+ if (data[1] & 0x04) si._flags |= ShapeInfo::SI_ROOF;
+ if (data[1] & 0x08) si._flags |= ShapeInfo::SI_TRANSL;
+ si._family = data[1] >> 4;
+ si._family += (data[2] & 1) << 4;
// (copied from old/viewer/ShapeManager.h)
- si.x = ((data[3] << 3) | (data[2] >> 5)) & 0x1F;
- si.y = (data[3] >> 2) & 0x1F;
- si.z = ((data[4] << 1) | (data[3] >> 7)) & 0x1F;
+ si._x = ((data[3] << 3) | (data[2] >> 5)) & 0x1F;
+ si._y = (data[3] >> 2) & 0x1F;
+ si._z = ((data[4] << 1) | (data[3] >> 7)) & 0x1F;
- if (data[6] & 0x01) si.flags |= ShapeInfo::SI_EDITOR;
- if (data[6] & 0x02) si.flags |= ShapeInfo::SI_CRUSUNK61;
- if (data[6] & 0x04) si.flags |= ShapeInfo::SI_CRUSUNK62;
- if (data[6] & 0x08) si.flags |= ShapeInfo::SI_CRUSUNK63;
- if (data[6] & 0x10) si.flags |= ShapeInfo::SI_CRUSUNK64;
- if (data[6] & 0x20) si.flags |= ShapeInfo::SI_CRUS_NPC;
- if (data[6] & 0x40) si.flags |= ShapeInfo::SI_CRUSUNK66;
- if (data[6] & 0x80) si.flags |= ShapeInfo::SI_CRUSUNK67;
+ if (data[6] & 0x01) si._flags |= ShapeInfo::SI_EDITOR;
+ if (data[6] & 0x02) si._flags |= ShapeInfo::SI_CRUSUNK61;
+ if (data[6] & 0x04) si._flags |= ShapeInfo::SI_CRUSUNK62;
+ if (data[6] & 0x08) si._flags |= ShapeInfo::SI_CRUSUNK63;
+ if (data[6] & 0x10) si._flags |= ShapeInfo::SI_CRUSUNK64;
+ if (data[6] & 0x20) si._flags |= ShapeInfo::SI_CRUS_NPC;
+ if (data[6] & 0x40) si._flags |= ShapeInfo::SI_CRUSUNK66;
+ if (data[6] & 0x80) si._flags |= ShapeInfo::SI_CRUSUNK67;
- si.animtype = 0;
+ si._animType = 0;
}
- si.weaponinfo = 0;
- si.armourinfo = 0;
+ si._weaponInfo = 0;
+ si._armourInfo = 0;
shapeInfo[i] = si;
}
@@ -161,7 +161,7 @@ void TypeFlags::load(IDataSource *ds) {
// Workaround for incorrectly set solid flags on some "moss
// curtains" in the catacombs. See also docs/u8bugs.txt
for (uint32 i = 459; i <= 464; ++i) {
- shapeInfo[i].flags &= ~ShapeInfo::SI_SOLID;
+ shapeInfo[i]._flags &= ~ShapeInfo::SI_SOLID;
}
}
@@ -218,7 +218,7 @@ void TypeFlags::loadWeaponInfo() {
wi->treasure_chance = 0;
assert(wi->shape < shapeInfo.size());
- shapeInfo[wi->shape].weaponinfo = wi;
+ shapeInfo[wi->shape]._weaponInfo = wi;
}
}
@@ -243,10 +243,10 @@ void TypeFlags::loadArmourInfo() {
assert(ai.shape < shapeInfo.size());
assert(msf->getShape(ai.shape));
unsigned int framecount = msf->getShape(ai.shape)->frameCount();
- ArmourInfo *aia = shapeInfo[ai.shape].armourinfo;
+ ArmourInfo *aia = shapeInfo[ai.shape]._armourInfo;
if (!aia) {
aia = new ArmourInfo[framecount];
- shapeInfo[ai.shape].armourinfo = aia;
+ shapeInfo[ai.shape]._armourInfo = aia;
for (unsigned int i = 0; i < framecount; ++i) {
aia[i].shape = 0;
aia[i].frame = 0;
@@ -363,7 +363,7 @@ void TypeFlags::loadMonsterInfo() {
}
assert(mi->shape < shapeInfo.size());
- shapeInfo[mi->shape].monsterinfo = mi;
+ shapeInfo[mi->shape]._monsterInfo = mi;
}
}
diff --git a/engines/ultima/ultima8/gumps/container_gump.cpp b/engines/ultima/ultima8/gumps/container_gump.cpp
index a0aa221..f67f518 100644
--- a/engines/ultima/ultima8/gumps/container_gump.cpp
+++ b/engines/ultima/ultima8/gumps/container_gump.cpp
@@ -244,7 +244,7 @@ void ContainerGump::GetItemLocation(int32 lerp_factor) {
// Convert the GumpSpaceCoord relative to the world/item gump
// into screenspace coords
- gy = gy - it->getShapeInfo()->z * 8 - 16;
+ gy = gy - it->getShapeInfo()->_z * 8 - 16;
gump->GumpToScreenSpace(gx, gy);
// Convert the screenspace coords into the coords of us
diff --git a/engines/ultima/ultima8/gumps/item_relative_gump.cpp b/engines/ultima/ultima8/gumps/item_relative_gump.cpp
index 4c5d14e..4e07794 100644
--- a/engines/ultima/ultima8/gumps/item_relative_gump.cpp
+++ b/engines/ultima/ultima8/gumps/item_relative_gump.cpp
@@ -150,7 +150,7 @@ void ItemRelativeGump::GetItemLocation(int32 lerp_factor) {
// Convert the GumpSpaceCoord relative to the world/item gump
// into screenspace coords
- gy = gy - it->getShapeInfo()->z * 8 - 16;
+ gy = gy - it->getShapeInfo()->_z * 8 - 16;
gump->GumpToScreenSpace(gx, gy);
// Convert the screenspace coords into the coords of us
diff --git a/engines/ultima/ultima8/gumps/paperdoll_gump.cpp b/engines/ultima/ultima8/gumps/paperdoll_gump.cpp
index d561469..130cb72 100644
--- a/engines/ultima/ultima8/gumps/paperdoll_gump.cpp
+++ b/engines/ultima/ultima8/gumps/paperdoll_gump.cpp
@@ -332,7 +332,7 @@ bool PaperdollGump::DraggingItem(Item *item, int mx, int my) {
_draggingFrame = item->getFrame();
_draggingFlags = item->getFlags();
- int equiptype = item->getShapeInfo()->equiptype;
+ int equiptype = item->getShapeInfo()->_equipType;
// determine target location and set dragging_x/y
if (!over_backpack && equiptype) {
// check if item will fit (weight/volume/etc...)
@@ -372,7 +372,7 @@ void PaperdollGump::DropItem(Item *item, int mx, int my) {
over_backpack = true;
}
- int equiptype = item->getShapeInfo()->equiptype;
+ int equiptype = item->getShapeInfo()->_equipType;
if (!over_backpack && equiptype) {
item->moveToContainer(a);
} else {
diff --git a/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp b/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
index 434745e..6530c52 100644
--- a/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
+++ b/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
@@ -114,11 +114,11 @@ void ShapeViewerGump::PaintThis(RenderSurface *surf, int32 lerp_factor, bool /*s
ShapeInfo *info = mainshapes->getShapeInfo(_curShape);
if (info) {
sprintf(buf3, "x = %d, y = %d, z = %d\n flags = 0x%04X, family = %d",
- info->x, info->y, info->z, info->flags, info->family);
+ info->_x, info->_y, info->_z, info->_flags, info->_family);
sprintf(buf4, "equip type = %d\n unknown flags = 0x%02X\n weight = %d",
- info->equiptype, info->unknown, info->weight);
+ info->_equipType, info->_unknown, info->_weight);
sprintf(buf5, "volume = %d\n animtype = %d, animdata = %d",
- info->animtype, info->animdata, info->volume);
+ info->_animType, info->_animData, info->_volume);
sprintf(buf6, "ShapeInfo:\n %s\n %s, %s\nUsecode: %s",
buf3, buf4, buf5, GameData::get_instance()->getMainUsecode()->get_class_name(_curShape));
rendtext = font->renderText(buf6, remaining);
diff --git a/engines/ultima/ultima8/world/actors/actor.cpp b/engines/ultima/ultima8/world/actors/actor.cpp
index e9b1de1..b1826a3 100644
--- a/engines/ultima/ultima8/world/actors/actor.cpp
+++ b/engines/ultima/ultima8/world/actors/actor.cpp
@@ -99,7 +99,7 @@ uint16 Actor::getMaxHP() const {
bool Actor::loadMonsterStats() {
ShapeInfo *shapeinfo = getShapeInfo();
MonsterInfo *mi = 0;
- if (shapeinfo) mi = shapeinfo->monsterinfo;
+ if (shapeinfo) mi = shapeinfo->_monsterInfo;
if (!mi)
return false;
@@ -128,7 +128,7 @@ bool Actor::giveTreasure() {
MainShapeArchive *mainshapes = GameData::get_instance()->getMainShapes();
ShapeInfo *shapeinfo = getShapeInfo();
MonsterInfo *mi = 0;
- if (shapeinfo) mi = shapeinfo->monsterinfo;
+ if (shapeinfo) mi = shapeinfo->_monsterInfo;
if (!mi)
return false;
@@ -164,9 +164,9 @@ bool Actor::giveTreasure() {
// NB: this is rather biased towards weapons with low shapes...
for (unsigned int s = 0; s < mainshapes->getCount(); ++s) {
ShapeInfo *si = mainshapes->getShapeInfo(s);
- if (!si->weaponinfo) continue;
+ if (!si->_weaponInfo) continue;
- int chance = si->weaponinfo->treasure_chance;
+ int chance = si->_weaponInfo->treasure_chance;
if (!chance) continue;
int r = getRandom() % 100;
@@ -363,7 +363,7 @@ bool Actor::removeItem(Item *item) {
bool Actor::setEquip(Item *item, bool checkwghtvol) {
const unsigned int backpack_shape = 529; //!! *cough* constant
- uint32 equiptype = item->getShapeInfo()->equiptype;
+ uint32 equiptype = item->getShapeInfo()->_equipType;
bool backpack = (item->getShape() == backpack_shape);
// valid item type?
@@ -375,7 +375,7 @@ bool Actor::setEquip(Item *item, bool checkwghtvol) {
for (iter = contents.begin(); iter != contents.end(); ++iter) {
if ((*iter)->getObjId() == item->getObjId()) continue;
- uint32 cet = (*iter)->getShapeInfo()->equiptype;
+ uint32 cet = (*iter)->getShapeInfo()->_equipType;
bool cbackpack = ((*iter)->getShape() == backpack_shape);
// already have an item with the same equiptype
@@ -395,7 +395,7 @@ uint16 Actor::getEquip(uint32 type) {
Std::list<Item *>::iterator iter;
for (iter = contents.begin(); iter != contents.end(); ++iter) {
- uint32 cet = (*iter)->getShapeInfo()->equiptype;
+ uint32 cet = (*iter)->getShapeInfo()->_equipType;
bool cbackpack = ((*iter)->getShape() == backpack_shape);
if (((*iter)->getFlags() & FLG_EQUIPPED) &&
@@ -538,16 +538,16 @@ uint16 Actor::cSetActivity(int activity) {
uint32 Actor::getArmourClass() {
ShapeInfo *si = getShapeInfo();
- if (si->monsterinfo)
- return si->monsterinfo->armour_class;
+ if (si->_monsterInfo)
+ return si->_monsterInfo->armour_class;
else
return 0;
}
uint16 Actor::getDefenseType() {
ShapeInfo *si = getShapeInfo();
- if (si->monsterinfo)
- return si->monsterinfo->defense_type;
+ if (si->_monsterInfo)
+ return si->_monsterInfo->defense_type;
else
return 0;
}
@@ -562,8 +562,8 @@ int16 Actor::getAttackingDex() {
uint16 Actor::getDamageType() {
ShapeInfo *si = getShapeInfo();
- if (si->monsterinfo)
- return si->monsterinfo->damage_type;
+ if (si->_monsterInfo)
+ return si->_monsterInfo->damage_type;
else
return WeaponInfo::DMG_NORMAL;
}
@@ -571,10 +571,10 @@ uint16 Actor::getDamageType() {
int Actor::getDamageAmount() {
ShapeInfo *si = getShapeInfo();
- if (si->monsterinfo) {
+ if (si->_monsterInfo) {
- int min = static_cast<int>(si->monsterinfo->min_dmg);
- int max = static_cast<int>(si->monsterinfo->max_dmg);
+ int min = static_cast<int>(si->_monsterInfo->min_dmg);
+ int max = static_cast<int>(si->_monsterInfo->max_dmg);
int damage = (getRandom() % (max - min + 1)) + min;
@@ -756,7 +756,7 @@ ProcId Actor::die(uint16 damageType) {
ShapeInfo *shapeinfo = getShapeInfo();
MonsterInfo *mi = 0;
- if (shapeinfo) mi = shapeinfo->monsterinfo;
+ if (shapeinfo) mi = shapeinfo->_monsterInfo;
if (mi && mi->resurrection && !(damageType & WeaponInfo::DMG_FIRE)) {
// this monster will be resurrected after a while
diff --git a/engines/ultima/ultima8/world/actors/animation_tracker.cpp b/engines/ultima/ultima8/world/actors/animation_tracker.cpp
index ecc3b6c..00150ff 100644
--- a/engines/ultima/ultima8/world/actors/animation_tracker.cpp
+++ b/engines/ultima/ultima8/world/actors/animation_tracker.cpp
@@ -269,7 +269,7 @@ bool AnimationTracker::step() {
// Do the sweep test
Std::list<CurrentMap::SweepItem> collisions;
Std::list<CurrentMap::SweepItem>::iterator it;
- cm->sweepTest(start, end, dims, a->getShapeInfo()->flags, a->getObjId(),
+ cm->sweepTest(start, end, dims, a->getShapeInfo()->_flags, a->getObjId(),
false, &collisions);
@@ -298,7 +298,7 @@ bool AnimationTracker::step() {
bool targetok = cm->isValidPosition(tx, ty, tz,
startx, starty, startz,
xd, yd, zd,
- a->getShapeInfo()->flags,
+ a->getShapeInfo()->_flags,
actor, &support, 0);
if (GAME_IS_U8 && targetok && support) {
@@ -386,7 +386,7 @@ bool AnimationTracker::step() {
/*bool targetok = */ cm->isValidPosition(tx, ty, tz,
startx, starty, startz,
xd, yd, zd,
- a->getShapeInfo()->flags,
+ a->getShapeInfo()->_flags,
actor, &support, 0);
diff --git a/engines/ultima/ultima8/world/actors/combat_process.cpp b/engines/ultima/ultima8/world/actors/combat_process.cpp
index 23ca4a4..d075cd5 100644
--- a/engines/ultima/ultima8/world/actors/combat_process.cpp
+++ b/engines/ultima/ultima8/world/actors/combat_process.cpp
@@ -281,7 +281,7 @@ bool CombatProcess::inAttackRange() {
Actor *a = getActor(_itemNum);
ShapeInfo *shapeinfo = a->getShapeInfo();
MonsterInfo *mi = 0;
- if (shapeinfo) mi = shapeinfo->monsterinfo;
+ if (shapeinfo) mi = shapeinfo->_monsterInfo;
if (mi && mi->ranged)
return true; // ranged attacks (ghost's fireball) always in range
@@ -304,7 +304,7 @@ void CombatProcess::waitForTarget() {
Actor *a = getActor(_itemNum);
ShapeInfo *shapeinfo = a->getShapeInfo();
MonsterInfo *mi = 0;
- if (shapeinfo) mi = shapeinfo->monsterinfo;
+ if (shapeinfo) mi = shapeinfo->_monsterInfo;
if (mi && mi->shifter && a->getMapNum() != 43 && (getRandom() % 2) == 0) {
// changelings (except the ones at the U8 endgame pentagram)
diff --git a/engines/ultima/ultima8/world/actors/main_actor.cpp b/engines/ultima/ultima8/world/actors/main_actor.cpp
index b9cd9c1..6b4f762 100644
--- a/engines/ultima/ultima8/world/actors/main_actor.cpp
+++ b/engines/ultima/ultima8/world/actors/main_actor.cpp
@@ -87,7 +87,7 @@ bool MainActor::CanAddItem(Item *item, bool checkwghtvol) {
// now check 'equipment slots'
// we can have one item of each equipment type, plus one backpack
- uint32 equiptype = item->getShapeInfo()->equiptype;
+ uint32 equiptype = item->getShapeInfo()->_equipType;
bool backpack = (item->getShape() == backpack_shape);
// valid item type?
@@ -95,7 +95,7 @@ bool MainActor::CanAddItem(Item *item, bool checkwghtvol) {
Std::list<Item *>::iterator iter;
for (iter = contents.begin(); iter != contents.end(); ++iter) {
- uint32 cet = (*iter)->getShapeInfo()->equiptype;
+ uint32 cet = (*iter)->getShapeInfo()->_equipType;
bool cbackpack = ((*iter)->getShape() == backpack_shape);
// already have an item with the same equiptype
@@ -110,7 +110,7 @@ bool MainActor::addItem(Item *item, bool checkwghtvol) {
item->setFlag(FLG_EQUIPPED);
- uint32 equiptype = item->getShapeInfo()->equiptype;
+ uint32 equiptype = item->getShapeInfo()->_equipType;
item->setZ(equiptype);
return true;
@@ -177,8 +177,8 @@ uint16 MainActor::getDefenseType() {
for (iter = contents.begin(); iter != contents.end(); ++iter) {
uint32 frameNum = (*iter)->getFrame();
ShapeInfo *si = (*iter)->getShapeInfo();
- if (si->armourinfo) {
- type |= si->armourinfo[frameNum].defense_type;
+ if (si->_armourInfo) {
+ type |= si->_armourInfo[frameNum].defense_type;
}
}
@@ -192,11 +192,11 @@ uint32 MainActor::getArmourClass() {
for (iter = contents.begin(); iter != contents.end(); ++iter) {
uint32 frameNum = (*iter)->getFrame();
ShapeInfo *si = (*iter)->getShapeInfo();
- if (si->armourinfo) {
- armour += si->armourinfo[frameNum].armour_class;
+ if (si->_armourInfo) {
+ armour += si->_armourInfo[frameNum].armour_class;
}
- if (si->weaponinfo) {
- armour += si->weaponinfo->armour_bonus;
+ if (si->_weaponInfo) {
+ armour += si->_weaponInfo->armour_bonus;
}
}
@@ -209,8 +209,8 @@ int16 MainActor::getDefendingDex() {
Item *weapon = getItem(getEquip(ShapeInfo::SE_WEAPON));
if (weapon) {
ShapeInfo *si = weapon->getShapeInfo();
- assert(si->weaponinfo);
- dex += si->weaponinfo->dex_defend_bonus;
+ assert(si->_weaponInfo);
+ dex += si->_weaponInfo->dex_defend_bonus;
}
if (dex <= 0) dex = 1;
@@ -224,8 +224,8 @@ int16 MainActor::getAttackingDex() {
Item *weapon = getItem(getEquip(ShapeInfo::SE_WEAPON));
if (weapon) {
ShapeInfo *si = weapon->getShapeInfo();
- assert(si->weaponinfo);
- dex += si->weaponinfo->dex_attack_bonus;
+ assert(si->_weaponInfo);
+ dex += si->_weaponInfo->dex_attack_bonus;
}
return dex;
@@ -238,9 +238,9 @@ uint16 MainActor::getDamageType() {
// weapon equipped?
ShapeInfo *si = weapon->getShapeInfo();
- assert(si->weaponinfo);
+ assert(si->_weaponInfo);
- return si->weaponinfo->damage_type;
+ return si->_weaponInfo->damage_type;
}
return Actor::getDamageType();
@@ -256,8 +256,8 @@ int MainActor::getDamageAmount() {
Item *legs = getItem(getEquip(ShapeInfo::SE_LEGS));
if (legs) {
ShapeInfo *si = legs->getShapeInfo();
- assert(si->armourinfo);
- kick_bonus = si->armourinfo[legs->getFrame()].kick_attack_bonus;
+ assert(si->_armourInfo);
+ kick_bonus = si->_armourInfo[legs->getFrame()].kick_attack_bonus;
}
damage = (getRandom() % (getStr() / 2 + 1)) + kick_bonus;
@@ -273,10 +273,10 @@ int MainActor::getDamageAmount() {
// weapon equipped?
ShapeInfo *si = weapon->getShapeInfo();
- assert(si->weaponinfo);
+ assert(si->_weaponInfo);
- int base = si->weaponinfo->base_damage;
- int mod = si->weaponinfo->damage_modifier;
+ int base = si->_weaponInfo->base_damage;
+ int mod = si->_weaponInfo->damage_modifier;
damage = (getRandom() % (mod + 1)) + base + getStr() / 5;
@@ -516,7 +516,7 @@ void MainActor::getWeaponOverlay(const WeaponOverlayFrame *&frame_, uint32 &shap
ShapeInfo *shapeinfo = weapon->getShapeInfo();
if (!shapeinfo) return;
- WeaponInfo *weaponinfo = shapeinfo->weaponinfo;
+ WeaponInfo *weaponinfo = shapeinfo->_weaponInfo;
if (!weaponinfo) return;
shape_ = weaponinfo->overlay_shape;
diff --git a/engines/ultima/ultima8/world/actors/quick_avatar_mover_process.cpp b/engines/ultima/ultima8/world/actors/quick_avatar_mover_process.cpp
index a2d2c731..98b18dc 100644
--- a/engines/ultima/ultima8/world/actors/quick_avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/quick_avatar_mover_process.cpp
@@ -92,7 +92,7 @@ void QuickAvatarMoverProcess::run() {
bool ok = false;
while (dxv || dyv || dzv) {
- uint32 shapeFlags = avatar->getShapeInfo()->flags;
+ uint32 shapeFlags = avatar->getShapeInfo()->_flags;
if (!clipping || cm->isValidPosition(x + dxv, y + dyv, z + dzv, ixd, iyd, izd, _flags, 1, 0, 0)) {
if (clipping && !dzv) {
diff --git a/engines/ultima/ultima8/world/container.cpp b/engines/ultima/ultima8/world/container.cpp
index 3325a8c..563430d 100644
--- a/engines/ultima/ultima8/world/container.cpp
+++ b/engines/ultima/ultima8/world/container.cpp
@@ -258,7 +258,7 @@ uint32 Container::getTotalWeight() {
}
uint32 Container::getCapacity() {
- uint32 volume = getShapeInfo()->volume;
+ uint32 volume = getShapeInfo()->_volume;
return (volume == 0) ? 32 : volume;
}
diff --git a/engines/ultima/ultima8/world/current_map.cpp b/engines/ultima/ultima8/world/current_map.cpp
index 4078796..33f2fe8 100644
--- a/engines/ultima/ultima8/world/current_map.cpp
+++ b/engines/ultima/ultima8/world/current_map.cpp
@@ -499,11 +499,11 @@ void CurrentMap::areaSearch(UCList *itemlist, const uint8 *loopscript,
//!! constants
if (item->getFlags() & Item::FLG_FLIPPED) {
- ixd = 32 * info->y;
- iyd = 32 * info->x;
+ ixd = 32 * info->_y;
+ iyd = 32 * info->_x;
} else {
- ixd = 32 * info->x;
- iyd = 32 * info->y;
+ ixd = 32 * info->_x;
+ iyd = 32 * info->_y;
}
Rect itemrect(ix - ixd, iy - iyd, ixd, iyd);
@@ -636,14 +636,14 @@ bool CurrentMap::isValidPosition(int32 x, int32 y, int32 z,
ShapeInfo *si = GameData::get_instance()->
getMainShapes()->getShapeInfo(shape);
//!! constants
- xd = si->x * 32;
- yd = si->y * 32;
- zd = si->z * 8;
+ xd = si->_x * 32;
+ yd = si->_y * 32;
+ zd = si->_z * 8;
return isValidPosition(x, y, z,
INT_MAX_VALUE / 2, INT_MAX_VALUE / 2, INT_MAX_VALUE / 2,
xd, yd, zd,
- si->flags, item, support, roof);
+ si->_flags, item, support, roof);
}
bool CurrentMap::isValidPosition(int32 x, int32 y, int32 z,
@@ -693,7 +693,7 @@ bool CurrentMap::isValidPosition(int32 x, int32 y, int32 z,
ShapeInfo *si = item->getShapeInfo();
//!! need to check is_sea() and is_land() maybe?
- if (!(si->flags & flagmask))
+ if (!(si->_flags & flagmask))
continue; // not an interesting item
int32 ix, iy, iz, ixd, iyd, izd;
@@ -710,7 +710,7 @@ bool CurrentMap::isValidPosition(int32 x, int32 y, int32 z,
#endif
// check overlap
- if ((si->flags & shapeflags & blockflagmask) &&
+ if ((si->_flags & shapeflags & blockflagmask) &&
/* not non-overlapping */
!(x <= ix - ixd || x - xd >= ix ||
y <= iy - iyd || y - yd >= iy ||
@@ -774,7 +774,7 @@ bool CurrentMap::scanForValidPosition(int32 x, int32 y, int32 z, Item *item,
supportmask[i] = 0;
}
- blockflagmask &= item->getShapeInfo()->flags;
+ blockflagmask &= item->getShapeInfo()->_flags;
int32 xd, yd, zd;
item->getFootpadWorld(xd, yd, zd);
@@ -811,7 +811,7 @@ bool CurrentMap::scanForValidPosition(int32 x, int32 y, int32 z, Item *item,
ShapeInfo *si = citem->getShapeInfo();
//!! need to check is_sea() and is_land() maybe?
- if (!(si->flags & blockflagmask))
+ if (!(si->_flags & blockflagmask))
continue; // not an interesting item
int32 ix, iy, iz, ixd, iyd, izd;
@@ -984,7 +984,7 @@ bool CurrentMap::sweepTest(const int32 start[3], const int32 end[3],
if (other_item->getObjId() == item) continue;
if (other_item->getExtFlags() & Item::EXT_SPRITE) continue;
- uint32 othershapeflags = other_item->getShapeInfo()->flags;
+ uint32 othershapeflags = other_item->getShapeInfo()->_flags;
bool blocking = (othershapeflags & shapeflags &
blockflagmask) != 0;
@@ -1169,7 +1169,7 @@ Item *CurrentMap::traceTopItem(int32 x, int32 y, int32 ztop, int32 zbot, ObjId i
if (item->getExtFlags() & Item::EXT_SPRITE) continue;
ShapeInfo *si = item->getShapeInfo();
- if (!(si->flags & shflags) || si->is_editor() || si->is_translucent()) continue;
+ if (!(si->_flags & shflags) || si->is_editor() || si->is_translucent()) continue;
int32 ix, iy, iz, ixd, iyd, izd;
item->getLocation(ix, iy, iz);
diff --git a/engines/ultima/ultima8/world/item.cpp b/engines/ultima/ultima8/world/item.cpp
index c4819f4..afae47e 100644
--- a/engines/ultima/ultima8/world/item.cpp
+++ b/engines/ultima/ultima8/world/item.cpp
@@ -429,14 +429,14 @@ void Item::getCentre(int32 &X, int32 &Y, int32 &Z) const {
// constants!
ShapeInfo *shapeinfo = getShapeInfo();
if (flags & FLG_FLIPPED) {
- X = x - shapeinfo->y * 16;
- Y = y - shapeinfo->x * 16;
+ X = x - shapeinfo->_y * 16;
+ Y = y - shapeinfo->_x * 16;
} else {
- X = x - shapeinfo->x * 16;
- Y = y - shapeinfo->y * 16;
+ X = x - shapeinfo->_x * 16;
+ Y = y - shapeinfo->_y * 16;
}
- Z = z + shapeinfo->z * 4;
+ Z = z + shapeinfo->_z * 4;
}
Box Item::getWorldBox() const {
@@ -577,13 +577,13 @@ Shape *Item::getShapeObject() const {
}
uint16 Item::getFamily() {
- return static_cast<uint16>(getShapeInfo()->family);
+ return static_cast<uint16>(getShapeInfo()->_family);
}
uint32 Item::getWeight() {
- uint32 weight = getShapeInfo()->weight;
+ uint32 weight = getShapeInfo()->_weight;
- switch (getShapeInfo()->family) {
+ switch (getShapeInfo()->_family) {
case ShapeInfo::SF_QUANTITY:
return ((getQuality() * weight) + 9) / 10;
case ShapeInfo::SF_REAGENT:
@@ -602,9 +602,9 @@ uint32 Item::getVolume() {
if (getFlags() & FLG_INVISIBLE) return 0;
- uint32 volume = getShapeInfo()->volume;
+ uint32 volume = getShapeInfo()->_volume;
- switch (getShapeInfo()->family) {
+ switch (getShapeInfo()->_family) {
case ShapeInfo::SF_QUANTITY:
return ((getQuality() * volume) + 99) / 100;
case ShapeInfo::SF_REAGENT:
@@ -862,7 +862,7 @@ int32 Item::collideMove(int32 dx, int32 dy, int32 dz, bool teleport, bool force,
// Do the sweep test
Std::list<CurrentMap::SweepItem> collisions;
Std::list<CurrentMap::SweepItem>::iterator it;
- map->sweepTest(start, end, dims, getShapeInfo()->flags, _objId, false, &collisions);
+ map->sweepTest(start, end, dims, getShapeInfo()->_flags, _objId, false, &collisions);
// Ok, now to work out what to do
@@ -1228,15 +1228,15 @@ void Item::animateItem() {
ShapeInfo *info = getShapeInfo();
Shape *shp = getShapeObject();
- if (!info->animtype) return;
+ if (!info->_animType) return;
- int anim_data = info->animdata;
+ int anim_data = info->_animData;
//bool dirty = false;
- if ((static_cast<int>(last_setup) % 6) != (_objId % 6) && info->animtype != 1)
+ if ((static_cast<int>(last_setup) % 6) != (_objId % 6) && info->_animType != 1)
return;
- switch (info->animtype) {
+ switch (info->_animType) {
case 2:
// 50 % chance
if (getRandom() & 1) break;
@@ -1283,7 +1283,7 @@ void Item::animateItem() {
break;
default:
- pout << "type " << info->animtype << " data " << anim_data << Std::endl;
+ pout << "type " << info->_animType << " data " << anim_data << Std::endl;
break;
}
//return dirty;
@@ -1542,8 +1542,8 @@ void Item::explode() {
uint16 Item::getDamageType() {
ShapeInfo *si = getShapeInfo();
- if (si->weaponinfo) {
- return si->weaponinfo->damage_type;
+ if (si->_weaponInfo) {
+ return si->_weaponInfo->damage_type;
}
return 0;
@@ -1567,7 +1567,7 @@ void Item::receiveHit(uint16 other, int dir, int damage, uint16 type) {
return;
}
- if (getShapeInfo()->is_fixed() || getShapeInfo()->weight == 0) {
+ if (getShapeInfo()->is_fixed() || getShapeInfo()->_weight == 0) {
// can't move
return;
}
@@ -1580,7 +1580,7 @@ void Item::receiveHit(uint16 other, int dir, int damage, uint16 type) {
bool Item::canDrag() {
ShapeInfo *si = getShapeInfo();
if (si->is_fixed()) return false;
- if (si->weight == 0) return false;
+ if (si->_weight == 0) return false;
Actor *actor = p_dynamic_cast<Actor *>(this);
if (actor) {
@@ -1854,9 +1854,9 @@ uint32 Item::I_getCX(const uint8 *args, unsigned int /*argsize*/) {
item->getLocationAbsolute(x, y, z);
if (item->flags & FLG_FLIPPED)
- return x - item->getShapeInfo()->y * 16;
+ return x - item->getShapeInfo()->_y * 16;
else
- return x - item->getShapeInfo()->x * 16;
+ return x - item->getShapeInfo()->_x * 16;
}
uint32 Item::I_getCY(const uint8 *args, unsigned int /*argsize*/) {
@@ -1867,9 +1867,9 @@ uint32 Item::I_getCY(const uint8 *args, unsigned int /*argsize*/) {
item->getLocationAbsolute(x, y, z);
if (item->flags & FLG_FLIPPED)
- return y - item->getShapeInfo()->x * 16;
+ return y - item->getShapeInfo()->_x * 16;
else
- return y - item->getShapeInfo()->y * 16;
+ return y - item->getShapeInfo()->_y * 16;
}
uint32 Item::I_getCZ(const uint8 *args, unsigned int /*argsize*/) {
@@ -1879,7 +1879,7 @@ uint32 Item::I_getCZ(const uint8 *args, unsigned int /*argsize*/) {
int32 x, y, z;
item->getLocationAbsolute(x, y, z);
- return z + item->getShapeInfo()->z * 4;
+ return z + item->getShapeInfo()->_z * 4;
}
uint32 Item::I_getPoint(const uint8 *args, unsigned int /*argsize*/) {
@@ -2395,7 +2395,7 @@ uint32 Item::I_getFamilyOfType(const uint8 *args, unsigned int /*argsize*/) {
ARG_UINT16(shape);
return GameData::get_instance()->getMainShapes()->
- getShapeInfo(shape)->family;
+ getShapeInfo(shape)->_family;
}
uint32 Item::I_push(const uint8 *args, unsigned int /*argsize*/) {
@@ -2859,7 +2859,7 @@ uint32 Item::I_isCrusTypeNPC(const uint8 *args, unsigned int /*argsize*/) {
info = GameData::get_instance()->getMainShapes()->getShapeInfo(sh);
if (!info) return 0;
- if (info->flags & ShapeInfo::SI_CRUS_NPC)
+ if (info->_flags & ShapeInfo::SI_CRUS_NPC)
return 1;
else
return 0;
diff --git a/engines/ultima/ultima8/world/item.h b/engines/ultima/ultima8/world/item.h
index d5a4f2e..7ffed3b 100644
--- a/engines/ultima/ultima8/world/item.h
+++ b/engines/ultima/ultima8/world/item.h
@@ -612,28 +612,28 @@ inline ShapeInfo *Item::getShapeInfo() const {
inline void Item::getFootpadData(int32 &X, int32 &Y, int32 &Z) const {
ShapeInfo *si = getShapeInfo();
- Z = si->z;
+ Z = si->_z;
if (flags & Item::FLG_FLIPPED) {
- X = si->y;
- Y = si->x;
+ X = si->_y;
+ Y = si->_x;
} else {
- X = si->x;
- Y = si->y;
+ X = si->_x;
+ Y = si->_y;
}
}
// like getFootpadData, but scaled to world coordinates
inline void Item::getFootpadWorld(int32 &X, int32 &Y, int32 &Z) const {
ShapeInfo *si = getShapeInfo();
- Z = si->z * 8;
+ Z = si->_z * 8;
if (flags & Item::FLG_FLIPPED) {
- X = si->y * 32;
- Y = si->x * 32;
+ X = si->_y * 32;
+ Y = si->_x * 32;
} else {
- X = si->x * 32;
- Y = si->y * 32;
+ X = si->_x * 32;
+ Y = si->_y * 32;
}
}
diff --git a/engines/ultima/ultima8/world/item_factory.cpp b/engines/ultima/ultima8/world/item_factory.cpp
index c493804..c419cad 100644
--- a/engines/ultima/ultima8/world/item_factory.cpp
+++ b/engines/ultima/ultima8/world/item_factory.cpp
@@ -51,7 +51,7 @@ Item *ItemFactory::createItem(uint32 shape, uint32 frame, uint16 quality,
// New item, no lerping
extendedflags |= Item::EXT_LERP_NOPREV;
- uint32 family = info->family;
+ uint32 family = info->_family;
switch (family) {
case ShapeInfo::SF_GENERIC:
diff --git a/engines/ultima/ultima8/world/item_sorter.cpp b/engines/ultima/ultima8/world/item_sorter.cpp
index 81cd167..72e1747 100644
--- a/engines/ultima/ultima8/world/item_sorter.cpp
+++ b/engines/ultima/ultima8/world/item_sorter.cpp
@@ -672,14 +672,14 @@ void ItemSorter::AddItem(int32 x, int32 y, int32 z, uint32 shape_num, uint32 fra
// X and Y are flipped
if (si->flags & Item::FLG_FLIPPED) {
- xd = info->y * 32; // Multiply by 32 to get actual world size
- yd = info->x * 32; // Multiply by 32 to get actual world size
+ xd = info->_y * 32; // Multiply by 32 to get actual world size
+ yd = info->_x * 32; // Multiply by 32 to get actual world size
} else {
- xd = info->x * 32; // Multiply by 32 to get actual world size
- yd = info->y * 32; // Multiply by 32 to get actual world size
+ xd = info->_x * 32; // Multiply by 32 to get actual world size
+ yd = info->_y * 32; // Multiply by 32 to get actual world size
}
- zd = info->z * 8; // Multiply by 8 to get actual world size
+ zd = info->_z * 8; // Multiply by 8 to get actual world size
// Worldspace bounding box
si->x = x;
@@ -745,7 +745,7 @@ void ItemSorter::AddItem(int32 x, int32 y, int32 z, uint32 shape_num, uint32 fra
!(si->ext_flags & Item::EXT_TRANSPARENT);
si->roof = info->is_roof();
si->noisy = info->is_noisy();
- si->anim = info->animtype != 0;
+ si->anim = info->_animType != 0;
si->trans = info->is_translucent();
si->fixed = info->is_fixed();
si->land = info->is_land();
@@ -851,14 +851,14 @@ void ItemSorter::AddItem(Item *add) {
// X and Y are flipped
if (si->flags & Item::FLG_FLIPPED) {
- xd = info->y * 32; // Multiply by 32 to get actual world size
- yd = info->x * 32; // Multiply by 32 to get actual world size
+ xd = info->_y * 32; // Multiply by 32 to get actual world size
+ yd = info->_x * 32; // Multiply by 32 to get actual world size
} else {
- xd = info->x * 32; // Multiply by 32 to get actual world size
- yd = info->y * 32; // Multiply by 32 to get actual world size
+ xd = info->_x * 32; // Multiply by 32 to get actual world size
+ yd = info->_y * 32; // Multiply by 32 to get actual world size
}
- zd = info->z * 8; // Multiply by 8 to get actual world size
+ zd = info->_z * 8; // Multiply by 8 to get actual world size
// Worldspace bounding box
add->getLerped(si->x, si->y, si->z);
@@ -922,7 +922,7 @@ void ItemSorter::AddItem(Item *add) {
!(si->ext_flags & Item::EXT_TRANSPARENT);
si->roof = info->is_roof();
si->noisy = info->is_noisy();
- si->anim = info->animtype != 0;
+ si->anim = info->_animType != 0;
si->trans = info->is_translucent();
si->fixed = info->is_fixed();
si->land = info->is_land();
diff --git a/engines/ultima/ultima8/world/map.cpp b/engines/ultima/ultima8/world/map.cpp
index 14d5777..601ce67 100644
--- a/engines/ultima/ultima8/world/map.cpp
+++ b/engines/ultima/ultima8/world/map.cpp
@@ -356,7 +356,7 @@ void Map::loadFixedFormatObjects(Std::list<Item *> &itemlist, IDataSource *ds,
ShapeInfo *info = GameData::get_instance()->getMainShapes()->
getShapeInfo(shape);
- if (info) pout << ", family = " << info->family;
+ if (info) pout << ", family = " << info->_family;
pout << Std::endl;
pout << "Couldn't create item" << Std::endl;
diff --git a/engines/ultima/ultima8/world/missile_tracker.cpp b/engines/ultima/ultima8/world/missile_tracker.cpp
index aeb9c6b..06e73ec 100644
--- a/engines/ultima/ultima8/world/missile_tracker.cpp
+++ b/engines/ultima/ultima8/world/missile_tracker.cpp
@@ -152,7 +152,7 @@ bool MissileTracker::isPathClear() {
// Do the sweep test
Std::list<CurrentMap::SweepItem> collisions;
Std::list<CurrentMap::SweepItem>::iterator it;
- map->sweepTest(start, end, dims, item->getShapeInfo()->flags, objid,
+ map->sweepTest(start, end, dims, item->getShapeInfo()->_flags, objid,
false, &collisions);
int32 hit = 0x4000;
Commit: 076c763523719d2a1a7f3ddc1b5ee93599ba6400
https://github.com/scummvm/scummvm/commit/076c763523719d2a1a7f3ddc1b5ee93599ba6400
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-16T19:26:46-08:00
Commit Message:
NEWS: Fix incorrect wording
Changed paths:
NEWS.md
diff --git a/NEWS.md b/NEWS.md
index 5881192..2de05b4 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -5,7 +5,7 @@ For a more comprehensive changelog of the latest experimental code, see:
General:
- Autosaves are now supported for all the engines
- - Errors are more likely to open the debugger, and be displayed, then just crash ScummVM
+ - Errors are more likely to open the debugger, and be displayed, than just crash ScummVM
Dreamweb:
- Added support for Russian fan-translation.
Commit: a1b70355c27e252a08852dc21be753026798e072
https://github.com/scummvm/scummvm/commit/a1b70355c27e252a08852dc21be753026798e072
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-16T19:47:36-08:00
Commit Message:
ULTIMA8: Rename remaining graphics folder class fields
Changed paths:
engines/ultima/ultima8/graphics/base_soft_render_surface.cpp
engines/ultima/ultima8/graphics/fonts/fixed_width_font.cpp
engines/ultima/ultima8/graphics/fonts/tt_font.cpp
engines/ultima/ultima8/graphics/point_scaler.cpp
engines/ultima/ultima8/graphics/scaler.h
engines/ultima/ultima8/graphics/skf_player.cpp
engines/ultima/ultima8/graphics/skf_player.h
engines/ultima/ultima8/graphics/soft_render_surface.cpp
engines/ultima/ultima8/graphics/texture.cpp
engines/ultima/ultima8/graphics/texture.h
engines/ultima/ultima8/graphics/wpn_ovlay_dat.cpp
engines/ultima/ultima8/graphics/wpn_ovlay_dat.h
engines/ultima/ultima8/gumps/minimap_gump.cpp
engines/ultima/ultima8/gumps/pentagram_menu_gump.cpp
engines/ultima/ultima8/kernel/mouse.cpp
engines/ultima/ultima8/world/actors/weapon_overlay.h
diff --git a/engines/ultima/ultima8/graphics/base_soft_render_surface.cpp b/engines/ultima/ultima8/graphics/base_soft_render_surface.cpp
index d642b8c..b893289 100644
--- a/engines/ultima/ultima8/graphics/base_soft_render_surface.cpp
+++ b/engines/ultima/ultima8/graphics/base_soft_render_surface.cpp
@@ -216,10 +216,10 @@ BaseSoftRenderSurface::BaseSoftRenderSurface(int w, int h) :
_pixels00 = new uint8[_pitch * _height];
_rttTex = new Texture;
- _rttTex->buffer = reinterpret_cast<uint32 *>(_pixels00);
- _rttTex->width = _width;
- _rttTex->height = _height;
- _rttTex->format = TEX_FMT_NATIVE;
+ _rttTex->_buffer = reinterpret_cast<uint32 *>(_pixels00);
+ _rttTex->_width = _width;
+ _rttTex->_height = _height;
+ _rttTex->_format = TEX_FMT_NATIVE;
_rttTex->CalcLOG2s();
SetPixelsPointer();
diff --git a/engines/ultima/ultima8/graphics/fonts/fixed_width_font.cpp b/engines/ultima/ultima8/graphics/fonts/fixed_width_font.cpp
index ad4ff8a..6c09db6 100644
--- a/engines/ultima/ultima8/graphics/fonts/fixed_width_font.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/fixed_width_font.cpp
@@ -62,11 +62,11 @@ FixedWidthFont *FixedWidthFont::Create(Std::string iniroot) {
fwf->tex = fonttex;
if (!config->get(iniroot + "/font/width", fwf->width)) {
- fwf->width = fwf->tex->width / 16;
+ fwf->width = fwf->tex->_width / 16;
}
if (!config->get(iniroot + "/font/height", fwf->height)) {
- fwf->height = fwf->tex->height / 16;
+ fwf->height = fwf->tex->_height / 16;
}
if (!config->get(iniroot + "/font/align_x", fwf->align_x)) {
diff --git a/engines/ultima/ultima8/graphics/fonts/tt_font.cpp b/engines/ultima/ultima8/graphics/fonts/tt_font.cpp
index ff22477..3e7efc3 100644
--- a/engines/ultima/ultima8/graphics/fonts/tt_font.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/tt_font.cpp
@@ -167,9 +167,9 @@ RenderedText *TTFont::renderText(const Std::string &text,
memset(buf, 0, 4 * resultwidth * resultheight);
Texture *texture = new Texture();
- texture->buffer = buf;
- texture->width = resultwidth;
- texture->height = resultheight;
+ texture->_buffer = buf;
+ texture->_width = resultwidth;
+ texture->_height = resultheight;
#if 0
pout << "Total size: " << resultwidth << "," << resultheight << Std::endl;
diff --git a/engines/ultima/ultima8/graphics/point_scaler.cpp b/engines/ultima/ultima8/graphics/point_scaler.cpp
index bee8048..6faa6b6 100644
--- a/engines/ultima/ultima8/graphics/point_scaler.cpp
+++ b/engines/ultima/ultima8/graphics/point_scaler.cpp
@@ -33,11 +33,11 @@ public:
static bool Scale(Texture *tex , int32 sx, int32 sy, int32 sw, int32 sh,
uint8 *pixel, int32 dw, int32 dh, int32 pitch, bool clamp_src) {
// Source buffer pointers
- uintS *texel = reinterpret_cast<uintS *>(tex->buffer) + (sy * tex->width + sx);
- int tpitch = tex->width;
+ uintS *texel = reinterpret_cast<uintS *>(tex->_buffer) + (sy * tex->_width + sx);
+ int tpitch = tex->_width;
uintS *tline_end = texel + sw;
- uintS *tex_end = texel + sh * tex->width;
- int tex_diff = tex->width - sw;
+ uintS *tex_end = texel + sh * tex->_width;
+ int tex_diff = tex->_width - sw;
// First detect integer up scalings, since they are 'easy'
diff --git a/engines/ultima/ultima8/graphics/scaler.h b/engines/ultima/ultima8/graphics/scaler.h
index 7864c67..325ecf8 100644
--- a/engines/ultima/ultima8/graphics/scaler.h
+++ b/engines/ultima/ultima8/graphics/scaler.h
@@ -82,7 +82,7 @@ public:
}
if (RenderSurface::format.s_bytes_per_pixel == 4) {
- if (texture->format == TEX_FMT_NATIVE || (texture->format == TEX_FMT_STANDARD &&
+ if (texture->_format == TEX_FMT_NATIVE || (texture->_format == TEX_FMT_STANDARD &&
RenderSurface::format.a_mask == TEX32_A_MASK && RenderSurface::format.r_mask == TEX32_R_MASK &&
RenderSurface::format.g_mask == TEX32_G_MASK && RenderSurface::format.b_mask == TEX32_B_MASK)) {
if (RenderSurface::format.a_mask == 0xFF000000) {
@@ -95,16 +95,16 @@ public:
if (!Scale32Nat) return 0;
return Scale32Nat(texture, sx, sy, sw, sh, pixel, dw, dh, pitch, clamp_src);
}
- } else if (texture->format == TEX_FMT_STANDARD) {
+ } else if (texture->_format == TEX_FMT_STANDARD) {
if (!Scale32Sta) return 0;
return Scale32Sta(texture, sx, sy, sw, sh, pixel, dw, dh, pitch, clamp_src);
}
}
if (RenderSurface::format.s_bytes_per_pixel == 2) {
- if (texture->format == TEX_FMT_NATIVE) {
+ if (texture->_format == TEX_FMT_NATIVE) {
if (!Scale16Nat) return 0;
return Scale16Nat(texture, sx, sy, sw, sh, pixel, dw, dh, pitch, clamp_src);
- } else if (texture->format == TEX_FMT_STANDARD) {
+ } else if (texture->_format == TEX_FMT_STANDARD) {
if (!Scale16Sta) return 0;
return Scale16Sta(texture, sx, sy, sw, sh, pixel, dw, dh, pitch, clamp_src);
}
diff --git a/engines/ultima/ultima8/graphics/skf_player.cpp b/engines/ultima/ultima8/graphics/skf_player.cpp
index 621c95f..8ecbfa7 100644
--- a/engines/ultima/ultima8/graphics/skf_player.cpp
+++ b/engines/ultima/ultima8/graphics/skf_player.cpp
@@ -22,7 +22,6 @@
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/graphics/skf_player.h"
-
#include "ultima/ultima8/convert/u8/convert_shape_u8.h"
#include "ultima/ultima8/filesys/raw_archive.h"
#include "ultima/ultima8/graphics/shape.h"
@@ -66,12 +65,12 @@ struct SKFEvent {
static const int FADESTEPS = 16; // HACK: half speed
-SKFPlayer::SKFPlayer(RawArchive *movie, int width_, int height_, bool introMusicHack_)
- : width(width_), height(height_), skf(movie),
- curframe(0), curobject(0), curaction(0), curevent(0), playing(false),
- timer(0), framerate(15), fadecolour(0), fadelevel(0), buffer(0), subs(0),
- introMusicHack(introMusicHack_) {
- IDataSource *eventlist = skf->get_datasource(0);
+SKFPlayer::SKFPlayer(RawArchive *movie, int width, int height, bool _introMusicHack)
+ : _width(width), _height(height), _skf(movie),
+ _curFrame(0), _curObject(0), _curAction(0), _curEvent(0), _playing(false),
+ _timer(0), _frameRate(15), _fadeColour(0), _fadeLevel(0), _buffer(0), _subs(0),
+ _introMusicHack(_introMusicHack), _lastUpdate(0), _subtitleY(0) {
+ IDataSource *eventlist = _skf->get_datasource(0);
if (!eventlist) {
perr << "No eventlist found in SKF" << Std::endl;
return;
@@ -80,16 +79,16 @@ SKFPlayer::SKFPlayer(RawArchive *movie, int width_, int height_, bool introMusic
parseEventList(eventlist);
delete eventlist;
- buffer = RenderSurface::CreateSecondaryRenderSurface(width, height);
+ _buffer = RenderSurface::CreateSecondaryRenderSurface(_width, _height);
}
SKFPlayer::~SKFPlayer() {
- for (unsigned int i = 0; i < events.size(); ++i)
- delete events[i];
+ for (unsigned int i = 0; i < _events.size(); ++i)
+ delete _events[i];
- delete skf;
- delete buffer;
- delete subs;
+ delete _skf;
+ delete _buffer;
+ delete _subs;
}
void SKFPlayer::parseEventList(IDataSource *eventlist) {
@@ -99,71 +98,71 @@ void SKFPlayer::parseEventList(IDataSource *eventlist) {
ev->frame = frame;
ev->action = static_cast<SKFAction>(eventlist->read2());
ev->data = eventlist->read2();
- events.push_back(ev);
+ _events.push_back(ev);
frame = eventlist->read2();
}
}
void SKFPlayer::start() {
- buffer->BeginPainting();
- buffer->Fill32(0, 0, 0, width, height);
- buffer->EndPainting();
+ _buffer->BeginPainting();
+ _buffer->Fill32(0, 0, 0, _width, _height);
+ _buffer->EndPainting();
MusicProcess *musicproc = MusicProcess::get_instance();
if (musicproc) musicproc->playMusic(0);
- playing = true;
- lastupdate = g_system->getMillis();
+ _playing = true;
+ _lastUpdate = g_system->getMillis();
}
void SKFPlayer::stop() {
MusicProcess *musicproc = MusicProcess::get_instance();
- if (musicproc && !introMusicHack) musicproc->playMusic(0);
- playing = false;
+ if (musicproc && !_introMusicHack) musicproc->playMusic(0);
+ _playing = false;
}
void SKFPlayer::paint(RenderSurface *surf, int /*lerp*/) {
- if (!buffer) return;
+ if (!_buffer) return;
- Texture *tex = buffer->GetSurfaceAsTexture();
+ Texture *tex = _buffer->GetSurfaceAsTexture();
- if (!fadelevel) {
- surf->Blit(tex, 0, 0, width, height, 0, 0);
- if (subs)
- subs->draw(surf, 60, subtitley);
+ if (!_fadeLevel) {
+ surf->Blit(tex, 0, 0, _width, _height, 0, 0);
+ if (_subs)
+ _subs->draw(surf, 60, _subtitleY);
} else {
- uint32 fade = TEX32_PACK_RGBA(fadecolour, fadecolour, fadecolour,
- (fadelevel * 255) / FADESTEPS);
- surf->FadedBlit(tex, 0, 0, width, height, 0, 0, fade);
- if (subs)
- subs->drawBlended(surf, 60, subtitley, fade);
+ uint32 fade = TEX32_PACK_RGBA(_fadeColour, _fadeColour, _fadeColour,
+ (_fadeLevel * 255) / FADESTEPS);
+ surf->FadedBlit(tex, 0, 0, _width, _height, 0, 0, fade);
+ if (_subs)
+ _subs->drawBlended(surf, 60, _subtitleY, fade);
}
}
void SKFPlayer::run() {
- if (!playing || !buffer) return;
+ if (!_playing || !_buffer) return;
// if doing something, continue
- if (curaction) {
- if (curaction == SKF_FadeOut || curaction == SKF_FadeWhite) {
- fadelevel++;
- if (fadelevel == FADESTEPS) curaction = 0; // done
- } else if (curaction == SKF_FadeIn) {
- fadelevel--;
- if (fadelevel == 0) curaction = 0; // done
+ if (_curAction) {
+ if (_curAction == SKF_FadeOut || _curAction == SKF_FadeWhite) {
+ _fadeLevel++;
+ if (_fadeLevel == FADESTEPS) _curAction = 0; // done
+ } else if (_curAction == SKF_FadeIn) {
+ _fadeLevel--;
+ if (_fadeLevel == 0) _curAction = 0; // done
} else {
- pout << "Unknown fade action: " << curaction << Std::endl;
+ pout << "Unknown fade action: " << _curAction << Std::endl;
}
}
// CHECKME: this timing may not be accurate enough...
uint32 now = g_system->getMillis();
- if (lastupdate + (1000 / framerate) > now) return;
+ if (_lastUpdate + (1000 / _frameRate) > now) return;
- lastupdate += (1000 / framerate);
+ _lastUpdate += (1000 / _frameRate);
// if waiting, continue to wait
- if (timer) {
- timer--;
+ if (_timer) {
+ _timer--;
return;
}
@@ -173,58 +172,58 @@ void SKFPlayer::run() {
MusicProcess *musicproc = MusicProcess::get_instance();
AudioProcess *audioproc = AudioProcess::get_instance();
- // handle events for the current frame
- while (curevent < events.size() && events[curevent]->frame <= curframe) {
-// pout << "event " << curevent << Std::endl;
- switch (events[curevent]->action) {
+ // handle _events for the current frame
+ while (_curEvent < _events.size() && _events[_curEvent]->frame <= _curFrame) {
+// pout << "event " << _curEvent << Std::endl;
+ switch (_events[_curEvent]->action) {
case SKF_FadeOut:
- curaction = SKF_FadeOut;
- fadecolour = 0;
- fadelevel = 0;
+ _curAction = SKF_FadeOut;
+ _fadeColour = 0;
+ _fadeLevel = 0;
// pout << "FadeOut" << Std::endl;
break;
case SKF_FadeIn:
- curaction = SKF_FadeIn;
- fadelevel = FADESTEPS;
+ _curAction = SKF_FadeIn;
+ _fadeLevel = FADESTEPS;
// pout << "FadeIn" << Std::endl;
break;
case SKF_FadeWhite:
- curaction = SKF_FadeWhite;
- fadecolour = 0xFF;
- fadelevel = 0;
+ _curAction = SKF_FadeWhite;
+ _fadeColour = 0xFF;
+ _fadeLevel = 0;
// pout << "FadeWhite" << Std::endl;
break;
case SKF_Wait:
-// pout << "Wait " << events[curevent]->data << Std::endl;
- timer = events[curevent]->data;
- curevent++;
+// pout << "Wait " << _events[_curEvent]->data << Std::endl;
+ _timer = _events[_curEvent]->data;
+ _curEvent++;
return;
case SKF_PlayMusic:
-// pout << "PlayMusic " << events[curevent]->data << Std::endl;
- if (musicproc) musicproc->playMusic(events[curevent]->data);
+// pout << "PlayMusic " << _events[_curEvent]->data << Std::endl;
+ if (musicproc) musicproc->playMusic(_events[_curEvent]->data);
break;
case SKF_SlowStopMusic:
POUT("SlowStopMusic");
- if (musicproc && !introMusicHack) musicproc->playMusic(0);
+ if (musicproc && !_introMusicHack) musicproc->playMusic(0);
break;
case SKF_PlaySFX:
-// pout << "PlaySFX " << events[curevent]->data << Std::endl;
- if (audioproc) audioproc->playSFX(events[curevent]->data, 0x60, 0, 0);
+// pout << "PlaySFX " << _events[_curEvent]->data << Std::endl;
+ if (audioproc) audioproc->playSFX(_events[_curEvent]->data, 0x60, 0, 0);
break;
case SKF_StopSFX:
-// pout << "StopSFX" << events[curevent]->data << Std::endl;
- if (audioproc) audioproc->stopSFX(events[curevent]->data, 0);
+// pout << "StopSFX" << _events[_curEvent]->data << Std::endl;
+ if (audioproc) audioproc->stopSFX(_events[_curEvent]->data, 0);
break;
case SKF_SetSpeed:
- POUT("SetSpeed " << events[curevent]->data);
-// framerate = events[curevent]->data;
+ POUT("SetSpeed " << _events[_curEvent]->data);
+// _frameRate = _events[_curEvent]->data;
break;
case SKF_PlaySound: {
-// pout << "PlaySound " << events[curevent]->data << Std::endl;
+// pout << "PlaySound " << _events[_curEvent]->data << Std::endl;
if (audioproc) {
- uint8 *buf = skf->get_object(events[curevent]->data);
- uint32 bufsize = skf->get_size(events[curevent]->data);
+ uint8 *buf = _skf->get_object(_events[_curEvent]->data);
+ uint32 bufsize = _skf->get_size(_events[_curEvent]->data);
AudioSample *s;
uint32 rate = buf[6] + (buf[7] << 8);
bool stereo = (buf[8] == 2);
@@ -236,14 +235,14 @@ void SKFPlayer::run() {
// subtitles
char *textbuf = reinterpret_cast<char *>(
- skf->get_object(events[curevent]->data - 1));
- uint32 textsize = skf->get_size(events[curevent]->data - 1);
+ _skf->get_object(_events[_curEvent]->data - 1));
+ uint32 textsize = _skf->get_size(_events[_curEvent]->data - 1);
if (textsize > 7) {
Std::string subtitle = (textbuf + 6);
- delete subs;
- subtitley = textbuf[4] + (textbuf[5] << 8);
+ delete _subs;
+ _subtitleY = textbuf[4] + (textbuf[5] << 8);
unsigned int remaining;
- subs = redfont->renderText(subtitle, remaining, 200, 0,
+ _subs = redfont->renderText(subtitle, remaining, 200, 0,
Font::TEXT_CENTER);
}
delete textbuf;
@@ -253,38 +252,38 @@ void SKFPlayer::run() {
}
case SKF_ClearSubs:
// pout << "ClearSubs" << Std::endl;
- delete subs;
- subs = 0;
+ delete _subs;
+ _subs = 0;
break;
default:
pout << "Unknown action" << Std::endl;
break;
}
- curevent++;
+ _curEvent++;
}
- curframe++;
+ _curFrame++;
PaletteManager *palman = PaletteManager::get_instance();
IDataSource *object;
uint16 objecttype = 0;
do {
- curobject++;
- if (curobject >= skf->getCount()) {
+ _curObject++;
+ if (_curObject >= _skf->getCount()) {
stop(); // done
return;
}
// read object
- object = skf->get_datasource(curobject);
+ object = _skf->get_datasource(_curObject);
if (!object || object->getSize() < 2)
continue;
objecttype = object->read2();
-// pout << "Object " << curobject << "/" << skf->getCount()
+// pout << "Object " << _curObject << "/" << _skf->getCount()
// << ", type = " << objecttype << Std::endl;
@@ -302,15 +301,15 @@ void SKFPlayer::run() {
Shape *shape = new Shape(object, &U8SKFShapeFormat);
Palette *pal = palman->getPalette(PaletteManager::Pal_Movie);
shape->setPalette(pal);
- buffer->BeginPainting();
- buffer->Paint(shape, 0, 0, 0);
- buffer->EndPainting();
+ _buffer->BeginPainting();
+ _buffer->Paint(shape, 0, 0, 0);
+ _buffer->EndPainting();
delete shape;
delete object;
}
- timer = 1; // HACK! timing is rather broken currently...
+ _timer = 1; // HACK! timing is rather broken currently...
}
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/skf_player.h b/engines/ultima/ultima8/graphics/skf_player.h
index b9aef61..e5e5b1a 100644
--- a/engines/ultima/ultima8/graphics/skf_player.h
+++ b/engines/ultima/ultima8/graphics/skf_player.h
@@ -46,28 +46,28 @@ public:
void start();
void stop();
bool isPlaying() const {
- return playing;
+ return _playing;
}
private:
void parseEventList(IDataSource *eventlist);
- int width, height;
- RawArchive *skf;
- Std::vector<SKFEvent *> events;
- unsigned int curframe, curobject;
- unsigned int curaction;
- unsigned int curevent;
- bool playing;
- unsigned int lastupdate;
- unsigned int timer;
- unsigned int framerate;
- uint8 fadecolour, fadelevel;
- RenderSurface *buffer;
- RenderedText *subs;
- int subtitley;
- bool introMusicHack;
+ int _width, _height;
+ RawArchive *_skf;
+ Std::vector<SKFEvent *> _events;
+ unsigned int _curFrame, _curObject;
+ unsigned int _curAction;
+ unsigned int _curEvent;
+ bool _playing;
+ unsigned int _lastUpdate;
+ unsigned int _timer;
+ unsigned int _frameRate;
+ uint8 _fadeColour, _fadeLevel;
+ RenderSurface *_buffer;
+ RenderedText *_subs;
+ int _subtitleY;
+ bool _introMusicHack;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/soft_render_surface.cpp b/engines/ultima/ultima8/graphics/soft_render_surface.cpp
index fa53b14..6503894 100644
--- a/engines/ultima/ultima8/graphics/soft_render_surface.cpp
+++ b/engines/ultima/ultima8/graphics/soft_render_surface.cpp
@@ -336,11 +336,11 @@ template<class uintX> void SoftRenderSurface<uintX>::DrawLine32(uint32 rgb, int3
//
template<class uintX> void SoftRenderSurface<uintX>::Blit(Texture *tex, int32 sx, int32 sy, int32 w, int32 h, int32 dx, int32 dy, bool alpha_blend) {
// Clamp or wrap or return?
- if (sx + w > static_cast<int32>(tex->width))
+ if (sx + w > static_cast<int32>(tex->_width))
return;
// Clamp or wrap or return?
- if (sy + h > static_cast<int32>(tex->height))
+ if (sy + h > static_cast<int32>(tex->_height))
return;
if (sx < 0 || sy < 0)
@@ -360,9 +360,9 @@ template<class uintX> void SoftRenderSurface<uintX>::Blit(Texture *tex, int32 sx
uint8 *end = pixel + h * _pitch;
int diff = _pitch - w * sizeof(uintX);
- if (tex->format == TEX_FMT_STANDARD) {
- uint32 *texel = tex->buffer + (sy * tex->width + sx);
- int tex_diff = tex->width - w;
+ if (tex->_format == TEX_FMT_STANDARD) {
+ uint32 *texel = tex->_buffer + (sy * tex->_width + sx);
+ int tex_diff = tex->_width - w;
while (pixel != end) {
if (!alpha_blend) while (pixel != line_end) {
@@ -388,9 +388,9 @@ template<class uintX> void SoftRenderSurface<uintX>::Blit(Texture *tex, int32 sx
pixel += diff;
texel += tex_diff;
}
- } else if (tex->format == TEX_FMT_NATIVE) {
- uintX *texel = reinterpret_cast<uintX *>(tex->buffer) + (sy * tex->width + sx);
- int tex_diff = tex->width - w;
+ } else if (tex->_format == TEX_FMT_NATIVE) {
+ uintX *texel = reinterpret_cast<uintX *>(tex->_buffer) + (sy * tex->_width + sx);
+ int tex_diff = tex->_width - w;
while (pixel != end) {
while (pixel != line_end) {
@@ -412,19 +412,19 @@ template<class uintX> void SoftRenderSurface<uintX>::Blit(Texture *tex, int32 sx
/* Old complete code
// Clamp or wrap or return?
#ifndef BLIT_WRAP
- if (w > static_cast<int32>(tex->width))
+ if (w > static_cast<int32>(tex->_width))
#ifndef BLIT_CLIP
return;
#else
- w = tex->width;
+ w = tex->_width;
#endif
// Clamp or wrap or return?
- if (h > static_cast<int32>(tex->height))
+ if (h > static_cast<int32>(tex->_height))
#ifndef BLIT_CLIP
return;
#else
- h = tex->height;
+ h = tex->_height;
#endif
#endif
@@ -442,14 +442,14 @@ template<class uintX> void SoftRenderSurface<uintX>::Blit(Texture *tex, int32 sx
uint8 *end = pixel + h * _pitch;
int diff = _pitch - w*sizeof(uintX);
- uint32 *texel = tex->buffer + (sy * tex->width + sx);
+ uint32 *texel = tex->_buffer + (sy * tex->_width + sx);
#ifdef BLIT_WRAP
- uint32 *texel_line_start = tex->buffer + sy * tex->width;
- uint32 *texel_line_end = tex->buffer + (sy+1) * tex->width;
- uint32 *texel_col_start = tex->buffer + sx;
- uint32 *texel_col_end = tex->buffer + (tex->height * tex->width + sx);
+ uint32 *texel_line_start = tex->_buffer + sy * tex->_width;
+ uint32 *texel_line_end = tex->_buffer + (sy+1) * tex->_width;
+ uint32 *texel_col_start = tex->_buffer + sx;
+ uint32 *texel_col_end = tex->_buffer + (tex->_height * tex->_width + sx);
#endif
- int tex_diff = tex->width - w;
+ int tex_diff = tex->_width - w;
//b = PACK_RGB8( (rgb>>16)&0xFF , (rgb>>8)&0xFF , rgb&0xFF );
@@ -489,11 +489,11 @@ template<class uintX> void SoftRenderSurface<uintX>::Blit(Texture *tex, int32 sx
//
template<class uintX> void SoftRenderSurface<uintX>::FadedBlit(Texture *tex, int32 sx, int32 sy, int32 w, int32 h, int32 dx, int32 dy, uint32 col32, bool alpha_blend) {
// Clamp or wrap or return?
- if (w > static_cast<int32>(tex->width))
+ if (w > static_cast<int32>(tex->_width))
return;
// Clamp or wrap or return?
- if (h > static_cast<int32>(tex->height))
+ if (h > static_cast<int32>(tex->_height))
return;
// Clip to window
@@ -516,9 +516,9 @@ template<class uintX> void SoftRenderSurface<uintX>::FadedBlit(Texture *tex, int
uint32 g = (TEX32_G(col32) * a);
uint32 b = (TEX32_B(col32) * a);
- if (tex->format == TEX_FMT_STANDARD) {
- uint32 *texel = tex->buffer + (sy * tex->width + sx);
- int tex_diff = tex->width - w;
+ if (tex->_format == TEX_FMT_STANDARD) {
+ uint32 *texel = tex->_buffer + (sy * tex->_width + sx);
+ int tex_diff = tex->_width - w;
while (pixel != end) {
if (!alpha_blend) while (pixel != line_end) {
@@ -568,9 +568,9 @@ template<class uintX> void SoftRenderSurface<uintX>::FadedBlit(Texture *tex, int
pixel += diff;
texel += tex_diff;
}
- } else if (tex->format == TEX_FMT_NATIVE) {
- uintX *texel = reinterpret_cast<uintX *>(tex->buffer) + (sy * tex->width + sx);
- int tex_diff = tex->width - w;
+ } else if (tex->_format == TEX_FMT_NATIVE) {
+ uintX *texel = reinterpret_cast<uintX *>(tex->_buffer) + (sy * tex->_width + sx);
+ int tex_diff = tex->_width - w;
while (pixel != end) {
while (pixel != line_end) {
@@ -599,11 +599,11 @@ template<class uintX> void SoftRenderSurface<uintX>::FadedBlit(Texture *tex, int
//
template<class uintX> void SoftRenderSurface<uintX>::MaskedBlit(Texture *tex, int32 sx, int32 sy, int32 w, int32 h, int32 dx, int32 dy, uint32 col32, bool alpha_blend) {
// Clamp or wrap or return?
- if (w > static_cast<int32>(tex->width))
+ if (w > static_cast<int32>(tex->_width))
return;
// Clamp or wrap or return?
- if (h > static_cast<int32>(tex->height))
+ if (h > static_cast<int32>(tex->_height))
return;
// Clip to window
@@ -626,9 +626,9 @@ template<class uintX> void SoftRenderSurface<uintX>::MaskedBlit(Texture *tex, in
uint32 g = (TEX32_G(col32) * a);
uint32 b = (TEX32_B(col32) * a);
- if (tex->format == TEX_FMT_STANDARD) {
- uint32 *texel = tex->buffer + (sy * tex->width + sx);
- int tex_diff = tex->width - w;
+ if (tex->_format == TEX_FMT_STANDARD) {
+ uint32 *texel = tex->_buffer + (sy * tex->_width + sx);
+ int tex_diff = tex->_width - w;
while (pixel != end) {
if (!alpha_blend) while (pixel != line_end) {
@@ -682,9 +682,9 @@ template<class uintX> void SoftRenderSurface<uintX>::MaskedBlit(Texture *tex, in
pixel += diff;
texel += tex_diff;
}
- } else if (tex->format == TEX_FMT_NATIVE) {
- uintX *texel = reinterpret_cast<uintX *>(tex->buffer) + (sy * tex->width + sx);
- int tex_diff = tex->width - w;
+ } else if (tex->_format == TEX_FMT_NATIVE) {
+ uintX *texel = reinterpret_cast<uintX *>(tex->_buffer) + (sy * tex->_width + sx);
+ int tex_diff = tex->_width - w;
while (pixel != end) {
while (pixel != line_end) {
diff --git a/engines/ultima/ultima8/graphics/texture.cpp b/engines/ultima/ultima8/graphics/texture.cpp
index 77865b4..e8a2ff9 100644
--- a/engines/ultima/ultima8/graphics/texture.cpp
+++ b/engines/ultima/ultima8/graphics/texture.cpp
@@ -36,9 +36,9 @@ namespace Ultima8 {
//
bool Texture::Clear() {
// Temporary fix to prevent us from freeing a RenderSurface's memory
- if (format != TEX_FMT_NATIVE)
- delete [] buffer;
- buffer = 0;
+ if (_format != TEX_FMT_NATIVE)
+ delete [] _buffer;
+ _buffer = 0;
return true;
}
@@ -98,13 +98,13 @@ Texture *Texture::Create(IDataSource *ds, const char *filename) {
void Texture::loadSurface(const Graphics::Surface *surf) {
assert(surf->format.bytesPerPixel == 2 || surf->format.bytesPerPixel == 4);
- this->width = surf->w;
- this->height = surf->h;
- this->format = TEX_FMT_STANDARD;
- this->wlog2 = -1;
- this->hlog2 = -1;
+ this->_width = surf->w;
+ this->_height = surf->h;
+ this->_format = TEX_FMT_STANDARD;
+ this->_wlog2 = -1;
+ this->_hlog2 = -1;
- buffer = new uint32[width * height];
+ _buffer = new uint32[_width * _height];
// Repack RGBA
uint32 pixel, i = 0;
@@ -116,7 +116,7 @@ void Texture::loadSurface(const Graphics::Surface *surf) {
pixel = (surf->format.bytesPerPixel == 2) ? *((const uint16 *)srcP) : *((const uint32 *)srcP);
surf->format.colorToARGB(pixel, a, r, g, b);
- buffer[i++] = (r << TEX32_R_SHIFT)
+ _buffer[i++] = (r << TEX32_R_SHIFT)
| (g << TEX32_G_SHIFT)
| (b << TEX32_B_SHIFT)
| (a << TEX32_A_SHIFT);
diff --git a/engines/ultima/ultima8/graphics/texture.h b/engines/ultima/ultima8/graphics/texture.h
index a6e0cc6..b36f08b 100644
--- a/engines/ultima/ultima8/graphics/texture.h
+++ b/engines/ultima/ultima8/graphics/texture.h
@@ -88,20 +88,20 @@ class IDataSource;
// Basic 32 Bit Texture
//
struct Texture {
- uint32 *buffer;
- int32 width;
- int32 height;
- uint32 format;
+ uint32 *_buffer;
+ int32 _width;
+ int32 _height;
+ uint32 _format;
// Use CalcLOG2s to calculate these (can be -1 which indicates not log2)
- int32 wlog2;
- int32 hlog2;
+ int32 _wlog2;
+ int32 _hlog2;
// For OpenGL
- uint32 gl_tex;
- Texture *next;
+ uint32 _glTex;
+ Texture *_next;
- Texture() : buffer(0), format(TEX_FMT_STANDARD), gl_tex(0), next(0) {
+ Texture() : _buffer(0), _format(TEX_FMT_STANDARD), _glTex(0), _next(0) {
}
virtual ~Texture();
@@ -111,14 +111,14 @@ struct Texture {
// Calc texture log2's
void CalcLOG2s() {
- wlog2 = -1;
- hlog2 = -1;
+ _wlog2 = -1;
+ _hlog2 = -1;
for (int i = 0; i < 32; i++) {
- if (width == (1 << i))
- wlog2 = i;
+ if (_width == (1 << i))
+ _wlog2 = i;
- if (height == (1 << i))
- hlog2 = i;
+ if (_height == (1 << i))
+ _hlog2 = i;
}
}
diff --git a/engines/ultima/ultima8/graphics/wpn_ovlay_dat.cpp b/engines/ultima/ultima8/graphics/wpn_ovlay_dat.cpp
index 32c6383..402728c 100644
--- a/engines/ultima/ultima8/graphics/wpn_ovlay_dat.cpp
+++ b/engines/ultima/ultima8/graphics/wpn_ovlay_dat.cpp
@@ -40,22 +40,22 @@ WpnOvlayDat::WpnOvlayDat() {
WpnOvlayDat::~WpnOvlayDat() {
- for (unsigned int i = 0; i < overlay.size(); i++)
- delete overlay[i];
- overlay.clear();
+ for (unsigned int i = 0; i < _overlay.size(); i++)
+ delete _overlay[i];
+ _overlay.clear();
}
const AnimWeaponOverlay *WpnOvlayDat::getAnimOverlay(uint32 action) const {
- if (action >= overlay.size()) return 0;
- return overlay[action];
+ if (action >= _overlay.size()) return 0;
+ return _overlay[action];
}
const WeaponOverlayFrame *WpnOvlayDat::getOverlayFrame(uint32 action, int type,
int direction,
int frame) const {
- if (action >= overlay.size()) return 0;
- if (!overlay[action]) return 0;
- return overlay[action]->getFrame(type, direction, frame);
+ if (action >= _overlay.size()) return 0;
+ if (!_overlay[action]) return 0;
+ return _overlay[action]->getFrame(type, direction, frame);
}
@@ -65,11 +65,11 @@ void WpnOvlayDat::load(RawArchive *overlaydat) {
MainShapeArchive *msf = GameData::get_instance()->getMainShapes();
assert(msf);
- overlay.resize(overlaydat->getCount());
+ _overlay.resize(overlaydat->getCount());
- for (unsigned int action = 0; action < overlay.size(); action++) {
+ for (unsigned int action = 0; action < _overlay.size(); action++) {
IDataSource *ds = overlaydat->get_datasource(action);
- overlay[action] = 0;
+ _overlay[action] = 0;
if (ds && ds->getSize()) {
// get Avatar's animation
@@ -80,20 +80,20 @@ void WpnOvlayDat::load(RawArchive *overlaydat) {
}
AnimWeaponOverlay *awo = new AnimWeaponOverlay;
- overlay[action] = awo;
+ _overlay[action] = awo;
unsigned int animlength = anim->size;
unsigned int dircount = anim->dircount;
unsigned int typecount = ds->getSize() / (4 * dircount * animlength);
- awo->overlay.resize(typecount);
+ awo->_overlay.resize(typecount);
for (unsigned int type = 0; type < typecount; type++) {
- awo->overlay[type].dircount = dircount;
- awo->overlay[type].frames =
+ awo->_overlay[type]._dirCount = dircount;
+ awo->_overlay[type]._frames =
new Std::vector<WeaponOverlayFrame>[dircount];
for (unsigned int dir = 0; dir < dircount; dir++) {
- awo->overlay[type].frames[dir].resize(animlength);
+ awo->_overlay[type]._frames[dir].resize(animlength);
for (unsigned int frame = 0; frame < animlength; frame++) {
unsigned int offset = type * 8 * animlength
+ dir * animlength + frame;
@@ -102,7 +102,7 @@ void WpnOvlayDat::load(RawArchive *overlaydat) {
f.yoff = ds->readXS(1);
f.frame = ds->read2();
- awo->overlay[type].frames[dir][frame] = f;
+ awo->_overlay[type]._frames[dir][frame] = f;
}
}
}
diff --git a/engines/ultima/ultima8/graphics/wpn_ovlay_dat.h b/engines/ultima/ultima8/graphics/wpn_ovlay_dat.h
index 7a3c979..44f39e0 100644
--- a/engines/ultima/ultima8/graphics/wpn_ovlay_dat.h
+++ b/engines/ultima/ultima8/graphics/wpn_ovlay_dat.h
@@ -44,7 +44,7 @@ public:
int direction, int frame) const;
private:
- Std::vector<AnimWeaponOverlay *> overlay;
+ Std::vector<AnimWeaponOverlay *> _overlay;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/minimap_gump.cpp b/engines/ultima/ultima8/gumps/minimap_gump.cpp
index 7a0929c..72684fc 100644
--- a/engines/ultima/ultima8/gumps/minimap_gump.cpp
+++ b/engines/ultima/ultima8/gumps/minimap_gump.cpp
@@ -41,9 +41,9 @@ DEFINE_RUNTIME_CLASSTYPE_CODE(MiniMapGump, Gump)
MiniMapGump::MiniMapGump(int x_, int y_) :
Gump(x_, y_, MAP_NUM_CHUNKS * 2 + 2, MAP_NUM_CHUNKS * 2 + 2, 0,
FLAG_DRAGGABLE, LAYER_NORMAL), _minimap(), _lastMapNum(0) {
- _minimap.format = TEX_FMT_NATIVE;
- _minimap.width = _minimap.height = MAP_NUM_CHUNKS * MINMAPGUMP_SCALE;
- _minimap.buffer = texbuffer[0];
+ _minimap._format = TEX_FMT_NATIVE;
+ _minimap._width = _minimap._height = MAP_NUM_CHUNKS * MINMAPGUMP_SCALE;
+ _minimap._buffer = texbuffer[0];
con->AddConsoleCommand("MiniMapGump::generateWholeMap",
MiniMapGump::ConCmd_generateWholeMap);
@@ -207,9 +207,9 @@ bool MiniMapGump::loadData(IDataSource *ids, uint32 version) {
if (!Gump::loadData(ids, version)) return false;
_lastMapNum = 0;
- _minimap.format = TEX_FMT_NATIVE;
- _minimap.width = _minimap.height = MAP_NUM_CHUNKS * MINMAPGUMP_SCALE;
- _minimap.buffer = texbuffer[0];
+ _minimap._format = TEX_FMT_NATIVE;
+ _minimap._width = _minimap._height = MAP_NUM_CHUNKS * MINMAPGUMP_SCALE;
+ _minimap._buffer = texbuffer[0];
con->AddConsoleCommand("MiniMapGump::generateWholeMap",
MiniMapGump::ConCmd_generateWholeMap);
diff --git a/engines/ultima/ultima8/gumps/pentagram_menu_gump.cpp b/engines/ultima/ultima8/gumps/pentagram_menu_gump.cpp
index e991a29..25fe354 100644
--- a/engines/ultima/ultima8/gumps/pentagram_menu_gump.cpp
+++ b/engines/ultima/ultima8/gumps/pentagram_menu_gump.cpp
@@ -112,10 +112,10 @@ void PentagramMenuGump::PaintThis(RenderSurface *surf, int32 lerp_factor, bool /
#endif
// surf->Fill32(0xFFDCB95C, 18, 0, 90, 400);
- surf->Blit(_navbarImage, 0, 0, _navbarImage->width, _navbarImage->height, 9, 0);
+ surf->Blit(_navbarImage, 0, 0, _navbarImage->_width, _navbarImage->_height, 9, 0);
// surf->Fill32(0xFFC11515, 200, 6, 340, 36);
- surf->Blit(_titleImage, 0, 0, _titleImage->width, _titleImage->height, 200, 6);
+ surf->Blit(_titleImage, 0, 0, _titleImage->_width, _titleImage->_height, 200, 6);
}
void PentagramMenuGump::PaintChildren(RenderSurface *surf, int32 lerp_factor, bool scaled) {
diff --git a/engines/ultima/ultima8/kernel/mouse.cpp b/engines/ultima/ultima8/kernel/mouse.cpp
index 3ab95ad..a948fc1 100644
--- a/engines/ultima/ultima8/kernel/mouse.cpp
+++ b/engines/ultima/ultima8/kernel/mouse.cpp
@@ -537,11 +537,11 @@ void Mouse::paint() {
if (frame >= 0) {
screen->Paint(mouse, frame, _mousePos.x, _mousePos.y, true);
} else if (frame == -2)
- screen->Blit(_defaultMouse, 0, 0, _defaultMouse->width, _defaultMouse->height, _mousePos.x, _mousePos.y);
+ screen->Blit(_defaultMouse, 0, 0, _defaultMouse->_width, _defaultMouse->_height, _mousePos.x, _mousePos.y);
}
} else {
if (getMouseFrame() != -1)
- screen->Blit(_defaultMouse, 0, 0, _defaultMouse->width, _defaultMouse->height, _mousePos.x, _mousePos.y);
+ screen->Blit(_defaultMouse, 0, 0, _defaultMouse->_width, _defaultMouse->_height, _mousePos.x, _mousePos.y);
}
}
diff --git a/engines/ultima/ultima8/world/actors/weapon_overlay.h b/engines/ultima/ultima8/world/actors/weapon_overlay.h
index e794c29..5d749d8 100644
--- a/engines/ultima/ultima8/world/actors/weapon_overlay.h
+++ b/engines/ultima/ultima8/world/actors/weapon_overlay.h
@@ -35,14 +35,14 @@ struct WeaponOverlayFrame {
};
struct WeaponOverlay {
- unsigned int dircount;
- Std::vector<WeaponOverlayFrame> *frames; // 8 or 16 directions
+ unsigned int _dirCount;
+ Std::vector<WeaponOverlayFrame> *_frames; // 8 or 16 directions
WeaponOverlay() {
- frames = NULL;
+ _frames = NULL;
}
~WeaponOverlay() {
- delete[] frames;
+ delete[] _frames;
}
};
@@ -55,13 +55,13 @@ struct AnimWeaponOverlay {
const WeaponOverlayFrame *getFrame(unsigned int type,
unsigned int direction,
unsigned int frame) const {
- if (type >= overlay.size()) return 0;
- if (direction >= overlay[type].dircount) return 0;
- if (frame >= overlay[type].frames[direction].size()) return 0;
- return &(overlay[type].frames[direction][frame]);
+ if (type >= _overlay.size()) return 0;
+ if (direction >= _overlay[type]._dirCount) return 0;
+ if (frame >= _overlay[type]._frames[direction].size()) return 0;
+ return &(_overlay[type]._frames[direction][frame]);
}
- Std::vector<WeaponOverlay> overlay;
+ Std::vector<WeaponOverlay> _overlay;
};
} // End of namespace Ultima8
More information about the Scummvm-git-logs
mailing list