ScummVM/scummex
1
0
Fork 0
mirror of https://github.com/scummvm/scummex.git synced 2026-05-21 05:40:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

warning cleanup, including some shadow fixes that should probably be applied back to descumm, why is the source to descumm included instead of calling an external binary anyway? its going to be a large pain syncing continually...

Browse Source
This commit is contained in:
Jonathan Gray
2003-09-23 12:56:12 +00:00
parent ba6816c862
commit c1673d1538
4 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bomp.cpp
+5 -3
View File
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Header: /Users/sev/projects/sc/s/scummvm/scummex/bomp.cpp,v 1.1 2003/09/21 23:50:28 yoshizf Exp $
* $Header: /Users/sev/projects/sc/s/scummvm/scummex/bomp.cpp,v 1.2 2003/09/23 12:56:12 khalek Exp $
*
*/
@@ -25,12 +25,12 @@
byte defaultScaleTable[768];
byte revBitMask[8];
static void bompScaleFuncX(byte *line_buffer, byte *scaling_x_ptr, byte skip, int32 size);
//static void bompScaleFuncX(byte *line_buffer, byte *scaling_x_ptr, byte skip, int32 size);
static void bompApplyShadow0(const byte *line_buffer, byte *dst, int32 size, byte transparency);
static void bompApplyShadow1(const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency);
static void bompApplyShadow3(const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency);
static void bompApplyActorPalette(byte *actorPalette, byte *line_buffer, int32 size);
//static void bompApplyActorPalette(byte *actorPalette, byte *line_buffer, int32 size);
@@ -163,6 +163,7 @@ void bompApplyShadow3(const byte *shadowPalette, const byte *line_buffer, byte *
}
}
/* FIXME can this be deleted?
void bompApplyActorPalette(byte *actorPalette, byte *line_buffer, int32 size) {
if (actorPalette != 0) {
actorPalette[255] = 255;
@@ -191,6 +192,7 @@ void bompScaleFuncX(byte *line_buffer, byte *scaling_x_ptr, byte skip, int32 siz
}
}
}
*/
/*void Scumm::drawBomp(const BompDrawData &bd, bool mirror) {
const byte *src;
descumm.cpp
+16 -16
View File
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Header: /Users/sev/projects/sc/s/scummvm/scummex/descumm.cpp,v 1.2 2003/09/19 19:57:07 yoshizf Exp $
* $Header: /Users/sev/projects/sc/s/scummvm/scummex/descumm.cpp,v 1.3 2003/09/23 12:56:12 khalek Exp $
*
*/
@@ -1193,33 +1193,33 @@ void DeScumm::do_print_ego(char *buf, byte opcode)
}
do {
int opcode = get_byte();
if (opcode == 0xFF)
int subopcode = get_byte();
if (subopcode == 0xFF)
break;
if (!first)
buf = strecpy(buf, ",");
first = 0;
switch (opcode & 0x1f) {
switch (subopcode & 0x1f) {
case 0x0:
buf = do_tok(buf, "Pos", ((opcode & 0x80) ? A1V : A1W) | ((opcode & 0x40) ? A2V : A2W));
buf = do_tok(buf, "Pos", ((subopcode & 0x80) ? A1V : A1W) | ((subopcode & 0x40) ? A2V : A2W));
break;
case 0x1:
buf = do_tok(buf, "Color", ((opcode & 0x80) ? A1V : A1B));
buf = do_tok(buf, "Color", ((subopcode & 0x80) ? A1V : A1B));
break;
case 0x2:
buf = do_tok(buf, "Clipped", ((opcode & 0x80) ? A1V : A1W));
buf = do_tok(buf, "Clipped", ((subopcode & 0x80) ? A1V : A1W));
break;
case 0x3:
buf = do_tok(buf, "Erase?", ((opcode & 0x80) ? A1V : A1W) | ((opcode & 0x40) ? A2V : A2W));
buf = do_tok(buf, "Erase?", ((subopcode & 0x80) ? A1V : A1W) | ((subopcode & 0x40) ? A2V : A2W));
break;
case 0x4:
buf = do_tok(buf, "Center", 0);
break;
case 0x6:
if (GF_UNBLOCKED)
buf = do_tok(buf, "Spacing?", ((opcode & 0x80) ? A1V: A1W));
buf = do_tok(buf, "Spacing?", ((subopcode & 0x80) ? A1V: A1W));
else
buf = do_tok(buf, "Left", 0);
break;
@@ -1227,7 +1227,7 @@ void DeScumm::do_print_ego(char *buf, byte opcode)
buf = do_tok(buf, "Overhead", 0);
break;
case 0x8:
buf = do_tok(buf, "PlayCDTrack", ((opcode & 0x80) ? A1V : A1W) | ((opcode & 0x40) ? A2V : A2W));
buf = do_tok(buf, "PlayCDTrack", ((subopcode & 0x80) ? A1V : A1W) | ((subopcode & 0x40) ? A2V : A2W));
break;
case 0xF:{
buf = strecpy(buf, "Text(\"");
@@ -1249,7 +1249,7 @@ void DeScumm::do_print_ego(char *buf, byte opcode)
}
goto exit_proc;
default:
buf += sprintf(buf, "Unknown%.2X()", opcode);
buf += sprintf(buf, "Unknown%.2X()", subopcode);
goto exit_proc;
}
} while (1);
@@ -2399,16 +2399,16 @@ void DeScumm::get_tok_V345(char *buf)
break;
case 0xAE:{
byte opcode;
byte subopcode;
if (IndyFlag)
opcode = 2;
subopcode = 2;
else
opcode = get_byte();
subopcode = get_byte();
switch (opcode) {
switch (subopcode) {
case 0x01:
case 0x81:
do_tok(buf, "WaitForActor", ((opcode & 0x80) ? A1V : A1B));
do_tok(buf, "WaitForActor", ((subopcode & 0x80) ? A1V : A1B));
break;
case 0x02:
do_tok(buf, "WaitForMessage", 0);
image.cpp
+2 -2
View File
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Header: /Users/sev/projects/sc/s/scummvm/scummex/image.cpp,v 1.13 2003/09/23 09:05:47 yoshizf Exp $
* $Header: /Users/sev/projects/sc/s/scummvm/scummex/image.cpp,v 1.14 2003/09/23 12:56:12 khalek Exp $
*
*/
@@ -41,7 +41,7 @@ int Image::drawPalette(BlockTable *_blockTable, int id, File& _input)
{
int addindex = 0;
int index = 0;
int h;
unsigned int h;
_gui->DisplayImage("Block Palette", 384, 384);
sound.cpp
+10 -10
View File
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Header: /Users/sev/projects/sc/s/scummvm/scummex/Attic/sound.cpp,v 1.4 2003/09/21 00:45:16 yoshizf Exp $
* $Header: /Users/sev/projects/sc/s/scummvm/scummex/Attic/sound.cpp,v 1.5 2003/09/23 12:56:12 khalek Exp $
*
*/
@@ -661,11 +661,11 @@ int Sound::playiMUSE(File& _input, BlockTable *_blockTable, int index, File& _ou
}
} else {
startPos = 1;
for (int i = 0; i < channels; i++) {
sByte[i] = *(src++);
sDWord1[i] = READ_BE_UINT32(src);
for (int ch = 0; ch < channels; ch++) {
sByte[ch] = *(src++);
sDWord1[ch] = READ_BE_UINT32(src);
src += 4;
sDWord2[i] = READ_BE_UINT32(src);
sDWord2[ch] = READ_BE_UINT32(src);
src += 4;
}
}
@@ -809,19 +809,19 @@ int Sound::playiMUSE(File& _input, BlockTable *_blockTable, int index, File& _ou
if (bits == 12) {
s_size = (size * 4) / 3 + 3;
buffer = (byte *) malloc(s_size+44);
uint32 l = 0, r = 44, tmp;
uint32 l = 0, ra = 44, tmp;
for (; l < size; l += 3) {
tmp = (ptr[l + 1] & 0x0f) << 8;
tmp = (tmp | ptr[l + 0]) << 4;
tmp -= 0x8000;
buffer[r++] = (uint8) (tmp & 0xff);
buffer[r++] = (uint8) ((tmp >> 8) & 0xff);
buffer[ra++] = (uint8) (tmp & 0xff);
buffer[ra++] = (uint8) ((tmp >> 8) & 0xff);
tmp = (ptr[l + 1] & 0xf0) << 4;
tmp = (tmp | ptr[l + 2]) << 4;
tmp -= 0x8000;
buffer[r++] = (uint8) (tmp & 0xff);
buffer[r++] = (uint8) ((tmp >> 8) & 0xff);
buffer[ra++] = (uint8) (tmp & 0xff);
buffer[ra++] = (uint8) ((tmp >> 8) & 0xff);
}
bits = 16;
} else {