[Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.100,1.101 disk.cpp,1.71,1.72 hufftext.cpp,1.9,1.10 text.h,1.38,1.39
Chris Apers
chrilith at users.sourceforge.net
Sat Nov 5 10:58:20 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon charset.cpp,1.42,1.43 cursor.cpp,1.9,1.10 debug.cpp,1.44,1.45 intern.h,1.41,1.42
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky sky.cpp,1.183,1.184
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25160
Modified Files:
control.cpp disk.cpp hufftext.cpp text.h
Log Message:
PalmOS ifdef
Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- control.cpp 26 Oct 2005 06:00:18 -0000 1.100
+++ control.cpp 5 Nov 2005 18:57:41 -0000 1.101
@@ -1523,7 +1523,7 @@
_mouseY = event.mouse.y;
break;
case OSystem::EVENT_LBUTTONDOWN:
-#ifdef __PALM_OS__
+#ifdef PALMOS_MODE
_mouseX = event.mouse.x;
_mouseY = event.mouse.y;
#endif
Index: disk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- disk.cpp 18 Oct 2005 01:30:23 -0000 1.71
+++ disk.cpp 5 Nov 2005 18:57:41 -0000 1.72
@@ -28,7 +28,7 @@
#include "sky/sky.h"
#include "sky/struc.h"
-#if defined(__PALM_OS__)
+#if defined(PALMOS_68K)
#include "arm/native.h"
#include "arm/macros.h"
#endif
@@ -164,7 +164,7 @@
if ((fileFlags >> 22) & 0x1) { //do we include the header?
// don't return the file's header
output = uncompDest;
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
ARM_START(RncDecoderType)
ARM_INIT(SKY_UNPACKM1)
ARM_ADDM(input)
@@ -184,7 +184,7 @@
memcpy(uncompDest, fileDest, sizeof(dataFileHeader));
output = uncompDest + sizeof(dataFileHeader);
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
ARM_START(RncDecoderType)
ARM_INIT(SKY_UNPACKM1)
ARM_ADDM(input)
Index: hufftext.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/hufftext.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- hufftext.cpp 18 Oct 2005 01:30:23 -0000 1.9
+++ hufftext.cpp 5 Nov 2005 18:57:41 -0000 1.10
@@ -23,7 +23,7 @@
namespace Sky {
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
const HuffTree *Text::_huffTree_00109;
const HuffTree *Text::_huffTree_00267;
const HuffTree *Text::_huffTree_00288;
@@ -2015,7 +2015,7 @@
} // End of namespace Sky
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
#include "scumm_globals.h"
_GINIT(Sky_Hufftext)
Index: text.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- text.h 18 Oct 2005 01:30:23 -0000 1.38
+++ text.h 5 Nov 2005 18:57:41 -0000 1.39
@@ -103,7 +103,7 @@
bool _dtCentre; //set for centre text
uint32 _lowTextWidth, _mouseOfsX, _mouseOfsY;
-#ifndef __PALM_OS__
+#ifndef PALMOS_68K
static const HuffTree _huffTree_00109[]; // trees moved to hufftext.cpp
static const HuffTree _huffTree_00267[];
static const HuffTree _huffTree_00288[];
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon charset.cpp,1.42,1.43 cursor.cpp,1.9,1.10 debug.cpp,1.44,1.45 intern.h,1.41,1.42
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky sky.cpp,1.183,1.184
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list