libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 16:03:24 +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 {
size_t Messager::va(const char *format, va_list argptr) {
if (enabled) {
if (_enabled) {
char tempBuf[256];
size_t size;
@ -48,7 +48,7 @@ size_t Messager::va(const char *format, va_list argptr) {
}
size_t Messager::operator()(const char *format, ...) {
if (enabled) {
if (_enabled) {
size_t size;
va_list argptr;
@ -69,39 +69,39 @@ uint16 heightStatusF = 11;
int StatusLineMessager::dumpit(char *s, size_t size) {
Rect16 r;
r.x = atX;
r.y = atY;
r.width = atW;
r.x = _atX;
r.y = _atY;
r.width = _atW;
r.height = heightStatusF;
textPort->setColor(blackStatusF);
textPort->fillRect(r);
textPort->setColor(atColor);
textPort->setStyle(0);
textPort->drawTextInBox(s, size, r, textPosLeft, Point16(2, 1));
_textPort->setColor(blackStatusF);
_textPort->fillRect(r);
_textPort->setColor(_atColor);
_textPort->setStyle(0);
_textPort->drawTextInBox(s, size, r, textPosLeft, Point16(2, 1));
return 0;
}
StatusLineMessager::StatusLineMessager(const char *entry, int lineno, gDisplayPort *mp, int32 x, int32 y, int32 w, int16 color)
: Messager(entry) {
line = lineno;
textPort = mp;
atX = (x >= 0 ? x : defaultStatusFX);
atY = (y >= 0 ? y : defaultStatusFY + line * heightStatusF);
atW = (w >= 0 ? w : 640 - (defaultStatusFX - 16) - 20);
atColor = (color >= 0 ? color : line * 16 + 12);
operator()("Status Line %d", line);
_line = lineno;
_textPort = mp;
_atX = (x >= 0 ? x : defaultStatusFX);
_atY = (y >= 0 ? y : defaultStatusFY + _line * heightStatusF);
_atW = (w >= 0 ? w : 640 - (defaultStatusFX - 16) - 20);
_atColor = (color >= 0 ? color : _line * 16 + 12);
operator()("Status Line %d", _line);
}
StatusLineMessager::StatusLineMessager(int lineno, gDisplayPort *mp, int32 x, int32 y, int32 w, int16 color) {
line = lineno;
textPort = mp;
atX = (x >= 0 ? x : defaultStatusFX);
atY = (y >= 0 ? y : defaultStatusFY + line * heightStatusF);
atW = (w >= 0 ? w : 640 - (defaultStatusFX - 16) - 20);
atColor = (color >= 0 ? color : line * 16 + 12);
operator()("Status Line %d", line);
_line = lineno;
_textPort = mp;
_atX = (x >= 0 ? x : defaultStatusFX);
_atY = (y >= 0 ? y : defaultStatusFY + _line * heightStatusF);
_atW = (w >= 0 ? w : 640 - (defaultStatusFX - 16) - 20);
_atColor = (color >= 0 ? color : _line * 16 + 12);
operator()("Status Line %d", _line);
}
StatusLineMessager::~StatusLineMessager() {

20
engines/saga2/messager.h
View File

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