[Scummvm-cvs-logs] CVS: scummvm/queen graphics.cpp,1.114,1.115

[Chris Apers]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17952

Modified Files:
	graphics.cpp 
Log Message:
- Changed PalmOS ifdef
- No global constructor with PalmOS ARM, bad hack to workaround this

Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- graphics.cpp	18 Oct 2005 01:30:18 -0000	1.114
+++ graphics.cpp	5 Nov 2005 18:22:51 -0000	1.115
@@ -32,7 +32,7 @@
 
 namespace Queen {
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 static const BamScene::BamDataBlock *_carData;
 static const BamScene::BamDataBlock *_fight1Data;
 static const BamScene::BamDataBlock *_fight2Data;
@@ -187,6 +187,14 @@
 	anim.string.buffer = NULL;
 	moving = false;
 	scale = 100;
+
+#ifdef PALMOS_ARM
+	Box *tmp = (Box *)&_defaultBox;
+	tmp->x1 = -1;
+	tmp->y1 = -1;
+	tmp->x2 = -1;
+	tmp->y2 = -1;
+#endif
 	box = _defaultBox;
 }
 
@@ -212,6 +220,24 @@
 	memset(_sortedBobs, 0, sizeof(_sortedBobs));
 	_sortedBobsCount = 0;
 	_shrinkBuffer.data = new uint8[ BOB_SHRINK_BUF_SIZE ];
+
+#ifdef PALMOS_ARM
+	Box *tmp1 = (Box *)&BobSlot::_defaultBox;
+	tmp1->x1 = -1;
+	tmp1->y1 = -1;
+	tmp1->x2 = -1;
+	tmp1->y2 = -1;
+	Box *tmp2 = (Box *)&_gameScreenBox;
+	tmp2->x1 = 0;
+	tmp2->y1 = 0;
+	tmp2->x2 = GAME_SCREEN_WIDTH - 1;
+	tmp2->y2 = ROOM_ZONE_HEIGHT - 1;
+	Box *tmp3 = (Box *)&_fullScreenBox;
+	tmp3->x1 = 0;
+	tmp3->y1 = 0;
+	tmp3->x2 = GAME_SCREEN_WIDTH - 1;
+	tmp3->y2 = GAME_SCREEN_HEIGHT - 1;
+#endif
 }
 
 Graphics::~Graphics() {
@@ -1219,7 +1245,7 @@
 	_flag = READ_BE_UINT16(ptr); ptr += 2;
 }
 
-#ifndef __PALM_OS__
+#ifndef PALMOS_68K
 const BamScene::BamDataBlock BamScene::_carData[] = {
 	{ { 310, 105, 1 }, { 314, 106, 17 }, { 366, 101,  1 },  0 },
 	{ { 303, 105, 1 }, { 307, 106, 17 }, { 214,   0, 10 },  0 },
@@ -1490,7 +1516,7 @@
 
 } // End of namespace Queen
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 #include "scumm_globals.h"
 
 _GINIT(Queen_Graphics)