From d7695542cdd486dbb29e3cc7d0bc8c317760d185 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Tue, 6 Sep 2011 00:16:07 +0200 Subject: CGE: Remove various defines and functions from "general" Those were already present in ScummVM (thanks Fingolfin for point out) --- engines/cge/cge_main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/cge/cge_main.cpp') 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; -- cgit v1.2.3