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

- whitespaces

Browse source 
- fix for compilation at MAX, at include types
- changed to our types

svn-id: r12344
This commit is contained in:
Paweł Kołodziejski 2004-01-12 19:08:04 +00:00
parent e4628fbb07
commit b8e3dda84c
4 changed files with 23 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

25
sword2/driver/animation.h
View file

@ -1,7 +1,6 @@
#ifndef ANIMATION_H #ifndef ANIMATION_H
#define ANIMATION_H #define ANIMATION_H
#include <inttypes.h>
#ifdef USE_MPEG2 #ifdef USE_MPEG2
extern "C" { extern "C" {
#include <mpeg2dec/mpeg2.h> #include <mpeg2dec/mpeg2.h>
@ -10,32 +9,30 @@ extern "C" {
namespace Sword2 { namespace Sword2 {
#define SQR(x) ((x)*(x)) #define SQR(x) ((x) * (x))
#define SHIFT 3 #define SHIFT 3
#define BITDEPTH (1<<(8-SHIFT)) #define BITDEPTH (1 << (8 - SHIFT))
#define ROUNDADD (1<<(SHIFT-1)) #define ROUNDADD (1 << (SHIFT - 1))
#define BUFFER_SIZE 4096 #define BUFFER_SIZE 4096
typedef struct { typedef struct {
int palnum; int palnum;
unsigned char lookup[2][BITDEPTH*BITDEPTH*BITDEPTH]; byte lookup[2][BITDEPTH * BITDEPTH * BITDEPTH];
unsigned char * lut; byte *lut;
unsigned char * lut2; byte *lut2;
int lutcalcnum; int lutcalcnum;
int framenum; int framenum;
#ifdef USE_MPEG2 #ifdef USE_MPEG2
mpeg2dec_t * decoder; mpeg2dec_t *decoder;
const mpeg2_info_t * info; const mpeg2_info_t *info;
#endif #endif
File * mpgfile; File *mpgfile;
int curpal; int curpal;
int cr; int cr;
@ -44,10 +41,10 @@ typedef struct {
struct { struct {
int cnt; int cnt;
int end; int end;
unsigned char pal[4*256]; byte pal[4 * 256];
} palettes[50]; } palettes[50];
unsigned char buffer[BUFFER_SIZE]; byte buffer[BUFFER_SIZE];
PlayingSoundHandle bgSound; PlayingSoundHandle bgSound;

2
sword2/driver/d_draw.h
View file

@ -249,7 +249,7 @@ public:
void plotPoint(uint16 x, uint16 y, uint8 colour); void plotPoint(uint16 x, uint16 y, uint8 colour);
void drawLine(int16 x1, int16 y1, int16 x2, int16 y2, uint8 colour); void drawLine(int16 x1, int16 y1, int16 x2, int16 y2, uint8 colour);
void plotYUV(unsigned char * lut, int width, int height, uint8_t * const * buf); void plotYUV(byte *lut, int width, int height, uint8 *const *buf);
int32 createSurface(SpriteInfo *s, uint8 **surface); int32 createSurface(SpriteInfo *s, uint8 **surface);
void drawSurface(SpriteInfo *s, uint8 *surface, Common::Rect *clipRect = NULL); void drawSurface(SpriteInfo *s, uint8 *surface, Common::Rect *clipRect = NULL);

21
sword2/driver/render.cpp
View file

@ -821,9 +821,8 @@ void Graphics::closeBackgroundLayer(void) {
} }
void Graphics::plotYUV(unsigned char * lut, int width, int height, uint8_t * const * dat) void Graphics::plotYUV(byte *lut, int width, int height, byte *const *dat) {
{ byte *buf = _buffer + (40 + (400 - height) / 2) * RENDERWIDE + (640 - width) / 2;
uint8 *buf = _buffer + (40+(400-height)/2) * RENDERWIDE + (640-width)/2;
int x, y; int x, y;
@ -831,17 +830,17 @@ void Graphics::plotYUV(unsigned char * lut, int width, int height, uint8_t * con
int cpos = 0; int cpos = 0;
int linepos = 0; int linepos = 0;
for (y = 0; y < height; y+=2) { for (y = 0; y < height; y += 2) {
for (x = 0; x < width; x+=2) { for (x = 0; x < width; x += 2) {
int i = ((((dat[2][cpos]+ROUNDADD)>>SHIFT) * BITDEPTH) + ((dat[1][cpos]+ROUNDADD)>>SHIFT)) * BITDEPTH; int i = ((((dat[2][cpos] + ROUNDADD) >> SHIFT) * BITDEPTH) + ((dat[1][cpos] + ROUNDADD)>>SHIFT)) * BITDEPTH;
cpos++; cpos++;
buf[linepos ] = lut[i+((dat[0][ ypos ]+ROUNDADD)>>SHIFT)]; buf[linepos ] = lut[i + ((dat[0][ ypos ] + ROUNDADD) >> SHIFT)];
buf[RENDERWIDE + linepos++] = lut[i+((dat[0][width+ypos++]+ROUNDADD)>>SHIFT)]; buf[RENDERWIDE + linepos++] = lut[i + ((dat[0][width + ypos++] + ROUNDADD) >> SHIFT)];
buf[linepos ] = lut[i+((dat[0][ ypos ]+ROUNDADD)>>SHIFT)]; buf[linepos ] = lut[i + ((dat[0][ ypos ] + ROUNDADD) >> SHIFT)];
buf[RENDERWIDE + linepos++] = lut[i+((dat[0][width+ypos++]+ROUNDADD)>>SHIFT)]; buf[RENDERWIDE + linepos++] = lut[i + ((dat[0][width + ypos++] + ROUNDADD) >> SHIFT)];
} }
linepos += (2*RENDERWIDE-width); linepos += (2 * RENDERWIDE - width);
ypos += width; ypos += width;
} }
} }

2
sword2/function.cpp
View file

@ -614,7 +614,7 @@ int32 Logic::fnPlayCredits(int32 *params) {
// credits. Note that musicTimeRemaining() will return 0 if the music // credits. Note that musicTimeRemaining() will return 0 if the music
// is muted, so we need a sensible fallback for that case. // is muted, so we need a sensible fallback for that case.
uint32 musicLength = MAX(1000 * (_vm->_sound->musicTimeRemaining() - 3), 25 * scrollSteps); uint32 musicLength = MAX(1000 * (_vm->_sound->musicTimeRemaining() - 3), 25 * (int32)scrollSteps);
while (scrollPos < scrollSteps && !_vm->_quit) { while (scrollPos < scrollSteps && !_vm->_quit) {
bool foundStartLine = false; bool foundStartLine = false;