zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-14 16:41:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed a few unused definitions.

Browse source
This commit is contained in:
Christoph Oelckers 2017-02-07 10:55:59 +01:00
parent dae6230f76
commit 4ca69f10c7
4 changed files with 3 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/oplsynth/muslib.h
View file

@ -83,26 +83,9 @@ class FileReader;
/* Global Definitions */ /* Global Definitions */
#define MLVERSION 0x0175
#define MLVERSIONSTR "1.75"
extern char MLversion[];
extern char MLcopyright[];
#define CHANNELS 16 // total channels 0..CHANNELS-1 #define CHANNELS 16 // total channels 0..CHANNELS-1
#define PERCUSSION 15 // percussion channel #define PERCUSSION 15 // percussion channel
/* MUS file header structure */
struct MUSheader {
char ID[4]; // identifier "MUS" 0x1A
WORD scoreLen; // score length
WORD scoreStart; // score start
WORD channels; // primary channels
WORD sec_channels; // secondary channels (??)
WORD instrCnt; // used instrument count
WORD dummy;
// WORD instruments[...]; // table of used instruments
};
/* OPL2 instrument */ /* OPL2 instrument */
struct OPL2instrument { struct OPL2instrument {
/*00*/ BYTE trem_vibr_1; /* OP 1: tremolo/vibrato/sustain/KSR/multi */ /*00*/ BYTE trem_vibr_1; /* OP 1: tremolo/vibrato/sustain/KSR/multi */
@ -131,7 +114,6 @@ struct OP2instrEntry {
}; };
#define FL_FIXED_PITCH 0x0001 // note has fixed pitch (see below) #define FL_FIXED_PITCH 0x0001 // note has fixed pitch (see below)
#define FL_UNKNOWN 0x0002 // ??? (used in instrument #65 only)
#define FL_DOUBLE_VOICE 0x0004 // use two voices instead of one #define FL_DOUBLE_VOICE 0x0004 // use two voices instead of one

2
src/r_data/renderstyle.cpp
View file

@ -103,7 +103,7 @@ double GetAlpha(int type, double alpha)
switch (type) switch (type)
{ {
case STYLEALPHA_Zero: return 0; case STYLEALPHA_Zero: return 0;
case STYLEALPHA_One: return OPAQUE; case STYLEALPHA_One: return 1.;
case STYLEALPHA_Src: return alpha; case STYLEALPHA_Src: return alpha;
case STYLEALPHA_InvSrc: return 1. - alpha; case STYLEALPHA_InvSrc: return 1. - alpha;
default: return 0; default: return 0;

4
src/r_data/renderstyle.h
View file

@ -44,10 +44,6 @@
enum enum
{ {
OPAQUE = 65536, OPAQUE = 65536,
TRANSLUC25 = (OPAQUE / 4),
TRANSLUC33 = (OPAQUE / 3),
TRANSLUC66 = ((OPAQUE * 2) / 3),
TRANSLUC75 = ((OPAQUE * 3) / 4),
}; };
// Legacy render styles // Legacy render styles

4
src/r_draw.cpp
View file

@ -383,7 +383,7 @@ namespace swrenderer
if (style.BlendOp == STYLEOP_Shadow) if (style.BlendOp == STYLEOP_Shadow)
{ {
style = LegacyRenderStyles[STYLE_TranslucentStencil]; style = LegacyRenderStyles[STYLE_TranslucentStencil];
alpha = TRANSLUC33; alpha = OPAQUE / 3;
color = 0; color = 0;
} }
@ -393,7 +393,7 @@ namespace swrenderer
} }
else if (style.Flags & STYLEF_Alpha1) else if (style.Flags & STYLEF_Alpha1)
{ {
alpha = FRACUNIT; alpha = OPAQUE;
} }
else else
{ {