aboutsummaryrefslogtreecommitdiff
path: root/engines/cge/cge_main.cpp
diff options
context:
space:
mode:
authorStrangerke2011-09-06 00:16:07 +0200
committerStrangerke2011-09-06 00:16:07 +0200
commitd7695542cdd486dbb29e3cc7d0bc8c317760d185 (patch)
tree9764e3528c48f8a766b8f80f7421f0585dd0239c /engines/cge/cge_main.cpp
parentb75a308bccae32a4fbd28be7ce61410cff050271 (diff)
downloadscummvm-rg350-d7695542cdd486dbb29e3cc7d0bc8c317760d185.tar.gz
scummvm-rg350-d7695542cdd486dbb29e3cc7d0bc8c317760d185.tar.bz2
scummvm-rg350-d7695542cdd486dbb29e3cc7d0bc8c317760d185.zip
CGE: Remove various defines and functions from "general"
Those were already present in ScummVM (thanks Fingolfin for point out)
Diffstat (limited to 'engines/cge/cge_main.cpp')
-rw-r--r--engines/cge/cge_main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index 9b1afed245..5970a3e339 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -691,8 +691,8 @@ System::System(CGEEngine *vm) : Sprite(vm, NULL), _vm(vm) {
}
void System::setPal() {
- Dac *p = _vga->_sysPal + 256 - ArrayCount(_stdPal);
- for (uint i = 0; i < ArrayCount(_stdPal); i++) {
+ Dac *p = _vga->_sysPal + 256 - ARRAYSIZE(_stdPal);
+ for (uint i = 0; i < ARRAYSIZE(_stdPal); i++) {
p[i]._r = _stdPal[i]._r >> 2;
p[i]._g = _stdPal[i]._g >> 2;
p[i]._b = _stdPal[i]._b >> 2;