From fe2e1bb2fd11d4f9e656f1e9392dc8e97c069d73 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Thu, 7 Jul 2011 20:43:09 +0200 Subject: CGE: Remove "bitmaps" files --- engines/cge/bitmaps.cpp | 229 ------------------------------------------------ engines/cge/bitmaps.h | 44 ---------- engines/cge/cge.cpp | 1 - engines/cge/events.h | 1 + engines/cge/game.h | 1 - engines/cge/module.mk | 1 - engines/cge/snail.cpp | 1 - engines/cge/text.cpp | 1 - 8 files changed, 1 insertion(+), 278 deletions(-) delete mode 100644 engines/cge/bitmaps.cpp delete mode 100644 engines/cge/bitmaps.h (limited to 'engines') diff --git a/engines/cge/bitmaps.cpp b/engines/cge/bitmaps.cpp deleted file mode 100644 index 5e8757ae73..0000000000 --- a/engines/cge/bitmaps.cpp +++ /dev/null @@ -1,229 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -/* - * This code is based on original Soltys source code - * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon - */ - -#include "cge/bitmaps.h" -/* - -#define W 255, -#define x 252, -#define _ TRANS, -#define o 0, -#define L LGRAY, -#define G GRAY, -#define D DGRAY, - -static uint8 MCDesign0[]= { W W W W W W _ - W W W W W o _ - W W W W o _ _ - W W W W W _ _ - W W o W W W _ - W o _ o W W W - o _ _ _ o W W - _ _ _ _ _ o o }; - - -static uint8 MCDesign1[]= { _ }; - - - -static uint8 SLDesign[] = { G G G G G G G G G _ _ _ _ _ _ - L G G G G G G G G D _ _ _ _ _ - _ L G G G G G G G D _ _ _ _ _ - _ _ L G G G G G G G D _ _ _ _ - _ _ _ L G G G G G G D _ _ _ _ - _ _ _ _ L G G G G G D _ _ _ _ - _ _ _ _ _ L G G G G G D _ _ _ - _ _ _ _ _ _ L G G G G D _ _ _ - _ _ _ _ _ _ _ L G G G D _ _ _ - _ _ _ _ _ _ _ _ L G G G D _ _ - _ _ _ _ _ _ _ _ _ L G G D _ _ - _ _ _ _ _ _ _ _ _ _ L G D _ _ - _ _ _ _ _ _ _ _ _ _ _ L G D _ - _ _ _ _ _ _ _ _ _ _ _ _ L D _ - _ _ _ _ _ _ _ _ _ _ _ _ _ L D - _ _ _ _ _ _ _ _ _ _ _ _ _ _ D - }; - -static uint8 SRDesign[] = { _ _ _ _ _ _ G G G G G G G G G - _ _ _ _ _ L G G G G G G G G D - _ _ _ _ _ L G G G G G G G D _ - _ _ _ _ L G G G G G G G D _ _ - _ _ _ _ L G G G G G G D _ _ _ - _ _ _ _ L G G G G G D _ _ _ _ - _ _ _ L G G G G G D _ _ _ _ _ - _ _ _ L G G G G D _ _ _ _ _ _ - _ _ _ L G G G D _ _ _ _ _ _ _ - _ _ L G G G D _ _ _ _ _ _ _ _ - _ _ L G G D _ _ _ _ _ _ _ _ _ - _ _ L G D _ _ _ _ _ _ _ _ _ _ - _ L G D _ _ _ _ _ _ _ _ _ _ _ - _ L D _ _ _ _ _ _ _ _ _ _ _ _ - L D _ _ _ _ _ _ _ _ _ _ _ _ _ - D _ _ _ _ _ _ _ _ _ _ _ _ _ _ - }; - -static uint8 MapBrick[] = { L L L L L L L G - L G G G G G G D - L G G G G G G D - G D D D D D D D - }; - -#undef W -#undef _ -#undef x -#undef o -#undef L -#undef G -#undef D - - -#if 0 - -#define _ TRANS, -#define A 213, -#define B 207, -#define C 225, -#define D 219, -#define E 231, - -static uint8 PRDesign[] = { A E E E C C D A B - C _ _ _ _ _ _ D A - C _ _ _ _ _ _ D A - C _ _ _ _ _ _ D A - C _ _ _ _ _ _ D A - C _ _ _ _ _ _ D A - C _ _ _ _ _ _ D A - B A A A A A A A B - B B B B B B B B B - }; - -#else - -#define _ TRANS, -#define A 213, -#define B 207, -#define C 225, // DGRAY -#define D 219, -#define E 231, -#define F 237, - -static uint8 PRDesign[] = { D D D D D D D D _ - D D D D D D D D _ - D _ _ _ _ _ _ _ _ - D _ _ _ _ _ _ _ _ - D _ _ _ _ _ _ _ _ - D _ _ _ _ _ _ _ _ - D _ _ _ _ _ _ _ _ - D _ _ _ _ _ _ C _ - D C C C C C C C _ - _ _ _ _ _ _ _ _ _ - }; -#endif - - -#undef _ -#undef A -#undef B -#undef C -#undef D -#undef E - - - -#define _ 0x00, -#define x 0xFF, -#define A _ x _ x _ x _ x -#define B A A A A A A A A - -static uint8 HLDesign[] = { B B B B B }; - -#undef _ -#undef x -#undef A -#undef B - - -// 228 yellow -// 211 red -// 226 light green -// 221 blue - -#define A 208, -#define B 214, -#define C 220, -#define D 226, -#define E 255, - -static uint8 LIDesign[][9] = { { A A A - A B A - A A A }, - - { A B A - B C B - A B A }, - - { B C B - C D C - B C B }, - - { C D C - D E D - C D C }, - }; - -#undef A -#undef B -#undef C -#undef D -#undef E - - -#define R 211, -#define G 0, -//226, - -static uint8 MEDesign[][9] = { { R R R R R R R R R }, // 0 - { R R R R R R R R G }, // 1 - { R R R R R R R G G }, // 2 - { R R R R R R G G G }, // 3 - { R R R R R G G G G }, // 4 - { R R R R G G G G G }, // 5 - { R R R G G G G G G }, // 6 - { R R G G G G G G G }, // 7 - { R G G G G G G G G }, // 8 - { G G G G G G G G G }, // 9 - }; - -#undef R -#undef G -*/ - -namespace CGE { - - - -} // End of namespace CGE diff --git a/engines/cge/bitmaps.h b/engines/cge/bitmaps.h deleted file mode 100644 index 8569932134..0000000000 --- a/engines/cge/bitmaps.h +++ /dev/null @@ -1,44 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -/* - * This code is based on original Soltys source code - * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon - */ - -#ifndef __CGE_BITMAPS__ -#define __CGE_BITMAPS__ - -#include "cge/vga13h.h" - -namespace CGE { - -extern Bitmap *MB[]; -extern Bitmap *HL[]; -extern Bitmap *MC[]; -extern Bitmap *PR[]; -extern Bitmap *SP[]; -extern Bitmap *LI[]; - -} // End of namespace CGE - -#endif diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp index b953f2f5b0..4c21b21f87 100644 --- a/engines/cge/cge.cpp +++ b/engines/cge/cge.cpp @@ -34,7 +34,6 @@ #include "cge/cge_main.h" #include "cge/talk.h" #include "cge/text.h" -#include "cge/bitmaps.h" #include "cge/vol.h" diff --git a/engines/cge/events.h b/engines/cge/events.h index cfb1023d6b..6df2c94d4a 100644 --- a/engines/cge/events.h +++ b/engines/cge/events.h @@ -91,6 +91,7 @@ struct CGEEvent { extern CGEEvent Evt[EVT_MAX]; extern uint16 EvtHead, EvtTail; +extern Bitmap *MC[]; class MOUSE : public Sprite { diff --git a/engines/cge/game.h b/engines/cge/game.h index b26fc0d165..c442d81577 100644 --- a/engines/cge/game.h +++ b/engines/cge/game.h @@ -29,7 +29,6 @@ #define __CGE_GAME__ #include "cge/vga13h.h" -#include "cge/bitmaps.h" namespace CGE { diff --git a/engines/cge/module.mk b/engines/cge/module.mk index d9dea6534d..95ffd6d906 100644 --- a/engines/cge/module.mk +++ b/engines/cge/module.mk @@ -2,7 +2,6 @@ MODULE := engines/cge MODULE_OBJS := \ bitmap.o \ - bitmaps.o \ btfile.o \ cfile.o \ cge.o \ diff --git a/engines/cge/snail.cpp b/engines/cge/snail.cpp index 683568e1a8..a0b5c4bdd6 100644 --- a/engines/cge/snail.cpp +++ b/engines/cge/snail.cpp @@ -29,7 +29,6 @@ #include "cge/sound.h" #include "cge/snail.h" #include "cge/vga13h.h" -#include "cge/bitmaps.h" #include "cge/text.h" #include "cge/cge_main.h" #include "cge/events.h" diff --git a/engines/cge/text.cpp b/engines/cge/text.cpp index 5f370150ca..c1d32d15cd 100644 --- a/engines/cge/text.cpp +++ b/engines/cge/text.cpp @@ -29,7 +29,6 @@ #include "cge/text.h" #include "cge/talk.h" #include "cge/vol.h" -#include "cge/bitmaps.h" #include "cge/game.h" #include "cge/snail.h" #include "cge/cge_main.h" -- cgit v1.2.3