diff options
| author | Strangerke | 2019-11-01 12:42:29 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-11-13 22:07:08 +0100 |
| commit | 78d2dc32b21094922eee5cd2bab787767d19bd42 (patch) | |
| tree | e9d3277b9ebf929ffe895dcb5404516f0afb8292 /engines/griffon/gfx.cpp | |
| parent | 8438b9c9bbd52841ee8ef35e42dd660f0ab88e1a (diff) | |
| download | scummvm-rg350-78d2dc32b21094922eee5cd2bab787767d19bd42.tar.gz scummvm-rg350-78d2dc32b21094922eee5cd2bab787767d19bd42.tar.bz2 scummvm-rg350-78d2dc32b21094922eee5cd2bab787767d19bd42.zip | |
GRIFFON: Introduce some new structures and refactoring, more renaming
Diffstat (limited to 'engines/griffon/gfx.cpp')
| -rw-r--r-- | engines/griffon/gfx.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/griffon/gfx.cpp b/engines/griffon/gfx.cpp index de28eba922..c4cbaeadfd 100644 --- a/engines/griffon/gfx.cpp +++ b/engines/griffon/gfx.cpp @@ -42,11 +42,11 @@ namespace Griffon { void GriffonEngine::addFloatIcon(int ico, float xloc, float yloc) { for (int i = 0; i < kMaxFloat; i++) { - if (ABS(_floatIcon[i][0]) < kEpsilon) { - _floatIcon[i][0] = 32; - _floatIcon[i][1] = xloc; - _floatIcon[i][2] = yloc; - _floatIcon[i][3] = ico; + if (ABS(_floatIcon[i].framesLeft) < kEpsilon) { + _floatIcon[i].framesLeft = 32; + _floatIcon[i].x = xloc; + _floatIcon[i].y = yloc; + _floatIcon[i].ico = ico; return; } } @@ -54,12 +54,12 @@ void GriffonEngine::addFloatIcon(int ico, float xloc, float yloc) { void GriffonEngine::addFloatText(const char *stri, float xloc, float yloc, int col) { for (int i = 0; i < kMaxFloat; i++) { - if (ABS(_floatText[i][0]) < kEpsilon) { - _floatText[i][0] = 32; - _floatText[i][1] = xloc; - _floatText[i][2] = yloc; - _floatText[i][3] = col; - strcpy(_floatStr[i], stri); + if (ABS(_floatText[i].framesLeft) < kEpsilon) { + _floatText[i].framesLeft = 32; + _floatText[i].x = xloc; + _floatText[i].y = yloc; + _floatText[i].col = col; + strcpy(_floatText[i].text, stri); return; } } |