summary refs log tree commit diff stats
path: root/Cart Collect.xcodeproj
diff options
context:
space:
mode:
authorStarla Insigna <starla4444@gmail.com>2011-08-09 21:36:09 -0400
committerStarla Insigna <starla4444@gmail.com>2011-08-09 21:36:09 -0400
commit002dc99a071a4a8f7d2afc15d1fdf2ae0312faed (patch)
tree82808d85a131ed0f970b374828a3e80ee1fb8d35 /Cart Collect.xcodeproj
parent1ed37fda409479769c8d110aa22d5dadc9d2cb85 (diff)
downloadcartcollect-002dc99a071a4a8f7d2afc15d1fdf2ae0312faed.tar.gz
cartcollect-002dc99a071a4a8f7d2afc15d1fdf2ae0312faed.tar.bz2
cartcollect-002dc99a071a4a8f7d2afc15d1fdf2ae0312faed.zip
Abstracted a lot of GameLayer's functionality out
In order to prepare for tutorial mode (and eventually, the other game modes), a lot of GameLayer's functionality (reading the accelerometer, moving the cart, moving falling objects, reacting to collisions…) has been abstracted out to FallingObject and subclasses of FallingObject, as well as a new Cart class, and GameMode, a new superclass of GameLayer. The only things that were not abstracted out that probably will be in the future are the pause functionality and the tutorial bubble functionality (which will in fact be moved to the tutorial mode class).

A lot of work was also done to cut down on compiler warnings and a lot of #imports were moved from header files to implementation files because I realized THAT'S HOW YOU'RE SUPPOSED TO DO IT.

Refs #193
Diffstat (limited to 'Cart Collect.xcodeproj')
-rwxr-xr-xCart Collect.xcodeproj/project.pbxproj32
1 files changed, 28 insertions, 4 deletions
diff --git a/Cart Collect.xcodeproj/project.pbxproj b/Cart Collect.xcodeproj/project.pbxproj index b3c5dfa..231e838 100755 --- a/Cart Collect.xcodeproj/project.pbxproj +++ b/Cart Collect.xcodeproj/project.pbxproj
@@ -84,6 +84,9 @@
84 50F4144910692EE7002A0D5E /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 50F4144410692EE7002A0D5E /* Default.png */; }; 84 50F4144910692EE7002A0D5E /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 50F4144410692EE7002A0D5E /* Default.png */; };
85 50F4144A10692EE7002A0D5E /* fps_images.png in Resources */ = {isa = PBXBuildFile; fileRef = 50F4144510692EE7002A0D5E /* fps_images.png */; }; 85 50F4144A10692EE7002A0D5E /* fps_images.png in Resources */ = {isa = PBXBuildFile; fileRef = 50F4144510692EE7002A0D5E /* fps_images.png */; };
86 50F4144B10692EE7002A0D5E /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 50F4144610692EE7002A0D5E /* Icon.png */; }; 86 50F4144B10692EE7002A0D5E /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 50F4144610692EE7002A0D5E /* Icon.png */; };
87 6C0C140E13F1C3EC003A31B2 /* ValuableObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C0C140D13F1C3EC003A31B2 /* ValuableObject.m */; };
88 6C0C141113F2099B003A31B2 /* Cart.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C0C141013F2099B003A31B2 /* Cart.m */; };
89 6C0C141413F20E98003A31B2 /* GameMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C0C141313F20E98003A31B2 /* GameMode.m */; };
87 6C29041013EAEB590032DA0F /* TutorialBubble.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C29040F13EAEB590032DA0F /* TutorialBubble.m */; }; 90 6C29041013EAEB590032DA0F /* TutorialBubble.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C29040F13EAEB590032DA0F /* TutorialBubble.m */; };
88 6C29041213EAEC8A0032DA0F /* framestuff.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C29041113EAEC8A0032DA0F /* framestuff.png */; }; 91 6C29041213EAEC8A0032DA0F /* framestuff.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C29041113EAEC8A0032DA0F /* framestuff.png */; };
89 6C5179C613DF3839006F1F38 /* Morning1.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C5179C513DF3839006F1F38 /* Morning1.png */; }; 92 6C5179C613DF3839006F1F38 /* Morning1.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C5179C513DF3839006F1F38 /* Morning1.png */; };
@@ -328,7 +331,6 @@
328 3F7D0F4913D8F17C00B6CE14 /* highscores2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = highscores2.png; sourceTree = "<group>"; }; 331 3F7D0F4913D8F17C00B6CE14 /* highscores2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = highscores2.png; sourceTree = "<group>"; };
329 3F7D0F4A13D8F17C00B6CE14 /* newgame.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = newgame.png; sourceTree = "<group>"; }; 332 3F7D0F4A13D8F17C00B6CE14 /* newgame.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = newgame.png; sourceTree = "<group>"; };
330 3F7D0F4B13D8F17C00B6CE14 /* newgame2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = newgame2.png; sourceTree = "<group>"; }; 333 3F7D0F4B13D8F17C00B6CE14 /* newgame2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = newgame2.png; sourceTree = "<group>"; };
331 3F8394AC13D72E2C0059AEE8 /* ValuableObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ValuableObject.h; sourceTree = "<group>"; };
332 3F8394F213D732330059AEE8 /* pause.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pause.png; sourceTree = "<group>"; }; 334 3F8394F213D732330059AEE8 /* pause.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pause.png; sourceTree = "<group>"; };
333 3F8394F413D7328E0059AEE8 /* pause2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pause2.png; sourceTree = "<group>"; }; 335 3F8394F413D7328E0059AEE8 /* pause2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pause2.png; sourceTree = "<group>"; };
334 3F83955113D739B10059AEE8 /* MainMenuLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainMenuLayer.h; sourceTree = "<group>"; }; 336 3F83955113D739B10059AEE8 /* MainMenuLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainMenuLayer.h; sourceTree = "<group>"; };
@@ -373,6 +375,12 @@
373 50F4144510692EE7002A0D5E /* fps_images.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fps_images.png; sourceTree = "<group>"; }; 375 50F4144510692EE7002A0D5E /* fps_images.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fps_images.png; sourceTree = "<group>"; };
374 50F4144610692EE7002A0D5E /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; }; 376 50F4144610692EE7002A0D5E /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
375 50F4144710692EE7002A0D5E /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 377 50F4144710692EE7002A0D5E /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
378 6C0C140C13F1C3EC003A31B2 /* ValuableObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ValuableObject.h; sourceTree = "<group>"; };
379 6C0C140D13F1C3EC003A31B2 /* ValuableObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ValuableObject.m; sourceTree = "<group>"; };
380 6C0C140F13F2099B003A31B2 /* Cart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Cart.h; sourceTree = "<group>"; };
381 6C0C141013F2099B003A31B2 /* Cart.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Cart.m; sourceTree = "<group>"; };
382 6C0C141213F20E98003A31B2 /* GameMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameMode.h; sourceTree = "<group>"; };
383 6C0C141313F20E98003A31B2 /* GameMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GameMode.m; sourceTree = "<group>"; };
376 6C29040E13EAEB590032DA0F /* TutorialBubble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TutorialBubble.h; sourceTree = "<group>"; }; 384 6C29040E13EAEB590032DA0F /* TutorialBubble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TutorialBubble.h; sourceTree = "<group>"; };
377 6C29040F13EAEB590032DA0F /* TutorialBubble.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TutorialBubble.m; sourceTree = "<group>"; }; 385 6C29040F13EAEB590032DA0F /* TutorialBubble.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TutorialBubble.m; sourceTree = "<group>"; };
378 6C29041113EAEC8A0032DA0F /* framestuff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = framestuff.png; sourceTree = "<group>"; }; 386 6C29041113EAEC8A0032DA0F /* framestuff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = framestuff.png; sourceTree = "<group>"; };
@@ -656,14 +664,13 @@
656 2D500B1D0D5A766B00DBA0E3 /* Classes */ = { 664 2D500B1D0D5A766B00DBA0E3 /* Classes */ = {
657 isa = PBXGroup; 665 isa = PBXGroup;
658 children = ( 666 children = (
667 6C0C141513F211C7003A31B2 /* Game Modes */,
659 6C5887E313EE3ED900B5A80A /* Items */, 668 6C5887E313EE3ED900B5A80A /* Items */,
660 E0F81035120A173C005866B8 /* GameConfig.h */, 669 E0F81035120A173C005866B8 /* GameConfig.h */,
661 E0F81036120A173C005866B8 /* RootViewController.h */, 670 E0F81036120A173C005866B8 /* RootViewController.h */,
662 E0F81037120A173C005866B8 /* RootViewController.m */, 671 E0F81037120A173C005866B8 /* RootViewController.m */,
663 1F3B9A2C0EF2145700286867 /* Cart_CollectAppDelegate.h */, 672 1F3B9A2C0EF2145700286867 /* Cart_CollectAppDelegate.h */,
664 507022A2107672FA00393637 /* Cart_CollectAppDelegate.m */, 673 507022A2107672FA00393637 /* Cart_CollectAppDelegate.m */,
665 3FE79CD213D4DE37001A6B93 /* GameLayer.h */,
666 3FE79CD313D4DE37001A6B93 /* GameLayer.m */,
667 3F6C7EE713D6377D00C038FE /* GameOverLayer.h */, 674 3F6C7EE713D6377D00C038FE /* GameOverLayer.h */,
668 3F6C7EE813D6377D00C038FE /* GameOverLayer.m */, 675 3F6C7EE813D6377D00C038FE /* GameOverLayer.m */,
669 3F83955213D739B10059AEE8 /* MainMenuLayer.m */, 676 3F83955213D739B10059AEE8 /* MainMenuLayer.m */,
@@ -821,6 +828,17 @@
821 path = Resources; 828 path = Resources;
822 sourceTree = "<group>"; 829 sourceTree = "<group>";
823 }; 830 };
831 6C0C141513F211C7003A31B2 /* Game Modes */ = {
832 isa = PBXGroup;
833 children = (
834 6C0C141213F20E98003A31B2 /* GameMode.h */,
835 6C0C141313F20E98003A31B2 /* GameMode.m */,
836 3FE79CD213D4DE37001A6B93 /* GameLayer.h */,
837 3FE79CD313D4DE37001A6B93 /* GameLayer.m */,
838 );
839 name = "Game Modes";
840 sourceTree = "<group>";
841 };
824 6C5887E313EE3ED900B5A80A /* Items */ = { 842 6C5887E313EE3ED900B5A80A /* Items */ = {
825 isa = PBXGroup; 843 isa = PBXGroup;
826 children = ( 844 children = (
@@ -834,7 +852,10 @@
834 3F6C7C7213D5E57100C038FE /* OneUp.m */, 852 3F6C7C7213D5E57100C038FE /* OneUp.m */,
835 3F6C7EE213D636CF00C038FE /* Rock.h */, 853 3F6C7EE213D636CF00C038FE /* Rock.h */,
836 3F6C7EE313D636CF00C038FE /* Rock.m */, 854 3F6C7EE313D636CF00C038FE /* Rock.m */,
837 3F8394AC13D72E2C0059AEE8 /* ValuableObject.h */, 855 6C0C140C13F1C3EC003A31B2 /* ValuableObject.h */,
856 6C0C140D13F1C3EC003A31B2 /* ValuableObject.m */,
857 6C0C140F13F2099B003A31B2 /* Cart.h */,
858 6C0C141013F2099B003A31B2 /* Cart.m */,
838 ); 859 );
839 name = Items; 860 name = Items;
840 sourceTree = "<group>"; 861 sourceTree = "<group>";
@@ -1341,6 +1362,9 @@
1341 3F03221613D78F8C00E6A708 /* HighscoreListController.m in Sources */, 1362 3F03221613D78F8C00E6A708 /* HighscoreListController.m in Sources */,
1342 3F03221913D7904E00E6A708 /* Highscore.m in Sources */, 1363 3F03221913D7904E00E6A708 /* Highscore.m in Sources */,
1343 6C29041013EAEB590032DA0F /* TutorialBubble.m in Sources */, 1364 6C29041013EAEB590032DA0F /* TutorialBubble.m in Sources */,
1365 6C0C140E13F1C3EC003A31B2 /* ValuableObject.m in Sources */,
1366 6C0C141113F2099B003A31B2 /* Cart.m in Sources */,
1367 6C0C141413F20E98003A31B2 /* GameMode.m in Sources */,
1344 ); 1368 );
1345 runOnlyForDeploymentPostprocessing = 0; 1369 runOnlyForDeploymentPostprocessing = 0;
1346 }; 1370 };