[Scummvm-cvs-logs] CVS: scummvm/sky/compacts 10comp.h,1.4,1.5 11comp.h,1.4,1.5 12comp.h,1.4,1.5 13comp.h,1.4,1.5 14comp.h,1.4,1.5 15comp.h,1.4,1.5 16comp.h,1.4,1.5 17comp.h,1.4,1.5 18comp.h,1.4,1.5 19comp.h,1.4,1.5 20comp.h,1.4,1.5 21comp.h,1.4,1.5 22comp.h,1.4,1.5 23comp.h,1.4,1.5 24comp.h,1.4,1.5 25comp.h,1.4,1.5 26comp.h,1.4,1.5 27comp.h,1.4,1.5 28comp.h,1.4,1.5 29comp.h,1.4,1.5 2compact.h,1.4,1.5 30comp.h,1.4,1.5 31comp.h,1.4,1.5 32comp.h,1.4,1.5 33comp.h,1.4,1.5 34comp.h,1.4,1.5 36comp.h,1.4,1.5 37comp.h,1.4,1.5 38comp.h,1.4,1.5 39comp.h,1.4,1.5 3compact.h,1.4,1.5 40comp.h,1.4,1.5 41comp.h,1.4,1.5 44comp.h,1.4,1.5 45comp.h,1.4,1.5 46comp.h,1.4,1.5 47comp.h,1.4,1.5 48comp.h,1.4,1.5 4compact.h,1.4,1.5 5compact.h,1.4,1.5 65comp.h,1.4,1.5 67comp.h,1.4,1.5 68comp.h,1.4,1.5 69comp.h,1.4,1.5 70comp.h,1.4,1.5 71comp.h,1.4,1.5 72comp.h,1.4,1.5 73comp.h,1.4,1.5 74comp.h,1.4,1.5 75comp.h,1.4,1.5 76comp.h,1.4,1.5 77comp.h,1.4,1.5 78comp.h,1.4,1.5 79comp.h,1.4,1.5 90comp.h,1.4,1.5 91comp.h,1.4,1.5 92comp.h,1.4,1.5 93comp.h,1.4,1.5 94comp.h,1.4,1.5 95comp.h,1.4,1.5 96comp.h,1.4,1.5 9compact.h,1.4,1.5 z_compac.h,1.4,1.5

Oliver Kiehl olki at users.sourceforge.net
Sun May 4 07:00:19 CEST 2003


Update of /cvsroot/scummvm/scummvm/sky/compacts
In directory sc8-pr-cvs1:/tmp/cvs-serv22548

Modified Files:
	10comp.h 11comp.h 12comp.h 13comp.h 14comp.h 15comp.h 16comp.h 
	17comp.h 18comp.h 19comp.h 20comp.h 21comp.h 22comp.h 23comp.h 
	24comp.h 25comp.h 26comp.h 27comp.h 28comp.h 29comp.h 
	2compact.h 30comp.h 31comp.h 32comp.h 33comp.h 34comp.h 
	36comp.h 37comp.h 38comp.h 39comp.h 3compact.h 40comp.h 
	41comp.h 44comp.h 45comp.h 46comp.h 47comp.h 48comp.h 
	4compact.h 5compact.h 65comp.h 67comp.h 68comp.h 69comp.h 
	70comp.h 71comp.h 72comp.h 73comp.h 74comp.h 75comp.h 76comp.h 
	77comp.h 78comp.h 79comp.h 90comp.h 91comp.h 92comp.h 93comp.h 
	94comp.h 95comp.h 96comp.h 9compact.h z_compac.h 
Log Message:
renamed RETURN_OK and RETURN_FAIL for morphos


Index: 10comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/10comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 10comp.h	29 Apr 2003 22:29:10 -0000	1.4
+++ 10comp.h	4 May 2003 13:51:08 -0000	1.5
@@ -541,7 +541,7 @@
 
 uint16 s10_floor_table[] = {
 	ID_S10_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_LEFT_EXIT_10,
 	GT_LEFT_EXIT_10,
 	0,
@@ -1290,7 +1290,7 @@
 	ID_LIFT_10,
 	GT_FLOOR_FROM_CHAIR10,
 	ID_LINC_10,
-	RETURN_OK,
+	RET_OK,
 	65535,
 };
 

Index: 11comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/11comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 11comp.h	29 Apr 2003 22:29:11 -0000	1.4
+++ 11comp.h	4 May 2003 13:51:08 -0000	1.5
@@ -707,7 +707,7 @@
 
 uint16 s11_floor_table[] = {
 	ID_S11_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_CABLE_FALL,
 	GT_CABLE_11,
 	ID_LOCKER_11,

Index: 12comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/12comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 12comp.h	29 Apr 2003 22:29:12 -0000	1.4
+++ 12comp.h	4 May 2003 13:51:08 -0000	1.5
@@ -220,7 +220,7 @@
 
 uint16 s12_floor_table[] = {
 	ID_S12_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,

Index: 13comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/13comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 13comp.h	29 Apr 2003 22:29:12 -0000	1.4
+++ 13comp.h	4 May 2003 13:51:08 -0000	1.5
@@ -762,7 +762,7 @@
 
 uint16 s13_floor_table[] = {
 	ID_S13_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,

Index: 14comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/14comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 14comp.h	29 Apr 2003 22:29:13 -0000	1.4
+++ 14comp.h	4 May 2003 13:51:08 -0000	1.5
@@ -620,7 +620,7 @@
 
 uint16 s14_floor_table[] = {
 	ID_S14_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,

Index: 15comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/15comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 15comp.h	29 Apr 2003 22:29:13 -0000	1.4
+++ 15comp.h	4 May 2003 13:51:08 -0000	1.5
@@ -189,9 +189,9 @@
 
 uint16 s15_floor_table[] = {
 	ID_S15_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_NU_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,

Index: 16comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/16comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 16comp.h	29 Apr 2003 22:29:14 -0000	1.4
+++ 16comp.h	4 May 2003 13:51:08 -0000	1.5
@@ -250,7 +250,7 @@
 
 uint16 s16_floor_table[] = {
 	ID_S16_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,

Index: 17comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/17comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 17comp.h	29 Apr 2003 22:29:14 -0000	1.4
+++ 17comp.h	4 May 2003 13:51:08 -0000	1.5
@@ -136,7 +136,7 @@
 
 uint16 s17_floor_table[] = {
 	ID_S17_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,

Index: 18comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/18comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 18comp.h	29 Apr 2003 22:29:14 -0000	1.4
+++ 18comp.h	4 May 2003 13:51:08 -0000	1.5
@@ -404,7 +404,7 @@
 
 uint16 s18_floor_table[] = {
 	ID_S18_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,

Index: 19comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/19comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 19comp.h	29 Apr 2003 22:29:15 -0000	1.4
+++ 19comp.h	4 May 2003 13:51:08 -0000	1.5
@@ -52,7 +52,7 @@
 
 uint16 s19_floor_table[] = {
 	ID_S19_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,

Index: 20comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/20comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 20comp.h	29 Apr 2003 22:29:15 -0000	1.4
+++ 20comp.h	4 May 2003 13:51:08 -0000	1.5
@@ -597,7 +597,7 @@
 
 uint16 s20_floor_table[] = {
 	ID_S20_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,

Index: 21comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/21comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 21comp.h	29 Apr 2003 22:29:15 -0000	1.4
+++ 21comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -346,7 +346,7 @@
 
 uint16 s21_floor_table[] = {
 	ID_S21_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,

Index: 22comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/22comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 22comp.h	29 Apr 2003 22:29:16 -0000	1.4
+++ 22comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -277,7 +277,7 @@
 
 uint16 s22_floor_table[] = {
 	ID_S22_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,

Index: 23comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/23comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 23comp.h	29 Apr 2003 22:29:16 -0000	1.4
+++ 23comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -635,7 +635,7 @@
 
 uint16 s23_floor_table[] = {
 	ID_S23_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,

Index: 24comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/24comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 24comp.h	29 Apr 2003 22:29:16 -0000	1.4
+++ 24comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -93,7 +93,7 @@
 
 uint16 s24_floor_table[] = {
 	ID_S24_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,

Index: 25comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/25comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 25comp.h	29 Apr 2003 22:29:16 -0000	1.4
+++ 25comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -993,7 +993,7 @@
 
 uint16 s25_floor_table[] = {
 	ID_S25_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,

Index: 26comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/26comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 26comp.h	29 Apr 2003 22:29:16 -0000	1.4
+++ 26comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -81,7 +81,7 @@
 
 uint16 s26_floor_table[] = {
 	ID_S26_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,

Index: 27comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/27comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 27comp.h	29 Apr 2003 22:29:17 -0000	1.4
+++ 27comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -752,7 +752,7 @@
 
 uint16 chair_table[] = {
 	ID_CHAIR_27,
-	RETURN_OK,
+	RET_OK,
 	ID_S27_FLOOR,
 	GT_FLOOR_FROM_CHAIR,
 	ID_RIGHT_EXIT_27,
@@ -1219,7 +1219,7 @@
 
 uint16 s27_floor_table[] = {
 	ID_S27_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_RIGHT_EXIT_27,
 	GT_RIGHT_EXIT_27,
 	ID_JOEY_PARK,

Index: 28comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/28comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 28comp.h	29 Apr 2003 22:29:17 -0000	1.4
+++ 28comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -46,7 +46,7 @@
 
 uint16 s28_floor_table[] = {
 	ID_S28_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,
@@ -76,7 +76,7 @@
 
 uint16 s28_sml_table[] = {
 	ID_S28_SML_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	ID_SMALL_R_28,

Index: 29comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/29comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 29comp.h	29 Apr 2003 22:29:18 -0000	1.4
+++ 29comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -69,7 +69,7 @@
 
 uint16 s29_floor_table[] = {
 	ID_S29_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	ID_LIFT_29,
@@ -996,7 +996,7 @@
 
 uint16 s29_sml_table[] = {
 	ID_S29_SML_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	ID_SMALL_R_29,

Index: 2compact.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/2compact.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 2compact.h	29 Apr 2003 22:29:18 -0000	1.4
+++ 2compact.h	4 May 2003 13:51:09 -0000	1.5
@@ -636,7 +636,7 @@
 
 uint16 top_lift_table[] = {
 	ID_TOP_LIFT,
-	RETURN_OK,
+	RET_OK,
 	115,
 	LIFT_TO_FLOOR,
 	ID_L_EXIT_S2,

Index: 30comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/30comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 30comp.h	29 Apr 2003 22:29:19 -0000	1.4
+++ 30comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -984,7 +984,7 @@
 
 uint16 sc30_floor_table[] = {
 	ID_SC30_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC30_EXIT_31,
 	GT_SC30_EXIT_31,
 	0,

Index: 31comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/31comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 31comp.h	29 Apr 2003 22:29:19 -0000	1.4
+++ 31comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -1878,7 +1878,7 @@
 
 uint16 sc31_floor_table[] = {
 	ID_SC31_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC31_EXIT_30,
 	GT_SC31_EXIT_30,
 	0,

Index: 32comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/32comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 32comp.h	29 Apr 2003 22:29:19 -0000	1.4
+++ 32comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -762,7 +762,7 @@
 
 uint16 sc32_floor_table[] = {
 	ID_SC32_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC32_EXIT_31,
 	GT_SC32_EXIT_31,
 	0,

Index: 33comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/33comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 33comp.h	29 Apr 2003 22:29:19 -0000	1.4
+++ 33comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -572,7 +572,7 @@
 
 uint16 sc33_floor_table[] = {
 	ID_SC33_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC33_EXIT_30,
 	GT_SC33_EXIT_30,
 	0,

Index: 34comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/34comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 34comp.h	29 Apr 2003 22:29:19 -0000	1.4
+++ 34comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -256,7 +256,7 @@
 
 uint16 sc34_floor_table[] = {
 	ID_SC34_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC34_DOOR,
 	GT_SC34_DOOR,
 	0,

Index: 36comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/36comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 36comp.h	29 Apr 2003 22:29:19 -0000	1.4
+++ 36comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -1743,7 +1743,7 @@
 	ID_SC36_FLOOR,
 	GT_SC36_FLOOR,
 	ID_SC36_LOW_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC36_EXIT_30,
 	GT_SC36_FLOOR,
 	ID_SC36_DOOR,
@@ -1796,7 +1796,7 @@
 
 uint16 sc36_floor_table[] = {
 	ID_SC36_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC36_LOW_FLOOR,
 	GT_SC36_LOW_FLOOR,
 	ID_SC36_EXIT_30,

Index: 37comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/37comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 37comp.h	29 Apr 2003 22:29:20 -0000	1.4
+++ 37comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -217,7 +217,7 @@
 
 uint16 sc37_floor_table[] = {
 	ID_SC37_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC37_DOOR,
 	GT_SC37_DOOR,
 	0,
@@ -491,7 +491,7 @@
 	ID_SC37_GRILL,
 	GT_SC37_GRILL,
 	ID_SC37_FLIMSY_BOX,
-	RETURN_OK,
+	RET_OK,
 	ID_SC37_BIG_BOX,
 	STEP_OFF_BOX,
 	ID_SC37_WINE_RACK,

Index: 38comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/38comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 38comp.h	29 Apr 2003 22:29:20 -0000	1.4
+++ 38comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -1182,7 +1182,7 @@
 
 uint16 sc38_floor_table[] = {
 	ID_SC38_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC38_LIFT,
 	GT_SC38_LIFT,
 	ID_SC38_SOFA,

Index: 39comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/39comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 39comp.h	29 Apr 2003 22:29:20 -0000	1.4
+++ 39comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -50,7 +50,7 @@
 
 uint16 sc39_floor_table[] = {
 	ID_SC39_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC39_EXIT_31,
 	GT_SC39_EXIT_31,
 	0,

Index: 3compact.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/3compact.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 3compact.h	29 Apr 2003 22:29:20 -0000	1.4
+++ 3compact.h	4 May 2003 13:51:09 -0000	1.5
@@ -1683,7 +1683,7 @@
 
 uint16 r3_floor_table[] = {
 	ID_S3_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_FURNACE_DOOR,
 	GET_TO_FURNACE_DOOR,
 	ID_SLOT,

Index: 40comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/40comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 40comp.h	29 Apr 2003 22:29:21 -0000	1.4
+++ 40comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -619,7 +619,7 @@
 
 uint16 sc40_floor_table[] = {
 	ID_SC40_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC40_EXIT_39,
 	GT_SC40_EXIT_39,
 	ID_SC40_CABINET,

Index: 41comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/41comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 41comp.h	29 Apr 2003 22:29:21 -0000	1.4
+++ 41comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -257,7 +257,7 @@
 
 uint16 sc41_floor_table[] = {
 	ID_SC41_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC41_EXIT_39,
 	GT_SC41_EXIT_39,
 	0,

Index: 44comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/44comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 44comp.h	29 Apr 2003 22:29:21 -0000	1.4
+++ 44comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -91,7 +91,7 @@
 
 uint16 sc44_floor_table[] = {
 	ID_SC44_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC44_RUBBLE,
 	GT_SC44_RUBBLE,
 	ID_SC44_GRILL,

Index: 45comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/45comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 45comp.h	29 Apr 2003 22:29:21 -0000	1.4
+++ 45comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -47,7 +47,7 @@
 
 uint16 sc45_floor_table[] = {
 	ID_SC45_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC45_EXIT_44,
 	GT_SC45_EXIT_44,
 	0,

Index: 46comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/46comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 46comp.h	29 Apr 2003 22:29:22 -0000	1.4
+++ 46comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -29,7 +29,7 @@
 
 uint16 sc46_floor_table[] = {
 	ID_SC46_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC46_RUBBLE,
 	GT_SC46_RUBBLE,
 	ID_SC46_EXIT_45,

Index: 47comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/47comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 47comp.h	29 Apr 2003 22:29:22 -0000	1.4
+++ 47comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -512,7 +512,7 @@
 
 uint16 sc47_floor_table[] = {
 	ID_SC47_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC47_EXIT_45,
 	GT_SC47_EXIT_45,
 	0,

Index: 48comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/48comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 48comp.h	29 Apr 2003 22:29:22 -0000	1.4
+++ 48comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -79,7 +79,7 @@
 
 uint16 sc48_floor_table[] = {
 	ID_SC48_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC48_EXIT_47,
 	GT_SC48_EXIT_47,
 	0,

Index: 4compact.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/4compact.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 4compact.h	29 Apr 2003 22:29:22 -0000	1.4
+++ 4compact.h	4 May 2003 13:51:09 -0000	1.5
@@ -112,9 +112,9 @@
 
 uint16 s4_talk_table[] = {
 	4106,
-	RETURN_OK,
+	RET_OK,
 	4107,
-	RETURN_OK,
+	RET_OK,
 	ID_S4_FLOOR,
 	STD_ADJOIN_FLOOR,
 	ID_S4_L_EXIT,
@@ -997,7 +997,7 @@
 
 uint16 r4_floor_table[] = {
 	ID_S4_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_S4_L_EXIT,
 	GET_TO_EL4,
 	ID_CUPBOARD,

Index: 5compact.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/5compact.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 5compact.h	29 Apr 2003 22:29:23 -0000	1.4
+++ 5compact.h	4 May 2003 13:51:09 -0000	1.5
@@ -388,7 +388,7 @@
 
 uint16 s7_floor_table[] = {
 	ID_S7_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,
@@ -2609,7 +2609,7 @@
 
 uint16 s6_floor_table[] = {
 	ID_S6_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_S6_STAIRS,
 	GET_TO_STAIRS6,
 	ID_JOEY_PARK,
@@ -2782,7 +2782,7 @@
 
 uint16 s5_floor_table[] = {
 	ID_S5_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,
@@ -2823,7 +2823,7 @@
 
 uint16 s8_floor_table[] = {
 	ID_S8_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	0,
 	S8_WALK_ON,
 	ID_WRECK_GUARD,

Index: 65comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/65comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 65comp.h	29 Apr 2003 22:29:24 -0000	1.4
+++ 65comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -52,7 +52,7 @@
 
 uint16 sc65_floor_table[] = {
 	ID_SC65_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC65_POSTER1,
 	GT_SC65_POSTER1,
 	ID_SC65_POSTER2,

Index: 67comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/67comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 67comp.h	29 Apr 2003 22:29:24 -0000	1.4
+++ 67comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -1796,7 +1796,7 @@
 
 uint16 sc67_floor_table[] = {
 	ID_SC67_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC67_BRICKWORK,
 	GT_SC67_BRICKWORK,
 	ID_SC67_DOOR,

Index: 68comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/68comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 68comp.h	29 Apr 2003 22:29:24 -0000	1.4
+++ 68comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -1183,7 +1183,7 @@
 
 uint16 sc68_floor_table[] = {
 	ID_SC68_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	0,
 	SC68_DOOR_WALK_ON,
 	1,

Index: 69comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/69comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 69comp.h	29 Apr 2003 22:29:24 -0000	1.4
+++ 69comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -565,7 +565,7 @@
 
 uint16 sc69_floor_table[] = {
 	ID_SC69_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	0,
 	SC69_EXIT_WALK_ON,
 	1,

Index: 70comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/70comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 70comp.h	29 Apr 2003 22:29:24 -0000	1.4
+++ 70comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -589,7 +589,7 @@
 
 uint16 sc70_floor_table[] = {
 	ID_SC70_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC70_DOOR,
 	GT_SC70_DOOR,
 	ID_SC70_CONTROL,

Index: 71comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/71comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 71comp.h	29 Apr 2003 22:29:24 -0000	1.4
+++ 71comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -1322,7 +1322,7 @@
 
 uint16 sc71_floor_table[] = {
 	ID_SC71_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	0,
 	SC71_DOOR69_WALK_ON,
 	3,

Index: 72comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/72comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 72comp.h	29 Apr 2003 22:29:24 -0000	1.4
+++ 72comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -327,7 +327,7 @@
 
 uint16 sc72_floor_table[] = {
 	ID_SC72_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	0,
 	SC72_DOOR_WALK_ON,
 	1,

Index: 73comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/73comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 73comp.h	29 Apr 2003 22:29:24 -0000	1.4
+++ 73comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -875,7 +875,7 @@
 
 uint16 sc73_floor_table[] = {
 	ID_SC73_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC73_EXIT,
 	GT_SC73_EXIT,
 	0,

Index: 74comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/74comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 74comp.h	29 Apr 2003 22:29:25 -0000	1.4
+++ 74comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -122,7 +122,7 @@
 	ID_SC74_RIGHT_TV,
 	GT_SC74_FLOOR,
 	ID_SC74_INTERFACE,
-	RETURN_OK,
+	RET_OK,
 	ID_SC74_INT_SLOT,
 	GT_SC74_FLOOR,
 	ID_SC74_TERMINAL,
@@ -1926,7 +1926,7 @@
 
 uint16 sc74_floor_table[] = {
 	ID_SC74_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC74_DOOR,
 	GT_SC74_DOOR,
 	0,

Index: 75comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/75comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 75comp.h	29 Apr 2003 22:29:25 -0000	1.4
+++ 75comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -29,7 +29,7 @@
 
 uint16 sc75_floor_table[] = {
 	ID_SC75_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC75_BIG_DOOR,
 	GT_SC75_BIG_DOOR,
 	0,

Index: 76comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/76comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 76comp.h	29 Apr 2003 22:29:25 -0000	1.4
+++ 76comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -589,7 +589,7 @@
 
 uint16 sc76_floor_table[] = {
 	ID_SC76_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC76_DOOR75,
 	GT_SC76_DOOR75,
 	0,

Index: 77comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/77comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 77comp.h	29 Apr 2003 22:29:25 -0000	1.4
+++ 77comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -818,7 +818,7 @@
 
 uint16 sc77_floor_table[] = {
 	ID_SC77_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC77_DOOR76,
 	GT_SC77_DOOR76,
 	0,

Index: 78comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/78comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 78comp.h	29 Apr 2003 22:29:25 -0000	1.4
+++ 78comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -29,7 +29,7 @@
 
 uint16 sc78_ledge_table[] = {
 	ID_SC78_LEDGE,
-	RETURN_OK,
+	RET_OK,
 	ID_SC78_PIPE,
 	GT_SC78_PIPE,
 	ID_SC78_BIG_DOOR,
@@ -626,7 +626,7 @@
 
 uint16 sc78_pipe_table[] = {
 	ID_SC78_PIPE,
-	RETURN_OK,
+	RET_OK,
 	ID_SC78_LEDGE,
 	GT_SC78_LEDGE,
 	ID_SC78_BIG_DOOR,

Index: 79comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/79comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 79comp.h	29 Apr 2003 22:29:25 -0000	1.4
+++ 79comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -1086,7 +1086,7 @@
 
 uint16 sc79_pipe_table[] = {
 	ID_SC79_PIPE,
-	RETURN_OK,
+	RET_OK,
 	ID_SC79_EXIT,
 	GT_SC79_EXIT,
 	0,

Index: 90comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/90comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 90comp.h	29 Apr 2003 22:29:26 -0000	1.4
+++ 90comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -99,17 +99,17 @@
 
 uint16 sc90_floor_table[] = {
 	ID_SC90_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC90_SMFLOOR,
-	RETURN_FAIL,
+	RET_FAIL,
 	ID_DOOR_L90,
-	RETURN_FAIL,
+	RET_FAIL,
 	ID_DOOR_R90,
 	GET_TO_DOOR_R90,
 	ID_JOIN_OBJECT,
 	GET_TO_JOIN_OBJECT,
 	ID_OSCILLATOR,
-	RETURN_FAIL,
+	RET_FAIL,
 	ID_EYEBALL_90,
 	GET_TO_EYEBALL_90,
 	65535,
@@ -138,19 +138,19 @@
 
 uint16 sc90_smfloor_table[] = {
 	ID_SC90_FLOOR,
-	RETURN_FAIL,
+	RET_FAIL,
 	ID_SC90_SMFLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_DOOR_L90,
 	GET_TO_DOOR_L90,
 	ID_DOOR_R90,
-	RETURN_FAIL,
+	RET_FAIL,
 	ID_JOIN_OBJECT,
-	RETURN_FAIL,
+	RET_FAIL,
 	ID_OSCILLATOR,
 	GET_TO_OSCILLATOR,
 	ID_EYEBALL_90,
-	RETURN_FAIL,
+	RET_FAIL,
 	65535,
 };
 

Index: 91comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/91comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 91comp.h	29 Apr 2003 22:29:26 -0000	1.4
+++ 91comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -474,7 +474,7 @@
 
 uint16 sc91_floor_table[] = {
 	ID_SC91_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_DOOR_L91,
 	GET_TO_DOOR_L91,
 	ID_DOOR_R91,

Index: 92comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/92comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 92comp.h	29 Apr 2003 22:29:26 -0000	1.4
+++ 92comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -99,7 +99,7 @@
 	ID_SLAB7,
 	GET_TO_SLAB,
 	ID_SLAB8,
-	RETURN_OK,
+	RET_OK,
 	65535,
 };
 
@@ -142,7 +142,7 @@
 	ID_SLAB2,
 	GET_TO_SLAB,
 	ID_SLAB3,
-	RETURN_OK,
+	RET_OK,
 	ID_SLAB6,
 	GET_TO_SLAB,
 	65535,
@@ -156,7 +156,7 @@
 	ID_SLAB1,
 	GET_TO_SLAB,
 	ID_SLAB2,
-	RETURN_OK,
+	RET_OK,
 	ID_SLAB3,
 	GET_TO_SLAB,
 	ID_SLAB5,
@@ -172,7 +172,7 @@
 	ID_SLAB1,
 	GET_TO_SLAB,
 	ID_SLAB4,
-	RETURN_OK,
+	RET_OK,
 	ID_SLAB5,
 	GET_TO_SLAB,
 	ID_SLAB7,
@@ -369,7 +369,7 @@
 	ID_SLAB5,
 	GET_TO_SLAB,
 	ID_SLAB6,
-	RETURN_OK,
+	RET_OK,
 	ID_SLAB9,
 	GET_TO_SLAB,
 	65535,
@@ -507,7 +507,7 @@
 	ID_SLAB4,
 	GET_TO_SLAB,
 	ID_SLAB7,
-	RETURN_OK,
+	RET_OK,
 	ID_SLAB8,
 	GET_TO_SLAB,
 	65535,
@@ -715,7 +715,7 @@
 	ID_SLAB6,
 	GET_TO_SLAB,
 	ID_SLAB9,
-	RETURN_OK,
+	RET_OK,
 	ID_DOOR_R92,
 	GET_TO_DOOR_R92,
 	65535,
@@ -727,7 +727,7 @@
 	ID_RED_CIRCLE,
 	GET_TO_CIRCLE,
 	ID_SLAB1,
-	RETURN_OK,
+	RET_OK,
 	ID_SLAB2,
 	GET_TO_SLAB,
 	ID_SLAB4,
@@ -1419,7 +1419,7 @@
 	ID_SLAB4,
 	GET_TO_SLAB,
 	ID_SLAB5,
-	RETURN_OK,
+	RET_OK,
 	ID_SLAB6,
 	GET_TO_SLAB,
 	ID_SLAB8,

Index: 93comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/93comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 93comp.h	29 Apr 2003 22:29:26 -0000	1.4
+++ 93comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -121,7 +121,7 @@
 
 uint16 sc93_floor_table[] = {
 	ID_SC93_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_DOOR_L93,
 	GET_TO_DOOR_L93,
 	ID_PERSONA,

Index: 94comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/94comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 94comp.h	29 Apr 2003 22:29:26 -0000	1.4
+++ 94comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -135,7 +135,7 @@
 
 uint16 sc94_floor_table[] = {
 	ID_SC94_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_DOOR_L94,
 	GET_TO_DOOR_L94,
 	ID_DOOR_R94,

Index: 95comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/95comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 95comp.h	29 Apr 2003 22:29:26 -0000	1.4
+++ 95comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -115,7 +115,7 @@
 
 uint16 sc95_floor_table[] = {
 	ID_SC95_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_DOOR_L95,
 	GET_TO_DOOR_L95,
 	ID_DOOR_R95,

Index: 96comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/96comp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 96comp.h	29 Apr 2003 22:29:26 -0000	1.4
+++ 96comp.h	4 May 2003 13:51:09 -0000	1.5
@@ -112,7 +112,7 @@
 
 uint16 sc96_floor_table[] = {
 	ID_SC96_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_DOOR_L96,
 	GET_TO_DOOR_L96,
 	ID_CRYSTAL,

Index: 9compact.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/9compact.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 9compact.h	29 Apr 2003 22:29:26 -0000	1.4
+++ 9compact.h	4 May 2003 13:51:09 -0000	1.5
@@ -29,7 +29,7 @@
 
 uint16 s9_floor_table[] = {
 	ID_S9_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	42,

Index: z_compac.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/z_compac.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- z_compac.h	29 Apr 2003 22:29:26 -0000	1.4
+++ z_compac.h	4 May 2003 13:51:09 -0000	1.5
@@ -85,7 +85,7 @@
 	90,
 	GET_TO_FEXIT,
 	17,
-	RETURN_OK,
+	RET_OK,
 	ID_NOTICE,
 	GET_TO_NOTICE,
 	0,
@@ -134,9 +134,9 @@
 
 uint16 s2_talk_table[] = {
 	21,
-	RETURN_OK,
+	RET_OK,
 	22,
-	RETURN_OK,
+	RET_OK,
 	116,
 	GET_TO_EL2,
 	ID_R_EXIT_S2,
@@ -566,9 +566,9 @@
 	69,
 	STAIRS_FROM_LOW,
 	44,
-	RETURN_OK,
+	RET_OK,
 	45,
-	RETURN_OK,
+	RET_OK,
 	105,
 	GET_TO_SMALL_DOOR,
 	111,
@@ -592,7 +592,7 @@
 	17,
 	STAIRS_FROM_LOW,
 	ID_LOW_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	44,
 	GET_TO_TALK1,
 	45,
@@ -1382,7 +1382,7 @@
 
 uint16 r2_floor_table[] = {
 	115,
-	RETURN_OK,
+	RET_OK,
 	ID_L_EXIT_S2,
 	GET_TO_EL2,
 	ID_R_EXIT_S2,
@@ -1578,7 +1578,7 @@
 	45,
 	GET_TO_TALK2,
 	69,
-	RETURN_OK,
+	RET_OK,
 	105,
 	GET_TO_SMALL_DOOR,
 	111,
@@ -1705,7 +1705,7 @@
 	17,
 	STD_ADJOIN_FLOOR,
 	70,
-	RETURN_OK,
+	RET_OK,
 	85,
 	GET_TO_BAR,
 	90,
@@ -1781,7 +1781,7 @@
 	90,
 	GET_TO_FEXIT,
 	85,
-	RETURN_OK,
+	RET_OK,
 	ID_NOTICE,
 	GET_TO_NOTICE,
 };
@@ -1960,7 +1960,7 @@
 	17,
 	STAIRS_FROM_LOW,
 	105,
-	RETURN_OK,
+	RET_OK,
 	111,
 	GET_TO_ER0,
 	69,
@@ -2601,7 +2601,7 @@
 
 uint16 ledge_table[] = {
 	95,
-	RETURN_OK,
+	RET_OK,
 	97,
 	GET_TO_R1_DOOR,
 	ID_NOTICE2,





More information about the Scummvm-git-logs mailing list