From 0a898d14331b7c896f4fc43d54942e21e388db59 Mon Sep 17 00:00:00 2001 From: Chris Apers Date: Sun, 26 Feb 2006 12:52:34 +0000 Subject: Use correct include and event function svn-id: r20911 --- backends/PalmOS/Src/base_event.cpp | 7 +++++++ backends/PalmOS/Src/be_base.h | 2 -- backends/PalmOS/Src/builder/b_globals.c | 6 ++++-- backends/PalmOS/Src/builder/b_globals.h | 5 ++++- backends/PalmOS/Src/builder/enum_globals.h | 17 +++++++++-------- backends/PalmOS/Src/builder/queen/bq_display.c | 6 +++--- backends/PalmOS/Src/builder/queen/bq_restables.c | 2 +- backends/PalmOS/Src/builder/queen/bq_talk.c | 2 +- backends/PalmOS/Src/builder/simon/bs_charset.c | 8 ++++---- backends/PalmOS/Src/builder/sword1/sw1_staticres.h | 22 ---------------------- 10 files changed, 33 insertions(+), 44 deletions(-) (limited to 'backends/PalmOS') diff --git a/backends/PalmOS/Src/base_event.cpp b/backends/PalmOS/Src/base_event.cpp index ecb3606446..65797a596d 100755 --- a/backends/PalmOS/Src/base_event.cpp +++ b/backends/PalmOS/Src/base_event.cpp @@ -22,6 +22,9 @@ * */ +#if defined(COMPILE_OS5) && defined(PALMOS_ARM) +# include +#endif #include "be_base.h" void OSystem_PalmBase::timer_handler() { @@ -59,7 +62,11 @@ void OSystem_PalmBase::battery_handler() { event.eType = keyDownEvent; event.data.keyDown.chr = vchrPowerOff; event.data.keyDown.modifiers = commandKeyMask; +#if defined(COMPILE_OS5) && defined(PALMOS_ARM) + SysEventAddToQueue(&event); +#else EvtAddEventToQueue(&event); +#endif } } diff --git a/backends/PalmOS/Src/be_base.h b/backends/PalmOS/Src/be_base.h index fede0d2700..ec12ee0401 100755 --- a/backends/PalmOS/Src/be_base.h +++ b/backends/PalmOS/Src/be_base.h @@ -61,8 +61,6 @@ typedef struct { void *param; } SoundType, *SoundPtr; -extern "C" void SysEventGet(EventType *, Int32); - class OSystem_PalmBase : public OSystem { private: virtual void int_initBackend() { } diff --git a/backends/PalmOS/Src/builder/b_globals.c b/backends/PalmOS/Src/builder/b_globals.c index 0e6026b7c0..dec25e96b4 100644 --- a/backends/PalmOS/Src/builder/b_globals.c +++ b/backends/PalmOS/Src/builder/b_globals.c @@ -4,8 +4,8 @@ //#define BUILD_COMMON //#define BUILD_SIMON -//#define BUILD_SCUMM -#define BUILD_SKY +#define BUILD_SCUMM +//#define BUILD_SKY //#define BUILD_QUEEN //#define BUILD_SWORD1 @@ -30,6 +30,7 @@ void writeRecord(MemPtr ptr, UInt32 size, UInt16 index, UInt16 dbID) { DmReleaseRecord (dbP[dbID], index, 0); } /////////////////////////////////////////////////////////////////// + void buildAll() { Err err; LocalID olddb; @@ -60,6 +61,7 @@ void buildAll() { addCharset(); addCostume(); addPlayerV2(); + addScummTables(); #elif defined(BUILD_SIMON) addSimon(); diff --git a/backends/PalmOS/Src/builder/b_globals.h b/backends/PalmOS/Src/builder/b_globals.h index df52185d98..6954a50999 100644 --- a/backends/PalmOS/Src/builder/b_globals.h +++ b/backends/PalmOS/Src/builder/b_globals.h @@ -9,8 +9,10 @@ typedef UInt32 uint32; void writeRecord(MemPtr ptr, UInt32 size, UInt16 index, UInt16 dbID); void buildAll(); -void addDimuseTables(); void addNewGui(); +void addGraphics(); +///////////////////////////////// +void addDimuseTables(); void addAkos(); void addDimuseCodecs(); void addCodec47(); @@ -19,6 +21,7 @@ void addDialogs(); void addCharset(); void addCostume(); void addPlayerV2(); +void addScummTables(); ///////////////////////////////// void addSimon(); void Simon_addCharset(); diff --git a/backends/PalmOS/Src/builder/enum_globals.h b/backends/PalmOS/Src/builder/enum_globals.h index a83a366cb4..45425299c6 100644 --- a/backends/PalmOS/Src/builder/enum_globals.h +++ b/backends/PalmOS/Src/builder/enum_globals.h @@ -3,9 +3,8 @@ // Common enum { - GBVARS_GUIFONT_INDEX = 0, - GBVARS_FONTBITS_INDEX -}; + GBVARS_GUIFONT_INDEX = 0 +}; // Scumm enum { @@ -17,8 +16,8 @@ enum { GBVARS_FTSTATEMUSICTABLE_INDEX, GBVARS_FTSEQMUSICTABLE_INDEX, GBVARS_FTSEQNAMES_INDEX, - GBVARS_DEFAULTSCALETABLE_INDEX, - GBVARS_OLDSCALETABLE_INDEX, + GBVARS_SMALLSCALETABLE_INDEX, + GBVARS_BIGSCALETABLE_INDEX, GBVARS_IMCTABLE_INDEX, GBVARS_CODEC47TABLE_INDEX, GBVARS_TRANSITIONEFFECTS_INDEX, @@ -30,7 +29,6 @@ enum { GBVARS_ENGLISHCHARSETDATAV2_INDEX, GBVARS_ITALIANCHARSETDATAV2_INDEX, GBVARS_SPANISHCHARSETDATAV2_INDEX, - GBVARS_COSTSCALETABLE_INDEX, GBVARS_NOTELENGTHS_INDEX, GBVARS_HULLOFFSETS_INDEX, GBVARS_HULLS_INDEX, @@ -38,7 +36,10 @@ enum { GBVARS_FREQMODOFFSETS_INDEX, GBVARS_FREQMODTABLE_INDEX, GBVARS_SPKFREQTABLE_INDEX, - GBVARS_PCJRFREQTABLE_INDEX + GBVARS_PCJRFREQTABLE_INDEX, + + GBVARS_MD5TABLE_INDEX +//GBVARS_SMALLSCALETABLEAKOS_INDEX }; // Simon enum { @@ -56,7 +57,7 @@ enum { GBVARS_SPANISHVIDEOFONT_INDEX, GBVARS_VIDEOFONT_INDEX, GBVARS_SIMON1CURSOR_INDEX -// GBVARS_SIMON2CURSORS_INDEX +// GBVARS_SIMON2CURSORS_INDEX }; // Queen enum { diff --git a/backends/PalmOS/Src/builder/queen/bq_display.c b/backends/PalmOS/Src/builder/queen/bq_display.c index 5179772302..9601729de7 100644 --- a/backends/PalmOS/Src/builder/queen/bq_display.c +++ b/backends/PalmOS/Src/builder/queen/bq_display.c @@ -274,7 +274,7 @@ static void addDisplay_fontHebrew() { static void addDisplay_palJoeClothes() { uint8 _palJoeClothes[] = { 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x87, 0x87, 0x87, 0xB0, 0xB0, 0xB0, 0xDA, 0xDA, 0xDA, 0x43, - 0x34, 0x20, 0x77, 0x33, 0x1F, 0xA3, 0x43, 0x27, 0x80, 0x45, 0x45, 0x9E, 0x5D, 0x5B, 0xB9, 0x78, + 0x34, 0x20, 0x77, 0x33, 0x1F, 0xA3, 0x43, 0x27, 0x80, 0x45, 0x45, 0x9E, 0x5D, 0x5B, 0xB9, 0x78, 0x75, 0xDF, 0x97, 0x91, 0x17, 0x27, 0x63, 0x1F, 0x3F, 0x83, 0x27, 0x5B, 0xA7, 0x98, 0xD4, 0xFF }; writeRecord(_palJoeClothes, sizeof(_palJoeClothes), GBVARS_DISPLAYPALJOECLOTHES_INDEX , GBVARS_QUEEN); @@ -283,7 +283,7 @@ static void addDisplay_palJoeClothes() { static void addDisplay_palJoeDress() { uint8 _palJoeDress[] = { 0x00, 0x00, 0x00, 0x50, 0x50, 0x50, 0x70, 0x70, 0x70, 0x90, 0x90, 0x90, 0xC6, 0xC6, 0xC6, 0xFF, - 0xFF, 0xFF, 0x30, 0x30, 0x90, 0x47, 0x49, 0xD0, 0x40, 0x24, 0x00, 0x79, 0x34, 0x0B, 0xB2, 0x3D, + 0xFF, 0xFF, 0x30, 0x30, 0x90, 0x47, 0x49, 0xD0, 0x40, 0x24, 0x00, 0x79, 0x34, 0x0B, 0xB2, 0x3D, 0x22, 0xED, 0x42, 0x42, 0x80, 0x45, 0x45, 0xA3, 0x5F, 0x5F, 0xC8, 0x7C, 0x7C, 0xEC, 0x9C, 0x9C }; writeRecord(_palJoeDress, sizeof(_palJoeDress), GBVARS_DISPLAYPALJOEDRESS_INDEX , GBVARS_QUEEN); @@ -294,4 +294,4 @@ void Queen_addDisplay() { addDisplay_fontHebrew(); addDisplay_palJoeClothes(); addDisplay_palJoeDress(); -} +} \ No newline at end of file diff --git a/backends/PalmOS/Src/builder/queen/bq_restables.c b/backends/PalmOS/Src/builder/queen/bq_restables.c index d1a27c45aa..29fd7fb370 100644 --- a/backends/PalmOS/Src/builder/queen/bq_restables.c +++ b/backends/PalmOS/Src/builder/queen/bq_restables.c @@ -1093,4 +1093,4 @@ static void addRestables_resourceTablePEM10() { void Queen_addRestables() { addRestables_resourceTablePEM10(); -} +} \ No newline at end of file diff --git a/backends/PalmOS/Src/builder/queen/bq_talk.c b/backends/PalmOS/Src/builder/queen/bq_talk.c index b81fd7dacf..4798a3bbe0 100644 --- a/backends/PalmOS/Src/builder/queen/bq_talk.c +++ b/backends/PalmOS/Src/builder/queen/bq_talk.c @@ -515,4 +515,4 @@ static void addTalk_speechParameters() { void Queen_addTalk() { addTalk_speechParameters(); -} +} \ No newline at end of file diff --git a/backends/PalmOS/Src/builder/simon/bs_charset.c b/backends/PalmOS/Src/builder/simon/bs_charset.c index 9909364465..662884682f 100644 --- a/backends/PalmOS/Src/builder/simon/bs_charset.c +++ b/backends/PalmOS/Src/builder/simon/bs_charset.c @@ -6,15 +6,15 @@ static void addCharset_russian_video_font() { 0, 0, 0, 0, 0, 0, 0, 0, 32, 112, 112, 32, 32, 0, 32, 0, 48, 48, 96, 0, 0, 0, 0, 0, - 0, 144, 0, 96, 144, 144, 104, 0, - 0, 144, 0, 96, 144, 144, 96, 0, - 0, 144, 0, 144, 144, 144, 96, 0, + 0, 0, 100, 40, 48, 40, 100, 0, + 0, 0, 96, 48, 40, 40, 112, 0, + 60, 68, 68, 60, 36, 68, 68, 0, 0, 16, 40, 16, 42, 68, 58, 0, 48, 48, 96, 0, 0, 0, 0, 0, 0, 4, 8, 8, 8, 8, 4, 0, 0, 32, 16, 16, 16, 16, 32, 0, 72, 84, 84, 116, 84, 84, 72, 0, - 0, 112, 136, 240, 136, 136, 240, 0, + 0, 0, 60, 68, 60, 36, 100, 0, 0, 0, 0, 0, 0, 48, 48, 96, 0, 0, 0, 240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 0, diff --git a/backends/PalmOS/Src/builder/sword1/sw1_staticres.h b/backends/PalmOS/Src/builder/sword1/sw1_staticres.h index 6f45c9eb07..796e3d10ed 100644 --- a/backends/PalmOS/Src/builder/sword1/sw1_staticres.h +++ b/backends/PalmOS/Src/builder/sword1/sw1_staticres.h @@ -1,25 +1,3 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2006 The ScummVM project - * - * 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 SWORDRES_H #define SWORDRES_H -- cgit v1.2.3