summaryrefslogtreecommitdiffstats
path: root/src/ui/color.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui/color.cpp')
-rw-r--r--src/ui/color.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/ui/color.cpp b/src/ui/color.cpp
index c8588b8..2666f84 100644
--- a/src/ui/color.cpp
+++ b/src/ui/color.cpp
@@ -16,7 +16,7 @@
// * along with this program. If not, see http://www.gnu.org/licenses/.
-#include "color.h"
+#include "ui/color.h"
#include "common/event.h"
#include "common/iman.h"
@@ -26,6 +26,8 @@
#include "graphics/core/device.h"
#include "graphics/engine/engine.h"
+#include <string.h>
+
namespace Ui {
const float DELAY1 = 0.4f;
@@ -188,10 +190,10 @@ void CColor::Draw()
m_engine->SetTexture("xxx.tga"); // no texture
m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
- vertex[0] = Gfx::VertexCol(Math::Vector(p1.x, p1.y, 0.0f), color,0x00000000, Math::Point(0.0f, 0.0f));
- vertex[1] = Gfx::VertexCol(Math::Vector(p1.x, p2.y, 0.0f), color,0x00000000, Math::Point(0.0f, 0.0f));
- vertex[2] = Gfx::VertexCol(Math::Vector(p2.x, p1.y, 0.0f), color,0x00000000, Math::Point(0.0f, 0.0f));
- vertex[3] = Gfx::VertexCol(Math::Vector(p2.x, p2.y, 0.0f), color,0x00000000, Math::Point(0.0f, 0.0f));
+ vertex[0] = Gfx::VertexCol(Math::Vector(p1.x, p1.y, 0.0f), color, Gfx::Color(), Math::Point(0.0f, 0.0f));
+ vertex[1] = Gfx::VertexCol(Math::Vector(p1.x, p2.y, 0.0f), color, Gfx::Color(), Math::Point(0.0f, 0.0f));
+ vertex[2] = Gfx::VertexCol(Math::Vector(p2.x, p1.y, 0.0f), color, Gfx::Color(), Math::Point(0.0f, 0.0f));
+ vertex[3] = Gfx::VertexCol(Math::Vector(p2.x, p2.y, 0.0f), color, Gfx::Color(), Math::Point(0.0f, 0.0f));
device = m_engine->GetDevice();
device->DrawPrimitive(Gfx::PRIMITIVE_TRIANGLE_STRIP, vertex, 4);