diff options
| author | Teetime <TeetimeTW@yahoo.de> | 2013-03-24 04:19:57 +0100 |
|---|---|---|
| committer | Teetime <TeetimeTW@yahoo.de> | 2013-03-24 04:19:57 +0100 |
| commit | 4affc155a906b6091aafc3f9635acc3b8b0aed8a (patch) | |
| tree | 43e4dc20b9c36599571f3caf2e9108a4bb3f5401 /src/engine/client/graphics.h | |
| parent | 6e73cd75bf24eb98781c68ae47d6527cc03262c8 (diff) | |
| parent | 0914490bd994185caef6bfc3038f5cec737e31f3 (diff) | |
| download | zcatch-4affc155a906b6091aafc3f9635acc3b8b0aed8a.tar.gz zcatch-4affc155a906b6091aafc3f9635acc3b8b0aed8a.zip | |
Merge branch 'master0.6' into zCatch
Conflicts: data/languages/index.txt src/game/server/entities/character.cpp
Diffstat (limited to 'src/engine/client/graphics.h')
| -rw-r--r-- | src/engine/client/graphics.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/client/graphics.h b/src/engine/client/graphics.h index fdd83aa7..670c22b4 100644 --- a/src/engine/client/graphics.h +++ b/src/engine/client/graphics.h @@ -119,7 +119,7 @@ public: virtual void QuadsDraw(CQuadItem *pArray, int Num); virtual void QuadsDrawTL(const CQuadItem *pArray, int Num); virtual void QuadsDrawFreeform(const CFreeformItem *pArray, int Num); - virtual void QuadsText(float x, float y, float Size, float r, float g, float b, float a, const char *pText); + virtual void QuadsText(float x, float y, float Size, const char *pText); virtual int Init(); }; |