Fixed compiling on XCode via conditional #includes - also removed player_struct as the player is a Tile now

netcode
kts 2013-10-15 19:51:43 -07:00
parent 33ab0f2af2
commit 22e2d1c3a8
15 changed files with 143 additions and 70 deletions

View File

@ -1,7 +1,9 @@
//#if !defined (__APPLE__)
#include <SDL/SDL.h>
#if !defined (__APPLE__)
#include <SDL/SDL_image.h>
//#endif
#else
#include <SDL_image.h>
#endif
#include "sdl.h"
#include "../main.h"

View File

@ -1,5 +1,6 @@
#ifndef PLAYER_H
#define PLAYER_H
#include "tile.h"
#define MAX_PLAYER_COMMANDS 128
/* list of standard command ids */
@ -27,12 +28,6 @@ typedef struct {
char name[16];
} PlayerTile;
typedef struct {
int x;
int y;
} player_struct;
//player_struct player;
//player_struct player;
struct Tile player;
void (*player_commands[128]) (); // pointer to array of command functions

BIN
xcode/build/.DS_Store vendored

Binary file not shown.

View File

@ -197,7 +197,48 @@
<key>Notifications</key>
<array/>
<key>OpenEditors</key>
<array/>
<array>
<dict>
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>20F90AE7180E362100242709</string>
<key>PBXProjectModuleLabel</key>
<string>sdl.c</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>20F90AE8180E362100242709</string>
<key>PBXProjectModuleLabel</key>
<string>sdl.c</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>20F90AFF180E369400242709</string>
<key>history</key>
<array>
<string>20F90ADF180E35F200242709</string>
</array>
</dict>
<key>SplitCount</key>
<string>1</string>
</dict>
<key>StatusBarVisibility</key>
<true/>
</dict>
<key>Geometry</key>
<dict>
<key>Frame</key>
<string>{{0, 20}, {750, 461}}</string>
<key>PBXModuleWindowStatusBarHidden2</key>
<false/>
<key>RubberWindowFrame</key>
<string>174 128 750 502 0 0 1024 746 </string>
</dict>
</dict>
</array>
<key>PerspectiveWidths</key>
<array>
<integer>-1</integer>
@ -228,8 +269,6 @@
<key>Layout</key>
<array>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXBottomSmartGroupGIDs</key>
@ -313,12 +352,14 @@
<key>Dock</key>
<array>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
<string>sdl.c</string>
<string>player.h</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@ -326,11 +367,11 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
<string>sdl.c</string>
<string>player.h</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>209B8C02180CDDE4002206C5</string>
<string>20F90AFE180E369400242709</string>
<key>history</key>
<array>
<string>20567ECF17E95DEC0002B1A9</string>
@ -349,7 +390,6 @@
<string>206D604A1808F92000C0DE49</string>
<string>206D604B1808F92000C0DE49</string>
<string>206D604C1808F92000C0DE49</string>
<string>206D60581808F99A00C0DE49</string>
<string>206D607B1808FED800C0DE49</string>
<string>206D6096180904FB00C0DE49</string>
<string>206D6097180904FB00C0DE49</string>
@ -358,7 +398,8 @@
<string>206D60B4180907AC00C0DE49</string>
<string>206D60B5180907AC00C0DE49</string>
<string>206D60C918090A6700C0DE49</string>
<string>2020E9CF180AA9A500ABF103</string>
<string>20F90AE1180E362100242709</string>
<string>20F90AE2180E362100242709</string>
</array>
<key>prevStack</key>
<array>
@ -388,6 +429,7 @@
<string>206D60541808F92000C0DE49</string>
<string>206D605B1808F99A00C0DE49</string>
<string>206D60B7180907AC00C0DE49</string>
<string>20F90AE3180E362100242709</string>
</array>
</dict>
<key>SplitCount</key>
@ -445,9 +487,9 @@
</array>
<key>TableOfContents</key>
<array>
<string>209B8BF5180CDB2A002206C5</string>
<string>20F90AE5180E362100242709</string>
<string>1CE0B1FE06471DED0097A5F4</string>
<string>209B8BF6180CDB2A002206C5</string>
<string>20F90AE6180E362100242709</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@ -581,8 +623,11 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
<string>20F90AF7180E367E00242709</string>
<string>20F90AF8180E367E00242709</string>
<string>1C78EAAD065D492600B07095</string>
<string>1CD10A99069EF8BA00B06720</string>
<string>20F90AE7180E362100242709</string>
<string>20F6A1B417E95A6200BAD261</string>
<string>/Users/kts/Devel/timesynk/xcode/timesynk.xcodeproj</string>
</array>
@ -608,7 +653,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CD0528F0623707200166675</string>
<key>PBXProjectModuleLabel</key>
<string></string>
<string>player.h</string>
<key>StatusBarVisibility</key>
<true/>
</dict>
@ -625,6 +670,8 @@
<string>218pt</string>
</dict>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@ -664,7 +711,7 @@
<key>TableOfContents</key>
<array>
<string>20F6A1B417E95A6200BAD261</string>
<string>209B8BF7180CDB2A002206C5</string>
<string>20F90AEA180E362100242709</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
@ -675,7 +722,7 @@
<key>WindowToolGUID</key>
<string>20F6A1B417E95A6200BAD261</string>
<key>WindowToolIsVisible</key>
<false/>
<true/>
</dict>
<dict>
<key>FirstTimeWindowDisplayed</key>
@ -784,13 +831,13 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
<string>209B8BF8180CDB2A002206C5</string>
<string>20F90AEB180E362100242709</string>
<string>1C162984064C10D400B95A72</string>
<string>209B8BF9180CDB2A002206C5</string>
<string>209B8BFA180CDB2A002206C5</string>
<string>209B8BFB180CDB2A002206C5</string>
<string>209B8BFC180CDB2A002206C5</string>
<string>209B8BFD180CDB2A002206C5</string>
<string>20F90AEC180E362100242709</string>
<string>20F90AED180E362100242709</string>
<string>20F90AEE180E362100242709</string>
<string>20F90AEF180E362100242709</string>
<string>20F90AF0180E362100242709</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
@ -952,7 +999,7 @@
<key>TableOfContents</key>
<array>
<string>1C78EAAD065D492600B07095</string>
<string>209B8BFE180CDB2A002206C5</string>
<string>20F90AF1180E362100242709</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>

View File

@ -42,16 +42,6 @@
vrLen = 508;
vrLoc = 0;
};
2020E9CF180AA9A500ABF103 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 20F6A1F017E95B6F00BAD261 /* sdl.c */;
name = "sdl.c: 52";
rLen = 0;
rLoc = 1813;
rType = 0;
vrLen = 1369;
vrLoc = 1182;
};
203B68D117F7D77900272675 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 20F6A1D417E95AD300BAD261 /* stubs.h */;
@ -170,9 +160,9 @@
};
20568DD517EBE9490022F314 /* player.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1200, 504}}";
sepNavSelRange = "{294, 22}";
sepNavVisRange = "{102, 398}";
sepNavIntBoundsRect = "{{0, 0}, {439, 742}}";
sepNavSelRange = "{51, 0}";
sepNavVisRange = "{0, 277}";
};
};
20568DE817EC16C60022F314 /* PBXTextBookmark */ = {
@ -376,16 +366,6 @@
vrLen = 183;
vrLoc = 0;
};
206D60581808F99A00C0DE49 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 20568DD517EBE9490022F314 /* player.h */;
name = "player.h: 19";
rLen = 22;
rLoc = 294;
rType = 0;
vrLen = 398;
vrLoc = 102;
};
206D605B1808F99A00C0DE49 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 206D60441808F90700C0DE49 /* tiles.h */;
@ -524,16 +504,6 @@
vrLen = 175;
vrLoc = 0;
};
209B8C02180CDDE4002206C5 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 20F6A1F017E95B6F00BAD261 /* sdl.c */;
name = "sdl.c: 52";
rLen = 0;
rLoc = 1813;
rType = 0;
vrLen = 1348;
vrLoc = 1182;
};
20DE9D051804FE1A0047B2DD /* context.c */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {755, 994}}";
@ -708,10 +678,10 @@
};
20F6A1F017E95B6F00BAD261 /* sdl.c */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1134, 1498}}";
sepNavSelRange = "{1813, 0}";
sepNavVisRange = "{1182, 1348}";
sepNavWindowFrame = "{{46, 69}, {750, 558}}";
sepNavIntBoundsRect = "{{0, 0}, {1134, 1764}}";
sepNavSelRange = "{101, 0}";
sepNavVisRange = "{0, 1079}";
sepNavWindowFrame = "{{174, 72}, {750, 558}}";
};
};
20F6A1F117E95B6F00BAD261 /* sdl.h */ = {
@ -748,6 +718,62 @@
vrLen = 238;
vrLoc = 0;
};
20F90ADF180E35F200242709 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
comments = "error: SDL/SDL_image.h: No such file or directory";
fRef = 20F6A1F017E95B6F00BAD261 /* sdl.c */;
rLen = 1;
rLoc = 2;
rType = 1;
};
20F90AE1180E362100242709 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 20F6A1F017E95B6F00BAD261 /* sdl.c */;
name = "sdl.c: 47";
rLen = 0;
rLoc = 1838;
rType = 0;
vrLen = 1704;
vrLoc = 1054;
};
20F90AE2180E362100242709 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
comments = "error: storage size of 'player' isn't known";
fRef = 20568DD517EBE9490022F314 /* player.h */;
rLen = 1;
rLoc = 30;
rType = 1;
};
20F90AE3180E362100242709 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 20F6A1F017E95B6F00BAD261 /* sdl.c */;
name = "sdl.c: 47";
rLen = 0;
rLoc = 1838;
rType = 0;
vrLen = 1704;
vrLoc = 1054;
};
20F90AFE180E369400242709 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 20568DD517EBE9490022F314 /* player.h */;
name = "player.h: 30";
rLen = 0;
rLoc = 559;
rType = 0;
vrLen = 952;
vrLoc = 233;
};
20F90AFF180E369400242709 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 20F6A1F017E95B6F00BAD261 /* sdl.c */;
name = "sdl.c: 5";
rLen = 0;
rLoc = 101;
rType = 0;
vrLen = 1079;
vrLoc = 0;
};
29B97313FDCFA39411CA2CEA /* Project object */ = {
activeBuildConfigurationName = Debug;
activeExecutable = 20F6A19417E9598B00BAD261 /* timesynk */;
@ -836,13 +862,12 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
PBXPerProjectTemplateStateSaveDate = 403495693;
PBXWorkspaceStateSaveDate = 403495693;
PBXPerProjectTemplateStateSaveDate = 403584391;
PBXWorkspaceStateSaveDate = 403584391;
};
perUserProjectItems = {
2002F0D917E972B3003CF277 /* PlistBookmark */ = 2002F0D917E972B3003CF277 /* PlistBookmark */;
2007C93017ECF2EB00268653 /* PBXTextBookmark */ = 2007C93017ECF2EB00268653 /* PBXTextBookmark */;
2020E9CF180AA9A500ABF103 /* PBXTextBookmark */ = 2020E9CF180AA9A500ABF103 /* PBXTextBookmark */;
203B68D117F7D77900272675 /* PBXTextBookmark */ = 203B68D117F7D77900272675 /* PBXTextBookmark */;
204F943D18005532007B4DAD /* PBXTextBookmark */ = 204F943D18005532007B4DAD /* PBXTextBookmark */;
2050562217ED9E6100F572B7 /* PBXTextBookmark */ = 2050562217ED9E6100F572B7 /* PBXTextBookmark */;
@ -867,7 +892,6 @@
206D604C1808F92000C0DE49 /* PBXTextBookmark */ = 206D604C1808F92000C0DE49 /* PBXTextBookmark */;
206D60511808F92000C0DE49 /* PBXTextBookmark */ = 206D60511808F92000C0DE49 /* PBXTextBookmark */;
206D60541808F92000C0DE49 /* PBXTextBookmark */ = 206D60541808F92000C0DE49 /* PBXTextBookmark */;
206D60581808F99A00C0DE49 /* PBXTextBookmark */ = 206D60581808F99A00C0DE49 /* PBXTextBookmark */;
206D605B1808F99A00C0DE49 /* PBXTextBookmark */ = 206D605B1808F99A00C0DE49 /* PBXTextBookmark */;
206D607B1808FED800C0DE49 /* PBXTextBookmark */ = 206D607B1808FED800C0DE49 /* PBXTextBookmark */;
206D6096180904FB00C0DE49 /* PBXTextBookmark */ = 206D6096180904FB00C0DE49 /* PBXTextBookmark */;
@ -881,7 +905,6 @@
2090289E17E95F9E0051A253 /* PBXTextBookmark */ = 2090289E17E95F9E0051A253 /* PBXTextBookmark */;
2090289F17E95F9E0051A253 /* PBXTextBookmark */ = 2090289F17E95F9E0051A253 /* PBXTextBookmark */;
209028A517E95F9E0051A253 /* PBXTextBookmark */ = 209028A517E95F9E0051A253 /* PBXTextBookmark */;
209B8C02180CDDE4002206C5 /* PBXTextBookmark */ = 209B8C02180CDDE4002206C5 /* PBXTextBookmark */;
20DE9D35180500990047B2DD /* PBXTextBookmark */ = 20DE9D35180500990047B2DD /* PBXTextBookmark */;
20DE9D36180500990047B2DD /* PBXTextBookmark */ = 20DE9D36180500990047B2DD /* PBXTextBookmark */;
20DE9D9D18050D980047B2DD /* PBXTextBookmark */ = 20DE9D9D18050D980047B2DD /* PBXTextBookmark */;
@ -893,6 +916,12 @@
20F6A1EA17E95B5200BAD261 /* PBXTextBookmark */ = 20F6A1EA17E95B5200BAD261 /* PBXTextBookmark */;
20F6A21A17E95C1200BAD261 /* PBXTextBookmark */ = 20F6A21A17E95C1200BAD261 /* PBXTextBookmark */;
20F6A21E17E95C1200BAD261 /* PBXTextBookmark */ = 20F6A21E17E95C1200BAD261 /* PBXTextBookmark */;
20F90ADF180E35F200242709 /* PBXTextBookmark */ = 20F90ADF180E35F200242709 /* PBXTextBookmark */;
20F90AE1180E362100242709 /* PBXTextBookmark */ = 20F90AE1180E362100242709 /* PBXTextBookmark */;
20F90AE2180E362100242709 /* PBXTextBookmark */ = 20F90AE2180E362100242709 /* PBXTextBookmark */;
20F90AE3180E362100242709 /* PBXTextBookmark */ = 20F90AE3180E362100242709 /* PBXTextBookmark */;
20F90AFE180E369400242709 /* PBXTextBookmark */ = 20F90AFE180E369400242709 /* PBXTextBookmark */;
20F90AFF180E369400242709 /* PBXTextBookmark */ = 20F90AFF180E369400242709 /* PBXTextBookmark */;
};
sourceControlManager = 20F6A1A517E959A000BAD261 /* Source Control */;
userBuildSettings = {