OpenTyrian: fixed compilation

This commit is contained in:
pelya
2021-02-14 00:09:52 +02:00
parent 55026dec85
commit 23e010f203
4 changed files with 39 additions and 14 deletions

View File

@@ -22,6 +22,7 @@
#include "opentyr.h"
#include "opl.h"
#include "SDL.h"
#define SFX_CHANNELS 8

View File

@@ -30,6 +30,30 @@
#include <string.h> // memset()
#include "opl.h"
// per-chip variables
Bitu chip_num;
op_type op[MAXOPERATORS];
Bits int_samplerate;
Bit8u status;
Bit32u opl_index;
#if defined(OPLTYPE_IS_OPL3)
Bit8u adlibreg[512]; // adlib register set (including second set)
Bit8u wave_sel[44]; // waveform selection
#else
Bit8u adlibreg[256]; // adlib register set
Bit8u wave_sel[22]; // waveform selection
#endif
// vibrato/tremolo increment/counter
Bit32u vibtab_pos;
Bit32u vibtab_add;
Bit32u tremtab_pos;
Bit32u tremtab_add;
static Bit32u generator_add; // should be a chip parameter
static fltype recipsamp; // inverse of sampling rate

View File

@@ -149,27 +149,27 @@ typedef struct operator_struct {
} op_type;
// per-chip variables
Bitu chip_num;
op_type op[MAXOPERATORS];
extern Bitu chip_num;
extern op_type op[MAXOPERATORS];
Bits int_samplerate;
extern Bits int_samplerate;
Bit8u status;
Bit32u opl_index;
extern Bit8u status;
extern Bit32u opl_index;
#if defined(OPLTYPE_IS_OPL3)
Bit8u adlibreg[512]; // adlib register set (including second set)
Bit8u wave_sel[44]; // waveform selection
extern Bit8u adlibreg[512]; // adlib register set (including second set)
extern Bit8u wave_sel[44]; // waveform selection
#else
Bit8u adlibreg[256]; // adlib register set
Bit8u wave_sel[22]; // waveform selection
extern Bit8u adlibreg[256]; // adlib register set
extern Bit8u wave_sel[22]; // waveform selection
#endif
// vibrato/tremolo increment/counter
Bit32u vibtab_pos;
Bit32u vibtab_add;
Bit32u tremtab_pos;
Bit32u tremtab_add;
extern Bit32u vibtab_pos;
extern Bit32u vibtab_add;
extern Bit32u tremtab_pos;
extern Bit32u tremtab_add;
// enable an operator