From d7ca14a8368e963777776fe503d62ff177f704c5 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Mon, 13 Jun 2011 23:54:44 +0000
Subject: [PATCH] android: compilation fixes for recent engine changes.

---
 src/androidapp.cpp | 7 +++----
 src/video.cpp      | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/androidapp.cpp b/src/androidapp.cpp
index 50b2bd30..7f233d11 100644
--- a/src/androidapp.cpp
+++ b/src/androidapp.cpp
@@ -43,7 +43,7 @@ Java_org_zoy_LolEngine_LolRenderer_nativeInit(JNIEnv* env)
 
     __android_log_print(ANDROID_LOG_INFO, "LOL", "init");
     Ticker::Setup(30.0f);
-    Video::Setup(320, 200);
+    Video::Setup(vec2i(320, 200));
 
     new Interface();
     new DebugFps(20, 20);
@@ -54,7 +54,7 @@ Java_org_zoy_LolEngine_LolRenderer_nativeResize(JNIEnv* env, jobject thiz,
                                                 jint w, jint h)
 {
     __android_log_print(ANDROID_LOG_INFO, "LOL", "resize w=%d h=%d", w, h);
-    Video::Setup(w, h);
+    Video::Setup(vec2i(w, h));
 }
 
 extern "C" void
@@ -85,8 +85,7 @@ extern "C" void
 Java_org_zoy_LolEngine_LolView_nativeMove(JNIEnv* env, jobject thiz,
                                           jint x, jint y)
 {
-    vec2i pos(x * 640 / Video::GetWidth(),
-              480 - 1 - y * 480 / Video::GetHeight());
+    vec2i pos = vec2i(0, 479) + vec2i(x * 640, -y * 480) / Video::GetSize();
     Input::SetMousePos(pos);
 }
 
diff --git a/src/video.cpp b/src/video.cpp
index 2c8f974c..649a7510 100644
--- a/src/video.cpp
+++ b/src/video.cpp
@@ -148,7 +148,7 @@ void Video::SetFov(float theta)
     float far = size.x + size.y;
 
 #if defined ANDROID_NDK
-    size = vec(640.0f, 480.0f);
+    size = vec2(640.0f, 480.0f);
 #endif
 
     /* Set the projection matrix */