Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unbreak android build
authorXeli
Thu, 17 May 2012 15:58:04 +0200
changeset 7083 5339aba29571
parent 7081 4900e3cd8fc4
child 7085 953a9d896df1
unbreak android build - export the Game function - fill the ammo store with 0s in the frondend, if we're missing any weapons - use english as default language
hedgewars/hwLibrary.pas file | annotate | diff | comparison | revisions
project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Datastructures/Weapon.java file | annotate | diff | comparison | revisions
project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/SDLActivity.java file | annotate | diff | comparison | revisions 
--- a/hedgewars/hwLibrary.pas	Tue May 15 21:07:47 2012 +0200
+++ b/hedgewars/hwLibrary.pas	Thu May 17 15:58:04 2012 +0200
@@ -106,7 +106,8 @@
     HW_getNumberOfweapons name Java_Prefix + 'HWgetNumberOfWeapons',
     HW_getMaxNumberOfHogs name Java_Prefix + 'HWgetMaxNumberOfHogs',
     HW_getMaxNumberOfTeams name Java_Prefix + 'HWgetMaxNumberOfTeams',
-    HW_terminate name Java_Prefix + 'HWterminate';
+    HW_terminate name Java_Prefix + 'HWterminate',
+    Game;
 {$ELSE}
 exports
     Game,
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Datastructures/Weapon.java	Tue May 15 21:07:47 2012 +0200
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Datastructures/Weapon.java	Thu May 17 15:58:04 2012 +0200
@@ -26,6 +26,7 @@
 import java.util.ArrayList;
 
 import org.hedgewars.hedgeroid.EngineProtocol.EngineProtocolNetwork;
+import org.hedgewars.hedgeroid.EngineProtocol.PascalExports;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParserFactory;
@@ -46,7 +47,7 @@
 	private static int maxWeapons;
 	
 	static{
-		//maxWeapons = PascalExports.HWgetNumberOfWeapons();
+		maxWeapons = PascalExports.HWgetNumberOfWeapons();
 	}
 	
 	public Weapon(String _name, String _QT, String _prob, String _delay, String _crate){
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/SDLActivity.java	Tue May 15 21:07:47 2012 +0200
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/SDLActivity.java	Thu May 17 15:58:04 2012 +0200
@@ -428,7 +428,7 @@
 		// Runs SDL_main() with added parameters
 		SDLActivity.nativeInit(new String[] { String.valueOf(ipc.port),
 				String.valueOf(surfaceWidth), String.valueOf(surfaceHeight),
-				"0", "null", "xeli", "1", "1", "1", path, ""  });
+				"0", "en.txt", "xeli", "1", "1", "1", path, ""  });
 
 		try {
 			ipc.quitIPC();
hedgewars