51 lines
1.8 KiB
Diff
51 lines
1.8 KiB
Diff
--- vavoom-1.21.2/source/d_local.h~ 2007-05-14 22:47:14.000000000 +0200
|
|
+++ vavoom-1.21.2/source/d_local.h 2007-05-14 22:47:14.000000000 +0200
|
|
@@ -425,8 +425,10 @@
|
|
extern spritespanfunc_t D_DrawAltFuzzSpriteSpans;
|
|
extern particle_func_t D_DrawParticle;
|
|
|
|
+extern "C" {
|
|
extern float xscaleshrink;
|
|
extern float yscaleshrink;
|
|
+}
|
|
|
|
extern byte *colormaps;
|
|
|
|
--- vavoom-1.23/source/s_flac.cpp 2007-04-28 16:54:28.000000000 +0200
|
|
+++ vavoom-1.23.new/source/s_flac.cpp 2007-05-15 20:42:29.000000000 +0200
|
|
@@ -54,7 +54,7 @@
|
|
protected:
|
|
// FLAC decoder callbacks.
|
|
::FLAC__StreamDecoderReadStatus read_callback(FLAC__byte buffer[],
|
|
- unsigned *bytes);
|
|
+ size_t *bytes);
|
|
::FLAC__StreamDecoderWriteStatus write_callback(
|
|
const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[]);
|
|
void metadata_callback(const ::FLAC__StreamMetadata *metadata);
|
|
@@ -92,7 +92,7 @@
|
|
protected:
|
|
// FLAC decoder callbacks.
|
|
::FLAC__StreamDecoderReadStatus read_callback(FLAC__byte buffer[],
|
|
- unsigned *bytes);
|
|
+ size_t *bytes);
|
|
::FLAC__StreamDecoderWriteStatus write_callback(
|
|
const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[]);
|
|
void metadata_callback(const ::FLAC__StreamMetadata *metadata);
|
|
@@ -199,7 +199,7 @@
|
|
//==========================================================================
|
|
|
|
::FLAC__StreamDecoderReadStatus VFlacSampleLoader::FStream::read_callback(
|
|
- FLAC__byte buffer[], unsigned* bytes)
|
|
+ FLAC__byte buffer[], size_t* bytes)
|
|
{
|
|
guard(VFlacSampleLoader::FStream::read_callback);
|
|
if (*bytes > 0)
|
|
@@ -477,7 +477,7 @@
|
|
//==========================================================================
|
|
|
|
::FLAC__StreamDecoderReadStatus VFlacAudioCodec::FStream::read_callback(
|
|
- FLAC__byte buffer[], unsigned* bytes)
|
|
+ FLAC__byte buffer[], size_t* bytes)
|
|
{
|
|
guard(VFlacAudioCodec::FStream::read_callback);
|
|
if (*bytes > 0)
|