[Scummvm-cvs-logs] CVS: scummvm/sky compact.cpp,1.2,1.3 compact.h,1.1,1.2 struc.h,1.6,1.7
Oliver Kiehl
olki at users.sourceforge.net
Sun Apr 27 14:46:12 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sky/compacts 0compact.h,1.2,1.3 101comp.h,1.2,1.3 102comp.h,1.2,1.3 10comp.h,1.2,1.3 11comp.h,1.2,1.3 12comp.h,1.2,1.3 13comp.h,1.2,1.3 14comp.h,1.2,1.3 15comp.h,1.2,1.3 16comp.h,1.2,1.3 17comp.h,1.2,1.3 18comp.h,1.2,1.3 19comp.h,1.2,1.3 1compact.h,1.2,1.3 20comp.h,1.2,1.3 21comp.h,1.2,1.3 22comp.h,1.2,1.3 23comp.h,1.2,1.3 24comp.h,1.2,1.3 25comp.h,1.2,1.3 26comp.h,1.2,1.3 27comp.h,1.2,1.3 28comp.h,1.2,1.3 29comp.h,1.2,1.3 2compact.h,1.2,1.3 30comp.h,1.2,1.3 31comp.h,1.2,1.3 32comp.h,1.2,1.3 33comp.h,1.2,1.3 34comp.h,1.2,1.3 36comp.h,1.2,1.3 37comp.h,1.2,1.3 38comp.h,1.2,1.3 39comp.h,1.2,1.3 3compact.h,1.2,1.3 40comp.h,1.2,1.3 41comp.h,1.2,1.3 42comp.h,1.2,1.3 44comp.h,1.2,1.3 45comp.h,1.2,1.3 46comp.h,1.2,1.3 47comp.h,1.2,1.3 48comp.h,1.2,1.3 4compact.h,1.2,1.3 5compact.h,1.2,1.3 65comp.h,1.2,1.3 66comp.h,1.2,1.3 67comp.h,1.2,1.3 68comp.h,1.2,1.3 69comp.h,1.2,1.3 70comp.h,1.2,1.3 71comp.h,1.2,1.3 72comp.h,1.2,1.3 73comp.h,1.2,1.3 74comp.h,1.2,1.3 75comp.h,1.2,1.3 76comp.h,1.2,1.3 77comp.h,1.2,1.3 78comp.h,1.2,1.3 79comp.h,1.2,1.3 80comp.h,1.2,1.3 81comp.h,1.2,1.3 82comp.h,1.2,1.3 85comp.h,1.2,1.3 90comp.h,1.2,1.3 91comp.h,1.2,1.3 92comp.h,1.2,1.3 93comp.h,1.2,1.3 94comp.h,1.2,1.3 95comp.h,1.2,1.3 96comp.h,1.2,1.3 9compact.h,1.2,1.3 linc_gen.h,1.2,1.3 lincmenu.h,1.2,1.3 objects.h,1.2,1.3 z_compac.h,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky compact.cpp,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv24148
Modified Files:
compact.cpp compact.h struc.h
Log Message:
adapted the code to the compact changes. not quite complete yet
Index: compact.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compact.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- compact.cpp 25 Apr 2003 15:37:51 -0000 1.2
+++ compact.cpp 27 Apr 2003 21:45:28 -0000 1.3
@@ -39,7 +39,6 @@
#define COMPACT_SIZE (sizeof(compactOffsets)/sizeof(uint32))
#define EXTCOMPACT_SIZE (sizeof(extCompactOffsets)/sizeof(uint32))
-#define UNKNOWNSTUFF_SIZE (sizeof(unknownStuffOffsets)/sizeof(uint32))
#define OFFS(type,item) (((uint32)(&((type*)0)->item)))
#define MK32(type,item) OFFS(type, item),0,0,0
@@ -104,136 +103,6 @@
MK16(ExtCompact, arTargetY),
MK32(ExtCompact, animScratch),
MK16(ExtCompact, megaSet),
- MK16(ExtCompact, gridWidth),
- MK16(ExtCompact, colOffset),
- MK16(ExtCompact, colWidth),
- MK16(ExtCompact, lastChr),
- MK32(ExtCompact, animUp),
- MK32(ExtCompact, animDown),
- MK32(ExtCompact, animLeft),
- MK32(ExtCompact, animRight),
- MK32(ExtCompact, standUp),
- MK32(ExtCompact, standDown),
- MK32(ExtCompact, standLeft),
- MK32(ExtCompact, standRight),
- MK32(ExtCompact, standTalk),
-};
-
-static const uint32 unknownStuffOffsets[] = {
- MK16(UnknownStuff, unknownStuff_1_1[0]),
- MK16(UnknownStuff, unknownStuff_1_1[1]),
- MK16(UnknownStuff, unknownStuff_1_1[2]),
- MK16(UnknownStuff, unknownStuff_1_1[3]),
- MK32(UnknownStuff, unknownStuff_1_2[0]),
- MK32(UnknownStuff, unknownStuff_1_2[1]),
- MK32(UnknownStuff, unknownStuff_1_2[2]),
- MK32(UnknownStuff, unknownStuff_1_2[3]),
- MK32(UnknownStuff, unknownStuff_1_2[4]),
- MK32(UnknownStuff, unknownStuff_1_2[5]),
- MK32(UnknownStuff, unknownStuff_1_2[6]),
- MK32(UnknownStuff, unknownStuff_1_2[7]),
- MK32(UnknownStuff, unknownStuff_1_2[8]),
- MK32(UnknownStuff, unknownStuff_1_2[9]),
- MK32(UnknownStuff, unknownStuff_1_2[10]),
- MK32(UnknownStuff, unknownStuff_1_2[11]),
- MK32(UnknownStuff, unknownStuff_1_2[12]),
- MK32(UnknownStuff, unknownStuff_1_2[13]),
- MK32(UnknownStuff, unknownStuff_1_2[14]),
- MK32(UnknownStuff, unknownStuff_1_2[15]),
- MK32(UnknownStuff, unknownStuff_1_2[16]),
- MK32(UnknownStuff, unknownStuff_1_2[17]),
- MK32(UnknownStuff, unknownStuff_1_2[18]),
- MK32(UnknownStuff, unknownStuff_1_2[19]),
- MK32(UnknownStuff, unknownStuff_1_2[20]),
- MK32(UnknownStuff, unknownStuff_1_2[21]),
- MK32(UnknownStuff, unknownStuff_1_2[22]),
- MK32(UnknownStuff, unknownStuff_1_2[23]),
- MK32(UnknownStuff, unknownStuff_1_2[24]),
- MK32(UnknownStuff, unknownStuff_1_2[25]),
- MK32(UnknownStuff, unknownStuff_1_2[26]),
- MK32(UnknownStuff, unknownStuff_1_2[27]),
- MK32(UnknownStuff, unknownStuff_1_2[28]),
- MK32(UnknownStuff, unknownStuff_1_2[29]),
- MK32(UnknownStuff, unknownStuff_1_2[30]),
- MK32(UnknownStuff, unknownStuff_1_2[31]),
- MK32(UnknownStuff, unknownStuff_1_2[32]),
- MK32(UnknownStuff, unknownStuff_1_2[33]),
- MK16(UnknownStuff, unknownStuff_2_1[0]),
- MK16(UnknownStuff, unknownStuff_2_1[1]),
- MK16(UnknownStuff, unknownStuff_2_1[2]),
- MK16(UnknownStuff, unknownStuff_2_1[3]),
- MK32(UnknownStuff, unknownStuff_2_2[0]),
- MK32(UnknownStuff, unknownStuff_2_2[1]),
- MK32(UnknownStuff, unknownStuff_2_2[2]),
- MK32(UnknownStuff, unknownStuff_2_2[3]),
- MK32(UnknownStuff, unknownStuff_2_2[4]),
- MK32(UnknownStuff, unknownStuff_2_2[5]),
- MK32(UnknownStuff, unknownStuff_2_2[6]),
- MK32(UnknownStuff, unknownStuff_2_2[7]),
- MK32(UnknownStuff, unknownStuff_2_2[8]),
- MK32(UnknownStuff, unknownStuff_2_2[9]),
- MK32(UnknownStuff, unknownStuff_2_2[10]),
- MK32(UnknownStuff, unknownStuff_2_2[11]),
- MK32(UnknownStuff, unknownStuff_2_2[12]),
- MK32(UnknownStuff, unknownStuff_2_2[13]),
- MK32(UnknownStuff, unknownStuff_2_2[14]),
- MK32(UnknownStuff, unknownStuff_2_2[15]),
- MK32(UnknownStuff, unknownStuff_2_2[16]),
- MK32(UnknownStuff, unknownStuff_2_2[17]),
- MK32(UnknownStuff, unknownStuff_2_2[18]),
- MK32(UnknownStuff, unknownStuff_2_2[19]),
- MK32(UnknownStuff, unknownStuff_2_2[20]),
- MK32(UnknownStuff, unknownStuff_2_2[21]),
- MK32(UnknownStuff, unknownStuff_2_2[22]),
- MK32(UnknownStuff, unknownStuff_2_2[23]),
- MK32(UnknownStuff, unknownStuff_2_2[24]),
- MK32(UnknownStuff, unknownStuff_2_2[25]),
- MK32(UnknownStuff, unknownStuff_2_2[26]),
- MK32(UnknownStuff, unknownStuff_2_2[27]),
- MK32(UnknownStuff, unknownStuff_2_2[28]),
- MK32(UnknownStuff, unknownStuff_2_2[29]),
- MK32(UnknownStuff, unknownStuff_2_2[30]),
- MK32(UnknownStuff, unknownStuff_2_2[31]),
- MK32(UnknownStuff, unknownStuff_2_2[32]),
- MK32(UnknownStuff, unknownStuff_2_2[33]),
- MK16(UnknownStuff, unknownStuff_3_1[0]),
- MK16(UnknownStuff, unknownStuff_3_1[1]),
- MK16(UnknownStuff, unknownStuff_3_1[2]),
- MK16(UnknownStuff, unknownStuff_3_1[3]),
- MK32(UnknownStuff, unknownStuff_3_2[0]),
- MK32(UnknownStuff, unknownStuff_3_2[1]),
- MK32(UnknownStuff, unknownStuff_3_2[2]),
- MK32(UnknownStuff, unknownStuff_3_2[3]),
- MK32(UnknownStuff, unknownStuff_3_2[4]),
- MK32(UnknownStuff, unknownStuff_3_2[5]),
- MK32(UnknownStuff, unknownStuff_3_2[6]),
- MK32(UnknownStuff, unknownStuff_3_2[7]),
- MK32(UnknownStuff, unknownStuff_3_2[8]),
- MK32(UnknownStuff, unknownStuff_3_2[9]),
- MK32(UnknownStuff, unknownStuff_3_2[10]),
- MK32(UnknownStuff, unknownStuff_3_2[11]),
- MK32(UnknownStuff, unknownStuff_3_2[12]),
- MK32(UnknownStuff, unknownStuff_3_2[13]),
- MK32(UnknownStuff, unknownStuff_3_2[14]),
- MK32(UnknownStuff, unknownStuff_3_2[15]),
- MK32(UnknownStuff, unknownStuff_3_2[16]),
- MK32(UnknownStuff, unknownStuff_3_2[17]),
- MK32(UnknownStuff, unknownStuff_3_2[18]),
- MK32(UnknownStuff, unknownStuff_3_2[19]),
- MK32(UnknownStuff, unknownStuff_3_2[20]),
- MK32(UnknownStuff, unknownStuff_3_2[21]),
- MK32(UnknownStuff, unknownStuff_3_2[22]),
- MK32(UnknownStuff, unknownStuff_3_2[23]),
- MK32(UnknownStuff, unknownStuff_3_2[24]),
- MK32(UnknownStuff, unknownStuff_3_2[25]),
- MK32(UnknownStuff, unknownStuff_3_2[26]),
- MK32(UnknownStuff, unknownStuff_3_2[27]),
- MK32(UnknownStuff, unknownStuff_3_2[28]),
- MK32(UnknownStuff, unknownStuff_3_2[29]),
- MK32(UnknownStuff, unknownStuff_3_2[30]),
- MK32(UnknownStuff, unknownStuff_3_2[31]),
- MK32(UnknownStuff, unknownStuff_3_2[32]),
- MK32(UnknownStuff, unknownStuff_3_2[33]),
};
void *getCompactElem(Compact *cpt, uint32 off) {
@@ -245,14 +114,9 @@
return((uint8 *)(cpt->extCompact) + extCompactOffsets[off]);
off -= EXTCOMPACT_SIZE;
- if (off < 5*5*4)
- return ((void **)(cpt->turnTable))[off/4];
-
- off -= 5*5*4;
- if (off < UNKNOWNSTUFF_SIZE)
- return((uint8 *)(cpt->unknownStuff) + unknownStuffOffsets[off]);
+ // TODO: put the MegaSet stuff in
- error("Offset %X out of bounds of compact", off + COMPACT_SIZE + EXTCOMPACT_SIZE + 5*5*4);
+ error("Offset %X out of bounds of compact", off + COMPACT_SIZE + EXTCOMPACT_SIZE);
}
};
Index: compact.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compact.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- compact.h 25 Apr 2003 15:17:45 -0000 1.1
+++ compact.h 27 Apr 2003 21:45:28 -0000 1.2
@@ -114,7 +114,6 @@
extern uint16 m_ss_l_to_u[];
extern uint16 m_ss_l_to_r[];
extern uint16 m_ss_r_to_l[];
- extern uint16 *mini_so_turnTable[5][5];
extern ExtCompact mini_so_ext;
extern Compact mini_so;
extern uint16 unload_seq1[];
@@ -135,7 +134,6 @@
extern uint16 f_ss_l_to_d[];
extern uint16 f_ss_r_to_u[];
extern uint16 f_ss_r_to_l[];
- extern uint16 *full_so_turnTable[5][5];
extern ExtCompact full_so_ext;
extern Compact full_so;
extern uint16 panel_seq[];
@@ -428,7 +426,6 @@
extern uint16 foreman_d_to_u[];
extern uint16 foreman_d_to_r[];
extern uint16 foreman_r_to_d[];
- extern uint16 *foreman_turnTable[5][5];
extern ExtCompact foreman_ext;
extern Compact foreman;
extern uint16 lite1_seq[];
@@ -467,7 +464,6 @@
extern uint16 radman_r_to_u[];
extern uint16 radman_r_to_d[];
extern uint16 radman_r_to_l[];
- extern uint16 *radman_turnTable[5][5];
extern ExtCompact radman_ext;
extern Compact radman;
extern Compact locker2;
@@ -1089,8 +1085,6 @@
extern uint16 sml_loaderb_u_to_r[];
extern uint16 sml_loaderb_d_to_r[];
extern uint16 sml_loaderb_l_to_d[];
- extern UnknownStuff loader_unk;
- extern uint16 *loader_turnTable[5][5];
extern ExtCompact loader_ext;
extern Compact loader;
extern Compact junk2;
@@ -1537,8 +1531,6 @@
extern uint16 sex_st_up[];
extern uint16 sex_st_left[];
extern uint16 sex_u_to_l[];
- extern UnknownStuff danielle_unk;
- extern uint16 *danielle_turnTable[5][5];
extern ExtCompact danielle_ext;
extern Compact danielle;
extern uint16 spu_d_to_r[];
@@ -3121,8 +3113,6 @@
extern uint16 sjoey_r_to_u[];
extern uint16 sjoey_r_to_d[];
extern uint16 sjoey_r_to_l[];
- extern UnknownStuff joey_unk;
- extern uint16 *joey_turnTable[5][5];
extern ExtCompact joey_ext;
extern Compact joey;
extern uint16 baby_logic_list[];
@@ -3182,8 +3172,6 @@
extern uint16 bfoster_l_to_u[];
extern uint16 bfoster_l_to_d[];
extern uint16 bfoster_l_to_r[];
- extern UnknownStuff foster_unk;
- extern uint16 *foster_turnTable[5][5];
extern ExtCompact foster_ext;
extern Compact foster;
extern uint16 monitor_up[];
@@ -3218,7 +3206,6 @@
extern uint16 monitor_l_to_d[];
extern uint16 monitor_r_to_d[];
extern uint16 monitor_r_to_l[];
- extern uint16 *monitor_turnTable[5][5];
extern ExtCompact monitor_ext;
extern Compact monitor;
extern ExtCompact anita_ext;
Index: struc.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/struc.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- struc.h 25 Apr 2003 17:57:04 -0000 1.6
+++ struc.h 27 Apr 2003 21:45:28 -0000 1.7
@@ -38,9 +38,24 @@
uint16 s_compressed_size;
};
-#if !defined(__GNUC__)
-#pragma START_PACK_STRUCTS
-#endif
+struct MegaSet {
+ uint16 gridWidth;
+ uint16 colOffset;
+ uint16 colWidth;
+ uint16 lastChr;
+
+ uint16 *animUp;
+ uint16 *animDown;
+ uint16 *animLeft;
+ uint16 *animRight;
+
+ uint16 *standUp;
+ uint16 *standDown;
+ uint16 *standLeft;
+ uint16 *standRight;
+ uint16 *standTalk;
+ void *turnTable;
+};
struct ExtCompact {
uint16 actionSub;
@@ -76,32 +91,11 @@
void *animScratch; // data area for AR
uint16 megaSet;
-
- uint16 gridWidth;
- uint16 colOffset;
- uint16 colWidth;
- uint16 lastChr;
-
- uint16 *animUp;
- uint16 *animDown;
- uint16 *animLeft;
- uint16 *animRight;
-
- uint16 *standUp;
- uint16 *standDown;
- uint16 *standLeft;
- uint16 *standRight;
- uint16 *standTalk;
-} GCC_PACK;
-
-struct UnknownStuff {
- uint16 unknownStuff_1_1[4];
- uint16 *unknownStuff_1_2[34];
- uint16 unknownStuff_2_1[4];
- uint16 *unknownStuff_2_2[34];
- uint16 unknownStuff_3_1[4];
- uint16 *unknownStuff_3_2[34];
-} GCC_PACK;
+ MegaSet *megaSet0;
+ MegaSet *megaSet1;
+ MegaSet *megaSet2;
+ MegaSet *megaSet3;
+};
struct Compact {
uint16 logic; // Entry in logic table to run (byte as <256entries in logic table
@@ -144,12 +138,6 @@
uint16 baseSub_off;
ExtCompact *extCompact;
- void *turnTable;
- UnknownStuff *unknownStuff;
-} GCC_PACK;
-
-#if !defined(__GNUC__)
-#pragma END_PACK_STRUCTS
-#endif
+};
#endif
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sky/compacts 0compact.h,1.2,1.3 101comp.h,1.2,1.3 102comp.h,1.2,1.3 10comp.h,1.2,1.3 11comp.h,1.2,1.3 12comp.h,1.2,1.3 13comp.h,1.2,1.3 14comp.h,1.2,1.3 15comp.h,1.2,1.3 16comp.h,1.2,1.3 17comp.h,1.2,1.3 18comp.h,1.2,1.3 19comp.h,1.2,1.3 1compact.h,1.2,1.3 20comp.h,1.2,1.3 21comp.h,1.2,1.3 22comp.h,1.2,1.3 23comp.h,1.2,1.3 24comp.h,1.2,1.3 25comp.h,1.2,1.3 26comp.h,1.2,1.3 27comp.h,1.2,1.3 28comp.h,1.2,1.3 29comp.h,1.2,1.3 2compact.h,1.2,1.3 30comp.h,1.2,1.3 31comp.h,1.2,1.3 32comp.h,1.2,1.3 33comp.h,1.2,1.3 34comp.h,1.2,1.3 36comp.h,1.2,1.3 37comp.h,1.2,1.3 38comp.h,1.2,1.3 39comp.h,1.2,1.3 3compact.h,1.2,1.3 40comp.h,1.2,1.3 41comp.h,1.2,1.3 42comp.h,1.2,1.3 44comp.h,1.2,1.3 45comp.h,1.2,1.3 46comp.h,1.2,1.3 47comp.h,1.2,1.3 48comp.h,1.2,1.3 4compact.h,1.2,1.3 5compact.h,1.2,1.3 65comp.h,1.2,1.3 66comp.h,1.2,1.3 67comp.h,1.2,1.3 68comp.h,1.2,1.3 69comp.h,1.2,1.3 70comp.h,1.2,1.3 71comp.h,1.2,1.3 72comp.h,1.2,1.3 73comp.h,1.2,1.3 74comp.h,1.2,1.3 75comp.h,1.2,1.3 76comp.h,1.2,1.3 77comp.h,1.2,1.3 78comp.h,1.2,1.3 79comp.h,1.2,1.3 80comp.h,1.2,1.3 81comp.h,1.2,1.3 82comp.h,1.2,1.3 85comp.h,1.2,1.3 90comp.h,1.2,1.3 91comp.h,1.2,1.3 92comp.h,1.2,1.3 93comp.h,1.2,1.3 94comp.h,1.2,1.3 95comp.h,1.2,1.3 96comp.h,1.2,1.3 9compact.h,1.2,1.3 linc_gen.h,1.2,1.3 lincmenu.h,1.2,1.3 objects.h,1.2,1.3 z_compac.h,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky compact.cpp,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list