edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add CEnvPoint::MAX_CHANNELS constant

Browse source
This commit is contained in:
Robert Müller 2023-01-24 20:11:33 +01:00
parent 3c42b224f5
commit 7ce143bd9e
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game/editor/editor.cpp
View file

@ -4955,21 +4955,21 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
ToolBar.VSplitLeft(15.0f, &Button, &ToolBar); ToolBar.VSplitLeft(15.0f, &Button, &ToolBar);
static const char *s_aapNames[4][4] = { static const char *s_aapNames[4][CEnvPoint::MAX_CHANNELS] = {
{"V", "", "", ""}, {"V", "", "", ""},
{"", "", "", ""}, {"", "", "", ""},
{"X", "Y", "R", ""}, {"X", "Y", "R", ""},
{"R", "G", "B", "A"}, {"R", "G", "B", "A"},
}; };
static const char *s_aapDescriptions[4][4] = { static const char *s_aapDescriptions[4][CEnvPoint::MAX_CHANNELS] = {
{"Volume of the envelope", "", "", ""}, {"Volume of the envelope", "", "", ""},
{"", "", "", ""}, {"", "", "", ""},
{"X-axis of the envelope", "Y-axis of the envelope", "Rotation of the envelope", ""}, {"X-axis of the envelope", "Y-axis of the envelope", "Rotation of the envelope", ""},
{"Red value of the envelope", "Green value of the envelope", "Blue value of the envelope", "Alpha value of the envelope"}, {"Red value of the envelope", "Green value of the envelope", "Blue value of the envelope", "Alpha value of the envelope"},
}; };
static int s_aChannelButtons[4] = {0}; static int s_aChannelButtons[CEnvPoint::MAX_CHANNELS] = {0};
int Bit = 1; int Bit = 1;
for(int i = 0; i < pEnvelope->m_Channels; i++, Bit <<= 1) for(int i = 0; i < pEnvelope->m_Channels; i++, Bit <<= 1)

7
src/game/mapitems.h
View file

@ -342,9 +342,14 @@ struct CMapItemVersion
struct CEnvPoint struct CEnvPoint
{ {
enum
{
MAX_CHANNELS = 4,
};
int m_Time; // in ms int m_Time; // in ms
int m_Curvetype; int m_Curvetype;
int m_aValues[4]; // 1-4 depending on envelope (22.10 fixed point) int m_aValues[MAX_CHANNELS]; // 1-4 depending on envelope (22.10 fixed point)
bool operator<(const CEnvPoint &Other) const { return m_Time < Other.m_Time; } bool operator<(const CEnvPoint &Other) const { return m_Time < Other.m_Time; }
}; };