diff options
| author | oy <Tom_Adams@web.de> | 2012-10-21 14:49:26 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2013-02-24 18:26:49 +0100 |
| commit | 8b4026cbbfb2cf04da8ee47f0b6b30d228cfebaf (patch) | |
| tree | 07fde3be556be404afb935e4a80015457c4b057a /src/game/editor/editor.h | |
| parent | d58afefaae99f239151483025e516e8da5b6dd17 (diff) | |
| download | zcatch-8b4026cbbfb2cf04da8ee47f0b6b30d228cfebaf.tar.gz zcatch-8b4026cbbfb2cf04da8ee47f0b6b30d228cfebaf.zip | |
fixed last commit
Conflicts: src/game/editor/editor.cpp src/game/editor/editor.h
Diffstat (limited to 'src/game/editor/editor.h')
| -rw-r--r-- | src/game/editor/editor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/editor/editor.h b/src/game/editor/editor.h index 2807d35c..19a8752e 100644 --- a/src/game/editor/editor.h +++ b/src/game/editor/editor.h @@ -761,8 +761,8 @@ public: vec4 ButtonColorMul(const void *pID); - void DoQuadEnvelopes(CQuad *pQuad, int Num, int TexID = -1); - void DoQuadEnvPoint(CQuad *pQuad, int QIndex, int pIndex); + void DoQuadEnvelopes(const array<CQuad> &m_lQuads, int TexID = -1); + void DoQuadEnvPoint(const CQuad *pQuad, int QIndex, int pIndex); void DoQuadPoint(CQuad *pQuad, int QuadIndex, int v); void DoMapEditor(CUIRect View, CUIRect Toolbar); |