project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/netplay/ThreadedNetConnection.java
changeset 7568 75ba91f14ed5
parent 7558 983ff426f91e
child 7582 714310efad8f
equal deleted inserted replaced
7566:57d343ee382f 7568:75ba91f14ed5
     9 import java.util.List;
     9 import java.util.List;
    10 
    10 
    11 import org.hedgewars.hedgeroid.R;
    11 import org.hedgewars.hedgeroid.R;
    12 import org.hedgewars.hedgeroid.Datastructures.MapRecipe;
    12 import org.hedgewars.hedgeroid.Datastructures.MapRecipe;
    13 import org.hedgewars.hedgeroid.Datastructures.Scheme;
    13 import org.hedgewars.hedgeroid.Datastructures.Scheme;
    14 import org.hedgewars.hedgeroid.Datastructures.Team;
    14 import org.hedgewars.hedgeroid.Datastructures.TeamInGame;
    15 import org.hedgewars.hedgeroid.Datastructures.Weaponset;
    15 import org.hedgewars.hedgeroid.Datastructures.Weaponset;
    16 import org.hedgewars.hedgeroid.frontlib.Flib;
    16 import org.hedgewars.hedgeroid.frontlib.Flib;
    17 import org.hedgewars.hedgeroid.frontlib.Frontlib;
    17 import org.hedgewars.hedgeroid.frontlib.Frontlib;
    18 import org.hedgewars.hedgeroid.frontlib.Frontlib.BoolCallback;
    18 import org.hedgewars.hedgeroid.frontlib.Frontlib.BoolCallback;
    19 import org.hedgewars.hedgeroid.frontlib.Frontlib.BytesCallback;
    19 import org.hedgewars.hedgeroid.frontlib.Frontlib.BytesCallback;
   281 		}
   281 		}
   282 	};
   282 	};
   283 	
   283 	
   284 	private final TeamCallback teamAddedCb = new TeamCallback() {
   284 	private final TeamCallback teamAddedCb = new TeamCallback() {
   285 		public void callback(Pointer context, TeamPtr team) {
   285 		public void callback(Pointer context, TeamPtr team) {
   286 			sendFromNet(MSG_TEAM_ADDED, team.deref().team);
   286 			sendFromNet(MSG_TEAM_ADDED, team.deref());
   287 		}
   287 		}
   288 	};
   288 	};
   289 	
   289 	
   290 	private final StrCallback teamDeletedCb = new StrCallback() {
   290 	private final StrCallback teamDeletedCb = new StrCallback() {
   291 		public void callback(Pointer context, String teamName) {
   291 		public void callback(Pointer context, String teamName) {
   466 			case MSG_SEND_KICK: {
   466 			case MSG_SEND_KICK: {
   467 				FLIB.flib_netconn_send_kick(conn, (String)msg.obj);
   467 				FLIB.flib_netconn_send_kick(conn, (String)msg.obj);
   468 				break;
   468 				break;
   469 			}
   469 			}
   470 			case MSG_SEND_ADD_TEAM: {
   470 			case MSG_SEND_ADD_TEAM: {
   471 				FLIB.flib_netconn_send_addTeam(conn, TeamPtr.createJavaOwned((Team)msg.obj));
   471 				FLIB.flib_netconn_send_addTeam(conn, TeamPtr.createJavaOwned((TeamInGame)msg.obj));
   472 				break;
   472 				break;
   473 			}
   473 			}
   474 			case MSG_SEND_REMOVE_TEAM: {
   474 			case MSG_SEND_REMOVE_TEAM: {
   475 				if(FLIB.flib_netconn_send_removeTeam(conn, (String)msg.obj)==0) {
   475 				if(FLIB.flib_netconn_send_removeTeam(conn, (String)msg.obj)==0) {
   476 					sendFromNet(MSG_TEAM_DELETED, msg.obj);
   476 					sendFromNet(MSG_TEAM_DELETED, msg.obj);
   481 				FLIB.flib_netconn_send_quit(conn, (String)msg.obj);
   481 				FLIB.flib_netconn_send_quit(conn, (String)msg.obj);
   482 				shutdown(false, "User quit");
   482 				shutdown(false, "User quit");
   483 				break;
   483 				break;
   484 			}
   484 			}
   485 			case MSG_SEND_TEAM_COLOR_INDEX: {
   485 			case MSG_SEND_TEAM_COLOR_INDEX: {
   486 				if(FLIB.flib_netconn_send_teamColor(conn, (String)msg.obj, msg.arg1)==0) {
   486 				FLIB.flib_netconn_send_teamColor(conn, (String)msg.obj, msg.arg1);
   487 					sendFromNet(MSG_TEAM_COLOR_CHANGED, msg.arg1, msg.obj);
       
   488 				}
       
   489 				break;
   487 				break;
   490 			}
   488 			}
   491 			case MSG_SEND_TEAM_HOG_COUNT: {
   489 			case MSG_SEND_TEAM_HOG_COUNT: {
   492 				if(FLIB.flib_netconn_send_teamHogCount(conn, (String)msg.obj, msg.arg1)==0) {
   490 				FLIB.flib_netconn_send_teamHogCount(conn, (String)msg.obj, msg.arg1);
   493 					sendFromNet(MSG_HOG_COUNT_CHANGED, msg.arg1, msg.obj);
       
   494 				}
       
   495 				break;
   491 				break;
   496 			}
   492 			}
   497 			case MSG_SEND_ENGINE_MESSAGE: {
   493 			case MSG_SEND_ENGINE_MESSAGE: {
   498 				byte[] message = (byte[])msg.obj;
   494 				byte[] message = (byte[])msg.obj;
   499 				Memory mem = new Memory(message.length);
   495 				Memory mem = new Memory(message.length);