[Scummvm-cvs-logs] SF.net SVN: scummvm: [28802] scummvm/trunk/backends/platform/PalmOS/Src
chrilith at users.sourceforge.net
chrilith at users.sourceforge.net
Sat Sep 1 21:08:16 CEST 2007
Revision: 28802
http://scummvm.svn.sourceforge.net/scummvm/?rev=28802&view=rev
Author: chrilith
Date: 2007-09-01 12:08:16 -0700 (Sat, 01 Sep 2007)
Log Message:
-----------
Cleanup:remove obsolete files related to old 68k version not supported anymore
Modified Paths:
--------------
scummvm/trunk/backends/platform/PalmOS/Src/base_gfx.cpp
scummvm/trunk/backends/platform/PalmOS/Src/globals.h
scummvm/trunk/backends/platform/PalmOS/Src/os5_overlay.cpp
scummvm/trunk/backends/platform/PalmOS/Src/os5_sound.cpp
scummvm/trunk/backends/platform/PalmOS/Src/zodiac_gfx.cpp
scummvm/trunk/backends/platform/PalmOS/Src/zodiac_overlay.cpp
Removed Paths:
-------------
scummvm/trunk/backends/platform/PalmOS/Src/builder/
scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_agi.h
scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_agos.h
scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_cine.h
scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_gob.h
scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_kyra.h
scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_lure.h
scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_queen.h
scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_saga.h
scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_scumm.h
scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_sky.h
scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_sword1.h
scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_sword2.h
scummvm/trunk/backends/platform/PalmOS/Src/scumm_globals.cpp
scummvm/trunk/backends/platform/PalmOS/Src/scumm_globals.h
Modified: scummvm/trunk/backends/platform/PalmOS/Src/base_gfx.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/base_gfx.cpp 2007-09-01 19:03:22 UTC (rev 28801)
+++ scummvm/trunk/backends/platform/PalmOS/Src/base_gfx.cpp 2007-09-01 19:08:16 UTC (rev 28802)
@@ -25,10 +25,6 @@
#include "be_base.h"
-#ifdef PALMOS_68K
-# include <BmpGlue.h>
-#endif
-
/*
* Graphics modes
*
@@ -144,27 +140,6 @@
WinPalette(winPaletteSet, _paletteDirtyStart, _paletteDirtyEnd - _paletteDirtyStart, _currentPalette + _paletteDirtyStart);
_paletteDirtyEnd = 0;
//_redawOSD = true;
-
-#ifdef PALMOS_68Ks
- UInt8 oldCol;
- oldCol = gVars->indicator.on;
- gVars->indicator.on = RGBToColor(0,255,0);
-
- if (oldCol != gVars->indicator.on)
- _redrawOSD = true;
-
-/* {
- // redraw if needed
- if (_lastKeyModifier)
- draw1BitGfx((kDrawKeyState + _lastKeyModifier - 1), 2, getHeight() + 2, true);
-
- if(_useNumPad)
- draw1BitGfx(kDrawNumPad, (getWidth() >> 1) - 32, getHeight() + 2, true);
-
- if (_showBatLow)
- draw1BitGfx(kDrawBatLow, (getWidth() >> 1), -16, true);
- }*/
-#endif
}
if (_redawOSD) {
_redawOSD = false;
@@ -184,11 +159,7 @@
void OSystem_PalmBase::draw_osd(UInt16 id, Int32 x, Int32 y, Boolean show, UInt8 color) {
//return;
-#ifdef PALMOS_68K
- MemHandle hTemp = DmGetResource(bitmapRsc, id);
-#else
MemHandle hTemp = DmGetResource('abmp', id + 100);
-#endif
if (hTemp) {
/*static const UInt32 pal[3] = {
@@ -201,11 +172,8 @@
bmTemp = (BitmapType *)MemHandleLock(hTemp);
Coord w, h;
-#ifdef PALMOS_68K
- BmpGlueGetDimensions(bmTemp, &w, &h, 0);
-#else
BmpGetDimensions(bmTemp, &w, &h, 0);
-#endif
+
PointType dst = { _screenOffset.x + x, _screenOffset.y + y };
RectangleType r = { dst.x, dst.y, w, h };
@@ -233,49 +201,4 @@
MemPtrUnlock(bmTemp);
DmReleaseResource(hTemp);
}
-
-/* MemHandle hTemp = DmGetResource(bitmapRsc, id);
-
- if (hTemp) {
- BitmapType *bmTemp;
- UInt32 *bmData;
- UInt8 ih, iw, ib;
- Coord w, h;
- Int16 blocks, next;
-
- UInt8 *scr = _screenP + x + _screenPitch * y;
- bmTemp = (BitmapType *)MemHandleLock(hTemp);
- bmData = (UInt32 *)BmpGetBits(bmTemp);
-
-#ifdef PALMOS_68K
- BmpGlueGetDimensions(bmTemp, &w, &h, 0);
-#else
- BmpGetDimensions(bmTemp, &w, &h, 0);
-#endif
-
- blocks = w >> 5;
- next = w - (blocks << 5);
-
- if (next)
- blocks++;
-
- for (ih = 0; ih < h; ih++) { // line
- for (ib = 0; ib < blocks; ib++) { // 32pix block
- next = w - (ib << 5);
- next = MIN(next, (Coord)32);
-
- for (iw = 0; iw < next; iw++) { // row
- *scr++ = ((*bmData & (1 << (31 - iw))) && show) ?
- gVars->indicator.on :
- gVars->indicator.off;
- }
-
- bmData++;
- }
- scr += _screenPitch - w;
- }
-
- MemHandleUnlock(hTemp);
- DmReleaseResource(hTemp);
- }*/
}
Modified: scummvm/trunk/backends/platform/PalmOS/Src/globals.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/globals.h 2007-09-01 19:03:22 UTC (rev 28801)
+++ scummvm/trunk/backends/platform/PalmOS/Src/globals.h 2007-09-01 19:08:16 UTC (rev 28802)
@@ -29,22 +29,7 @@
#include <VFSMgr.h>
#include "stuffs.h"
-#ifdef PALMOS_68K
-
-#include "scumm_globals.h"
-
enum {
- kMemScummOldCostGames = 0,
- kMemScummNewCostGames,
- kMemSimon1Games,
- kMemSimon2Games,
-
- kMemGamesCount
-};
-
-#endif
-
-enum {
INIT_VIBRATOR = 1 << 0x00,
INIT_PA1LIB = 1 << 0x01,
INIT_ARM = 1 << 0x02,
@@ -99,20 +84,6 @@
UInt8 fmQuality;
UInt8 advancedMode;
-#ifdef PALMOS_68K
- // 68k only part
- struct {
- Boolean enable;
- UInt8 driver, format;
- UInt16 defaultTrackLength;
- UInt16 firstTrack;
- UInt8 volume;
- } CD;
-
- DmOpenRef globals[GBVARS_COUNT];
- UInt32 memory[kMemGamesCount];
-#endif
-
} GlobalsDataType, *GlobalsDataPtr;
extern GlobalsDataPtr gVars;
Modified: scummvm/trunk/backends/platform/PalmOS/Src/os5_overlay.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/os5_overlay.cpp 2007-09-01 19:03:22 UTC (rev 28801)
+++ scummvm/trunk/backends/platform/PalmOS/Src/os5_overlay.cpp 2007-09-01 19:08:16 UTC (rev 28802)
@@ -80,9 +80,6 @@
}
void OSystem_PalmOS5::colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) {
-#ifdef PALMOS_68K
- color = SWAP_BYTES_16(color);
-#endif
r = ((color >> 8) & 0xF8);
g = ((color >> 3) & 0xFC);
b = ((color << 3) & 0xF8);
Modified: scummvm/trunk/backends/platform/PalmOS/Src/os5_sound.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/os5_sound.cpp 2007-09-01 19:03:22 UTC (rev 28801)
+++ scummvm/trunk/backends/platform/PalmOS/Src/os5_sound.cpp 2007-09-01 19:08:16 UTC (rev 28802)
@@ -97,18 +97,12 @@
sndOutput,
sndFormatPCM,
_samplesPerSec,
-#ifdef PALMOS_68K
- sndInt16Big,
-#else
sndInt16Little,
-#endif
sndStereo,
sound_callback(),
&_soundEx,
8192
-#ifdef PALMOS_68K
- ,false
-#elif defined (COMPILE_OS5)
+#ifdef COMPILE_OS5
,true
#endif
);
Deleted: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_agi.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_agi.h 2007-09-01 19:03:22 UTC (rev 28801)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_agi.h 2007-09-01 19:08:16 UTC (rev 28802)
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_AGI
-
-#define PALMOS_68K
-
-#endif
Deleted: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_agos.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_agos.h 2007-09-01 19:03:22 UTC (rev 28801)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_agos.h 2007-09-01 19:08:16 UTC (rev 28802)
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_AGOS
-
-#define PALMOS_68K
-
-#endif
Deleted: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_cine.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_cine.h 2007-09-01 19:03:22 UTC (rev 28801)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_cine.h 2007-09-01 19:08:16 UTC (rev 28802)
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_CINE
-
-#define PALMOS_68K
-
-#endif
Deleted: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_gob.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_gob.h 2007-09-01 19:03:22 UTC (rev 28801)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_gob.h 2007-09-01 19:08:16 UTC (rev 28802)
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_GOB
-
-#define PALMOS_68K
-
-#endif
Deleted: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_kyra.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_kyra.h 2007-09-01 19:03:22 UTC (rev 28801)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_kyra.h 2007-09-01 19:08:16 UTC (rev 28802)
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_KYRA
-
-#define PALMOS_68K
-
-#endif
Deleted: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_lure.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_lure.h 2007-09-01 19:03:22 UTC (rev 28801)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_lure.h 2007-09-01 19:08:16 UTC (rev 28802)
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_LURE
-
-#define PALMOS_68K
-
-#endif
Deleted: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_queen.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_queen.h 2007-09-01 19:03:22 UTC (rev 28801)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_queen.h 2007-09-01 19:08:16 UTC (rev 28802)
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_QUEEN
-
-#define PALMOS_68K
-
-#endif
Deleted: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_saga.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_saga.h 2007-09-01 19:03:22 UTC (rev 28801)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_saga.h 2007-09-01 19:08:16 UTC (rev 28802)
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_SAGA
-
-#define PALMOS_68K
-
-#endif
Deleted: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_scumm.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_scumm.h 2007-09-01 19:03:22 UTC (rev 28801)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_scumm.h 2007-09-01 19:08:16 UTC (rev 28802)
@@ -1,12 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_SCUMM
-//#undef DISABLE_SCUMM_7_8
-//#undef DISABLE_HE
-
-#define PALMOS_68K
-//#define PALMOS_DEBUG
-
-#endif
Deleted: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_sky.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_sky.h 2007-09-01 19:03:22 UTC (rev 28801)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_sky.h 2007-09-01 19:08:16 UTC (rev 28802)
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_SKY
-
-#define PALMOS_68K
-
-#endif
Deleted: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_sword1.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_sword1.h 2007-09-01 19:03:22 UTC (rev 28801)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_sword1.h 2007-09-01 19:08:16 UTC (rev 28802)
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_SWORD1
-
-#define PALMOS_68K
-
-#endif
Deleted: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_sword2.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_sword2.h 2007-09-01 19:03:22 UTC (rev 28801)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_sword2.h 2007-09-01 19:08:16 UTC (rev 28802)
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_SWORD2
-
-#define PALMOS_68K
-
-#endif
Deleted: scummvm/trunk/backends/platform/PalmOS/Src/scumm_globals.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/scumm_globals.cpp 2007-09-01 19:03:22 UTC (rev 28801)
+++ scummvm/trunk/backends/platform/PalmOS/Src/scumm_globals.cpp 2007-09-01 19:08:16 UTC (rev 28802)
@@ -1,156 +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.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include <PalmOS.h>
-
-#include "palmdefs.h"
-#include "globals.h"
-#include "scumm_globals.h"
-
-static void GlbInitAll() {
- if (gVars->globals[GBVARS_COMMON]) {
- CALL_INIT(ScummFont)
- }
- if (gVars->globals[GBVARS_ENGINE]) {
-#ifndef DISABLE_SCUMM
-# ifndef DISABLE_SCUMM_7_8
- CALL_INIT(DimuseTables)
- CALL_INIT(DimuseCodecs)
- CALL_INIT(Codec47)
-# endif
- CALL_INIT(Akos)
- CALL_INIT(Gfx)
- CALL_INIT(Dialogs)
- CALL_INIT(Charset)
- CALL_INIT(Costume)
- CALL_INIT(PlayerV2)
- CALL_INIT(Scumm_md5table)
-#endif
-#ifndef DISABLE_AGOS
- CALL_INIT(AGOS_AGOS)
- CALL_INIT(AGOS_Cursor)
- CALL_INIT(AGOS_Charset)
-#endif
-#ifndef DISABLE_SKY
- CALL_INIT(Sky_Hufftext)
-#endif
-#ifndef DISABLE_SWORD1
- CALL_INIT(Sword1_fxList)
-#endif
-#ifndef DISABLE_QUEEN
- CALL_INIT(Queen_Talk)
- CALL_INIT(Queen_Display)
- CALL_INIT(Queen_Graphics)
- CALL_INIT(Queen_Restables)
- CALL_INIT(Queen_Musicdata)
-#endif
- }
-}
-
-static void GlbReleaseAll() {
- if (gVars->globals[GBVARS_COMMON]) {
- CALL_RELEASE(ScummFont)
-
- }
- if (gVars->globals[GBVARS_SCUMM]) {
-#ifndef DISABLE_SCUMM
-# ifndef DISABLE_SCUMM_7_8
- CALL_RELEASE(DimuseTables)
- CALL_RELEASE(DimuseCodecs)
- CALL_RELEASE(Codec47)
-# endif
- CALL_RELEASE(Akos)
- CALL_RELEASE(Gfx)
- CALL_RELEASE(Dialogs)
- CALL_RELEASE(Charset)
- CALL_RELEASE(Costume)
- CALL_RELEASE(PlayerV2)
- CALL_RELEASE(Scumm_md5table)
-#endif
-#ifndef DISABLE_AGOS
- CALL_RELEASE(AGOS_AGOS)
- CALL_RELEASE(AGOS_AGOS)
- CALL_RELEASE(AGOS_AGOS)
-#endif
-#ifndef DISABLE_SKY
- CALL_RELEASE(Sky_Hufftext)
-#endif
-#ifndef DISABLE_SWORD1
- CALL_RELEASE(Sword1_fxList)
-#endif
-#ifndef DISABLE_QUEEN
- CALL_RELEASE(Queen_Talk)
- CALL_RELEASE(Queen_Display)
- CALL_RELEASE(Queen_Graphics)
- CALL_RELEASE(Queen_Restables)
- CALL_RELEASE(Queen_Musicdata)
-#endif
- }
-}
-
-//TODO : use Boolean instead of void to check err
-static DmOpenRef GlbOpenInternal(const Char *nameP) {
- LocalID dbID = DmFindDatabase(0, nameP);
- if (dbID) {
- UInt32 dbType, dbCreator;
- Err e = DmDatabaseInfo(0, dbID, 0, 0, 0, 0, 0, 0, 0, 0, 0, &dbType, &dbCreator);
-
- if (!e && dbType == 'GLBS' && dbCreator == appFileCreator)
- return DmOpenDatabase(0, dbID, dmModeReadOnly);
- }
- return NULL;
-}
-
-void GlbOpen() {
- gVars->globals[GBVARS_COMMON] = GlbOpenInternal("Glbs::Common");
- gVars->globals[GBVARS_ENGINE] = GlbOpenInternal("Glbs::Engine");
- GlbInitAll();
-}
-
-void GlbClose() {
- GlbReleaseAll();
-
- if (gVars->globals[GBVARS_COMMON])
- DmCloseDatabase(gVars->globals[GBVARS_COMMON]);
- if (gVars->globals[GBVARS_ENGINE])
- DmCloseDatabase(gVars->globals[GBVARS_ENGINE]);
-}
-
-void *GlbGetRecord(UInt16 index, UInt16 id) {
- if (gVars->globals[id]) {
- MemHandle recordH = DmQueryRecord(gVars->globals[id], index);
- if (recordH)
- return MemHandleLock(recordH);
- }
- return NULL;
-}
-
-void GlbReleaseRecord(UInt16 index, UInt16 id) {
- if (gVars->globals[id]) {
- MemHandle recordH = DmQueryRecord(gVars->globals[id], index);
- if (recordH)
- MemHandleUnlock(recordH);
- }
-}
Deleted: scummvm/trunk/backends/platform/PalmOS/Src/scumm_globals.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/scumm_globals.h 2007-09-01 19:03:22 UTC (rev 28801)
+++ scummvm/trunk/backends/platform/PalmOS/Src/scumm_globals.h 2007-09-01 19:08:16 UTC (rev 28802)
@@ -1,92 +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.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef __SCUMM_GLOBALS_H__
-#define __SCUMM_GLOBALS_H__
-
-#include "builder/enum_globals.h"
-
-void *GlbGetRecord(UInt16 index, UInt16 id);
-void GlbReleaseRecord(UInt16 index, UInt16 id);
-void GlbOpen();
-void GlbClose();
-
-
-#define _GINIT(x) void initGlobals_##x() {
-#define _GEND }
-#define _GRELEASE(x) void releaseGlobals_##x() {
-
-#define CALL_INIT(x) initGlobals_##x();
-#define CALL_RELEASE(x) releaseGlobals_##x();
-
-#define _GSETPTR(var,index,format,id) var = (format *)GlbGetRecord(index,id);
-#define _GRELEASEPTR(index,id) GlbReleaseRecord(index,id);
-
-#define PROTO_GLOBALS(x) void CALL_INIT(x);\
- void CALL_RELEASE(x);
-
-
-// Common stuffs
-PROTO_GLOBALS(ScummFont)
-
-// Scumm stuffs
-#ifndef DISABLE_SCUMM
-PROTO_GLOBALS(DimuseTables)
-PROTO_GLOBALS(Akos)
-PROTO_GLOBALS(DimuseCodecs)
-PROTO_GLOBALS(Codec47)
-PROTO_GLOBALS(Gfx)
-PROTO_GLOBALS(Dialogs)
-PROTO_GLOBALS(Charset)
-PROTO_GLOBALS(Costume)
-PROTO_GLOBALS(PlayerV2)
-PROTO_GLOBALS(Scumm_md5table)
-#endif
-// AGOS stuffs
-#ifndef DISABLE_AGOS
-PROTO_GLOBALS(AGOS_AGOS)
-PROTO_GLOBALS(AGOS_Cursor)
-PROTO_GLOBALS(AGOS_Charset)
-#endif
-// Sky stuffs
-#ifndef DISABLE_SKY
-PROTO_GLOBALS(Sky_Hufftext)
-#endif
-// Queen stuffs
-#ifndef DISABLE_QUEEN
-PROTO_GLOBALS(Queen_Talk)
-PROTO_GLOBALS(Queen_Display)
-PROTO_GLOBALS(Queen_Graphics)
-PROTO_GLOBALS(Queen_Restables)
-PROTO_GLOBALS(Queen_Musicdata)
-#endif
-// Sword1 stuffs
-#ifndef DISABLE_SWORD1
-PROTO_GLOBALS(Sword1_fxList)
-#endif
-
-#undef PROTO_GLOBALS
-
-#endif
Modified: scummvm/trunk/backends/platform/PalmOS/Src/zodiac_gfx.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/zodiac_gfx.cpp 2007-09-01 19:03:22 UTC (rev 28801)
+++ scummvm/trunk/backends/platform/PalmOS/Src/zodiac_gfx.cpp 2007-09-01 19:08:16 UTC (rev 28802)
@@ -27,9 +27,6 @@
#include "common/config-manager.h"
#include "rumble.h"
-#ifdef PALMOS_68K
-#define _TwGfxOpen(x, y) TwGfxOpen((TwGfxHandle*)x, y);
-#else
static asm Err _TwGfxOpen(void **aResult, void *aInfoResult) {
stmfd sp!, {r4-r11,lr}
ldr r9, [r9]
@@ -39,7 +36,6 @@
mov r7, r1
ldr pc, =0x200995F0
}
-#endif
int OSystem_PalmZodiac::getDefaultGraphicsMode() const {
return GFX_WIDE;
Modified: scummvm/trunk/backends/platform/PalmOS/Src/zodiac_overlay.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/zodiac_overlay.cpp 2007-09-01 19:03:22 UTC (rev 28801)
+++ scummvm/trunk/backends/platform/PalmOS/Src/zodiac_overlay.cpp 2007-09-01 19:08:16 UTC (rev 28802)
@@ -71,9 +71,6 @@
}
void OSystem_PalmZodiac::colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) {
-#ifdef PALMOS_68K
- color = SWAP_BYTES_16(color);
-#endif
r = ((color >> 8) & 0xF8);
g = ((color >> 3) & 0xFC);
b = ((color << 3) & 0xF8);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list