1 files changed, 14 insertions, 45 deletions

diff --git a/platform/android/godot_android.cpp b/platform/android/godot_android.cpp
index 71db03049a..8235683496 100644
--- a/platform/android/godot_android.cpp
+++ b/platform/android/godot_android.cpp
@@ -3,7 +3,7 @@
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
-/*                    http://www.godotengine.org                         */
+/*                      https://godotengine.org                          */
 /*************************************************************************/
 /* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
 /* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
@@ -565,20 +565,6 @@ static void engine_handle_cmd(struct android_app *app, int32_t cmd) {
 		case APP_CMD_CONFIG_CHANGED:
 		case APP_CMD_WINDOW_RESIZED: {
 
-#if 0
-// android blows
-		if (engine->display_active) {
-
-			EGLint w,h;
-			eglQuerySurface(engine->display, engine->surface, EGL_WIDTH, &w);
-			eglQuerySurface(engine->display, engine->surface, EGL_HEIGHT, &h);
-			engine->os->init_video_mode(w,h);
-			//print_line("RESIZED VIDEO MODE: "+itos(w)+","+itos(h));
-			engine_draw_frame(engine);
-
-		}
-#else
-
 			if (engine->display_active) {
 
 				EGLint w, h;
@@ -594,17 +580,6 @@ static void engine_handle_cmd(struct android_app *app, int32_t cmd) {
 			engine_draw_frame(engine);
 			engine->animating = 1;
 
-/*
-			    EGLint w,h;
-			    eglQuerySurface(engine->display, engine->surface, EGL_WIDTH, &w);
-			    eglQuerySurface(engine->display, engine->surface, EGL_HEIGHT, &h);
-			    engine->os->init_video_mode(w,h);
-			    //print_line("RESIZED VIDEO MODE: "+itos(w)+","+itos(h));
-
-		    }*/
-
-#endif
-
 		} break;
 		case APP_CMD_INIT_WINDOW:
 			//The window is being shown, get it ready.
@@ -616,11 +591,8 @@ static void engine_handle_cmd(struct android_app *app, int32_t cmd) {
 					//do initialization here, when there's OpenGL! hackish but the only way
 					engine->os = new OS_Android(_gfx_init, engine);
 
-					//char *args[]={"-test","gui",NULL};
 					__android_log_print(ANDROID_LOG_INFO, "godot", "pre asdasd setup...");
-#if 0
-				Error err  = Main::setup("apk",2,args);
-#else
+
 					Error err = Main::setup("apk", 0, NULL);
 
 					String modules = ProjectSettings::get_singleton()->get("android/modules");
@@ -670,8 +642,6 @@ static void engine_handle_cmd(struct android_app *app, int32_t cmd) {
 						}
 					}
 
-#endif
-
 					if (!Main::start())
 						return; //should exit instead and print the error
 
@@ -739,21 +709,21 @@ static void engine_handle_cmd(struct android_app *app, int32_t cmd) {
 	}
 }
 
-void android_main(struct android_app *state) {
+void android_main(struct android_app *app) {
 	struct engine engine;
 	// Make sure glue isn't stripped.
 	app_dummy();
 
 	memset(&engine, 0, sizeof(engine));
-	state->userData = &engine;
-	state->onAppCmd = engine_handle_cmd;
-	state->onInputEvent = engine_handle_input;
-	engine.app = state;
+	app->userData = &engine;
+	app->onAppCmd = engine_handle_cmd;
+	app->onInputEvent = engine_handle_input;
+	engine.app = app;
 	engine.requested_quit = false;
 	engine.os = NULL;
 	engine.display_active = false;
 
-	FileAccessAndroid::asset_manager = state->activity->assetManager;
+	FileAccessAndroid::asset_manager = app->activity->assetManager;
 
 	// Prepare to monitor sensors
 	engine.sensorManager = ASensorManager_getInstance();
@@ -764,11 +734,11 @@ void android_main(struct android_app *state) {
 	engine.gyroscopeSensor = ASensorManager_getDefaultSensor(engine.sensorManager,
 			ASENSOR_TYPE_GYROSCOPE);
 	engine.sensorEventQueue = ASensorManager_createEventQueue(engine.sensorManager,
-			state->looper, LOOPER_ID_USER, NULL, NULL);
+			app->looper, LOOPER_ID_USER, NULL, NULL);
 
-	ANativeActivity_setWindowFlags(state->activity, AWINDOW_FLAG_FULLSCREEN | AWINDOW_FLAG_KEEP_SCREEN_ON, 0);
+	ANativeActivity_setWindowFlags(app->activity, AWINDOW_FLAG_FULLSCREEN | AWINDOW_FLAG_KEEP_SCREEN_ON, 0);
 
-	state->activity->vm->AttachCurrentThread(&engine.jni, NULL);
+	app->activity->vm->AttachCurrentThread(&engine.jni, NULL);
 
 	// loop waiting for stuff to do.
 
@@ -790,7 +760,7 @@ void android_main(struct android_app *state) {
 
 			if (source != NULL) {
 				// LOGI("process\n");
-				source->process(state, source);
+				source->process(app, source);
 			} else {
 				nullmax--;
 				if (nullmax < 0)
@@ -824,17 +794,16 @@ void android_main(struct android_app *state) {
 			}
 
 			// Check if we are exiting.
-			if (state->destroyRequested != 0) {
+			if (app->destroyRequested != 0) {
 				if (engine.os) {
 					engine.os->main_loop_request_quit();
 				}
-				state->destroyRequested = 0;
+				app->destroyRequested = 0;
 			}
 
 			if (engine.requested_quit) {
 				engine_term_display(&engine);
 				exit(0);
-				return;
 			}
 
 			//     LOGI("end\n");