Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[Android] Add save state native functions.
  • Loading branch information
Sonicadvance1 committed Aug 29, 2013
1 parent 1dcede4 commit 957c263
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 3 deletions.
Expand Up @@ -11,12 +11,11 @@
import android.os.Bundle;
import android.os.Environment;
import android.util.Log;

import java.io.*;

import org.dolphinemu.dolphinemu.gamelist.GameListActivity;
import org.dolphinemu.dolphinemu.settings.UserPreferences;

import java.io.*;

/**
* The main activity of this emulator.
*
Expand Down
16 changes: 16 additions & 0 deletions Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java
Expand Up @@ -104,6 +104,22 @@
*/
public static native String GetVersionString();

/**
* Saves a game state to the slot number.
*
* @param slot The slot location to save state to.
*/
public static native void SaveState(int slot);

/**
* Loads a game state from the slot number.
*
* @param slot The slot location to load state from.
*/
public static native void LoadState(int slot);



/**
* Begins emulation.
*
Expand Down
11 changes: 11 additions & 0 deletions Source/Core/DolphinWX/Src/MainAndroid.cpp
Expand Up @@ -26,6 +26,7 @@
#include "CPUDetect.h"
#include "Thread.h"

#include "State.h"
#include "PowerPC/PowerPC.h"
#include "HW/Wiimote.h"

Expand Down Expand Up @@ -298,6 +299,16 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetDimension
g_height = (int)_height;
}

JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveState(JNIEnv *env, jobject obj, jint slot)
{
State::Save(slot);
}

JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_LoadState(JNIEnv *env, jobject obj, jint slot)
{
State::Load(slot);
}

JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv *env, jobject obj, jobject _surf)
{
surf = ANativeWindow_fromSurface(env, _surf);
Expand Down

0 comments on commit 957c263

Please sign in to comment.