diff options
| author | Paul Gilbert | 2011-06-27 19:03:50 +1000 |
|---|---|---|
| committer | Paul Gilbert | 2011-06-27 19:03:50 +1000 |
| commit | af00b91111d4cbf6660879e924e06d542b8ebc3b (patch) | |
| tree | d282254bcb9feb9aaff40a18f43bdf68d136f808 /engines/cge/vga13h.h | |
| parent | e13317baeab99f4868d49a89e110deda1d5ca5f4 (diff) | |
| parent | 083d6ff6122cb2faf0a4330eb480bb9f77afa255 (diff) | |
| download | scummvm-rg350-af00b91111d4cbf6660879e924e06d542b8ebc3b.tar.gz scummvm-rg350-af00b91111d4cbf6660879e924e06d542b8ebc3b.tar.bz2 scummvm-rg350-af00b91111d4cbf6660879e924e06d542b8ebc3b.zip | |
Merge branch 'soltys_wip2' of github.com:Strangerke/scummvm into cge
Conflicts:
engines/cge/cge_main.cpp
engines/cge/general.cpp
engines/cge/snail.cpp
engines/cge/vga13h.cpp
Diffstat (limited to 'engines/cge/vga13h.h')
| -rw-r--r-- | engines/cge/vga13h.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/cge/vga13h.h b/engines/cge/vga13h.h index edbeebf727..cf4252e5c2 100644 --- a/engines/cge/vga13h.h +++ b/engines/cge/vga13h.h @@ -33,6 +33,7 @@ #include <stddef.h> #include "cge/bitmap.h" #include "cge/snail.h" +#include "cge/cge.h" namespace CGE { @@ -198,7 +199,7 @@ public: inline bool Active(void) { return Ext != NULL; } - SPRITE(BMP_PTR *shp); + SPRITE(CGEEngine *vm, BMP_PTR *shp); virtual ~SPRITE(void); BMP_PTR Shp(void); BMP_PTR *SetShapeList(BMP_PTR *shp); @@ -223,6 +224,8 @@ public: SNAIL::COM *SnList(SNLIST type); virtual void Touch(uint16 mask, int x, int y); virtual void Tick(void); +private: + CGEEngine *_vm; }; @@ -301,7 +304,7 @@ uint8 Closest(CBLK *pal, CBLK x) { if (!L) ++L; uint16 R = f(x.R, L), G = f(x.G, L), B = f(x.B, L); - for (i = 0; i < 256; i ++) { + for (i = 0; i < 256; i++) { uint16 l = pal[i].R + pal[i].G + pal[i].B; if (! l) ++l; |