[Scummvm-cvs-logs] CVS: scummvm/sky/compacts 0compact.h,1.6,1.7 27comp.h,1.7,1.8 2compact.h,1.7,1.8 30comp.h,1.7,1.8 31comp.h,1.7,1.8 32comp.h,1.7,1.8 33comp.h,1.7,1.8 34comp.h,1.6,1.7 36comp.h,1.7,1.8 37comp.h,1.7,1.8 38comp.h,1.7,1.8 39comp.h,1.6,1.7 3compact.h,1.7,1.8 40comp.h,1.6,1.7 41comp.h,1.6,1.7 42comp.h,1.5,1.6 44comp.h,1.6,1.7 45comp.h,1.6,1.7 46comp.h,1.6,1.7 47comp.h,1.6,1.7 48comp.h,1.6,1.7 4compact.h,1.8,1.9 5compact.h,1.7,1.8 66comp.h,1.5,1.6 72comp.h,1.7,1.8 73comp.h,1.7,1.8 90comp.h,1.7,1.8 z_compac.h,1.7,1.8

Robert G?ffringmann lavosspawn at users.sourceforge.net
Mon Jun 9 13:39:08 CEST 2003


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

Modified Files:
	0compact.h 27comp.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 42comp.h 44comp.h 45comp.h 
	46comp.h 47comp.h 48comp.h 4compact.h 5compact.h 66comp.h 
	72comp.h 73comp.h 90comp.h z_compac.h 
Log Message:
fixed compact data

Index: 0compact.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/0compact.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- 0compact.h	9 Jun 2003 16:38:46 -0000	1.6
+++ 0compact.h	9 Jun 2003 20:38:25 -0000	1.7
@@ -457,7 +457,7 @@
 	0
 };
 
-uint32 *c74 = 0;
+uint32 *c74 = (uint32*)(&mini_so);
 
 uint16 f_ss_left[] = {
 	4,
@@ -1131,7 +1131,7 @@
 	65535
 };
 
-uint32 *rs_jobs_4_2 = 0;
+uint32 *rs_jobs_4_2 = (uint32*)rs_foster_4_2;
 
 uint16 monitor_seq[] = {
 	151*64,
@@ -6869,7 +6869,7 @@
 	0
 };
 
-uint32 *c101 = 0;
+uint32 *c101 = (uint32*)(&full_so);
 
 uint16 put_bar_away[] = {
 	88*64,

Index: 27comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/27comp.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- 27comp.h	9 Jun 2003 16:38:46 -0000	1.7
+++ 27comp.h	9 Jun 2003 20:38:25 -0000	1.8
@@ -1291,7 +1291,7 @@
 	0
 };
 
-uint32 *heart_seq = 0;
+uint32 *heart_seq = (uint32*)lung_seq;
 
 uint16 squirm_seq[] = {
 	164*64,

Index: 2compact.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/2compact.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- 2compact.h	9 Jun 2003 16:38:46 -0000	1.7
+++ 2compact.h	9 Jun 2003 20:38:25 -0000	1.8
@@ -56,7 +56,7 @@
 	0
 };
 
-uint32 *c4121 = 0;
+uint32 *c4121 = (uint32*)&loader;
 
 uint16 loader_right[] = {
 	2,
@@ -625,7 +625,7 @@
 	0
 };
 
-uint16 *left_table2 = 0;
+uint16 *left_table2 = (uint16*)(&junk1);
 
 uint16 sml_loaderb_u_to_d[] = {
 	24+158*64,
@@ -865,7 +865,7 @@
 	0
 };
 
-uint32 *exit_table = 0;
+uint32 *exit_table = (uint32*)(&junk1);
 
 uint16 sml_loaderb_r_to_l[] = {
 	23+158*64,

Index: 30comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/30comp.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- 30comp.h	9 Jun 2003 16:38:46 -0000	1.7
+++ 30comp.h	9 Jun 2003 20:38:25 -0000	1.8
@@ -629,7 +629,7 @@
 	16191
 };
 
-uint32 *sec4_compacts = 0;
+uint32 *sec4_compacts = (uint32*)data_4;
 
 uint16 sc36_col_talk2[] = {
 	63*64,
@@ -1491,7 +1491,7 @@
 	ID_TEXT_MOUSE
 };
 
-uint32 *sc30_walk_grid = 0;
+uint32 *sc30_walk_grid = (uint32*)sc30_joey_list;
 
 Compact sc30_exit_31 = {
 	0,	// logic

Index: 31comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/31comp.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- 31comp.h	9 Jun 2003 16:38:47 -0000	1.7
+++ 31comp.h	9 Jun 2003 20:38:25 -0000	1.8
@@ -743,7 +743,7 @@
 	0
 };
 
-uint32 *sc31_walk_grid = 0;
+uint32 *sc31_walk_grid = (uint32*)sc31_joey_list;
 
 Compact sc31_rope = {
 	L_SCRIPT,	// logic

Index: 32comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/32comp.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- 32comp.h	9 Jun 2003 16:38:47 -0000	1.7
+++ 32comp.h	9 Jun 2003 20:38:25 -0000	1.8
@@ -498,7 +498,7 @@
 	&sc32_vincent_ext
 };
 
-uint32 *sc32_walk_grid = 0;
+uint32 *sc32_walk_grid = (uint32*)sc32_joey_list;
 
 uint16 sc32_gard_turn_d[] = {
 	59*64,

Index: 33comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/33comp.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- 33comp.h	9 Jun 2003 16:38:47 -0000	1.7
+++ 33comp.h	9 Jun 2003 20:38:25 -0000	1.8
@@ -469,7 +469,7 @@
 	0
 };
 
-uint32 *sc33_walk_grid = 0;
+uint32 *sc33_walk_grid = (uint32*)sc33_joey_list;
 
 uint16 reset_34_33[] = {
 	C_SCREEN,

Index: 34comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/34comp.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- 34comp.h	21 May 2003 20:20:18 -0000	1.6
+++ 34comp.h	9 Jun 2003 20:38:26 -0000	1.7
@@ -81,7 +81,7 @@
 	0
 };
 
-uint32 *sc34_walk_grid = 0;
+uint32 *sc34_walk_grid = (uint32*)sc34_fast_list;
 
 uint16 sc34_logic_list[] = {
 	ID_FOSTER,

Index: 36comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/36comp.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- 36comp.h	9 Jun 2003 16:38:47 -0000	1.7
+++ 36comp.h	9 Jun 2003 20:38:26 -0000	1.8
@@ -3268,7 +3268,7 @@
 	0
 };
 
-uint32 *babs = 0;
+uint32 *babs = (uint32*)&sc36_babs;
 
 uint16 bar_wipe[] = {
 	32*64,
@@ -3846,7 +3846,7 @@
 	0
 };
 
-uint32 *sc36_walk_grid = 0;
+uint32 *sc36_walk_grid = (uint32*)sc36_fast_list;
 
 uint16 sc36_dooropen[] = {
 	144*64,

Index: 37comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/37comp.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- 37comp.h	9 Jun 2003 16:38:47 -0000	1.7
+++ 37comp.h	9 Jun 2003 20:38:26 -0000	1.8
@@ -1541,7 +1541,7 @@
 	0
 };
 
-uint32 *sc37_walk_grid = 0;
+uint32 *sc37_walk_grid = (uint32*)sc37_fast_list;
 
 Compact sc37_door = {
 	L_SCRIPT,	// logic

Index: 38comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/38comp.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- 38comp.h	9 Jun 2003 16:38:47 -0000	1.7
+++ 38comp.h	9 Jun 2003 20:38:26 -0000	1.8
@@ -1209,7 +1209,7 @@
 	0
 };
 
-uint32 *spu = 0;
+uint32 *spu = (uint32*)&spunky;
 
 uint16 sc38_floor_table[] = {
 	ID_SC38_FLOOR,
@@ -2833,9 +2833,9 @@
 	0
 };
 
-uint32 *sc38_walk_grid = 0;
+uint32 *sc38_walk_grid = (uint32*)sc38_fast_list;
 
-uint32 *dna = 0;
+uint32 *dna = (uint32*)&danielle;
 
 uint16 spu_st_right[] = {
 	71*64,

Index: 39comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/39comp.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- 39comp.h	21 May 2003 20:20:18 -0000	1.6
+++ 39comp.h	9 Jun 2003 20:38:26 -0000	1.7
@@ -327,7 +327,7 @@
 	0
 };
 
-uint32 *sc39_walk_grid = 0;
+uint32 *sc39_walk_grid = (uint32*)sc39_fast_list;
 
 uint16 sc39_descend[] = {
 	23*64,

Index: 3compact.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/3compact.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- 3compact.h	9 Jun 2003 16:38:47 -0000	1.7
+++ 3compact.h	9 Jun 2003 20:38:26 -0000	1.8
@@ -574,7 +574,7 @@
 	&eye_ball_ext
 };
 
-uint32 *sh = 0;
+uint32 *sh = (uint32*)&shades;
 
 uint16 liftc3_up[] = {
 	204*64,

Index: 40comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/40comp.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- 40comp.h	21 May 2003 20:20:18 -0000	1.6
+++ 40comp.h	9 Jun 2003 20:38:26 -0000	1.7
@@ -168,7 +168,7 @@
 	0
 };
 
-uint32 *sc40_walk_grid = 0;
+uint32 *sc40_walk_grid = (uint32*)sc40_fast_list;
 
 uint16 sc40_palette[] = {
 	0,

Index: 41comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/41comp.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- 41comp.h	21 May 2003 20:20:18 -0000	1.6
+++ 41comp.h	9 Jun 2003 20:38:26 -0000	1.7
@@ -154,7 +154,7 @@
 	0
 };
 
-uint32 *sc41_walk_grid = 0;
+uint32 *sc41_walk_grid = (uint32*)sc41_fast_list;
 
 uint16 sc41_fast_list[] = {
 	13+DISK_14,

Index: 42comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/42comp.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- 42comp.h	21 May 2003 20:20:18 -0000	1.5
+++ 42comp.h	9 Jun 2003 20:38:26 -0000	1.6
@@ -541,8 +541,6 @@
 	ID_STD_MENU_LOGIC
 };
 
-uint32 *sc42_walk_grid = 0;
-
 uint16 sc42_jdg_turn[] = {
 	167*64,
 	1,
@@ -565,6 +563,8 @@
 	170+DISK_14+0X8000,
 	0
 };
+
+uint32 *sc42_walk_grid = (uint32*)sc42_fast_list;
 
 ExtCompact sc42_prosecution_ext = {
 	0,	// actionSub

Index: 44comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/44comp.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- 44comp.h	21 May 2003 20:20:18 -0000	1.6
+++ 44comp.h	9 Jun 2003 20:38:26 -0000	1.7
@@ -33,7 +33,7 @@
 	0
 };
 
-uint32 *sc44_walk_grid = 0;
+uint32 *sc44_walk_grid = (uint32*)sc44_fast_list;
 
 Compact sc44_rubble = {
 	0,	// logic

Index: 45comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/45comp.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- 45comp.h	21 May 2003 20:20:18 -0000	1.6
+++ 45comp.h	9 Jun 2003 20:38:26 -0000	1.7
@@ -567,7 +567,7 @@
 	0
 };
 
-uint32 *sc45_walk_grid = 0;
+uint32 *sc45_walk_grid = (uint32*)sc45_fast_list;
 
 uint16 reset_47_45[] = {
 	C_SCREEN,

Index: 46comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/46comp.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- 46comp.h	21 May 2003 20:20:18 -0000	1.6
+++ 46comp.h	9 Jun 2003 20:38:26 -0000	1.7
@@ -477,7 +477,7 @@
 	ID_TEXT_MOUSE
 };
 
-uint32 *sc46_walk_grid = 0;
+uint32 *sc46_walk_grid = (uint32*)sc46_fast_list;
 
 uint16 sc46_fast_list[] = {
 	12+DISK_13,

Index: 47comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/47comp.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- 47comp.h	21 May 2003 20:20:18 -0000	1.6
+++ 47comp.h	9 Jun 2003 20:38:26 -0000	1.7
@@ -478,7 +478,7 @@
 	0
 };
 
-uint32 *sc47_walk_grid = 0;
+uint32 *sc47_walk_grid = (uint32*)sc47_fast_list;
 
 uint16 sc47_fast_list[] = {
 	12+DISK_13,

Index: 48comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/48comp.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- 48comp.h	21 May 2003 20:20:18 -0000	1.6
+++ 48comp.h	9 Jun 2003 20:38:26 -0000	1.7
@@ -741,7 +741,7 @@
 	0
 };
 
-uint32 *sc48_walk_grid = 0;
+uint32 *sc48_walk_grid = (uint32*)sc48_fast_list;
 
 Compact sc48_floor = {
 	0,	// logic

Index: 4compact.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/4compact.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- 4compact.h	9 Jun 2003 16:38:47 -0000	1.8
+++ 4compact.h	9 Jun 2003 20:38:26 -0000	1.9
@@ -151,7 +151,7 @@
 	65535
 };
 
-uint32 *l_talk_s4 = 0;
+uint32 *l_talk_s4 = (uint32*)&r_talk_s4;
 
 uint16 chip_list_sc4[] = {
 	56,
@@ -1192,7 +1192,7 @@
 	0
 };
 
-uint32 *c43 = 0;
+uint32 *c43 = (uint32*)&jobsworth;
 
 Compact chuck_s4 = {
 	L_SCRIPT,	// logic

Index: 5compact.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/5compact.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- 5compact.h	9 Jun 2003 16:38:47 -0000	1.7
+++ 5compact.h	9 Jun 2003 20:38:26 -0000	1.8
@@ -3497,7 +3497,7 @@
 	16191
 };
 
-uint32 *z2 = 0;
+uint32 *z2 = (uint32*)data_2;
 
 uint32 *grid6 = 0;
 
@@ -4921,7 +4921,7 @@
 	&foreman
 };
 
-uint32 *table2 = 0;
+uint32 *table2 = (uint32*)data_2;
 
 }; // namespace SkyCompact
 

Index: 66comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/66comp.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- 66comp.h	21 May 2003 20:20:18 -0000	1.5
+++ 66comp.h	9 Jun 2003 20:38:26 -0000	1.6
@@ -4001,7 +4001,7 @@
 	0
 };
 
-uint32 *sec5_compacts = 0;
+uint32 *sec5_compacts = (uint32*)data_5;
 
 uint16 sc81_fos_sat_tlk[] = {
 	205*64,

Index: 72comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/72comp.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- 72comp.h	9 Jun 2003 16:38:47 -0000	1.7
+++ 72comp.h	9 Jun 2003 20:38:26 -0000	1.8
@@ -443,7 +443,7 @@
 	0
 };
 
-uint32 *wit = 0;
+uint32 *wit = (uint32*)&witness;
 
 Compact sc72_cham2_light = {
 	L_SCRIPT,	// logic

Index: 73comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/73comp.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- 73comp.h	9 Jun 2003 16:38:47 -0000	1.7
+++ 73comp.h	9 Jun 2003 20:38:26 -0000	1.8
@@ -2512,7 +2512,7 @@
 	0
 };
 
-uint32 *gal = 0;
+uint32 *gal = (uint32*)&gal;
 
 Compact sc73_cham4_light = {
 	L_SCRIPT,	// logic

Index: 90comp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/90comp.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- 90comp.h	9 Jun 2003 16:38:47 -0000	1.7
+++ 90comp.h	9 Jun 2003 20:38:26 -0000	1.8
@@ -1855,7 +1855,7 @@
 	linc_menu_mouse
 };
 
-uint32 *sec6_compacts = 0;
+uint32 *sec6_compacts = (uint32*)data_6;
 
 }; // namespace SkyCompact
 

Index: z_compac.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compacts/z_compac.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- z_compac.h	9 Jun 2003 16:38:47 -0000	1.7
+++ z_compac.h	9 Jun 2003 20:38:26 -0000	1.8
@@ -1550,7 +1550,7 @@
 	0
 };
 
-uint32 *c68 = 0;
+uint32 *c68 = (uint32*)&foster;
 
 uint16 ljoey_d_to_r[] = {
 	23+173*64,
@@ -2070,7 +2070,7 @@
 	GET_TO_TALK2
 };
 
-uint32 *l_talk_s2 = 0;
+uint32 *l_talk_s2 = (uint32*)&r_talk_s2;
 
 uint16 bfoster_r_to_l[] = {
 	45+182*64,
@@ -4940,7 +4940,7 @@
 	0
 };
 
-uint32 *zt = 0;
+uint32 *zt = (uint32*)data_0;
 
 uint16 but_9[] = {
 	149*64,
@@ -5235,7 +5235,7 @@
 	0
 };
 
-uint32 *talk1 = 0;
+uint32 *talk1 = (uint32*)(&talk2);
 
 uint16 rs_lamb_start_2[] = {
 	C_STATUS,
@@ -5967,7 +5967,7 @@
 	forklift2_cdt
 };
 
-uint32 *z_compact_table = 0;
+uint32 *z_compact_table = (uint32*)data_0;
 
 }; // namespace SkyCompact
 





More information about the Scummvm-git-logs mailing list