project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/netplay/ThreadedNetConnection.java
changeset 7582 714310efad8f
parent 7568 75ba91f14ed5
child 7584 7831c84cc644
equal deleted inserted replaced
7580:c92596feac0d 7582:714310efad8f
   108 					shutdown(true, appContext.getString(R.string.error_connection_failed));
   108 					shutdown(true, appContext.getString(R.string.error_connection_failed));
   109 					return;
   109 					return;
   110 				}
   110 				}
   111 
   111 
   112 				//FLIB.flib_netconn_onAdminAccess(conn, adminAccessCb, null)
   112 				//FLIB.flib_netconn_onAdminAccess(conn, adminAccessCb, null)
   113 				FLIB.flib_netconn_onCfgScheme(conn, cfgSchemeCb, null);
   113 				FLIB.flib_netconn_onSchemeChanged(conn, cfgSchemeCb, null);
   114 				FLIB.flib_netconn_onChat(conn, chatCb, null);
   114 				FLIB.flib_netconn_onChat(conn, chatCb, null);
   115 				FLIB.flib_netconn_onConnected(conn, connectedCb, null);
   115 				FLIB.flib_netconn_onConnected(conn, connectedCb, null);
   116 				FLIB.flib_netconn_onDisconnected(conn, disconnectCb, null);
   116 				FLIB.flib_netconn_onDisconnected(conn, disconnectCb, null);
   117 				FLIB.flib_netconn_onEngineMessage(conn, engineMessageCb, null);
   117 				FLIB.flib_netconn_onEngineMessage(conn, engineMessageCb, null);
   118 				FLIB.flib_netconn_onEnterRoom(conn, enterRoomCb, null);
   118 				FLIB.flib_netconn_onEnterRoom(conn, enterRoomCb, null);
   385 		MSG_SEND_TEAM_COLOR_INDEX,
   385 		MSG_SEND_TEAM_COLOR_INDEX,
   386 		MSG_SEND_TEAM_HOG_COUNT,
   386 		MSG_SEND_TEAM_HOG_COUNT,
   387 		MSG_SEND_ENGINE_MESSAGE,
   387 		MSG_SEND_ENGINE_MESSAGE,
   388 		MSG_SEND_ROUND_FINISHED,
   388 		MSG_SEND_ROUND_FINISHED,
   389 		MSG_SEND_TOGGLE_READY,
   389 		MSG_SEND_TOGGLE_READY,
       
   390 		MSG_SEND_START_GAME,
   390 		MSG_SEND_WEAPONSET,
   391 		MSG_SEND_WEAPONSET,
   391 		MSG_SEND_MAP,
   392 		MSG_SEND_MAP,
   392 		MSG_SEND_MAP_NAME,
   393 		MSG_SEND_MAP_NAME,
   393 		MSG_SEND_MAP_GENERATOR,
   394 		MSG_SEND_MAP_GENERATOR,
   394 		MSG_SEND_MAP_TEMPLATE,
   395 		MSG_SEND_MAP_TEMPLATE,
   503 			}
   504 			}
   504 			case MSG_SEND_TOGGLE_READY: {
   505 			case MSG_SEND_TOGGLE_READY: {
   505 				FLIB.flib_netconn_send_toggleReady(conn);
   506 				FLIB.flib_netconn_send_toggleReady(conn);
   506 				break;
   507 				break;
   507 			}
   508 			}
       
   509 			case MSG_SEND_START_GAME: {
       
   510 				FLIB.flib_netconn_send_startGame(conn);
       
   511 				break;
       
   512 			}
   508 			case MSG_SEND_WEAPONSET: {
   513 			case MSG_SEND_WEAPONSET: {
   509 				FLIB.flib_netconn_send_weaponset(conn, WeaponsetPtr.createJavaOwned((Weaponset)msg.obj));
   514 				FLIB.flib_netconn_send_weaponset(conn, WeaponsetPtr.createJavaOwned((Weaponset)msg.obj));
   510 				break;
   515 				break;
   511 			}
   516 			}
   512 			case MSG_SEND_MAP: {
   517 			case MSG_SEND_MAP: {