diff --git a/src/com/efortin/frozenbubble/NetworkGameManager.java b/src/com/efortin/frozenbubble/NetworkGameManager.java index 651df81..9d9718d 100644 --- a/src/com/efortin/frozenbubble/NetworkGameManager.java +++ b/src/com/efortin/frozenbubble/NetworkGameManager.java @@ -1354,7 +1354,18 @@ else if ((gameId != MulticastManager.FILTER_OFF) && if ((msgId == MSG_ID_PREFS) && (length == (PREFS_BYTES + 3))) { if ((playerId == VirtualInput.PLAYER1) && localStatus.prefsRequest) { copyPrefsFromBuffer(remotePrefs, buffer, 3); - PreferencesActivity.setFrozenBubblePrefs(remotePrefs); + /* + * In a network game, do not override any of the local game + * options that can be configuring during game play. Only + * set the bubble collision sensitivity and the compressor + * on/off option as specified by player 1, as these options + * are inaccessible during game play, and are absolutely + * necessary for distributed game behavior synchronization. + * All the other options are purely cosmetic, or may cause + * confusion if they are changed without notification. + */ + FrozenBubble.setCollision(remotePrefs.collision); + FrozenBubble.setCompressor(remotePrefs.compressor); /* * If all new game data synchronization requests have been * fulfilled, then the network game is ready to begin.