sheepy-clone: comparison project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/frontlib/Frontlib.java

equal deleted inserted replaced

-:33924ff4af50
+:27e5857da6af
 			result.setPointer(result.javaOwnedInstance.getPointer());
 			return result;
 		}
 	}
+	public static class ByteArrayPtr extends PointerType {
+		public byte[] deref(int size) {
+			return getPointer().getByteArray(0, size);
+		}
+		public static byte[] deref(ByteArrayPtr ptr, int size) {
+			if(ptr==null && size==0) {
+				return null;
+			} else {
+				return ptr.deref(size);
+			}
+		}
+		public static ByteArrayPtr createJavaOwned(byte[] buffer) {
+			if(buffer == null) {
+				return null;
+			}
+			// no need for javaOwnedInstance here because PointerType
+			// remembers the memory as its Pointer
+			Pointer ptr = new Memory(buffer.length);
+			ptr.write(0, buffer, 0, buffer.length);
+			ByteArrayPtr result = new ByteArrayPtr();
+			result.setPointer(ptr);
+			return result;
+		}
+	}
 	static class HogStruct extends Structure {
 		public static class ByVal extends HogStruct implements Structure.ByValue {}
 		public static class ByRef extends HogStruct implements Structure.ByReference {}
 		private static String[] FIELD_ORDER = new String[] {"name", "hat", "rounds", "kills", "deaths", "suicides", "difficulty", "initialHealth", "weaponset"};
 			mapgen = map.mapgen;
 			name = map.name;
 			seed = map.seed;
 			theme = map.theme;
 			byte[] buf = map.getDrawData();
-			if(buf != null) {
+			drawData = ByteArrayPtr.createJavaOwned(buf);
-				drawData = new Memory(buf.length);
+			drawDataSize = NativeSizeT.valueOf(buf==null ? 0 : buf.length);
-				drawData.write(0, buf, 0, buf.length);
-				drawDataSize = NativeSizeT.valueOf(buf.length);
-			} else {
-				drawData = null;
-				drawDataSize = NativeSizeT.valueOf(0);
-			}
 			templateFilter = map.templateFilter;
 			mazeSize = map.mazeSize;
 		}
 		public MapRecipe toMapRecipe() {
-			byte[] buf = null;
+			byte[] buf = ByteArrayPtr.deref(drawData, drawDataSize.intValue());
-			if(drawData != null && drawDataSize.intValue()>0) {
-				buf = new byte[drawDataSize.intValue()];
-				drawData.read(0, buf, 0, drawDataSize.intValue());
-			}
 			return new MapRecipe(mapgen, templateFilter, mazeSize, name, seed, theme, buf);
 		}
 		public int mapgen;
 		public String name;
 		public String seed;
 		public String theme;
-		public Pointer drawData;
+		public ByteArrayPtr drawData;
 		public NativeSizeT drawDataSize;
 		public int templateFilter;
 		public int mazeSize;
 	}
 	public static interface TeamCallback extends Callback {
 		void callback(Pointer context, TeamPtr arg1);
 	}
 	public static interface BytesCallback extends Callback {
-		void callback(Pointer context, Pointer buffer, NativeSizeT size);
+		void callback(Pointer context, ByteArrayPtr buffer, NativeSizeT size);
 	}
 	public static interface BytesBoolCallback extends Callback {
-		void callback(Pointer context, Pointer buffer, NativeSizeT size, boolean arg3);
+		void callback(Pointer context, ByteArrayPtr buffer, NativeSizeT size, boolean arg3);
 	}
 	public static interface SchemeCallback extends Callback {
 		void callback(Pointer context, SchemePtr arg1);
 	}
 	public static interface WeaponsetCallback extends Callback {
 		void callback(Pointer context, WeaponsetPtr arg1);
 	}
 	public static interface MapimageCallback extends Callback {
-		void callback(Pointer context, Pointer buffer, int hedgehogCount);
+		void callback(Pointer context, ByteArrayPtr buffer, int hedgehogCount);
 	}
 	public static interface LogCallback extends Callback {
 		void callback(int level, String logMessage);
 	}
 	int flib_netconn_send_renameRoom(NetconnPtr conn, String roomName);
 	int flib_netconn_send_leaveRoom(NetconnPtr conn, String msg);
 	int flib_netconn_send_toggleReady(NetconnPtr conn);
 	int flib_netconn_send_addTeam(NetconnPtr conn, TeamPtr team);
 	int flib_netconn_send_removeTeam(NetconnPtr conn, String teamname);
-	int flib_netconn_send_engineMessage(NetconnPtr conn, Pointer message, NativeSizeT size);
+	int flib_netconn_send_engineMessage(NetconnPtr conn, ByteArrayPtr message, NativeSizeT size);
 	int flib_netconn_send_teamHogCount(NetconnPtr conn, String teamname, int hogcount);
 	int flib_netconn_send_teamColor(NetconnPtr conn, String teamname, int colorIndex);
 	int flib_netconn_send_weaponset(NetconnPtr conn, WeaponsetPtr weaponset);
 	int flib_netconn_send_map(NetconnPtr conn, MapRecipePtr map);
 	int flib_netconn_send_mapName(NetconnPtr conn, String mapName);
 	int flib_netconn_send_mapGen(NetconnPtr conn, int mapGen);
 	int flib_netconn_send_mapTemplate(NetconnPtr conn, int templateFilter);
 	int flib_netconn_send_mapMazeSize(NetconnPtr conn, int mazeSize);
 	int flib_netconn_send_mapSeed(NetconnPtr conn, String seed);
 	int flib_netconn_send_mapTheme(NetconnPtr conn, String theme);
-	int flib_netconn_send_mapDrawdata(NetconnPtr conn, Pointer drawData, NativeSizeT size);
+	int flib_netconn_send_mapDrawdata(NetconnPtr conn, ByteArrayPtr drawData, NativeSizeT size);
 	int flib_netconn_send_script(NetconnPtr conn, String scriptName);
 	int flib_netconn_send_scheme(NetconnPtr conn, SchemePtr scheme);
 	int flib_netconn_send_roundfinished(NetconnPtr conn, boolean withoutError);
 	int flib_netconn_send_ban(NetconnPtr conn, String playerName);
 	int flib_netconn_send_kick(NetconnPtr conn, String playerName);
 	static final int GAME_END_INTERRUPTED = 1;
 	static final int GAME_END_HALTED = 2;
 	static final int GAME_END_ERROR = 3;
 	GameconnPtr flib_gameconn_create(String playerName, GameSetupPtr setup, boolean netgame);
-	GameconnPtr flib_gameconn_create_playdemo(Pointer demo, NativeSizeT size);
+	GameconnPtr flib_gameconn_create_playdemo(ByteArrayPtr demo, NativeSizeT size);
-	GameconnPtr flib_gameconn_create_loadgame(String playerName, Pointer save, NativeSizeT size);
+	GameconnPtr flib_gameconn_create_loadgame(String playerName, ByteArrayPtr save, NativeSizeT size);
 	GameconnPtr flib_gameconn_create_campaign(String playerName, String seed, String script);
 	void flib_gameconn_destroy(GameconnPtr conn);
 	int flib_gameconn_getport(GameconnPtr conn);
 	void flib_gameconn_tick(GameconnPtr conn);
-	int flib_gameconn_send_enginemsg(GameconnPtr conn, Pointer data, NativeSizeT len);
+	int flib_gameconn_send_enginemsg(GameconnPtr conn, ByteArrayPtr data, NativeSizeT len);
 	int flib_gameconn_send_textmsg(GameconnPtr conn, int msgtype, String msg);
 	int flib_gameconn_send_chatmsg(GameconnPtr conn, String playername, String msg);
 	int flib_gameconn_send_quit(GameconnPtr conn);
 	int flib_gameconn_send_cmd(GameconnPtr conn, String cmdString);

changeset 7588	27e5857da6af
parent 7584	7831c84cc644
child 7590	0be267033fb3