diff options
| author | Max Horn | 2011-04-14 14:12:27 +0200 |
|---|---|---|
| committer | Max Horn | 2011-04-14 14:12:35 +0200 |
| commit | 84184aabc00251374a181fe296487619afa779ed (patch) | |
| tree | 6e635dcaf2300d979e6ad1be9a5e9e0ec653df4a /engines/m4/mads_views.h | |
| parent | 64c4e65201ca3097cc25b295359683eafaf25b07 (diff) | |
| download | scummvm-rg350-84184aabc00251374a181fe296487619afa779ed.tar.gz scummvm-rg350-84184aabc00251374a181fe296487619afa779ed.tar.bz2 scummvm-rg350-84184aabc00251374a181fe296487619afa779ed.zip | |
ALL: colour -> color
Diffstat (limited to 'engines/m4/mads_views.h')
| -rw-r--r-- | engines/m4/mads_views.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/m4/mads_views.h b/engines/m4/mads_views.h index c93d0beda3..ce5ba9c4e5 100644 --- a/engines/m4/mads_views.h +++ b/engines/m4/mads_views.h @@ -174,8 +174,8 @@ public: int expire; int spacing; Common::Rect bounds; - uint8 colour1; - uint8 colour2; + uint8 color1; + uint8 color2; Font *font; const char *msg; @@ -201,7 +201,7 @@ public: _entries[idx].expire = -1; } - int add(int xp, int yp, uint fontColour, int charSpacing, const char *msg, Font *font); + int add(int xp, int yp, uint fontColor, int charSpacing, const char *msg, Font *font); void clear(); void draw(M4Surface *view); void setDirtyAreas(); @@ -221,8 +221,8 @@ public: int sequenceIndex; char asciiChar; char asciiChar2; - int colour1; - int colour2; + int color1; + int color2; Common::Point position; int textDisplayIndex; int msgOffset; @@ -251,7 +251,7 @@ public: MadsKernelMessageList(MadsView &owner); void clear(); - int add(const Common::Point &pt, uint fontColour, uint8 flags, uint8 abortTimers, uint32 timeout, const char *msg); + int add(const Common::Point &pt, uint fontColor, uint8 flags, uint8 abortTimers, uint32 timeout, const char *msg); int addQuote(int quoteId, int abortTimers, uint32 timeout); void scrollMessage(int msgIndex, int numTicks, bool quoted); void setSeqIndex(int msgIndex, int seqIndex); |