Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Synchronize parameter names in definition and declaration

Browse source 
Fixes #10244.
This commit is contained in:
TwistedTwigleg 2017-08-11 15:10:05 -04:00 • committed by Rémi Verschelde
parent b1ecaaa22b
commit 00f6c85928
134 changed files with 974 additions and 974 deletions
Download patch file Download diff file Expand all files Collapse all files

2
platform/android/audio_driver_jandroid.h
View file

@ -71,7 +71,7 @@ public:
virtual void set_pause(bool p_pause);
static void setup(jobject act);
static void setup(jobject p_io);
static void thread_func(JNIEnv *env);
AudioDriverAndroid();

2
platform/android/dir_access_jandroid.h
View file

@ -79,7 +79,7 @@ public:
//virtual FileType get_file_type() const;
size_t get_space_left();
static void setup(jobject io);
static void setup(jobject p_io);
DirAccessJAndroid();
~DirAccessJAndroid();

2
platform/android/file_access_jandroid.h
View file

@ -71,7 +71,7 @@ public:
virtual bool file_exists(const String &p_path); ///< return true if a file exists
static void setup(jobject io);
static void setup(jobject p_io);
virtual uint64_t _get_modified_time(const String &p_file) { return 0; }

24
platform/android/godot_android.cpp
View file

@ -739,21 +739,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 +764,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 +790,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,11 +824,11 @@ 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) {

4
platform/android/java_glue.h
View file

@ -56,8 +56,8 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusout(JNIEnv *env,
JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_singleton(JNIEnv *env, jobject obj, jstring name, jobject p_object);
JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_method(JNIEnv *env, jobject obj, jstring sname, jstring name, jstring ret, jobjectArray args);
JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getGlobal(JNIEnv *env, jobject obj, jstring path);
JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_callobject(JNIEnv *env, jobject obj, jint ID, jstring method, jobjectArray params);
JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_calldeferred(JNIEnv *env, jobject obj, jint ID, jstring method, jobjectArray params);
JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_callobject(JNIEnv *env, jobject p_obj, jint ID, jstring method, jobjectArray params);
JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_calldeferred(JNIEnv *env, jobject p_obj, jint ID, jstring method, jobjectArray params);
}
#endif