thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Whitespace changes

Browse source 
svn-id: r10516
This commit is contained in:
Torbjörn Andersson 2003-10-01 09:40:28 +00:00
parent 920c11972e
commit cee745dbf9
17 changed files with 1236 additions and 1237 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sky/autoroute.cpp
View file

@ -88,7 +88,7 @@ void SkyAutoRoute::initWalkGrid(uint8 screen, uint8 width) {
screenGrid += GRID_SIZE;
wGridPos = _routeGrid + (ROUTE_GRID_SIZE >> 1) - ROUTE_GRID_WIDTH - 2;
memset(_routeGrid, 0, ROUTE_GRID_SIZE);
memset(_routeGrid, 0, ROUTE_GRID_SIZE);
uint8 bitsLeft = 0; uint32 gridData = 0;
for (uint8 gridCntY = 0; gridCntY < ROUTE_GRID_HEIGHT - 2; gridCntY++) {
for (uint8 gridCntX = 0; gridCntX < ROUTE_GRID_WIDTH - 2; gridCntX++) {

113
sky/compact.cpp
View file

@ -303,107 +303,106 @@ void *getCompactElem(Compact *cpt, uint32 off) {
// getToTables
uint16 s11_fl_tab288[33] = {
0x3132, 0x001C, 0x3139, 0x3017, 0x3145, 0x301B, 0x3148, 0x301D,
0x314C, 0x301F, 0x314D, 0x3021, 0x314E, 0x3022, 0x314F, 0x3023,
0x3150, 0x3024, 0x3152, 0x301F, 0x3153, 0x3021, 0x3154, 0x3022,
0x3155, 0x3023, 0x3156, 0x3024, 0x3157, 0x3026, 0x0000, 0x3028,
0xFFFF
0x3132, 0x001C, 0x3139, 0x3017, 0x3145, 0x301B, 0x3148, 0x301D,
0x314C, 0x301F, 0x314D, 0x3021, 0x314E, 0x3022, 0x314F, 0x3023,
0x3150, 0x3024, 0x3152, 0x301F, 0x3153, 0x3021, 0x3154, 0x3022,
0x3155, 0x3023, 0x3156, 0x3024, 0x3157, 0x3026, 0x0000, 0x3028,
0xFFFF
};
uint16 s19_fl_tab288[17] = {
0x3042, 0x001C, 0x0002, 0x002A, 0x0000, 0x302A, 0x0001, 0x3029,
0x3042, 0x001C, 0x0002, 0x002A, 0x0000, 0x302A, 0x0001, 0x3029,
0x3046, 0x302B, 0x3049, 0x302D, 0x3189, 0x302F, 0x3001, 0x3033,
0xFFFF
0xFFFF
};
uint16 s20_fl_tab288[37] = {
0x30A4, 0x001C, 0x0002, 0x002A, 0x0000, 0x3035, 0x0001, 0x303F,
0x0003, 0x3049, 0x30A8, 0x3037, 0x30AB, 0x303B, 0x30BA, 0x3047,
0x30AE, 0x303D, 0x30BD, 0x3043, 0x30C8, 0x304A, 0x30C9, 0x304C,
0x30CA, 0x304E, 0x3102, 0x3052, 0x310B, 0x3054, 0x310C, 0x3056,
0x0017, 0x3059, 0x0018, 0x305B, 0xFFFF
0x30A4, 0x001C, 0x0002, 0x002A, 0x0000, 0x3035, 0x0001, 0x303F,
0x0003, 0x3049, 0x30A8, 0x3037, 0x30AB, 0x303B, 0x30BA, 0x3047,
0x30AE, 0x303D, 0x30BD, 0x3043, 0x30C8, 0x304A, 0x30C9, 0x304C,
0x30CA, 0x304E, 0x3102, 0x3052, 0x310B, 0x3054, 0x310C, 0x3056,
0x0017, 0x3059, 0x0018, 0x305B, 0xFFFF
};
uint16 s21_fl_tab288[31] = {
0x30C2, 0x001C, 0x0002, 0x002A, 0x0000, 0x305C, 0x30C6, 0x305D,
0x30DE, 0x305F, 0x30DF, 0x3061, 0x30E0, 0x3063, 0x30E2, 0x3066,
0x30E4, 0x3069, 0x30E5, 0x306B, 0x30EC, 0x306D, 0x30EE, 0x3072,
0x30EF, 0x3074, 0x30ED, 0x306F, 0x30F6, 0x3077, 0xFFFF
0x30C2, 0x001C, 0x0002, 0x002A, 0x0000, 0x305C, 0x30C6, 0x305D,
0x30DE, 0x305F, 0x30DF, 0x3061, 0x30E0, 0x3063, 0x30E2, 0x3066,
0x30E4, 0x3069, 0x30E5, 0x306B, 0x30EC, 0x306D, 0x30EE, 0x3072,
0x30EF, 0x3074, 0x30ED, 0x306F, 0x30F6, 0x3077, 0xFFFF
};
uint16 s22_fl_tab288[31] = {
0x30B3, 0x001C, 0x0002, 0x002A, 0x0000, 0x307A, 0x30B7, 0x307B,
0x30CC, 0x307D, 0x30CD, 0x307F, 0x30CE, 0x3081, 0x30CF, 0x3081,
0x30D0, 0x3085, 0x30D5, 0x3087, 0x30D9, 0x308A, 0x30DA, 0x308C,
0x30DB, 0x308E, 0x30DC, 0x3090, 0x30DD, 0x3092, 0xFFFF
0x30B3, 0x001C, 0x0002, 0x002A, 0x0000, 0x307A, 0x30B7, 0x307B,
0x30CC, 0x307D, 0x30CD, 0x307F, 0x30CE, 0x3081, 0x30CF, 0x3081,
0x30D0, 0x3085, 0x30D5, 0x3087, 0x30D9, 0x308A, 0x30DA, 0x308C,
0x30DB, 0x308E, 0x30DC, 0x3090, 0x30DD, 0x3092, 0xFFFF
} ;
uint16 s23_fl_tab288[27] = {
0x3015, 0x001C, 0x0002, 0x002A, 0x0000, 0x3095, 0x0001, 0x3096,
0x0003, 0x3097, 0x3019, 0x3098, 0x301B, 0x309A, 0x3027, 0x309D,
0x305E, 0x309F, 0x305F, 0x30A1, 0x3060, 0x30A3, 0x3061, 0x30A5,
0x3184, 0x30A7, 0xFFFF
0x3015, 0x001C, 0x0002, 0x002A, 0x0000, 0x3095, 0x0001, 0x3096,
0x0003, 0x3097, 0x3019, 0x3098, 0x301B, 0x309A, 0x3027, 0x309D,
0x305E, 0x309F, 0x305F, 0x30A1, 0x3060, 0x30A3, 0x3061, 0x30A5,
0x3184, 0x30A7, 0xFFFF
};
uint16 s24_fl_tab288[23] = {
0x302C, 0x001C, 0x0002, 0x002A, 0x0000, 0x30A9, 0x3030, 0x30AA,
0x3062, 0x30AC, 0x3063, 0x30AE, 0x3064, 0x30B0, 0x3075, 0x30B2,
0x309A, 0x30B7, 0x3115, 0x30BA, 0x3118, 0x30BB, 0xFFFF
0x302C, 0x001C, 0x0002, 0x002A, 0x0000, 0x30A9, 0x3030, 0x30AA,
0x3062, 0x30AC, 0x3063, 0x30AE, 0x3064, 0x30B0, 0x3075, 0x30B2,
0x309A, 0x30B7, 0x3115, 0x30BA, 0x3118, 0x30BB, 0xFFFF
};
uint16 s25_fl_tab288[19] = {
0x3020, 0x001C, 0x0002, 0x002A, 0x0000, 0x30BE, 0x3024, 0x30BF,
0x308E, 0x30C4, 0x0003, 0x30C7, 0x3093, 0x30C9, 0x3092, 0x30CE,
0x3101, 0x30D0, 0xFFFF
0x3020, 0x001C, 0x0002, 0x002A, 0x0000, 0x30BE, 0x3024, 0x30BF,
0x308E, 0x30C4, 0x0003, 0x30C7, 0x3093, 0x30C9, 0x3092, 0x30CE,
0x3101, 0x30D0, 0xFFFF
};
uint16 s26_fl_tab288[29] = {
0x304E, 0x001C, 0x0002, 0x002A, 0x0000, 0x30D3, 0x0001, 0x30D2,
0x3052, 0x30D4, 0x3066, 0x30E3, 0x3057, 0x30D7, 0x3058, 0x30D7,
0x3059, 0x30D7, 0x305A, 0x30D7, 0x305B, 0x30DC, 0x305C, 0x30E9,
0x305D, 0x30DF, 0x30FD, 0x30E7, 0xFFFF
0x304E, 0x001C, 0x0002, 0x002A, 0x0000, 0x30D3, 0x0001, 0x30D2,
0x3052, 0x30D4, 0x3066, 0x30E3, 0x3057, 0x30D7, 0x3058, 0x30D7,
0x3059, 0x30D7, 0x305A, 0x30D7, 0x305B, 0x30DC, 0x305C, 0x30E9,
0x305D, 0x30DF, 0x30FD, 0x30E7, 0xFFFF
};
uint16 body_tab288[7] = {
0x3081, 0x30F5, 0x3073, 0x30F3, 0x0018, 0x30FC, 0xFFFF
0x3081, 0x30F5, 0x3073, 0x30F3, 0x0018, 0x30FC, 0xFFFF
};
uint16 chair_tab288[23] = {
0x3081, 0x001C, 0x306B, 0x30F7, 0x306F, 0x30F7, 0x0017, 0x30F7,
0x3071, 0x30F7, 0x3072, 0x30F7, 0x3073, 0x30F7, 0x3074, 0x30F7,
0x3089, 0x30F7, 0x308D, 0x30F7, 0x3084, 0x30F7, 0xFFFF
0x3081, 0x001C, 0x306B, 0x30F7, 0x306F, 0x30F7, 0x0017, 0x30F7,
0x3071, 0x30F7, 0x3072, 0x30F7, 0x3073, 0x30F7, 0x3074, 0x30F7,
0x3089, 0x30F7, 0x308D, 0x30F7, 0x3084, 0x30F7, 0xFFFF
};
uint16 s27_fl_tab288[29] = {
0x306B, 0x001C, 0x306F, 0x30ED, 0x0002, 0x002A, 0x0017, 0x30FA,
0x0018, 0x30FC, 0x0000, 0x30EC, 0x3071, 0x30EF, 0x3072, 0x30F1,
0x3073, 0x30F3, 0x3074, 0x30F8, 0x3089, 0x30FE, 0x3081, 0x30F5,
0x3084, 0x3109, 0x308D, 0x3108, 0xFFFF
0x0018, 0x30FC, 0x0000, 0x30EC, 0x3071, 0x30EF, 0x3072, 0x30F1,
0x3073, 0x30F3, 0x3074, 0x30F8, 0x3089, 0x30FE, 0x3081, 0x30F5,
0x3084, 0x3109, 0x308D, 0x3108, 0xFFFF
};
uint16 s28_fl_tab288[27] = {
0x3037, 0x001C, 0x0002, 0x002A, 0x0000, 0x310E, 0x0001, 0x3113,
0x0003, 0x3119, 0x303B, 0x310F, 0x303D, 0x3111, 0x309F, 0x3117,
0x3054, 0x3114, 0x0017, 0x311B, 0x0018, 0x311D, 0x3196, 0x3125,
0x3199, 0x3128, 0xFFFF
0x3037, 0x001C, 0x0002, 0x002A, 0x0000, 0x310E, 0x0001, 0x3113,
0x0003, 0x3119, 0x303B, 0x310F, 0x303D, 0x3111, 0x309F, 0x3117,
0x3054, 0x3114, 0x0017, 0x311B, 0x0018, 0x311D, 0x3196, 0x3125,
0x3199, 0x3128, 0xFFFF
};
uint16 s28_sml_tab288[13] = {
0x318E, 0x001C, 0x0002, 0x002A, 0x3187, 0x311E, 0x3188, 0x3120,
0x0004, 0x3122, 0x0005, 0x3123, 0xFFFF
} ;
0x318E, 0x001C, 0x0002, 0x002A, 0x3187, 0x311E, 0x3188, 0x3120,
0x0004, 0x3122, 0x0005, 0x3123, 0xFFFF
};
uint16 s29_fl_tab288[27] = {
0x3004, 0x001C, 0x0002, 0x002A, 0x3008, 0x312C, 0x300B, 0x312E,
0x002A, 0x3137, 0x3010, 0x3130, 0x3032, 0x3133, 0x0001, 0x3132,
0x0003, 0x3135, 0x002A, 0x3137, 0x0017, 0x313C, 0x0018, 0x313E,
0x312C, 0x313F, 0xFFFF
0x3004, 0x001C, 0x0002, 0x002A, 0x3008, 0x312C, 0x300B, 0x312E,
0x002A, 0x3137, 0x3010, 0x3130, 0x3032, 0x3133, 0x0001, 0x3132,
0x0003, 0x3135, 0x002A, 0x3137, 0x0017, 0x313C, 0x0018, 0x313E,
0x312C, 0x313F, 0xFFFF
};
uint16 s29_sml_tab288[13] = {
0x318A, 0x001C, 0x0002, 0x002A, 0x3185, 0x3141, 0x3186, 0x3143,
0x0004, 0x3145, 0x0005, 0x3146, 0xFFFF
0x318A, 0x001C, 0x0002, 0x002A, 0x3185, 0x3141, 0x3186, 0x3143,
0x0004, 0x3145, 0x0005, 0x3146, 0xFFFF
};
void patchFor288(void) {
@ -560,7 +559,7 @@ void patchFor288(void) {
((Compact *)SkyCompact::data_3[258])->baseSub = 0x3051; // gallager_bel
((Compact *)SkyCompact::data_3[267])->actionScript = 0x3055; // reich_window
((Compact *)SkyCompact::data_3[268])->actionScript = 0x3057; // lamb_window
((Compact *)SkyCompact::data_3[270])->baseSub = 0x3079; // inner_lamb_door
((Compact *)SkyCompact::data_3[270])->baseSub = 0x3079; // inner_lamb_door
((Compact *)SkyCompact::data_3[277])->actionScript = 0x30B9; // ticket
((Compact *)SkyCompact::data_3[277])->baseSub = 0x30B8;
((Compact *)SkyCompact::data_3[280])->actionScript = 0x30BC; // globe
@ -581,7 +580,7 @@ void patchFor288(void) {
((Compact *)SkyCompact::data_3[325])->baseSub = 0x301A; // locker_11
((Compact *)SkyCompact::data_3[328])->actionScript = 0x301E; // slot_11
((Compact *)SkyCompact::data_3[332])->actionScript = 0x3020; // soccer_1
((Compact *)SkyCompact::data_3[333])->actionScript = 0x3020; // soccer_2
((Compact *)SkyCompact::data_3[333])->actionScript = 0x3020; // soccer_2
((Compact *)SkyCompact::data_3[334])->actionScript = 0x3020; // soccer_3
((Compact *)SkyCompact::data_3[335])->actionScript = 0x3020; // soccer_4
((Compact *)SkyCompact::data_3[336])->actionScript = 0x3020; // soccer_5

2276
sky/compacts/savedata.cpp
View file

File diff suppressed because it is too large Load diff

4
sky/disk.cpp
View file

@ -223,7 +223,7 @@ uint8 *SkyDisk::loadFile(uint16 fileNr, uint8 *dest) {
if (!cflag) {
warning("patching header for uncompressed file %d", fileNr);
uint16 *headPtr = (uint16 *)_fileDest;
for (uint i = 0; i < sizeof(struct dataFileHeader) / 2; i++)
for (uint i = 0; i < sizeof(struct dataFileHeader) / 2; i++)
*(headPtr + i) = READ_LE_UINT16(headPtr + i);
}
#endif
@ -270,7 +270,7 @@ uint8 *SkyDisk::givePrefetched(uint16 fileNr, uint32 *fSize) {
*fEntry = (*fEntry)->next;
*fSize = retStr->fileSize;
delete retStr;
return retPtr;
return retPtr;
}
uint8 *SkyDisk::getFileInfo(uint16 fileNr) {

4
sky/grid.cpp
View file

@ -175,11 +175,11 @@ bool SkyGrid::getGridValues(uint32 x, uint32 y, uint32 width, Compact *cpt, uint
} else
x -= TOP_LEFT_X >> 3;
if ((GAME_SCREEN_WIDTH >> 3) <= x) return false; // off screen
if ((GAME_SCREEN_WIDTH >> 3) <= x) return false; // off screen
if ((GAME_SCREEN_WIDTH >> 3) < x + width) // partially off screen
width = (GAME_SCREEN_WIDTH >> 3) - x;
bitPos += x;
bitPos += x;
int32 screenGridOfs = _gridConvertTable[cpt->screen] * GRID_SIZE;
bitPos += (screenGridOfs << 3); // convert to bits
uint32 tmpBits = 0x1F - (bitPos&0x1F);

24
sky/intro.cpp
View file

@ -231,7 +231,7 @@ uint16 SkyIntro::_mainIntroSeq[] = {
FADEUP, 60115,
DELAY, 2000,
FADEDOWN,
SEQEND
SEQEND
};
uint16 SkyIntro::_cdIntroSeq[] = {
@ -283,14 +283,14 @@ uint16 SkyIntro::_cdIntroSeq[] = {
WAITVOICE,
PLAYVOICE, CDV_13,
WAITVOICE,
WAITFLIRT,
WAITFLIRT,
WAITVOICE,
PLAYVOICE, CDV_14,
LOADBG, 59498, // fade-in heli
PLAYBG,
DOFLIRT, CD_13,
WAITVOICE,
PLAYVOICE, CDV_15,
PLAYVOICE, CDV_15,
FADEDOWN,
SHOWSCREEN, CD_15_LOG,
FADEUP, CD_15_PAL,
@ -326,7 +326,7 @@ uint16 SkyIntro::_cdIntroSeq[] = {
WAITVOICE,
PLAYVOICE, CDV_22,
LOADBG, 59494, // heli whine
PLAYBG,
PLAYBG,
WAITVOICE,
PLAYVOICE, CDV_23,
FADEDOWN,
@ -336,7 +336,7 @@ uint16 SkyIntro::_cdIntroSeq[] = {
PLAYVOICE, CDV_24,
WAITVOICE,
PLAYVOICE, CDV_25,
WAITVOICE,
WAITVOICE,
PLAYVOICE, CDV_26,
WAITVOICE,
FADEDOWN,
@ -504,7 +504,7 @@ uint16 SkyIntro::_cdIntroSeq[] = {
PLAYVOICE, CDV_79,
WAITVOICE,
PLAYVOICE, CDV_80,
BGFLIRT, CD_100,
BGFLIRT, CD_100,
WAITVOICE,
PLAYVOICE, CDV_81,
WAITVOICE,
@ -555,7 +555,7 @@ uint16 SkyIntro::_floppyIntroSeq[] = {
50, IC_FX_VOLUME, 90,
5, IC_FX_VOLUME, 100,
COMMANDEND,
SHOWSCREEN, 60088,
SHOWSCREEN, 60088,
COMMANDFLIRT, 60089, // => command list 4b (cockpit)
1000, IC_PREPARE_TEXT, 77,
220, IC_SHOW_TEXT, 20, 160, // radar detects jamming signal
@ -592,13 +592,13 @@ uint16 SkyIntro::_floppyIntroSeq[] = {
COMMANDFLIRT, 60098, // => command list 6b
131, IC_REMOVE_TEXT,
131, IC_PREPARE_TEXT, 479,
74, IC_SHOW_TEXT, 175, 155,
74, IC_SHOW_TEXT, 175, 155,
45, IC_REMOVE_TEXT,
45, IC_PREPARE_TEXT, 162,
44, IC_SHOW_TEXT, 175, 155,
4, IC_REMOVE_TEXT,
COMMANDEND,
SEQEND
SEQEND
};
SkyIntro::SkyIntro(SkyDisk *disk, SkyScreen *screen, SkyMusicBase *music, SkySound *sound, SkyText *text, SoundMixer *mixer, OSystem *system) {
@ -658,7 +658,7 @@ bool SkyIntro::doIntro(bool floppyIntro) {
if (!nextPart(seqData))
return false;
}
return true;
return true;
}
bool SkyIntro::nextPart(uint16 *&data) {
@ -846,7 +846,7 @@ void SkyIntro::showTextBuf(void) {
uint8 *saveBuf = _saveBuf + sizeof(dataFileHeader);
uint8 *textBuf = _textBuf + sizeof(dataFileHeader);
for (uint16 cnty = 0; cnty < height; cnty++) {
memcpy(saveBuf, screenBuf, width);
memcpy(saveBuf, screenBuf, width);
for (uint16 cntx = 0; cntx < width; cntx++)
if (textBuf[cntx])
screenBuf[cntx] = textBuf[cntx];
@ -893,7 +893,7 @@ bool SkyIntro::escDelay(uint32 msecs) {
uint8 nDelay = (msecs > 50)?(50):((uint8)msecs);
#endif
_system->delay_msecs(nDelay);
msecs -= nDelay;
msecs -= nDelay;
} while (msecs > 0);
return true;
}

2
sky/logic.cpp
View file

@ -1134,7 +1134,7 @@ void SkyLogic::initScriptVariables() {
if (SkyState::_systemVars.gameVersion == 288)
memcpy(_scriptVariables + 352, forwardList1b288, sizeof(forwardList1b288));
else
memcpy(_scriptVariables + 352, forwardList1b, sizeof(forwardList1b));
memcpy(_scriptVariables + 352, forwardList1b, sizeof(forwardList1b));
memcpy(_scriptVariables + 656, forwardList2b, sizeof(forwardList2b));
memcpy(_scriptVariables + 721, forwardList3b, sizeof(forwardList3b));

4
sky/mouse.cpp
View file

@ -290,7 +290,7 @@ uint16 SkyMouse::findMouseCursor(uint32 itemNum) {
return cnt;
}
}
return 0;
return 0;
}
void SkyMouse::fnOpenCloseHand(bool open) {
@ -310,7 +310,7 @@ void SkyMouse::fnOpenCloseHand(bool open) {
srcData = (uint8 *)_objectMouseData + size * cursor + sizeof(dataFileHeader);
destData = (uint8 *)_miceData + sizeof(dataFileHeader);
memcpy(destData, srcData, size);
spriteMouse(0, 5, 5);
spriteMouse(0, 5, 5);
}
bool SkyMouse::wasClicked(void) {

4
sky/music/adlibchannel.h
View file

@ -75,7 +75,7 @@ private:
InstrumentStruct *_instruments;
uint16 *_frequenceTable;
uint8 *_instrumentMap;
uint8 *_registerTable, *_opOutputTable;
uint8 *_registerTable, *_opOutputTable;
uint8 *_adlibRegMirror;
//- normal subs
void setRegister(uint8 regNum, uint8 value);
@ -84,7 +84,7 @@ private:
void adlibSetupInstrument(void);
void setupInstrument(uint8 opcode);
void setupChannelVolume(uint8 volume);
//- Streamfunctions from Command90hTable
//- Streamfunctions from Command90hTable
void com90_caseNoteOff(void); // 0
void com90_stopChannel(void); // 1
void com90_setupInstrument(void); // 2

2
sky/music/adlibmusic.cpp
View file

@ -31,7 +31,7 @@ SkyAdlibMusic::SkyAdlibMusic(SoundMixer *pMixer, SkyDisk *pSkyDisk, OSystem *sys
: SkyMusicBase(pSkyDisk, system) {
_driverFileBase = 60202;
_mixer = pMixer;
_mixer = pMixer;
_sampleRate = pMixer->getOutputRate();
int env_bits = g_system->property(OSystem::PROP_GET_FMOPL_ENV_BITS, NULL);

8
sky/music/gmchannel.cpp
View file

@ -22,8 +22,8 @@
#include "gmchannel.h"
#include "common/util.h"
SkyGmChannel::SkyGmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pMidiDrv, byte *pInstMap, uint8 *veloTab)
{
SkyGmChannel::SkyGmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pMidiDrv, byte *pInstMap, uint8 *veloTab) {
_musicData = pMusicData;
_midiDrv = pMidiDrv;
_channelData.midiChannelNumber = 0;
@ -59,8 +59,8 @@ void SkyGmChannel::stopNote(void) {
_midiDrv->send((0xB0 | _channelData.midiChannelNumber) | 0x7B00 | 0 | 0x79000000);
}
int32 SkyGmChannel::getNextEventTime(void)
{
int32 SkyGmChannel::getNextEventTime(void) {
int32 retV = 0;
uint8 cnt, lVal;
for (cnt = 0; cnt < 4; cnt++) {

2
sky/music/gmchannel.h
View file

@ -57,7 +57,7 @@ private:
void adlibSetupInstrument(void);
void setupInstrument(uint8 opcode);
void setupChannelVolume(uint8 volume);
//- Streamfunctions from Command90hTable
//- Streamfunctions from Command90hTable
void com90_caseNoteOff(void); // 0
void com90_stopChannel(void); // 1
void com90_setupInstrument(void); // 2

2
sky/music/gmmusic.cpp
View file

@ -31,7 +31,7 @@ SkyGmMusic::SkyGmMusic(MidiDriver *pMidiDrv, SkyDisk *pSkyDisk, OSystem *system)
: SkyMusicBase(pSkyDisk, system) {
_driverFileBase = 60200;
_midiDrv = pMidiDrv;
_midiDrv = pMidiDrv;
int midiRes = _midiDrv->open();
if (midiRes != 0) {
error("Can't open midi device. Errorcode: %d",midiRes);

12
sky/screen.cpp
View file

@ -366,12 +366,12 @@ void SkyScreen::waitForTimer(void) {
}
void SkyScreen::waitForSequence(void) {
while (_seqInfo.running) {
OSystem::Event event;
while (_seqInfo.running) {
OSystem::Event event;
_system->delay_msecs(20);
while (_system->poll_event(&event));
}
_system->delay_msecs(20);
while (_system->poll_event(&event));
}
}
void SkyScreen::handleTimer(void) {
@ -419,7 +419,7 @@ void SkyScreen::processSequence(void) {
_seqInfo.delay = SEQ_DELAY;
memset(_seqGrid, 0, 12 * 20);
uint8 nrToSkip, nrToDo, cnt;
uint8 nrToSkip, nrToDo, cnt;
do {
do {
nrToSkip = _seqInfo.seqDataPos[0];

2
sky/screen.h
View file

@ -109,7 +109,7 @@ private:
bool runningItem; // when playing an item, don't free it afterwards.
} _seqInfo;
//- more regular screen.asm + layer.asm routines
//- more regular screen.asm + layer.asm routines
void convertPalette(uint8 *inPal, uint8* outPal);
void palette_fadedown_helper(uint32 *pal, uint num);

2
sky/text.cpp
View file

@ -336,7 +336,7 @@ void SkyText::fnPointerText(uint32 pointedId, uint16 mouseX, uint16 mouseY) {
if (mouseX < 150) _mouseOfsX = TOP_LEFT_X + 24;
else _mouseOfsX = TOP_LEFT_X - 8 - _lowTextWidth;
} else {
_mouseOfsY = TOP_LEFT_Y - 10;
_mouseOfsY = TOP_LEFT_Y - 10;
if (mouseX < 150) _mouseOfsX = TOP_LEFT_X + 13;
else _mouseOfsX = TOP_LEFT_X - 8 - _lowTextWidth;
}