diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/avp/win95/frontend/avp_menus.c | 12 | ||||
| -rw-r--r-- | src/bink.c | 661 | ||||
| -rw-r--r-- | src/bink.h | 31 | ||||
| -rw-r--r-- | src/fixer.h | 12 | ||||
| -rw-r--r-- | src/fmv.c | 2 | ||||
| -rw-r--r-- | src/fmv.h | 2 | ||||
| -rw-r--r-- | src/main.c | 7 | ||||
| -rw-r--r-- | src/menus.c | 40 | ||||
| -rw-r--r-- | src/openal.c | 9 | ||||
| -rw-r--r-- | src/stubs.c | 26 | ||||
| -rw-r--r-- | src/win95/platform.h | 8 |
11 files changed, 784 insertions, 26 deletions
diff --git a/src/avp/win95/frontend/avp_menus.c b/src/avp/win95/frontend/avp_menus.c index f77ec80..b3952c3 100644 --- a/src/avp/win95/frontend/avp_menus.c +++ b/src/avp/win95/frontend/avp_menus.c @@ -544,7 +544,7 @@ void HandlePostGameFMVs(void) ClearScreenToBlack(); FlipBuffers(); ClearScreenToBlack(); - PlayBinkedFMV("FMVs/marineoutro.bik"); + PlayBinkedFMV("FMVs/marineoutro.bik", 127); } break; } @@ -555,7 +555,7 @@ void HandlePostGameFMVs(void) ClearScreenToBlack(); FlipBuffers(); ClearScreenToBlack(); - PlayBinkedFMV("FMVs/alienoutro.bik"); + PlayBinkedFMV("FMVs/alienoutro.bik", 127); } break; } @@ -566,7 +566,7 @@ void HandlePostGameFMVs(void) ClearScreenToBlack(); FlipBuffers(); ClearScreenToBlack(); - PlayBinkedFMV("FMVs/predatoroutro.bik"); + PlayBinkedFMV("FMVs/predatoroutro.bik", 127); } break; } @@ -582,21 +582,21 @@ void HandlePreGameFMVs(void) ClearScreenToBlack(); FlipBuffers(); ClearScreenToBlack(); - PlayBinkedFMV("FMVs/marineintro.bik"); + PlayBinkedFMV("FMVs/marineintro.bik", 127); } else if (!stricmp("temple", LevelName)) { ClearScreenToBlack(); FlipBuffers(); ClearScreenToBlack(); - PlayBinkedFMV("FMVs/alienintro.bik"); + PlayBinkedFMV("FMVs/alienintro.bik", 127); } else if (!stricmp("fall", LevelName)) { ClearScreenToBlack(); FlipBuffers(); ClearScreenToBlack(); - PlayBinkedFMV("FMVs/predatorintro.bik"); + PlayBinkedFMV("FMVs/predatorintro.bik", 127); } } } diff --git a/src/bink.c b/src/bink.c new file mode 100644 index 0000000..7191b2a --- /dev/null +++ b/src/bink.c @@ -0,0 +1,661 @@ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include "fixer.h" + +#include "bink.h" + +#include <AL/al.h> +#include <AL/alc.h> + +#include "libavcodec/avcodec.h" +#include "libavformat/avformat.h" +#include "libavutil/avutil.h" +#include "libavutil/channel_layout.h" +#include "libswscale/swscale.h" + + +//#define DISABLE_MOVIES +//#define DISABLE_MUSIC +//#define DISABLE_FMVS + +extern void SDL_Delay(); +extern uint SDL_GetTicks(); +extern int SoundSys_IsOn(); +extern void DrawAvpMenuBink(char* buf, int width, int height, int pitch); +extern float PlatVolumeToGain(int volume); + + +//#define AL_CHECK() { int err = alGetError(); if(err!=AL_NO_ERROR) printf("%s:%d ALError %04x\n", __FILE__, __LINE__, err); } +#define AL_CHECK() {} + +#define FRAMEQUEUESIZE 4 + +static BOOL binkInitialized = FALSE; + +struct binkMovie +{ + AVFormatContext* avContext; + + int videoStreamIndex; + AVCodec* videoCodec; + AVCodecContext* videoCodecContext; + AVFrame* videoFrame; + struct SwsContext* videoScaleContext; + AVPicture videoScalePicture; + uint videoScaleWidth; + uint videoScaleHeight; + uint videoScaleFormat; + float videoFrameRate; + + int audioStreamIndex; + AVCodec* audioCodec; + AVCodecContext* audioCodecContext; + AVFrame* audioFrame; + char* audioTempBuffer; + + BOOL alInited; + ALuint alSource; + ALuint alBuffers[FRAMEQUEUESIZE]; + ALuint alFreeBuffers[FRAMEQUEUESIZE]; + ALuint alNumFreeBuffers; + ALuint alNumChannels; + ALenum alFormat; + ALuint alSampleRate; + + uint timeLastUpdate; + + BOOL looping; + BOOL isfmv; +}; + + +//----------------------------------------------------------------------------------------------- + +void BinkRenderMovie(struct binkMovie* aMovie) +{ + if(aMovie && aMovie->videoFrame && aMovie->videoScalePicture.data[0]) + { + DrawAvpMenuBink( + aMovie->videoScalePicture.data[0], + aMovie->videoFrame->width, + aMovie->videoFrame->height, + aMovie->videoScalePicture.linesize[0]); + } +} + + +void BinkInitMovieStruct(struct binkMovie* aMovie) +{ + memset((void*)aMovie, 0, sizeof(struct binkMovie)); + aMovie->videoStreamIndex = -1; + aMovie->audioStreamIndex = -1; +} + +void BinkReleaseMovie(struct binkMovie* aMovie) +{ + if(aMovie->alInited) + { + alSourceStop(aMovie->alSource); + alDeleteSources(1, &aMovie->alSource); + alDeleteBuffers(FRAMEQUEUESIZE, aMovie->alBuffers); + if(aMovie->audioTempBuffer) + free(aMovie->audioTempBuffer); + } + + if(aMovie->videoScaleContext) + avpicture_free(&aMovie->videoScalePicture); + + if(aMovie->avContext) + avformat_close_input(&aMovie->avContext); + + BinkInitMovieStruct(aMovie); +} + + +int BinkStartMovie(struct binkMovie* aMovie, const char* aFilename, BOOL aLoopFlag, BOOL aFmvFlag, BOOL aMusicFlag) +{ + BinkInitMovieStruct(aMovie); + aMovie->looping = aLoopFlag; + + if(aFmvFlag) + { + aMovie->videoScaleWidth = 128; + aMovie->videoScaleHeight = 96; + aMovie->videoScaleFormat = AV_PIX_FMT_RGB24; + } + + if(avformat_open_input(&aMovie->avContext, aFilename, NULL, NULL) < 0) + { + return 0; + } + + if(!avformat_find_stream_info(aMovie->avContext, NULL) < 0) + { + BinkReleaseMovie(aMovie); + return 0; + } + + int numStreams = 0; + for(int i=0; i<aMovie->avContext->nb_streams; i++) + { + AVCodecContext* codec_context = aMovie->avContext->streams[i]->codec; + AVCodec* codec = avcodec_find_decoder(codec_context->codec_id); + if(codec) + { + if((codec_context->codec_type==AVMEDIA_TYPE_VIDEO && aMovie->videoStreamIndex>=0) || (codec_context->codec_type==AVMEDIA_TYPE_AUDIO && aMovie->audioStreamIndex>=0)) + continue; + + if(avcodec_open2(codec_context, codec, 0) < 0) + continue; + + if(codec_context->codec_type==AVMEDIA_TYPE_VIDEO && !aMusicFlag) + { + aMovie->videoCodec = codec; + aMovie->videoCodecContext = codec_context; + aMovie->videoStreamIndex = i; + aMovie->videoFrame = av_frame_alloc(); + numStreams++; + + aMovie->videoFrameRate = (float)aMovie->avContext->streams[i]->avg_frame_rate.num / (float)aMovie->avContext->streams[i]->avg_frame_rate.den; + } + if(codec_context->codec_type==AVMEDIA_TYPE_AUDIO) + { + aMovie->audioCodec = codec; + aMovie->audioCodecContext = codec_context; + aMovie->audioStreamIndex = i; + aMovie->audioFrame = av_frame_alloc(); + numStreams++; + } + } + } + + if(aMovie->videoStreamIndex < 0 && aMovie->audioStreamIndex < 0) + { + BinkReleaseMovie(aMovie); + return 0; + } + + if(!aFmvFlag) + { + for(int i=0; i<(FRAMEQUEUESIZE-1) * numStreams; i++) + BinkDecodeFrame(aMovie); + } + + aMovie->timeLastUpdate = SDL_GetTicks(); + return 1; +} + + +int BinkDecodeFrameInternal(struct binkMovie* aMovie, AVPacket* aPacket) +{ + // decode video frame + if(aPacket->stream_index == aMovie->videoStreamIndex) + { + int decoded_frame_ready = 0; + int len = avcodec_decode_video2(aMovie->videoCodecContext, aMovie->videoFrame, &decoded_frame_ready, aPacket); + if(len<0) + return aMovie->looping; + + if(decoded_frame_ready<1) + return 1; + + if(aMovie->videoScaleContext==NULL) + { + if(aMovie->videoScaleWidth==0) aMovie->videoScaleWidth = aMovie->videoFrame->width; + if(aMovie->videoScaleHeight==0) aMovie->videoScaleHeight = aMovie->videoFrame->height; + if(aMovie->videoScaleFormat==0) aMovie->videoScaleFormat = AV_PIX_FMT_RGB565; + + aMovie->videoScaleContext = sws_getContext( + aMovie->videoFrame->width, aMovie->videoFrame->height, aMovie->videoFrame->format, + aMovie->videoScaleWidth, aMovie->videoScaleHeight, aMovie->videoScaleFormat, + SWS_FAST_BILINEAR, NULL, NULL, NULL); + + if(aMovie->videoScaleContext==NULL) + return 0; + + avpicture_alloc(&aMovie->videoScalePicture, aMovie->videoScaleFormat, aMovie->videoScaleWidth, aMovie->videoScaleHeight); + } + + sws_scale(aMovie->videoScaleContext, aMovie->videoFrame->data, aMovie->videoFrame->linesize, 0, aMovie->videoFrame->height, aMovie->videoScalePicture.data, aMovie->videoScalePicture.linesize); + } + + // decode audio frame + else if(aPacket->stream_index == aMovie->audioStreamIndex) + { + + int packageSize= aPacket->size; + + int decoded_frame_ready = 0; + av_frame_unref(aMovie->audioFrame); + //avcodec_get_frame_defaults(aMovie->audioFrame); + + int len = avcodec_decode_audio4(aMovie->audioCodecContext, aMovie->audioFrame, &decoded_frame_ready, aPacket); + if(len<0) + return aMovie->looping; + + if(!SoundSys_IsOn()) + return 0; + + if(!aMovie->alInited) + { + alGenSources(1, &aMovie->alSource); + AL_CHECK(); + + alGenBuffers(FRAMEQUEUESIZE, aMovie->alBuffers); + AL_CHECK(); + + alSource3f(aMovie->alSource, AL_POSITION, 0.0, 0.0, 0.0); + alSource3f(aMovie->alSource, AL_VELOCITY, 0.0, 0.0, 0.0); + alSource3f(aMovie->alSource, AL_DIRECTION, 0.0, 0.0, 0.0); + alSourcef (aMovie->alSource, AL_ROLLOFF_FACTOR, 0.0); + alSourcei (aMovie->alSource, AL_SOURCE_RELATIVE, AL_TRUE); + alSourcef (aMovie->alSource, AL_PITCH, 1); + alSourcef (aMovie->alSource, AL_GAIN, 1.0); + + AL_CHECK(); + + aMovie->alNumFreeBuffers=FRAMEQUEUESIZE; + for(int i=0; i<aMovie->alNumFreeBuffers; i++) + aMovie->alFreeBuffers[i] = aMovie->alBuffers[i]; + + switch(aMovie->audioFrame->channel_layout) + { + case AV_CH_LAYOUT_MONO: + aMovie->alFormat = (aMovie->audioFrame->format == AV_SAMPLE_FMT_U8) ? AL_FORMAT_MONO8 : AL_FORMAT_MONO16; + aMovie->alNumChannels = 1; + break; + case AV_CH_LAYOUT_STEREO: + aMovie->alFormat = (aMovie->audioFrame->format == AV_SAMPLE_FMT_U8) ? AL_FORMAT_STEREO8 : AL_FORMAT_STEREO16; + aMovie->alNumChannels = 2; + break; + } + + aMovie->alSampleRate = aMovie->audioFrame->sample_rate; + aMovie->audioTempBuffer = malloc(aMovie->alNumChannels * aMovie->audioFrame->nb_samples * 2 * 2); + aMovie->alInited=TRUE; + } + + + memset(aMovie->audioTempBuffer, 0, aMovie->alNumChannels * aMovie->audioFrame->nb_samples * 2 * 2); + + if(aMovie->alNumChannels==0) + return 0; + + // reclaim completed frames + int processedBuffers = 0; + alGetSourcei(aMovie->alSource, AL_BUFFERS_PROCESSED, &processedBuffers); + if(processedBuffers>0) + { + alSourceStop(aMovie->alSource); + while(processedBuffers>0) + { + ALuint buffer = 0; + alSourceUnqueueBuffers(aMovie->alSource, 1, &buffer); + AL_CHECK(); + + if(buffer>0) + { + aMovie->alFreeBuffers[aMovie->alNumFreeBuffers] = buffer; + aMovie->alNumFreeBuffers++; + } + processedBuffers--; + } + alSourcePlay(aMovie->alSource); + } + + // queue this frame + if(aMovie->alNumFreeBuffers>0) + { + ALuint alBuffer = aMovie->alFreeBuffers[aMovie->alNumFreeBuffers-1]; + + int sampleCount = aMovie->audioFrame->nb_samples * aMovie->alNumChannels; + + + // 16bit is deafult + uint dataSize = sampleCount*2; + void* data = (void*) aMovie->audioFrame->extended_data[0]; + + switch(aMovie->audioFrame->format) + { + case AV_SAMPLE_FMT_U8: + { + dataSize = sampleCount; + } break; + + default: + case AV_SAMPLE_FMT_S16: + { + /* + unsigned short* p = (unsigned short*) data; + for(int i=0; i<sampleCount; i++) + p[i] -= p[i]>>2; + */ + } break; + + case AV_SAMPLE_FMT_FLT: + { + data = (void*) aMovie->audioTempBuffer; + short* tempBuf = (short*) aMovie->audioTempBuffer; + float* srcBuf = (float*) aMovie->audioFrame->extended_data[0]; + for(int i=0; i<sampleCount; i++) + { + float val = srcBuf[i] * 32768; + if(val > 32767) val = 32767; + if(val < -32768) val = 32768; + tempBuf[i] = (short) val; + + } + } break; + + case AV_SAMPLE_FMT_S32: + { + data = (void*) aMovie->audioTempBuffer; + short* tempBuf = (short*) aMovie->audioTempBuffer; + unsigned int* srcBuf = (unsigned int*) aMovie->audioFrame->extended_data[0]; + for(int i=0; i<sampleCount; i++) + tempBuf[i] = (short) (((*srcBuf - *srcBuf>>2) >> 16) & 0x0000FFFF); + } break; + + case AV_SAMPLE_FMT_FLTP: + { + data = (void*) aMovie->audioTempBuffer; + short* tempBuf = (short*) aMovie->audioTempBuffer; + + for(int i=0; i<aMovie->audioFrame->nb_samples; i++) + { + for(int j=0; j<aMovie->alNumChannels; j++) + { + float* srcBuf = (float*) aMovie->audioFrame->extended_data[j]; + float val = srcBuf[i] * 32768; + if(val > 32767) val = 32767; + if(val < -32768) val = 32768; + tempBuf[(i*aMovie->alNumChannels)+j] = (short) val; + } + } + } break; + } + + alSourceStop(aMovie->alSource); + + //printf("fmt=%d, buffer size=%d, rdy=%d, len=%d, s1=%d, samples=%d\n", aMovie->audioFrame->format, dataSize, decoded_frame_ready, len, aPacket->size, sampleCount); + + alBufferData(alBuffer, aMovie->alFormat, data, dataSize-16, aMovie->alSampleRate); + AL_CHECK(); + + alSourceQueueBuffers(aMovie->alSource, 1, &alBuffer); + AL_CHECK(); + + float vx, vy, vz; + alGetListener3f(AL_VELOCITY, &vx, &vy, &vz); + alSource3f(aMovie->alSource, AL_VELOCITY, vx, vy, vz); + + alSourcePlay(aMovie->alSource); + + aMovie->alNumFreeBuffers--; + aMovie->alFreeBuffers[aMovie->alNumFreeBuffers] = 0; + } + } + return 1; +} + + + +int BinkDecodeFrame(struct binkMovie* aMovie) +{ + AVPacket packet; + av_init_packet(&packet); + + if(av_read_frame(aMovie->avContext, &packet) < 0) + { + if(!aMovie->looping) + return 0; + + av_seek_frame(aMovie->avContext, -1, 0, 0); + if(av_read_frame(aMovie->avContext, &packet) < 0) + return 0; + } + + int result = BinkDecodeFrameInternal(aMovie, &packet); + +// if(packet.data) +// av_free_packet(&packet); + + return result; +} + + + +int BinkUpdateMovie(struct binkMovie* aMovie) +{ + if(!aMovie->avContext) + return 0; + + uint timeNow = SDL_GetTicks(); + float delta = ((float)(timeNow - aMovie->timeLastUpdate)) / 1000.0f; + + + if(aMovie->videoStreamIndex >= 0) + { + if(delta < (1.0f / aMovie->videoFrameRate)) + { + if(aMovie->audioStreamIndex<0 || !SoundSys_IsOn() || aMovie->alNumFreeBuffers==0) + return 1; + } + } + else if(aMovie->audioStreamIndex >= 0 && aMovie->alInited) + { + int processedBuffers = 0; + alGetSourcei(aMovie->alSource, AL_BUFFERS_PROCESSED, &processedBuffers); + if(aMovie->alNumFreeBuffers<=0 && processedBuffers == 0) + return 1; + } + + int streamsPlaying = 0; + if(aMovie->videoStreamIndex >= 0) + streamsPlaying += BinkDecodeFrame(aMovie); + + if(aMovie->audioStreamIndex >= 0) + streamsPlaying += BinkDecodeFrame(aMovie); + + aMovie->timeLastUpdate = timeNow; + return (streamsPlaying > 0) ? 1 : 0; +} + + + +//----------------------------------------------------------------------------------------------- + + +BOOL BinkSys_Init() +{ + if(binkInitialized) + return TRUE; + + av_register_all(); + + binkInitialized = TRUE; + return binkInitialized; +} + + + +void BinkSys_Release() +{ + if(!binkInitialized) + return; + + binkInitialized = FALSE; +} + + + +//----------------------------------------------------------------------------------------------- + + +void PlayBinkedFMV(char *filenamePtr, int volume) +{ + if(!binkInitialized) + return; + + struct binkMovie movie; + + if(BinkStartMovie(&movie, filenamePtr, FALSE, FALSE, FALSE)) + { + alSourcef(movie.alSource, AL_GAIN, PlatVolumeToGain(volume)); + while(BinkUpdateMovie(&movie)) + { + BinkRenderMovie(&movie); + FlipBuffers(); + } + BinkReleaseMovie(&movie); + } +} + + +//----------------------------------------------------------------------------------------------- + +struct binkMovie menuBackgroundMovie; + +void StartMenuBackgroundBink() +{ + if(!binkInitialized) + return; + + BinkStartMovie(&menuBackgroundMovie, "FMVs/Menubackground.bik", TRUE, FALSE, FALSE); +} + + +int PlayMenuBackgroundBink() +{ + if(!binkInitialized) + return 0; + + ClearScreenToBlack(); + if(BinkUpdateMovie(&menuBackgroundMovie)) + { + BinkRenderMovie(&menuBackgroundMovie); + return 1; + } + return 0; +} + + +void EndMenuBackgroundBink() +{ + if(!binkInitialized) + return; + + BinkReleaseMovie(&menuBackgroundMovie); +} + + +//----------------------------------------------------------------------------------------------- + +struct binkMovie musicMovie; + +int StartMusicBink(char* filenamePtr, BOOL looping) +{ + if(!binkInitialized || !SoundSys_IsOn()) + return 0; + + int ret = BinkStartMovie(&musicMovie, filenamePtr, looping, FALSE, TRUE); + return ret; +} + +int PlayMusicBink(int volume) +{ + if(!binkInitialized || !SoundSys_IsOn()) + return 1; + + if(!musicMovie.avContext) + return 1; + + if(!(musicMovie.audioStreamIndex>=0 && musicMovie.alInited)) + return 1; + + alSourcef(musicMovie.alSource, AL_GAIN, PlatVolumeToGain(volume)); + for(int i=0; i<musicMovie.avContext->nb_streams * FRAMEQUEUESIZE; i++) + { + int processedBuffers = 0; + alGetSourcei(musicMovie.alSource, AL_BUFFERS_PROCESSED, &processedBuffers); + if(processedBuffers + musicMovie.alNumFreeBuffers > 0) + { + if(!BinkDecodeFrame(&musicMovie)) + { + return 0; + } + } + } + return 1; +} + +void EndMusicBink() +{ + if(!binkInitialized || !SoundSys_IsOn()) + return; + + BinkReleaseMovie(&musicMovie); +} + + +//----------------------------------------------------------------------------------------------- + + +FMVHandle CreateBinkFMV(char* filenamePtr) +{ + if(!binkInitialized) + return 0; + + struct binkMovie* movie = malloc(sizeof(struct binkMovie)); + BinkInitMovieStruct(movie); + + if(!BinkStartMovie(movie, filenamePtr, FALSE, TRUE, FALSE)) + { + free(movie); + return 0; + } + return (FMVHandle)movie; +} + + +int UpdateBinkFMV(FMVHandle aFmvHandle, int volume) +{ + if(!binkInitialized || aFmvHandle==0) + return 0; + + struct binkMovie* movie = (struct binkMovie*)aFmvHandle; + alSourcef(movie->alSource, AL_GAIN, PlatVolumeToGain(volume)); + BinkUpdateMovie(movie); + BinkUpdateMovie(movie); + BinkUpdateMovie(movie); + BinkUpdateMovie(movie); + return BinkUpdateMovie(movie); +} + + +void CloseBinkFMV(FMVHandle aFmvHandle) +{ + if(!binkInitialized || aFmvHandle==0) + return 0; + + struct binkMovie* movie = (struct binkMovie*)aFmvHandle; + BinkReleaseMovie(movie); + free(movie); +} + + +char* GetBinkFMVImage(FMVHandle aFmvHandle) +{ + if(!binkInitialized || aFmvHandle==0) + return 0; + + struct binkMovie* movie = (struct binkMovie*)aFmvHandle; + + if(!movie->videoScaleContext) + return 0; + + return movie->videoScalePicture.data[0]; +} + + diff --git a/src/bink.h b/src/bink.h new file mode 100644 index 0000000..a54cdee --- /dev/null +++ b/src/bink.h @@ -0,0 +1,31 @@ +#ifndef _BINK_H_ +#define _BINK_H_ + +extern BOOL BinkSys_Init(); +extern void BinkSys_Release(); + +//--- intro/outro +extern void PlayBinkedFMV(char *filenamePtr, int volume); + +//--- menu background +extern void StartMenuBackgroundBink(); +extern int PlayMenuBackgroundBink(); +extern void EndMenuBackgroundBink(); + +//---- music +extern int StartMusicBink(char* filenamePtr, BOOL looping); +extern int PlayMusicBink(int volume); +extern void EndMusicBink(); + + +//---- ingame fmv +typedef unsigned int FMVHandle; + +extern FMVHandle CreateBinkFMV(char* filenamePtr); +extern int UpdateBinkFMV(FMVHandle aFmvHandle, int volume); +extern void CloseBinkFMV(FMVHandle aFmvHandle); +extern char* GetBinkFMVImage(FMVHandle aFmvHandle); + + + +#endif //_BINK_H_ diff --git a/src/fixer.h b/src/fixer.h index 5164542..288d22c 100644 --- a/src/fixer.h +++ b/src/fixer.h @@ -152,6 +152,18 @@ typedef unsigned __int64 uint64_t; #define FILE_ATTRIBUTE_DIRECTORY 0x1000 #define FILE_ATTRIBUTE_NORMAL 0x2000 +#if defined(__BIG_ENDIAN__) + extern void DoByteSwap2(void* x); + extern void DoByteSwap4(void* x); + extern void DoByteSwap8(void* x); + #define BYTESWAP2(x) DoByteSwap2((void*)&x); + #define BYTESWAP4(x) DoByteSwap4((void*)&x); + #define BYTESWAP8(x) DoByteSwap8((void*)&x); +#else + #define BYTESWAP2(x) {} + #define BYTESWAP4(x) {} + #define BYTESWAP8(x) {} +#endif HANDLE CreateFile(const char *file, int write, int x, int y, int flags, int flags2, int z); HANDLE CreateFileA(const char *file, int write, int x, int y, int flags, int flags2, int z); @@ -29,7 +29,7 @@ extern int NumImagesArray[]; extern int NumImages; #endif -void PlayFMV(char *filenamePtr); +//void PlayFMV(char *filenamePtr); void FindLightingValueFromFMV(unsigned short *bufferPtr); void FindLightingValuesFromTriggeredFMV(unsigned char *bufferPtr, FMVTEXTURE *ftPtr); @@ -39,6 +39,6 @@ void UpdateAllFMVTextures(void); void ScanImagesForFMVs(void); void ReleaseAllFMVTextures(void); -void PlayBinkedFMV(char *filenamePtr); +//void PlayBinkedFMV(char *filenamePtr); #endif @@ -248,7 +248,7 @@ VideoModeStruct VideoModeList[] = { { 640, 480, 0 }, { 720, 480, 0 }, { 800, 600, 0 }, -{ 1024, 768, 0 }, +{ 1366, 768, 0 }, { 1152, 864, 0 }, { 1280, 720, 0 }, { 1280, 768, 0 }, @@ -1228,6 +1228,9 @@ int main(int argc, char *argv[]) LoadKeyConfiguration(); SoundSys_Start(); + + BinkSys_Init(); + if (WantCDRom) CDDA_Start(); InitTextStrings(); @@ -1419,6 +1422,8 @@ if (AvP_MainMenus()) ExitSystem(); CDDA_End(); + BinkSys_Release(); + ClearMemoryPool(); return 0; diff --git a/src/menus.c b/src/menus.c index 6c862a2..ec73820 100644 --- a/src/menus.c +++ b/src/menus.c @@ -1179,6 +1179,46 @@ void ReleaseAllAvPMenuGfx() UnloadMenuFont(); } +void DrawAvpMenuBink(unsigned char* buf, int width, int height, int pitch) +{ + int topleftX = ((ScreenDescriptorBlock.SDB_Width - width)>>1); + int topleftY = ((ScreenDescriptorBlock.SDB_Height - height)>>1); + + int length = width; + if (ScreenDescriptorBlock.SDB_Width - topleftX < length) { + length = ScreenDescriptorBlock.SDB_Width - topleftX; + } + if (length <= 0) return; + + + if (SDL_MUSTLOCK(surface)) { + if (SDL_LockSurface(surface) < 0) { + return; + } + } + + unsigned short* srcPtr = (unsigned short*) buf; + unsigned short* dstPtr = (unsigned short*) ((((unsigned char *)surface->pixels) + (topleftY*surface->pitch)) + (topleftX*2)); + + unsigned int srcPitch = (pitch>>1); + unsigned int dstPitch = (surface->pitch>>1); + + for(int y=height; y!=0; y--) + { + unsigned short* s = srcPtr; + unsigned short* d = dstPtr; + for(int x=width; x!=0; x--) + *d++ = *s++; + + srcPtr += srcPitch; + dstPtr += dstPitch; + } + + if (SDL_MUSTLOCK(surface)) { + SDL_UnlockSurface(surface); + } +} + void DrawAvPMenuGfx(enum AVPMENUGFX_ID menuGfxID, int topleftX, int topleftY, int alpha,enum AVPMENUFORMAT_ID format) { AVPMENUGFX *gfxPtr; diff --git a/src/openal.c b/src/openal.c index 19bae84..0ac0c84 100644 --- a/src/openal.c +++ b/src/openal.c @@ -1240,3 +1240,12 @@ int LoadWavFromFastFile(int soundNum, char * wavFileName) return ok; } + +float PlatVolumeToGain(int volume) +{ + if(volume<0) volume = 0; + if(volume>127) volume = 127; + return vol_to_gain_table[volume]; +} + + diff --git a/src/stubs.c b/src/stubs.c index 8733c41..714fd7f 100644 --- a/src/stubs.c +++ b/src/stubs.c @@ -23,34 +23,34 @@ int HWAccel = 1; int VideoModeNotAvailable=0; /* bink.c */ -void PlayBinkedFMV(char *filenamePtr) -{ +//void PlayBinkedFMV(char *filenamePtr) +//{ /* fprintf(stderr, "PlayBinkedFMV(%s)\n", filenamePtr); */ -} +//} -void StartMenuBackgroundBink() -{ +//void StartMenuBackgroundBink() +//{ /* fprintf(stderr, "StartMenuBackgroundBink()\n"); */ -} +//} -int PlayMenuBackgroundBink() -{ +//int PlayMenuBackgroundBink() +//{ /* fprintf(stderr, "PlayMenuBackgroundBink()\n"); */ - return 0; -} +// return 0; +//} -void EndMenuBackgroundBink() -{ +//void EndMenuBackgroundBink() +//{ /* fprintf(stderr, "EndMenuBackgroundBink()\n"); */ -} +//} /* alt_tab.cpp */ void ATIncludeSurface(void * pSurface, void * hBackup) diff --git a/src/win95/platform.h b/src/win95/platform.h index fabeaf5..41a2257 100644 --- a/src/win95/platform.h +++ b/src/win95/platform.h @@ -326,10 +326,10 @@ typedef enum { VideoMode_DX_800x600x15, VideoMode_DX_800x600x24, - VideoMode_DX_1024x768x8, - VideoMode_DX_1024x768x8T, - VideoMode_DX_1024x768x15, - VideoMode_DX_1024x768x24, + VideoMode_DX_1366x768x8, + VideoMode_DX_1366x768x8T, + VideoMode_DX_1366x768x15, + VideoMode_DX_1366x768x24, VideoMode_DX_1280x1024x8, VideoMode_DX_1280x1024x8T, |