[Scummvm-cvs-logs] SF.net SVN: scummvm: [29844] scummvm/trunk/engines/cine
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Thu Dec 13 13:33:31 CET 2007
Revision: 29844
http://scummvm.svn.sourceforge.net/scummvm/?rev=29844&view=rev
Author: thebluegr
Date: 2007-12-13 04:33:31 -0800 (Thu, 13 Dec 2007)
Log Message:
-----------
Cleanup
Modified Paths:
--------------
scummvm/trunk/engines/cine/bg.cpp
scummvm/trunk/engines/cine/bg_list.cpp
scummvm/trunk/engines/cine/cine.cpp
scummvm/trunk/engines/cine/object.cpp
scummvm/trunk/engines/cine/sound.cpp
Modified: scummvm/trunk/engines/cine/bg.cpp
===================================================================
--- scummvm/trunk/engines/cine/bg.cpp 2007-12-13 11:11:38 UTC (rev 29843)
+++ scummvm/trunk/engines/cine/bg.cpp 2007-12-13 12:33:31 UTC (rev 29844)
@@ -33,6 +33,8 @@
namespace Cine {
uint16 bgVar0;
+byte *additionalBgTable[9];
+byte currentAdditionalBgIdx = 0, currentAdditionalBgIdx2 = 0;
void loadCtHigh(byte * currentPtr) {
memcpy(page3Raw, currentPtr, 320 * 200);
@@ -115,10 +117,6 @@
return 0;
}
-byte *additionalBgTable[9];
-byte currentAdditionalBgIdx = 0;
-byte currentAdditionalBgIdx2 = 0;
-
void addBackground(const char *bgName, uint16 bgIdx) {
byte *ptr, *dataPtr;
Modified: scummvm/trunk/engines/cine/bg_list.cpp
===================================================================
--- scummvm/trunk/engines/cine/bg_list.cpp 2007-12-13 11:11:38 UTC (rev 29843)
+++ scummvm/trunk/engines/cine/bg_list.cpp 2007-12-13 12:33:31 UTC (rev 29844)
@@ -39,20 +39,12 @@
BGIncrustList *bgIncrustList;
void addToBGList(int16 objIdx, bool addList) {
- int16 x;
- int16 y;
- int16 width;
- int16 height;
- int16 part;
+ int16 x = objectTable[objIdx].x;
+ int16 y = objectTable[objIdx].y;
+ int16 width = animDataTable[objectTable[objIdx].frame].var1;
+ int16 height = animDataTable[objectTable[objIdx].frame].height;
+ int16 part = objectTable[objIdx].part;
- x = objectTable[objIdx].x;
- y = objectTable[objIdx].y;
-
- width = animDataTable[objectTable[objIdx].frame].var1;
- height = animDataTable[objectTable[objIdx].frame].height;
-
- part = objectTable[objIdx].part;
-
if (g_cine->getGameType() == GType_OS) {
drawSpriteRaw2(animDataTable[objectTable[objIdx].frame].ptr1, objectTable[objIdx].part, width, height, page2Raw, x, y);
} else {
@@ -64,17 +56,11 @@
}
void addSpriteFilledToBGList(int16 objIdx, bool addList) {
- int16 x;
- int16 y;
- int16 width;
- int16 height;
+ int16 x = objectTable[objIdx].x;
+ int16 y = objectTable[objIdx].y;
+ int16 width = animDataTable[objectTable[objIdx].frame].width;
+ int16 height = animDataTable[objectTable[objIdx].frame].height;
- x = objectTable[objIdx].x;
- y = objectTable[objIdx].y;
-
- width = animDataTable[objectTable[objIdx].frame].width;
- height = animDataTable[objectTable[objIdx].frame].height;
-
if (animDataTable[objectTable[objIdx].frame].ptr1) {
gfxFillSprite(animDataTable[objectTable[objIdx].frame].ptr1, width / 2, height, page2Raw, x, y);
}
Modified: scummvm/trunk/engines/cine/cine.cpp
===================================================================
--- scummvm/trunk/engines/cine/cine.cpp 2007-12-13 11:11:38 UTC (rev 29843)
+++ scummvm/trunk/engines/cine/cine.cpp 2007-12-13 12:33:31 UTC (rev 29844)
@@ -160,26 +160,21 @@
}
for (i = 0; i < NUM_MAX_ANIMDATA; i++) {
- animDataTable[i].ptr1 = NULL;
- animDataTable[i].ptr2 = NULL;
+ animDataTable[i].ptr1 = animDataTable[i].ptr2 = NULL;
}
- overlayHead.next = NULL;
- overlayHead.previous = NULL;
+ overlayHead.next = overlayHead.previous = NULL;
var8 = 0;
bgIncrustList = NULL;
objScriptList.next = NULL;
- globalScriptsHead.next = NULL;
-
objScriptList.scriptPtr = NULL;
+
+ globalScriptsHead.next = NULL;
globalScriptsHead.scriptPtr = NULL;
- var2 = 0;
- var3 = 0;
- var4 = 0;
- var5 = 0;
+ var2 = var3 = var4 = var5 = 0;
freePrcLinkedList();
Modified: scummvm/trunk/engines/cine/object.cpp
===================================================================
--- scummvm/trunk/engines/cine/object.cpp 2007-12-13 11:11:38 UTC (rev 29843)
+++ scummvm/trunk/engines/cine/object.cpp 2007-12-13 12:33:31 UTC (rev 29844)
@@ -112,17 +112,12 @@
currentHeadPtr = tempHead->next;
}
- if (!currentHeadPtr) {
+ if (!currentHeadPtr || objIdx != currentHeadPtr->objIdx || param != currentHeadPtr->type) {
return -1;
}
- if (objIdx != currentHeadPtr->objIdx || param != currentHeadPtr->type) {
- return -1;
- }
+ tempHead->next = tempPtr2 = currentHeadPtr->next;
- tempHead->next = currentHeadPtr->next;
- tempPtr2 = currentHeadPtr->next;
-
if (!tempPtr2) {
tempPtr2 = &overlayHead;
}
@@ -143,14 +138,10 @@
currentHeadPtr = previousPtr->next;
}
- if (!currentHeadPtr) {
+ if (!currentHeadPtr || !((currentHeadPtr->objIdx == objIdx) && (currentHeadPtr->type == param))) {
return -1;
}
- if (!((currentHeadPtr->objIdx == objIdx) && (currentHeadPtr->type == param))) {
- return -1;
- }
-
previousPtr->next = currentHeadPtr->next;
overlayHeadElement *tempPtr2 = currentHeadPtr->next;
Modified: scummvm/trunk/engines/cine/sound.cpp
===================================================================
--- scummvm/trunk/engines/cine/sound.cpp 2007-12-13 11:11:38 UTC (rev 29843)
+++ scummvm/trunk/engines/cine/sound.cpp 2007-12-13 12:33:31 UTC (rev 29844)
@@ -304,7 +304,9 @@
OPLWriteReg(_opl, 0xBD, _vibrato);
OPLWriteReg(_opl, 0x08, 0x40);
- int i;
+ int i, j;
+ int oplRegs[] = { 0x60, 0x80, 0x20, 0xE0 };
+
for (i = 0; i < 18; ++i) {
OPLWriteReg(_opl, 0x40 | _operatorsTable[i], 0);
}
@@ -314,18 +316,12 @@
for (i = 0; i < 9; ++i) {
OPLWriteReg(_opl, 0xC0 | i, 0);
}
- for (i = 0; i < 18; ++i) {
- OPLWriteReg(_opl, 0x60 | _operatorsTable[i], 0);
+
+ for (j = 0; j < 4; j++) {
+ for (i = 0; i < 18; ++i) {
+ OPLWriteReg(_opl, oplRegs[j] | _operatorsTable[i], 0);
+ }
}
- for (i = 0; i < 18; ++i) {
- OPLWriteReg(_opl, 0x80 | _operatorsTable[i], 0);
- }
- for (i = 0; i < 18; ++i) {
- OPLWriteReg(_opl, 0x20 | _operatorsTable[i], 0);
- }
- for (i = 0; i < 18; ++i) {
- OPLWriteReg(_opl, 0xE0 | _operatorsTable[i], 0);
- }
OPLWriteReg(_opl, 1, 0x20);
OPLWriteReg(_opl, 1, 0);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list