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

SAGA2: Fix class variable names in messager.h

Browse Source
This commit is contained in:
Eugene Sandulenko 2022-09-26 15:45:43 +02:00
parent f3a751e947
commit 9bb65c95fe
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
engines/saga2/messager.cpp
View File

@ -30,7 +30,7 @@
namespace Saga2 { namespace Saga2 {
size_t Messager::va(const char *format, va_list argptr) { size_t Messager::va(const char *format, va_list argptr) {
if (enabled) { if (_enabled) {
char tempBuf[256]; char tempBuf[256];
size_t size; size_t size;
@ -48,7 +48,7 @@ size_t Messager::va(const char *format, va_list argptr) {
} }
size_t Messager::operator()(const char *format, ...) { size_t Messager::operator()(const char *format, ...) {
if (enabled) { if (_enabled) {
size_t size; size_t size;
va_list argptr; va_list argptr;
@ -69,39 +69,39 @@ uint16 heightStatusF = 11;
int StatusLineMessager::dumpit(char *s, size_t size) { int StatusLineMessager::dumpit(char *s, size_t size) {
Rect16 r; Rect16 r;
r.x = atX; r.x = _atX;
r.y = atY; r.y = _atY;
r.width = atW; r.width = _atW;
r.height = heightStatusF; r.height = heightStatusF;
textPort->setColor(blackStatusF); _textPort->setColor(blackStatusF);
textPort->fillRect(r); _textPort->fillRect(r);
textPort->setColor(atColor); _textPort->setColor(_atColor);
textPort->setStyle(0); _textPort->setStyle(0);
textPort->drawTextInBox(s, size, r, textPosLeft, Point16(2, 1)); _textPort->drawTextInBox(s, size, r, textPosLeft, Point16(2, 1));
return 0; return 0;
} }
StatusLineMessager::StatusLineMessager(const char *entry, int lineno, gDisplayPort *mp, int32 x, int32 y, int32 w, int16 color) StatusLineMessager::StatusLineMessager(const char *entry, int lineno, gDisplayPort *mp, int32 x, int32 y, int32 w, int16 color)
: Messager(entry) { : Messager(entry) {
line = lineno; _line = lineno;
textPort = mp; _textPort = mp;
atX = (x >= 0 ? x : defaultStatusFX); _atX = (x >= 0 ? x : defaultStatusFX);
atY = (y >= 0 ? y : defaultStatusFY + line * heightStatusF); _atY = (y >= 0 ? y : defaultStatusFY + _line * heightStatusF);
atW = (w >= 0 ? w : 640 - (defaultStatusFX - 16) - 20); _atW = (w >= 0 ? w : 640 - (defaultStatusFX - 16) - 20);
atColor = (color >= 0 ? color : line * 16 + 12); _atColor = (color >= 0 ? color : _line * 16 + 12);
operator()("Status Line %d", line); operator()("Status Line %d", _line);
} }
StatusLineMessager::StatusLineMessager(int lineno, gDisplayPort *mp, int32 x, int32 y, int32 w, int16 color) { StatusLineMessager::StatusLineMessager(int lineno, gDisplayPort *mp, int32 x, int32 y, int32 w, int16 color) {
line = lineno; _line = lineno;
textPort = mp; _textPort = mp;
atX = (x >= 0 ? x : defaultStatusFX); _atX = (x >= 0 ? x : defaultStatusFX);
atY = (y >= 0 ? y : defaultStatusFY + line * heightStatusF); _atY = (y >= 0 ? y : defaultStatusFY + _line * heightStatusF);
atW = (w >= 0 ? w : 640 - (defaultStatusFX - 16) - 20); _atW = (w >= 0 ? w : 640 - (defaultStatusFX - 16) - 20);
atColor = (color >= 0 ? color : line * 16 + 12); _atColor = (color >= 0 ? color : _line * 16 + 12);
operator()("Status Line %d", line); operator()("Status Line %d", _line);
} }
StatusLineMessager::~StatusLineMessager() { StatusLineMessager::~StatusLineMessager() {

20
engines/saga2/messager.h
View File

@ -62,15 +62,15 @@ class gDisplayPort;
class Messager { class Messager {
protected: protected:
bool enabled; bool _enabled;
virtual int dumpit(char *, size_t) = 0; virtual int dumpit(char *, size_t) = 0;
public: public:
Messager() { Messager() {
enabled = true; _enabled = true;
} }
Messager(const char *entry) { Messager(const char *entry) {
enabled = true; _enabled = true;
} }
virtual ~Messager() {} virtual ~Messager() {}
@ -78,13 +78,13 @@ public:
size_t va(const char *format, va_list argptr); size_t va(const char *format, va_list argptr);
void enable() { void enable() {
enabled = true; _enabled = true;
} }
void disable() { void disable() {
enabled = false; _enabled = false;
} }
bool active() { bool active() {
return enabled; return _enabled;
} }
}; };
@ -100,10 +100,10 @@ typedef Messager *pMessager;
class StatusLineMessager : public Messager { class StatusLineMessager : public Messager {
private: private:
int line; int _line;
int32 atX, atY, atW; int32 _atX, _atY, _atW;
int16 atColor; int16 _atColor;
gDisplayPort *textPort; gDisplayPort *_textPort;
protected: protected:
int dumpit(char *s, size_t size) ; int dumpit(char *s, size_t size) ;