Skip to content

Commit

Permalink
Merge pull request #5 from JoshuaKaden/chore/cleanup-system-message
Browse files Browse the repository at this point in the history 
Chore/cleanup system message
  • Loading branch information
Joshua Kaden committed Aug 4, 2015
2 parents 0964cf8 + 8ca1de1 commit a3b6cb3
Show file tree
Hide file tree
Showing 25 changed files with 1,256 additions and 1,145 deletions.
46 changes: 37 additions & 9 deletions Partisans.xcodeproj/project.pbxproj
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
objects = { objects = {


/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
77195CFE1B70E9CF00E11518 /* NetPlayerHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 77195CFD1B70E9CF00E11518 /* NetPlayerHandler.m */; };
7721B8751B6FA4B1004D3BE0 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 7721B8741B6FA4B1004D3BE0 /* Reachability.m */; };
7721B8781B6FA748004D3BE0 /* NetworkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7721B8771B6FA748004D3BE0 /* NetworkManager.m */; };
7795A2941B70211000382382 /* NetHostHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 7795A2931B70211000382382 /* NetHostHandler.m */; };
7795A29A1B70D48400382382 /* NetHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 7795A2991B70D48400382382 /* NetHandler.m */; };
9300C7D8175BFCA00047AA15 /* GameTesterMenuItems.m in Sources */ = {isa = PBXBuildFile; fileRef = 9300C7D7175BFCA00047AA15 /* GameTesterMenuItems.m */; }; 9300C7D8175BFCA00047AA15 /* GameTesterMenuItems.m in Sources */ = {isa = PBXBuildFile; fileRef = 9300C7D7175BFCA00047AA15 /* GameTesterMenuItems.m */; };
9303BE5117467CAE0065ADD2 /* JoinGameViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9303BE5017467CAE0065ADD2 /* JoinGameViewController.m */; }; 9303BE5117467CAE0065ADD2 /* JoinGameViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9303BE5017467CAE0065ADD2 /* JoinGameViewController.m */; };
9303BE551746836A0065ADD2 /* GameJoiner.m in Sources */ = {isa = PBXBuildFile; fileRef = 9303BE541746836A0065ADD2 /* GameJoiner.m */; }; 9303BE551746836A0065ADD2 /* GameJoiner.m in Sources */ = {isa = PBXBuildFile; fileRef = 9303BE541746836A0065ADD2 /* GameJoiner.m */; };
Expand Down Expand Up @@ -47,7 +52,6 @@
936510D41741597500F2AD06 /* JSKSystemMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 936510CD1741597500F2AD06 /* JSKSystemMessage.m */; }; 936510D41741597500F2AD06 /* JSKSystemMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 936510CD1741597500F2AD06 /* JSKSystemMessage.m */; };
936510D51741597500F2AD06 /* JSKViewStack.m in Sources */ = {isa = PBXBuildFile; fileRef = 936510CF1741597500F2AD06 /* JSKViewStack.m */; }; 936510D51741597500F2AD06 /* JSKViewStack.m in Sources */ = {isa = PBXBuildFile; fileRef = 936510CF1741597500F2AD06 /* JSKViewStack.m */; };
936510DC1741598800F2AD06 /* NSManagedObjectContext+FetchAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 936510D81741598800F2AD06 /* NSManagedObjectContext+FetchAdditions.m */; }; 936510DC1741598800F2AD06 /* NSManagedObjectContext+FetchAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 936510D81741598800F2AD06 /* NSManagedObjectContext+FetchAdditions.m */; };
936510DD1741598800F2AD06 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 936510DB1741598800F2AD06 /* Reachability.m */; };
936510E3174159C900F2AD06 /* RootViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 936510E0174159C900F2AD06 /* RootViewController.m */; }; 936510E3174159C900F2AD06 /* RootViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 936510E0174159C900F2AD06 /* RootViewController.m */; };
936510E4174159C900F2AD06 /* SystemMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 936510E2174159C900F2AD06 /* SystemMessage.m */; }; 936510E4174159C900F2AD06 /* SystemMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 936510E2174159C900F2AD06 /* SystemMessage.m */; };
936510EB17415A1000F2AD06 /* MainMenuItems.m in Sources */ = {isa = PBXBuildFile; fileRef = 936510EA17415A1000F2AD06 /* MainMenuItems.m */; }; 936510EB17415A1000F2AD06 /* MainMenuItems.m in Sources */ = {isa = PBXBuildFile; fileRef = 936510EA17415A1000F2AD06 /* MainMenuItems.m */; };
Expand Down Expand Up @@ -132,7 +136,18 @@
/* End PBXBuildFile section */ /* End PBXBuildFile section */


/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
77195CFC1B70E9CF00E11518 /* NetPlayerHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetPlayerHandler.h; path = Classes/NetPlayerHandler.h; sourceTree = "<group>"; };
77195CFD1B70E9CF00E11518 /* NetPlayerHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NetPlayerHandler.m; path = Classes/NetPlayerHandler.m; sourceTree = "<group>"; };
7721B8731B6FA4B1004D3BE0 /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = "<group>"; };
7721B8741B6FA4B1004D3BE0 /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = "<group>"; };
7721B8761B6FA748004D3BE0 /* NetworkManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkManager.h; path = Classes/NetworkManager.h; sourceTree = "<group>"; };
7721B8771B6FA748004D3BE0 /* NetworkManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NetworkManager.m; path = Classes/NetworkManager.m; sourceTree = "<group>"; };
775407A31B6EE8B9002AE2DA /* Partisans-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Partisans-Bridging-Header.h"; sourceTree = "<group>"; }; 775407A31B6EE8B9002AE2DA /* Partisans-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Partisans-Bridging-Header.h"; sourceTree = "<group>"; };
7795A2921B70211000382382 /* NetHostHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetHostHandler.h; path = Classes/NetHostHandler.h; sourceTree = "<group>"; };
7795A2931B70211000382382 /* NetHostHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NetHostHandler.m; path = Classes/NetHostHandler.m; sourceTree = "<group>"; };
7795A2971B70583400382382 /* JSKCommandMessageProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = JSKCommandMessageProtocol.h; path = "Classes/Libraries/My Library/JSKCommandMessageProtocol.h"; sourceTree = "<group>"; };
7795A2981B70D48400382382 /* NetHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetHandler.h; path = Classes/NetHandler.h; sourceTree = "<group>"; };
7795A2991B70D48400382382 /* NetHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NetHandler.m; path = Classes/NetHandler.m; sourceTree = "<group>"; };
9300C7D6175BFCA00047AA15 /* GameTesterMenuItems.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GameTesterMenuItems.h; path = Classes/GameTesterMenuItems.h; sourceTree = "<group>"; }; 9300C7D6175BFCA00047AA15 /* GameTesterMenuItems.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GameTesterMenuItems.h; path = Classes/GameTesterMenuItems.h; sourceTree = "<group>"; };
9300C7D7175BFCA00047AA15 /* GameTesterMenuItems.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GameTesterMenuItems.m; path = Classes/GameTesterMenuItems.m; sourceTree = "<group>"; }; 9300C7D7175BFCA00047AA15 /* GameTesterMenuItems.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GameTesterMenuItems.m; path = Classes/GameTesterMenuItems.m; sourceTree = "<group>"; };
9303BE4F17467CAD0065ADD2 /* JoinGameViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JoinGameViewController.h; path = Classes/JoinGameViewController.h; sourceTree = "<group>"; }; 9303BE4F17467CAD0065ADD2 /* JoinGameViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JoinGameViewController.h; path = Classes/JoinGameViewController.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -204,8 +219,6 @@
936510CF1741597500F2AD06 /* JSKViewStack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JSKViewStack.m; path = "Classes/Libraries/My Library/JSKViewStack.m"; sourceTree = "<group>"; }; 936510CF1741597500F2AD06 /* JSKViewStack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JSKViewStack.m; path = "Classes/Libraries/My Library/JSKViewStack.m"; sourceTree = "<group>"; };
936510D71741598800F2AD06 /* NSManagedObjectContext+FetchAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSManagedObjectContext+FetchAdditions.h"; sourceTree = "<group>"; }; 936510D71741598800F2AD06 /* NSManagedObjectContext+FetchAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSManagedObjectContext+FetchAdditions.h"; sourceTree = "<group>"; };
936510D81741598800F2AD06 /* NSManagedObjectContext+FetchAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSManagedObjectContext+FetchAdditions.m"; sourceTree = "<group>"; }; 936510D81741598800F2AD06 /* NSManagedObjectContext+FetchAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSManagedObjectContext+FetchAdditions.m"; sourceTree = "<group>"; };
936510DA1741598800F2AD06 /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = "<group>"; };
936510DB1741598800F2AD06 /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = "<group>"; };
936510DF174159C900F2AD06 /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RootViewController.h; path = Classes/RootViewController.h; sourceTree = "<group>"; }; 936510DF174159C900F2AD06 /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RootViewController.h; path = Classes/RootViewController.h; sourceTree = "<group>"; };
936510E0174159C900F2AD06 /* RootViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RootViewController.m; path = Classes/RootViewController.m; sourceTree = "<group>"; }; 936510E0174159C900F2AD06 /* RootViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RootViewController.m; path = Classes/RootViewController.m; sourceTree = "<group>"; };
936510E1174159C900F2AD06 /* SystemMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SystemMessage.h; path = Classes/SystemMessage.h; sourceTree = "<group>"; }; 936510E1174159C900F2AD06 /* SystemMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SystemMessage.h; path = Classes/SystemMessage.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -388,10 +401,18 @@
children = ( children = (
9307B3D2177F8A41003CEC6F /* HostFinder.h */, 9307B3D2177F8A41003CEC6F /* HostFinder.h */,
9307B3D3177F8A41003CEC6F /* HostFinder.m */, 9307B3D3177F8A41003CEC6F /* HostFinder.m */,
7795A2981B70D48400382382 /* NetHandler.h */,
7795A2991B70D48400382382 /* NetHandler.m */,
936CDFBC1761276900C6A4EE /* NetHost.h */, 936CDFBC1761276900C6A4EE /* NetHost.h */,
936CDFBD1761276900C6A4EE /* NetHost.m */, 936CDFBD1761276900C6A4EE /* NetHost.m */,
7795A2921B70211000382382 /* NetHostHandler.h */,
7795A2931B70211000382382 /* NetHostHandler.m */,
936CDFC0176202E500C6A4EE /* NetPlayer.h */, 936CDFC0176202E500C6A4EE /* NetPlayer.h */,
936CDFC1176202E500C6A4EE /* NetPlayer.m */, 936CDFC1176202E500C6A4EE /* NetPlayer.m */,
77195CFC1B70E9CF00E11518 /* NetPlayerHandler.h */,
77195CFD1B70E9CF00E11518 /* NetPlayerHandler.m */,
7721B8761B6FA748004D3BE0 /* NetworkManager.h */,
7721B8771B6FA748004D3BE0 /* NetworkManager.m */,
); );
name = Network; name = Network;
sourceTree = "<group>"; sourceTree = "<group>";
Expand Down Expand Up @@ -550,6 +571,7 @@
children = ( children = (
936510C41741597500F2AD06 /* JSKCommandMessage.h */, 936510C41741597500F2AD06 /* JSKCommandMessage.h */,
936510C51741597500F2AD06 /* JSKCommandMessage.m */, 936510C51741597500F2AD06 /* JSKCommandMessage.m */,
7795A2971B70583400382382 /* JSKCommandMessageProtocol.h */,
9365111D17415D0A00F2AD06 /* JSKCommandParcel.h */, 9365111D17415D0A00F2AD06 /* JSKCommandParcel.h */,
9365111E17415D0A00F2AD06 /* JSKCommandParcel.m */, 9365111E17415D0A00F2AD06 /* JSKCommandParcel.m */,
936510C61741597500F2AD06 /* JSKDataMiner.h */, 936510C61741597500F2AD06 /* JSKDataMiner.h */,
Expand Down Expand Up @@ -600,8 +622,8 @@
936510D91741598800F2AD06 /* Reachability */ = { 936510D91741598800F2AD06 /* Reachability */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
936510DA1741598800F2AD06 /* Reachability.h */, 7721B8731B6FA4B1004D3BE0 /* Reachability.h */,
936510DB1741598800F2AD06 /* Reachability.m */, 7721B8741B6FA4B1004D3BE0 /* Reachability.m */,
); );
name = Reachability; name = Reachability;
path = Classes/Libraries/Reachability; path = Classes/Libraries/Reachability;
Expand Down Expand Up @@ -919,6 +941,7 @@
files = ( files = (
9365109F1741578C00F2AD06 /* main.m in Sources */, 9365109F1741578C00F2AD06 /* main.m in Sources */,
936510A31741578C00F2AD06 /* AppDelegate.m in Sources */, 936510A31741578C00F2AD06 /* AppDelegate.m in Sources */,
7721B8751B6FA4B1004D3BE0 /* Reachability.m in Sources */,
936510BF1741596200F2AD06 /* ILColorPickerView.m in Sources */, 936510BF1741596200F2AD06 /* ILColorPickerView.m in Sources */,
936510C01741596200F2AD06 /* ILHuePickerView.m in Sources */, 936510C01741596200F2AD06 /* ILHuePickerView.m in Sources */,
936510C11741596200F2AD06 /* ILSaturationBrightnessPickerView.m in Sources */, 936510C11741596200F2AD06 /* ILSaturationBrightnessPickerView.m in Sources */,
Expand All @@ -930,8 +953,8 @@
936510D41741597500F2AD06 /* JSKSystemMessage.m in Sources */, 936510D41741597500F2AD06 /* JSKSystemMessage.m in Sources */,
936510D51741597500F2AD06 /* JSKViewStack.m in Sources */, 936510D51741597500F2AD06 /* JSKViewStack.m in Sources */,
936510DC1741598800F2AD06 /* NSManagedObjectContext+FetchAdditions.m in Sources */, 936510DC1741598800F2AD06 /* NSManagedObjectContext+FetchAdditions.m in Sources */,
936510DD1741598800F2AD06 /* Reachability.m in Sources */,
936510E3174159C900F2AD06 /* RootViewController.m in Sources */, 936510E3174159C900F2AD06 /* RootViewController.m in Sources */,
7795A2941B70211000382382 /* NetHostHandler.m in Sources */,
936510E4174159C900F2AD06 /* SystemMessage.m in Sources */, 936510E4174159C900F2AD06 /* SystemMessage.m in Sources */,
936510EB17415A1000F2AD06 /* MainMenuItems.m in Sources */, 936510EB17415A1000F2AD06 /* MainMenuItems.m in Sources */,
936510F317415A4E00F2AD06 /* ColorPickerViewController.m in Sources */, 936510F317415A4E00F2AD06 /* ColorPickerViewController.m in Sources */,
Expand All @@ -946,6 +969,7 @@
93C10B9D1744028300B47095 /* GameEnvoy.m in Sources */, 93C10B9D1744028300B47095 /* GameEnvoy.m in Sources */,
93C10BBA17440C4500B47095 /* PlayGameMenuItems.m in Sources */, 93C10BBA17440C4500B47095 /* PlayGameMenuItems.m in Sources */,
93C10BC8174439B300B47095 /* SetupGameMenuItems.m in Sources */, 93C10BC8174439B300B47095 /* SetupGameMenuItems.m in Sources */,
77195CFE1B70E9CF00E11518 /* NetPlayerHandler.m in Sources */,
93FECAB1174521A40046529A /* LabelProgressView.m in Sources */, 93FECAB1174521A40046529A /* LabelProgressView.m in Sources */,
93FECAB3174521A40046529A /* ProgressCell.m in Sources */, 93FECAB3174521A40046529A /* ProgressCell.m in Sources */,
9303BE5117467CAE0065ADD2 /* JoinGameViewController.m in Sources */, 9303BE5117467CAE0065ADD2 /* JoinGameViewController.m in Sources */,
Expand All @@ -964,7 +988,9 @@
936CDFC2176202E500C6A4EE /* NetPlayer.m in Sources */, 936CDFC2176202E500C6A4EE /* NetPlayer.m in Sources */,
93BF3B531771CABF00B20A71 /* GameDirector.m in Sources */, 93BF3B531771CABF00B20A71 /* GameDirector.m in Sources */,
93BF3B571771CEA500B20A71 /* MissionEnvoy.m in Sources */, 93BF3B571771CEA500B20A71 /* MissionEnvoy.m in Sources */,
7795A29A1B70D48400382382 /* NetHandler.m in Sources */,
9398A9C6177224EE00E5D31C /* Image.m in Sources */, 9398A9C6177224EE00E5D31C /* Image.m in Sources */,
7721B8781B6FA748004D3BE0 /* NetworkManager.m in Sources */,
9398A9CA177224EE00E5D31C /* Player.m in Sources */, 9398A9CA177224EE00E5D31C /* Player.m in Sources */,
9398A9D2177224EF00E5D31C /* Scorecard.m in Sources */, 9398A9D2177224EF00E5D31C /* Scorecard.m in Sources */,
939697E717732A110013B125 /* RoundEnvoy.m in Sources */, 939697E717732A110013B125 /* RoundEnvoy.m in Sources */,
Expand Down Expand Up @@ -1038,7 +1064,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 6.1; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos; SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -1062,7 +1088,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 6.1; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
SDKROOT = iphoneos; SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -1076,13 +1102,15 @@
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_ARC = YES;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Partisans/Partisans-Prefix.pch"; GCC_PREFIX_HEADER = "Partisans/Partisans-Prefix.pch";
INFOPLIST_FILE = "Partisans/Partisans-Info.plist"; INFOPLIST_FILE = "Partisans/Partisans-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.chadfordsoftware.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_BUNDLE_IDENTIFIER = "com.chadfordsoftware.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_OBJC_BRIDGING_HEADER = "Partisans/Partisans-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Partisans/Partisans-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_OPTIMIZATION_LEVEL = "-Onone";
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
Expand All @@ -1095,7 +1123,7 @@
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_ARC = YES;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Partisans/Partisans-Prefix.pch"; GCC_PREFIX_HEADER = "Partisans/Partisans-Prefix.pch";
INFOPLIST_FILE = "Partisans/Partisans-Info.plist"; INFOPLIST_FILE = "Partisans/Partisans-Info.plist";
Expand Down
7 changes: 4 additions & 3 deletions Partisans/Classes/AppDelegate.m
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@


#import "JSKDataMiner.h" #import "JSKDataMiner.h"
#import "RootViewController.h" #import "RootViewController.h"
#import "NetworkManager.h"
#import "SystemMessage.h" #import "SystemMessage.h"


@interface AppDelegate () @interface AppDelegate ()
Expand Down Expand Up @@ -49,19 +50,19 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(


- (void)applicationWillResignActive:(UIApplication *)application - (void)applicationWillResignActive:(UIApplication *)application
{ {
[SystemMessage putPlayerOffline]; [NetworkManager putPlayerOffline];
} }


- (void)applicationDidEnterBackground:(UIApplication *)application - (void)applicationDidEnterBackground:(UIApplication *)application
{ {
[SystemMessage putPlayerOffline]; [NetworkManager putPlayerOffline];
[JSKDataMiner save]; [JSKDataMiner save];
} }


- (void)applicationWillTerminate:(UIApplication *)application - (void)applicationWillTerminate:(UIApplication *)application
{ {
[JSKDataMiner save]; [JSKDataMiner save];
[SystemMessage putPlayerOffline]; [NetworkManager putPlayerOffline];
} }


@end @end
18 changes: 6 additions & 12 deletions Partisans/Classes/GameDirector.m
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#import "GamePrecis.h" #import "GamePrecis.h"
#import "JSKCommandParcel.h" #import "JSKCommandParcel.h"
#import "MissionEnvoy.h" #import "MissionEnvoy.h"
#import "NetworkManager.h"
#import "PlayerEnvoy.h" #import "PlayerEnvoy.h"
#import "RoundEnvoy.h" #import "RoundEnvoy.h"
#import "SystemMessage.h" #import "SystemMessage.h"
Expand Down Expand Up @@ -81,7 +82,7 @@ - (void)startGame
[self saveGame]; [self saveGame];


JSKCommandParcel *parcel = [[JSKCommandParcel alloc] initWithType:JSKCommandParcelTypeUpdate to:nil from:[SystemMessage playerEnvoy].peerID object:gameEnvoy]; JSKCommandParcel *parcel = [[JSKCommandParcel alloc] initWithType:JSKCommandParcelTypeUpdate to:nil from:[SystemMessage playerEnvoy].peerID object:gameEnvoy];
[SystemMessage sendParcelToPlayers:parcel]; [NetworkManager sendParcelToPlayers:parcel];
} }


- (void)startMission - (void)startMission
Expand Down Expand Up @@ -172,13 +173,6 @@ - (void)saveGame
{ {
GameEnvoy *gameEnvoy = self.gameEnvoy; GameEnvoy *gameEnvoy = self.gameEnvoy;
[gameEnvoy commitAndSave]; [gameEnvoy commitAndSave];

// NSDate *oldDate = [NSDate distantPast];
// [self sendGameUpdateTo:nil modifiedDate:oldDate shouldSendAllData:NO];

// JSKCommandParcel *parcel = [[JSKCommandParcel alloc] initWithType:JSKCommandParcelTypeUpdate to:nil from:[SystemMessage playerEnvoy].peerID object:gameEnvoy];
// [SystemMessage sendParcelToPlayers:parcel];
// [parcel release];
} }




Expand Down Expand Up @@ -234,11 +228,11 @@ - (void)sendGameUpdateTo:(NSString *)peerID modifiedDate:(NSDate *)modifiedDate
JSKCommandParcel *parcel = [[JSKCommandParcel alloc] initWithType:JSKCommandParcelTypeUpdate to:peerID from:hostID object:gameEnvoy]; JSKCommandParcel *parcel = [[JSKCommandParcel alloc] initWithType:JSKCommandParcelTypeUpdate to:peerID from:hostID object:gameEnvoy];
if (peerID) if (peerID)
{ {
[SystemMessage sendCommandParcel:parcel shouldAwaitResponse:NO]; [NetworkManager sendCommandParcel:parcel shouldAwaitResponse:NO];
} }
else else
{ {
[SystemMessage sendParcelToPlayers:parcel]; [NetworkManager sendParcelToPlayers:parcel];
} }
return; return;
} }
Expand Down Expand Up @@ -278,11 +272,11 @@ - (void)sendGameUpdateTo:(NSString *)peerID modifiedDate:(NSDate *)modifiedDate
JSKCommandParcel *parcel = [[JSKCommandParcel alloc] initWithType:JSKCommandParcelTypeUpdate to:peerID from:hostID object:objectArray]; JSKCommandParcel *parcel = [[JSKCommandParcel alloc] initWithType:JSKCommandParcelTypeUpdate to:peerID from:hostID object:objectArray];
if (peerID) if (peerID)
{ {
[SystemMessage sendCommandParcel:parcel shouldAwaitResponse:NO]; [NetworkManager sendCommandParcel:parcel shouldAwaitResponse:NO];
} }
else else
{ {
[SystemMessage sendParcelToPlayers:parcel]; [NetworkManager sendParcelToPlayers:parcel];
} }
} }


Expand Down
19 changes: 8 additions & 11 deletions Partisans/Classes/GameTesterMenuItems.m
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -131,11 +131,10 @@ - (NSString *)menuViewController:(JSKMenuViewController *)menuViewController tit
- (NSString *)menuViewController:(JSKMenuViewController *)menuViewController labelAtIndexPath:(NSIndexPath *)indexPath - (NSString *)menuViewController:(JSKMenuViewController *)menuViewController labelAtIndexPath:(NSIndexPath *)indexPath
{ {
NSString *returnValue = nil; NSString *returnValue = nil;
GameTesterMenuSection menuSection = indexPath.section; GameTesterMenuSection menuSection = (GameTesterMenuSection)indexPath.section;
switch (menuSection) { switch (menuSection) {
case GameTesterMenuSectionAction: case GameTesterMenuSectionAction: {
{ GameTesterMenuRow menuRow = (GameTesterMenuRow)indexPath.row;
GameTesterMenuRow menuRow = indexPath.row;
switch (menuRow) { switch (menuRow) {
case GameTesterMenuRowAddPlayers: case GameTesterMenuRowAddPlayers:
returnValue = @"Add Players"; returnValue = @"Add Players";
Expand All @@ -150,8 +149,7 @@ - (NSString *)menuViewController:(JSKMenuViewController *)menuViewController lab
} }
case GameTesterMenuSectionPlayers: case GameTesterMenuSectionPlayers:
{ {
if (self.players.count > 0) if (self.players.count > 0) {
{
PlayerEnvoy *playerEnvoy = [self.players objectAtIndex:indexPath.row]; PlayerEnvoy *playerEnvoy = [self.players objectAtIndex:indexPath.row];
returnValue = playerEnvoy.playerName; returnValue = playerEnvoy.playerName;
} }
Expand All @@ -166,7 +164,7 @@ - (NSString *)menuViewController:(JSKMenuViewController *)menuViewController lab
- (UIImage *)menuViewController:(JSKMenuViewController *)menuViewController imageForIndexPath:(NSIndexPath *)indexPath - (UIImage *)menuViewController:(JSKMenuViewController *)menuViewController imageForIndexPath:(NSIndexPath *)indexPath
{ {
UIImage *returnValue = nil; UIImage *returnValue = nil;
GameTesterMenuSection menuSection = indexPath.section; GameTesterMenuSection menuSection = (GameTesterMenuSection)indexPath.section;
switch (menuSection) { switch (menuSection) {
case GameTesterMenuSectionAction: case GameTesterMenuSectionAction:
break; break;
Expand Down Expand Up @@ -197,12 +195,11 @@ - (void)menuViewControllerInvokedRefresh:(JSKMenuViewController *)menuViewContro


- (void)menuViewController:(JSKMenuViewController *)menuViewController didSelectRowAt:(NSIndexPath *)indexPath - (void)menuViewController:(JSKMenuViewController *)menuViewController didSelectRowAt:(NSIndexPath *)indexPath
{ {
GameTesterMenuSection menuSection = indexPath.section; GameTesterMenuSection menuSection = (GameTesterMenuSection)indexPath.section;
if (!(menuSection == GameTesterMenuSectionAction)) if (!(menuSection == GameTesterMenuSectionAction)) {
{
return; return;
} }
GameTesterMenuRow menuRow = indexPath.row; GameTesterMenuRow menuRow = (GameTesterMenuRow)indexPath.row;
switch (menuRow) { switch (menuRow) {
case GameTesterMenuRowAddPlayers: case GameTesterMenuRowAddPlayers:
[self addPlayers]; [self addPlayers];
Expand Down
7 changes: 4 additions & 3 deletions Partisans/Classes/HostFinder.m
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#import "HostFinder.h" #import "HostFinder.h"


#import "GameEnvoy.h" #import "GameEnvoy.h"
#import "NetworkManager.h"
#import "PlayerEnvoy.h" #import "PlayerEnvoy.h"
#import "SystemMessage.h" #import "SystemMessage.h"


Expand Down Expand Up @@ -53,7 +54,7 @@ - (void)dealloc


- (BOOL)isConnected - (BOOL)isConnected
{ {
self.isConnected = [SystemMessage isPlayerOnline]; self.isConnected = [NetworkManager isPlayerOnline];
return m_isConnected; return m_isConnected;
} }


Expand All @@ -65,14 +66,14 @@ - (NSString *)hostPeerID


- (void)connect - (void)connect
{ {
if ([SystemMessage isPlayerOnline]) if ([NetworkManager isPlayerOnline])
{ {
return; return;
} }


[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(hostReadyToCommunicate:) name:kPartisansNotificationHostReadyToCommunicate object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(hostReadyToCommunicate:) name:kPartisansNotificationHostReadyToCommunicate object:nil];


[SystemMessage putPlayerOnline]; [NetworkManager putPlayerOnline];


if (!self.timer) if (!self.timer)
{ {
Expand Down
4 changes: 2 additions & 2 deletions Partisans/Classes/JoinGameViewController.m
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ - (void)viewWillAppear:(BOOL)animated
} }


NSString *prefix = NSLocalizedString(@"The Game Code is", @"The Game Code is -- prefix"); NSString *prefix = NSLocalizedString(@"The Game Code is", @"The Game Code is -- prefix");
NSString *message = [NSString stringWithFormat:@"%@ %ul.", prefix, self.gameCode]; NSString *message = [NSString stringWithFormat:@"%@ %lul.", prefix, (unsigned long)self.gameCode];
[self addStatusMessage:message]; [self addStatusMessage:message];


message = NSLocalizedString(@"Tap to start scanning.", @"Tap to start scanning. -- status message"); message = NSLocalizedString(@"Tap to start scanning.", @"Tap to start scanning. -- status message");
Expand Down Expand Up @@ -207,7 +207,7 @@ - (void)startScanning {
[self.viewStack clearViews]; [self.viewStack clearViews];


NSString *prefix = NSLocalizedString(@"The Game Code is", @"The Game Code is -- prefix"); NSString *prefix = NSLocalizedString(@"The Game Code is", @"The Game Code is -- prefix");
NSString *message = [NSString stringWithFormat:@"%@ %d.", prefix, self.gameCode]; NSString *message = [NSString stringWithFormat:@"%@ %lu.", prefix, (unsigned long)self.gameCode];
[self addStatusMessage:message]; [self addStatusMessage:message];


if (!self.gameJoiner) if (!self.gameJoiner)
Expand Down
Loading

0 comments on commit a3b6cb3

Please sign in to comment.