diff --git a/source/src/bot/bot.h b/source/src/bot/bot.h index 5b029464..f299cec1 100644 --- a/source/src/bot/bot.h +++ b/source/src/bot/bot.h @@ -55,12 +55,12 @@ #include "bot_util.h" #include "bot_waypoint.h" -#ifdef __linux__ -#include -#else // Windows doesn't have syslog -#define openlog (void)0 -#define syslog (void)0 -#define closelog (void)0 +#ifdef WIN32 + #define openlog (void)0 + #define syslog (void)0 + #define closelog (void)0 +#else + #include #endif extern bool dedserv; diff --git a/source/src/bot/bot_util.cpp b/source/src/bot/bot_util.cpp index 49634666..d2354952 100644 --- a/source/src/bot/bot_util.cpp +++ b/source/src/bot/bot_util.cpp @@ -12,16 +12,16 @@ #include "../cube.h" -#ifndef __linux__ -#include -#endif #include -#if (defined __linux__) -#include -#include -#include + + +#ifdef WIN32 + #include + #include #else -#include + #include + #include + #include #endif // Function code by PMB - Begin diff --git a/source/src/bot/botmanager.cpp b/source/src/bot/botmanager.cpp index df80c0bb..ebb0728e 100644 --- a/source/src/bot/botmanager.cpp +++ b/source/src/bot/botmanager.cpp @@ -470,7 +470,7 @@ void CBotManager::MakeBotFileName(const char *szFileName, const char *szDir1, co { char *DirSeperator; -#ifndef __linux__ +#ifdef WIN32 DirSeperator = "\\"; strcpy(szOutput, "bot\\"); #else diff --git a/source/src/rendergl.cpp b/source/src/rendergl.cpp index 1628e237..b477fc3b 100644 --- a/source/src/rendergl.cpp +++ b/source/src/rendergl.cpp @@ -2,12 +2,13 @@ #include "cube.h" -#ifdef DARWIN -#define GL_COMBINE_EXT GL_COMBINE_ARB -#define GL_COMBINE_RGB_EXT GL_COMBINE_RGB_ARB -#define GL_SOURCE0_RBG_EXT GL_SOURCE0_RGB_ARB -#define GL_SOURCE1_RBG_EXT GL_SOURCE1_RGB_ARB -#define GL_RGB_SCALE_EXT GL_RGB_SCALE_ARB +#ifdef __APPLE__ + #define GL_COMBINE_EXT GL_COMBINE_ARB + #define GL_COMBINE_RGB_EXT GL_COMBINE_RGB_ARB + #define GL_SOURCE0_RGB_EXT GL_SOURCE0_RGB_ARB + #define GL_SOURCE1_RGB_EXT GL_SOURCE1_RGB_ARB + #define GL_RGB_SCALE_EXT GL_RGB_SCALE_ARB + #define GL_PRIMARY_COLOR_EXT GL_PRIMARY_COLOR_ARB #endif bool hasoverbright = false; @@ -42,6 +43,7 @@ void gl_init(int w, int h, int bpp, int depth, int fsaa) char *exts = (char *)glGetString(GL_EXTENSIONS); if(strstr(exts, "GL_EXT_texture_env_combine")) hasoverbright = true; + else if(strstr(exts, "GL_ARB_texture_env_combine")) hasoverbright = true; else conoutf("WARNING: cannot use overbright lighting, using old lighting model!"); glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxtexsize); diff --git a/source/xcode/actioncube.xcodeproj/julianmayer.pbxuser b/source/xcode/actioncube.xcodeproj/julianmayer.pbxuser index 658750c6..d4ffce8f 100644 --- a/source/xcode/actioncube.xcodeproj/julianmayer.pbxuser +++ b/source/xcode/actioncube.xcodeproj/julianmayer.pbxuser @@ -28,7 +28,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 1000, + 10, 20, 48, 43, @@ -91,56 +91,41 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 184472125; - PBXWorkspaceStateSaveDate = 184472125; + PBXPerProjectTemplateStateSaveDate = 185153012; + PBXWorkspaceStateSaveDate = 185153012; }; perUserProjectItems = { - 6608DD090AFED45B008A0167 /* PBXTextBookmark */ = 6608DD090AFED45B008A0167 /* PBXTextBookmark */; - 6608DD0A0AFED45B008A0167 /* PBXTextBookmark */ = 6608DD0A0AFED45B008A0167 /* PBXTextBookmark */; - 6608DD0B0AFED45B008A0167 /* PBXTextBookmark */ = 6608DD0B0AFED45B008A0167 /* PBXTextBookmark */; - 6608DD0C0AFED45B008A0167 /* PBXTextBookmark */ = 6608DD0C0AFED45B008A0167 /* PBXTextBookmark */; + 66074C1D0B0933C5003103CE /* PBXTextBookmark */ = 66074C1D0B0933C5003103CE /* PBXTextBookmark */; + 66074C230B0933EB003103CE /* PBXTextBookmark */ = 66074C230B0933EB003103CE /* PBXTextBookmark */; + 66074C250B0933EB003103CE /* PBXTextBookmark */ = 66074C250B0933EB003103CE /* PBXTextBookmark */; + 66074C3B0B093555003103CE /* PBXTextBookmark */ = 66074C3B0B093555003103CE /* PBXTextBookmark */; + 66074C3F0B093555003103CE /* PBXTextBookmark */ = 66074C3F0B093555003103CE /* PBXTextBookmark */; + 66074C440B093555003103CE /* PBXTextBookmark */ = 66074C440B093555003103CE /* PBXTextBookmark */; + 66074C480B093555003103CE /* PBXTextBookmark */ = 66074C480B093555003103CE /* PBXTextBookmark */; + 66074C4B0B09355E003103CE /* PBXTextBookmark */ = 66074C4B0B09355E003103CE /* PBXTextBookmark */; 6608DD120AFED57F008A0167 /* PBXTextBookmark */ = 6608DD120AFED57F008A0167 /* PBXTextBookmark */; - 6608DD130AFED57F008A0167 /* PBXTextBookmark */ = 6608DD130AFED57F008A0167 /* PBXTextBookmark */; - 6608DD140AFED57F008A0167 /* PBXTextBookmark */ = 6608DD140AFED57F008A0167 /* PBXTextBookmark */; - 6608DD150AFED57F008A0167 /* PBXTextBookmark */ = 6608DD150AFED57F008A0167 /* PBXTextBookmark */; - 6608DD2E0AFED669008A0167 /* PBXTextBookmark */ = 6608DD2E0AFED669008A0167 /* PBXTextBookmark */; - 6608DD2F0AFED669008A0167 /* PBXTextBookmark */ = 6608DD2F0AFED669008A0167 /* PBXTextBookmark */; - 661FFAE00AFEC8AD00C77FFE /* PBXTextBookmark */ = 661FFAE00AFEC8AD00C77FFE /* PBXTextBookmark */; 661FFAE10AFEC8AD00C77FFE /* PBXTextBookmark */ = 661FFAE10AFEC8AD00C77FFE /* PBXTextBookmark */; - 661FFAE40AFEC8AD00C77FFE /* PBXTextBookmark */ = 661FFAE40AFEC8AD00C77FFE /* PBXTextBookmark */; - 661FFAE50AFEC8AD00C77FFE /* PBXTextBookmark */ = 661FFAE50AFEC8AD00C77FFE /* PBXTextBookmark */; - 661FFAE70AFEC8AD00C77FFE /* PBXTextBookmark */ = 661FFAE70AFEC8AD00C77FFE /* PBXTextBookmark */; 661FFAE80AFEC8AD00C77FFE /* PBXTextBookmark */ = 661FFAE80AFEC8AD00C77FFE /* PBXTextBookmark */; - 661FFAF50AFEC8AD00C77FFE /* PBXTextBookmark */ = 661FFAF50AFEC8AD00C77FFE /* PBXTextBookmark */; 661FFAFD0AFEC8FE00C77FFE /* PBXTextBookmark */ = 661FFAFD0AFEC8FE00C77FFE /* PBXTextBookmark */; - 661FFC700AFECE0900C77FFE /* PBXTextBookmark */ = 661FFC700AFECE0900C77FFE /* PBXTextBookmark */; 661FFC710AFECE0900C77FFE /* PBXTextBookmark */ = 661FFC710AFECE0900C77FFE /* PBXTextBookmark */; 661FFC720AFECE0900C77FFE /* PBXTextBookmark */ = 661FFC720AFECE0900C77FFE /* PBXTextBookmark */; 661FFC730AFECE0900C77FFE /* PBXTextBookmark */ = 661FFC730AFECE0900C77FFE /* PBXTextBookmark */; 661FFC750AFECE0900C77FFE /* PBXTextBookmark */ = 661FFC750AFECE0900C77FFE /* PBXTextBookmark */; 661FFC770AFECE0900C77FFE /* PBXTextBookmark */ = 661FFC770AFECE0900C77FFE /* PBXTextBookmark */; - 661FFC790AFECE0900C77FFE /* PBXTextBookmark */ = 661FFC790AFECE0900C77FFE /* PBXTextBookmark */; - 661FFC7A0AFECE0900C77FFE /* PBXTextBookmark */ = 661FFC7A0AFECE0900C77FFE /* PBXTextBookmark */; - 661FFC7B0AFECE0900C77FFE /* PBXTextBookmark */ = 661FFC7B0AFECE0900C77FFE /* PBXTextBookmark */; - 661FFC7C0AFECE0900C77FFE /* PBXTextBookmark */ = 661FFC7C0AFECE0900C77FFE /* PBXTextBookmark */; - 661FFC7D0AFECE0900C77FFE /* PBXTextBookmark */ = 661FFC7D0AFECE0900C77FFE /* PBXTextBookmark */; - 661FFC7E0AFECE0900C77FFE /* PBXTextBookmark */ = 661FFC7E0AFECE0900C77FFE /* PBXTextBookmark */; - 661FFC7F0AFECE0900C77FFE /* PBXTextBookmark */ = 661FFC7F0AFECE0900C77FFE /* PBXTextBookmark */; 661FFC830AFECE0900C77FFE /* PBXTextBookmark */ = 661FFC830AFECE0900C77FFE /* PBXTextBookmark */; 661FFC840AFECE0900C77FFE /* PBXTextBookmark */ = 661FFC840AFECE0900C77FFE /* PBXTextBookmark */; 661FFC860AFECE0900C77FFE /* PBXTextBookmark */ = 661FFC860AFECE0900C77FFE /* PBXTextBookmark */; 661FFC870AFECE0900C77FFE /* PBXTextBookmark */ = 661FFC870AFECE0900C77FFE /* PBXTextBookmark */; 661FFC8C0AFECE0900C77FFE /* PBXTextBookmark */ = 661FFC8C0AFECE0900C77FFE /* PBXTextBookmark */; 661FFC8E0AFECE0900C77FFE /* PBXTextBookmark */ = 661FFC8E0AFECE0900C77FFE /* PBXTextBookmark */; - 661FFCA00AFED0DE00C77FFE /* PBXTextBookmark */ = 661FFCA00AFED0DE00C77FFE /* PBXTextBookmark */; - 661FFCA40AFED0DE00C77FFE /* PBXTextBookmark */ = 661FFCA40AFED0DE00C77FFE /* PBXTextBookmark */; - 661FFCA50AFED0DE00C77FFE /* PBXTextBookmark */ = 661FFCA50AFED0DE00C77FFE /* PBXTextBookmark */; - 664C029C0AD45137005C7BBB /* PBXTextBookmark */ = 664C029C0AD45137005C7BBB /* PBXTextBookmark */; + 6638512A0B092FF200C6A735 /* PBXTextBookmark */ = 6638512A0B092FF200C6A735 /* PBXTextBookmark */; + 6638512B0B092FF200C6A735 /* PBXTextBookmark */ = 6638512B0B092FF200C6A735 /* PBXTextBookmark */; + 6638512E0B092FF200C6A735 /* PBXTextBookmark */ = 6638512E0B092FF200C6A735 /* PBXTextBookmark */; + 6638512F0B092FF200C6A735 /* PBXTextBookmark */ = 6638512F0B092FF200C6A735 /* PBXTextBookmark */; 664C02A20AD45137005C7BBB /* PBXTextBookmark */ = 664C02A20AD45137005C7BBB /* PBXTextBookmark */; 664C02A30AD45137005C7BBB /* PBXTextBookmark */ = 664C02A30AD45137005C7BBB /* PBXTextBookmark */; 664C02AA0AD45137005C7BBB /* PBXTextBookmark */ = 664C02AA0AD45137005C7BBB /* PBXTextBookmark */; 664C02AB0AD45137005C7BBB /* PBXTextBookmark */ = 664C02AB0AD45137005C7BBB /* PBXTextBookmark */; - 665CDD560AFE818B0030D605 /* PBXTextBookmark */ = 665CDD560AFE818B0030D605 /* PBXTextBookmark */; 665CDD570AFE818B0030D605 /* PBXBookmark */ = 665CDD570AFE818B0030D605 /* PBXBookmark */; 665CDD580AFE818B0030D605 /* PBXTextBookmark */ = 665CDD580AFE818B0030D605 /* PBXTextBookmark */; 665CDD590AFE818B0030D605 /* PBXTextBookmark */ = 665CDD590AFE818B0030D605 /* PBXTextBookmark */; @@ -150,116 +135,129 @@ 665CDD650AFE818B0030D605 /* PBXTextBookmark */ = 665CDD650AFE818B0030D605 /* PBXTextBookmark */; 665CDD670AFE818B0030D605 /* PBXTextBookmark */ = 665CDD670AFE818B0030D605 /* PBXTextBookmark */; 665CDD680AFE818B0030D605 /* PBXTextBookmark */ = 665CDD680AFE818B0030D605 /* PBXTextBookmark */; - 665CDD6D0AFE818B0030D605 /* PBXTextBookmark */ = 665CDD6D0AFE818B0030D605 /* PBXTextBookmark */; 665CDD720AFE822E0030D605 /* PBXTextBookmark */ = 665CDD720AFE822E0030D605 /* PBXTextBookmark */; - 665CDD730AFE822E0030D605 /* PBXTextBookmark */ = 665CDD730AFE822E0030D605 /* PBXTextBookmark */; 665CDD740AFE822E0030D605 /* PBXTextBookmark */ = 665CDD740AFE822E0030D605 /* PBXTextBookmark */; 665CDD760AFE822E0030D605 /* PBXTextBookmark */ = 665CDD760AFE822E0030D605 /* PBXTextBookmark */; 665CDD780AFE822E0030D605 /* PBXTextBookmark */ = 665CDD780AFE822E0030D605 /* PBXTextBookmark */; - 665CDED60AFE823A0030D605 /* PBXTextBookmark */ = 665CDED60AFE823A0030D605 /* PBXTextBookmark */; 665CDED90AFE823A0030D605 /* PBXTextBookmark */ = 665CDED90AFE823A0030D605 /* PBXTextBookmark */; 665CDEDB0AFE823A0030D605 /* PBXTextBookmark */ = 665CDEDB0AFE823A0030D605 /* PBXTextBookmark */; 665CDEE60AFE832D0030D605 /* PBXTextBookmark */ = 665CDEE60AFE832D0030D605 /* PBXTextBookmark */; 665CDEE70AFE832D0030D605 /* PBXTextBookmark */ = 665CDEE70AFE832D0030D605 /* PBXTextBookmark */; - 665CDEF10AFE83B90030D605 /* PBXTextBookmark */ = 665CDEF10AFE83B90030D605 /* PBXTextBookmark */; - 665CDEF90AFE841A0030D605 /* PBXTextBookmark */ = 665CDEF90AFE841A0030D605 /* PBXTextBookmark */; 665CDEFA0AFE841A0030D605 /* PBXTextBookmark */ = 665CDEFA0AFE841A0030D605 /* PBXTextBookmark */; - 665CDEFE0AFE841A0030D605 /* PBXTextBookmark */ = 665CDEFE0AFE841A0030D605 /* PBXTextBookmark */; 665CDEFF0AFE841A0030D605 /* PBXTextBookmark */ = 665CDEFF0AFE841A0030D605 /* PBXTextBookmark */; - 665CDF030AFE847D0030D605 /* PBXTextBookmark */ = 665CDF030AFE847D0030D605 /* PBXTextBookmark */; - 665CDF040AFE847D0030D605 /* PBXTextBookmark */ = 665CDF040AFE847D0030D605 /* PBXTextBookmark */; - 665CDF060AFE847D0030D605 /* PBXTextBookmark */ = 665CDF060AFE847D0030D605 /* PBXTextBookmark */; - 665CDF0B0AFE84DD0030D605 /* PBXTextBookmark */ = 665CDF0B0AFE84DD0030D605 /* PBXTextBookmark */; 665CDF0C0AFE84DD0030D605 /* PBXTextBookmark */ = 665CDF0C0AFE84DD0030D605 /* PBXTextBookmark */; - 665CDF0E0AFE84DD0030D605 /* PBXTextBookmark */ = 665CDF0E0AFE84DD0030D605 /* PBXTextBookmark */; 665CDF0F0AFE84DD0030D605 /* PBXTextBookmark */ = 665CDF0F0AFE84DD0030D605 /* PBXTextBookmark */; - 665CDF350AFE87DA0030D605 /* PBXTextBookmark */ = 665CDF350AFE87DA0030D605 /* PBXTextBookmark */; 665CDF360AFE87DA0030D605 /* PBXTextBookmark */ = 665CDF360AFE87DA0030D605 /* PBXTextBookmark */; 665CDF370AFE87DA0030D605 /* PBXTextBookmark */ = 665CDF370AFE87DA0030D605 /* PBXTextBookmark */; - 665CDF380AFE87DA0030D605 /* PBXTextBookmark */ = 665CDF380AFE87DA0030D605 /* PBXTextBookmark */; - 665CDF390AFE87DA0030D605 /* PBXTextBookmark */ = 665CDF390AFE87DA0030D605 /* PBXTextBookmark */; 665CDF3B0AFE87DA0030D605 /* PBXTextBookmark */ = 665CDF3B0AFE87DA0030D605 /* PBXTextBookmark */; - 665CDF3D0AFE87DA0030D605 /* PBXTextBookmark */ = 665CDF3D0AFE87DA0030D605 /* PBXTextBookmark */; 665CDF400AFE87DA0030D605 /* PBXTextBookmark */ = 665CDF400AFE87DA0030D605 /* PBXTextBookmark */; 665CDF430AFE87DA0030D605 /* PBXTextBookmark */ = 665CDF430AFE87DA0030D605 /* PBXTextBookmark */; - 665CDF450AFE87DA0030D605 /* PBXTextBookmark */ = 665CDF450AFE87DA0030D605 /* PBXTextBookmark */; 665CDF470AFE87DA0030D605 /* PBXTextBookmark */ = 665CDF470AFE87DA0030D605 /* PBXTextBookmark */; - 665CDF4A0AFE87E70030D605 /* PBXTextBookmark */ = 665CDF4A0AFE87E70030D605 /* PBXTextBookmark */; 665CDF4F0AFE881D0030D605 /* PBXTextBookmark */ = 665CDF4F0AFE881D0030D605 /* PBXTextBookmark */; 665CDF530AFE881D0030D605 /* PBXTextBookmark */ = 665CDF530AFE881D0030D605 /* PBXTextBookmark */; - 665CDF590AFE88470030D605 /* PBXTextBookmark */ = 665CDF590AFE88470030D605 /* PBXTextBookmark */; 665CDF5B0AFE88470030D605 /* PBXTextBookmark */ = 665CDF5B0AFE88470030D605 /* PBXTextBookmark */; - 665CDF610AFE88720030D605 /* PBXTextBookmark */ = 665CDF610AFE88720030D605 /* PBXTextBookmark */; 665CDF690AFE88F40030D605 /* PBXTextBookmark */ = 665CDF690AFE88F40030D605 /* PBXTextBookmark */; 665CDF6A0AFE88F40030D605 /* PBXTextBookmark */ = 665CDF6A0AFE88F40030D605 /* PBXTextBookmark */; 665CDF6B0AFE88F40030D605 /* PBXTextBookmark */ = 665CDF6B0AFE88F40030D605 /* PBXTextBookmark */; 665CDF6C0AFE88F40030D605 /* PBXTextBookmark */ = 665CDF6C0AFE88F40030D605 /* PBXTextBookmark */; 665CDF6E0AFE88F40030D605 /* PBXTextBookmark */ = 665CDF6E0AFE88F40030D605 /* PBXTextBookmark */; 665CDF700AFE88F40030D605 /* PBXTextBookmark */ = 665CDF700AFE88F40030D605 /* PBXTextBookmark */; - 665CDF800AFE89C40030D605 /* PBXTextBookmark */ = 665CDF800AFE89C40030D605 /* PBXTextBookmark */; 665CDF810AFE89C40030D605 /* PBXTextBookmark */ = 665CDF810AFE89C40030D605 /* PBXTextBookmark */; 665CDF840AFE89C40030D605 /* PBXTextBookmark */ = 665CDF840AFE89C40030D605 /* PBXTextBookmark */; 665CDF860AFE89C40030D605 /* PBXTextBookmark */ = 665CDF860AFE89C40030D605 /* PBXTextBookmark */; 665CDF970AFE8CCF0030D605 /* PBXTextBookmark */ = 665CDF970AFE8CCF0030D605 /* PBXTextBookmark */; 665CDF980AFE8CCF0030D605 /* PBXTextBookmark */ = 665CDF980AFE8CCF0030D605 /* PBXTextBookmark */; - 665CDF990AFE8CCF0030D605 /* PBXTextBookmark */ = 665CDF990AFE8CCF0030D605 /* PBXTextBookmark */; 665CDF9B0AFE8CCF0030D605 /* PBXTextBookmark */ = 665CDF9B0AFE8CCF0030D605 /* PBXTextBookmark */; - 665CDF9C0AFE8CCF0030D605 /* PBXTextBookmark */ = 665CDF9C0AFE8CCF0030D605 /* PBXTextBookmark */; 665CDFA00AFE8CCF0030D605 /* PBXTextBookmark */ = 665CDFA00AFE8CCF0030D605 /* PBXTextBookmark */; - 665CDFA40AFE8CCF0030D605 /* PBXTextBookmark */ = 665CDFA40AFE8CCF0030D605 /* PBXTextBookmark */; - 665CDFA70AFE8CCF0030D605 /* PBXTextBookmark */ = 665CDFA70AFE8CCF0030D605 /* PBXTextBookmark */; 665CDFAF0AFE8E960030D605 /* PBXTextBookmark */ = 665CDFAF0AFE8E960030D605 /* PBXTextBookmark */; - 665CDFB90AFE900F0030D605 /* PBXTextBookmark */ = 665CDFB90AFE900F0030D605 /* PBXTextBookmark */; - 665CDFC70AFE90BD0030D605 /* PBXTextBookmark */ = 665CDFC70AFE90BD0030D605 /* PBXTextBookmark */; - 665CDFD30AFE90F50030D605 /* PBXTextBookmark */ = 665CDFD30AFE90F50030D605 /* PBXTextBookmark */; - 665CDFDB0AFE927D0030D605 /* PBXBookmark */ = 665CDFDB0AFE927D0030D605 /* PBXBookmark */; - 665CDFDC0AFE927D0030D605 /* PBXTextBookmark */ = 665CDFDC0AFE927D0030D605 /* PBXTextBookmark */; - 665CDFDF0AFE927D0030D605 /* PBXBookmark */ = 665CDFDF0AFE927D0030D605 /* PBXBookmark */; - 66C55B130AEECDBF002B666E /* PBXTextBookmark */ = 66C55B130AEECDBF002B666E /* PBXTextBookmark */; + 66C1FA230B09368000025143 /* PBXTextBookmark */ = 66C1FA230B09368000025143 /* PBXTextBookmark */; + 66C1FA240B09368000025143 /* PBXTextBookmark */ = 66C1FA240B09368000025143 /* PBXTextBookmark */; + 66C1FA250B09368000025143 /* PBXTextBookmark */ = 66C1FA250B09368000025143 /* PBXTextBookmark */; + 66C1FA260B09368000025143 /* PBXTextBookmark */ = 66C1FA260B09368000025143 /* PBXTextBookmark */; }; sourceControlManager = 664C028A0AD44C8C005C7BBB /* Source Control */; userBuildSettings = { }; }; - 6608DD090AFED45B008A0167 /* PBXTextBookmark */ = { + 66074C1D0B0933C5003103CE /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 665CDCFA0AFE7ED80030D605 /* rendermd2.cpp */; - name = "rendermd2.cpp: 1"; + fRef = 665CDCE00AFE7ED80030D605 /* bot.h */; + name = "bot.h: 63"; + rLen = 0; + rLoc = 1501; + rType = 0; + vrLen = 1184; + vrLoc = 1166; + }; + 66074C230B0933EB003103CE /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 665CDCE20AFE7ED80030D605 /* bot_util.cpp */; + name = "bot_util.cpp: 25"; + rLen = 0; + rLoc = 350; + rType = 0; + vrLen = 985; + vrLoc = 0; + }; + 66074C250B0933EB003103CE /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 665CDCE20AFE7ED80030D605 /* bot_util.cpp */; + name = "bot_util.cpp: 25"; + rLen = 0; + rLoc = 350; + rType = 0; + vrLen = 985; + vrLoc = 0; + }; + 66074C3B0B093555003103CE /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6638511F0B092A4800C6A735 /* md3.h */; + name = endian; + rLen = 6; + rLoc = 1803; + rType = 0; + vrLen = 1890; + vrLoc = 331; + }; + 66074C3F0B093555003103CE /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B96D0D6C0920976E00B6C936 /* main.m */; + name = "main.m: 1"; rLen = 0; rLoc = 0; rType = 0; - vrLen = 1531; - vrLoc = 8440; + vrLen = 255; + vrLoc = 0; }; - 6608DD0A0AFED45B008A0167 /* PBXTextBookmark */ = { + 66074C440B093555003103CE /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 665CDCFB0AFE7ED80030D605 /* rendermd3.cpp */; - name = "rendermd3.cpp: 500"; - rLen = 0; - rLoc = 15625; + fRef = 6638511F0B092A4800C6A735 /* md3.h */; + name = endian; + rLen = 6; + rLoc = 1803; rType = 0; - vrLen = 1973; - vrLoc = 11349; + vrLen = 1890; + vrLoc = 331; }; - 6608DD0B0AFED45B008A0167 /* PBXTextBookmark */ = { + 66074C480B093555003103CE /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 665CDCFB0AFE7ED80030D605 /* rendermd3.cpp */; - name = "rendermd3.cpp: 500"; - rLen = 0; - rLoc = 15625; - rType = 0; - vrLen = 1973; - vrLoc = 11349; - }; - 6608DD0C0AFED45B008A0167 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDCFA0AFE7ED80030D605 /* rendermd2.cpp */; - name = "rendermd2.cpp: 1"; + fRef = B96D0D6C0920976E00B6C936 /* main.m */; + name = "main.m: 1"; rLen = 0; rLoc = 0; rType = 0; - vrLen = 1531; - vrLoc = 8440; + vrLen = 255; + vrLoc = 0; + }; + 66074C4B0B09355E003103CE /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 665CDCE60AFE7ED80030D605 /* botmanager.cpp */; + name = "botmanager.cpp: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 621; + vrLoc = 0; }; 6608DD120AFED57F008A0167 /* PBXTextBookmark */ = { isa = PBXTextBookmark; @@ -271,64 +269,6 @@ vrLen = 1287; vrLoc = 5207; }; - 6608DD130AFED57F008A0167 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - comments = "error: 'frames' was not declared in this scope"; - fRef = 665CDCFB0AFE7ED80030D605 /* rendermd3.cpp */; - rLen = 0; - rLoc = 150; - rType = 1; - }; - 6608DD140AFED57F008A0167 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDCFB0AFE7ED80030D605 /* rendermd3.cpp */; - name = "rendermd3.cpp: 151"; - rLen = 0; - rLoc = 3463; - rType = 0; - vrLen = 1551; - vrLoc = 2806; - }; - 6608DD150AFED57F008A0167 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDD060AFE7ED80030D605 /* tools.h */; - name = "this->parent = gp();"; - rLen = 30; - rLoc = 5669; - rType = 0; - vrLen = 1287; - vrLoc = 5207; - }; - 6608DD2E0AFED669008A0167 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDCFB0AFE7ED80030D605 /* rendermd3.cpp */; - name = "rendermd3.cpp: load"; - rLen = 0; - rLoc = 5859; - rType = 0; - vrLen = 1419; - vrLoc = 5570; - }; - 6608DD2F0AFED669008A0167 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDCFB0AFE7ED80030D605 /* rendermd3.cpp */; - name = "rendermd3.cpp: 187"; - rLen = 0; - rLoc = 5160; - rType = 0; - vrLen = 1900; - vrLoc = 3992; - }; - 661FFAE00AFEC8AD00C77FFE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDF9D0AFE8CCF0030D605 /* SDLMain.m */; - name = "SDLMain.m: 1"; - rLen = 7698; - rLoc = 0; - rType = 0; - vrLen = 1029; - vrLoc = 346; - }; 661FFAE10AFEC8AD00C77FFE /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = F5A47A9E01A0483001D3D55B /* SDLMain.m */; @@ -339,36 +279,6 @@ vrLen = 1104; vrLoc = 1034; }; - 661FFAE40AFEC8AD00C77FFE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B96D0D580920970C00B6C936 /* Launcher.m */; - name = "Launcher.m: 46"; - rLen = 0; - rLoc = 1083; - rType = 0; - vrLen = 1138; - vrLoc = 1770; - }; - 661FFAE50AFEC8AD00C77FFE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDFE10AFE927D0030D605 /* serverbrowser.cpp */; - name = "serverbrowser.cpp: 5"; - rLen = 0; - rLoc = 152; - rType = 0; - vrLen = 1232; - vrLoc = 311; - }; - 661FFAE70AFEC8AD00C77FFE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDF9D0AFE8CCF0030D605 /* SDLMain.m */; - name = "SDLMain.m: 1"; - rLen = 7698; - rLoc = 0; - rType = 0; - vrLen = 1029; - vrLoc = 346; - }; 661FFAE80AFEC8AD00C77FFE /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 665CDD010AFE7ED80030D605 /* serverbrowser.cpp */; @@ -379,16 +289,6 @@ vrLen = 1168; vrLoc = 265; }; - 661FFAF50AFEC8AD00C77FFE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDFE10AFE927D0030D605 /* serverbrowser.cpp */; - name = "serverbrowser.cpp: 5"; - rLen = 0; - rLoc = 152; - rType = 0; - vrLen = 1232; - vrLoc = 311; - }; 661FFAFD0AFEC8FE00C77FFE /* PBXTextBookmark */ = { isa = PBXTextBookmark; comments = "warning: #warning haha"; @@ -397,16 +297,6 @@ rLoc = 34; rType = 1; }; - 661FFC700AFECE0900C77FFE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDD010AFE7ED80030D605 /* serverbrowser.cpp */; - name = "while (SDL_SemWaitTimeout(resolversem, 10) == SDL_MUTEX_TIMEDOUT) {pthread_testcancel();}"; - rLen = 93; - rLoc = 641; - rType = 0; - vrLen = 1245; - vrLoc = 202; - }; 661FFC710AFECE0900C77FFE /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 665CDC9F0AFE7ECD0030D605 /* unix.c */; @@ -478,76 +368,6 @@ path = /System/Library/Frameworks/AppKit.framework/Headers/NSBitmapImageRep.h; sourceTree = ""; }; - 661FFC790AFECE0900C77FFE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDCE00AFE7ED80030D605 /* bot.h */; - name = WIN32; - rLen = 5; - rLoc = 1473; - rType = 0; - vrLen = 1269; - vrLoc = 1175; - }; - 661FFC7A0AFECE0900C77FFE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDCE20AFE7ED80030D605 /* bot_util.cpp */; - name = WIN32; - rLen = 5; - rLoc = 215; - rType = 0; - vrLen = 1231; - vrLoc = 0; - }; - 661FFC7B0AFECE0900C77FFE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDCE60AFE7ED80030D605 /* botmanager.cpp */; - name = WIN32; - rLen = 5; - rLoc = 11869; - rType = 0; - vrLen = 1157; - vrLoc = 11157; - }; - 661FFC7C0AFECE0900C77FFE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDCEC0AFE7ED80030D605 /* console.cpp */; - name = WIN32; - rLen = 5; - rLoc = 3054; - rType = 0; - vrLen = 1303; - vrLoc = 2326; - }; - 661FFC7D0AFECE0900C77FFE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDCED0AFE7ED80030D605 /* cube.h */; - name = "cube.h: 481"; - rLen = 0; - rLoc = 16701; - rType = 0; - vrLen = 1231; - vrLoc = 16049; - }; - 661FFC7E0AFECE0900C77FFE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDCF90AFE7ED80030D605 /* rendergl.cpp */; - name = "rendergl.cpp: 25"; - rLen = 0; - rLoc = 562; - rType = 0; - vrLen = 1413; - vrLoc = 564; - }; - 661FFC7F0AFECE0900C77FFE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDF600AFE88720030D605 /* SDLMain.m */; - name = "SDLMain.m: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1366; - vrLoc = 1700; - }; 661FFC830AFECE0900C77FFE /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 665CDC9F0AFE7ECD0030D605 /* unix.c */; @@ -563,7 +383,7 @@ fRef = 665CDCE00AFE7ED80030D605 /* bot.h */; name = "bot.h: 64"; rLen = 0; - rLoc = 1578; + rLoc = 1571; rType = 0; vrLen = 1271; vrLoc = 1175; @@ -629,35 +449,66 @@ path = /System/Library/Frameworks/AppKit.framework/Headers/NSBitmapImageRep.h; sourceTree = ""; }; - 661FFCA00AFED0DE00C77FFE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B96D0D580920970C00B6C936 /* Launcher.m */; - name = "Launcher.m: 107"; - rLen = 0; - rLoc = 3093; - rType = 0; - vrLen = 1286; - vrLoc = 1814; + 6638511C0B092A3800C6A735 /* hudgun.cpp */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1595, 1932}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRect = "{{0, 0}, {1595, 602}}"; + }; }; - 661FFCA40AFED0DE00C77FFE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDCFB0AFE7ED80030D605 /* rendermd3.cpp */; - name = "rendermd3.cpp: 472"; - rLen = 0; - rLoc = 14900; - rType = 0; - vrLen = 1495; - vrLoc = 13947; + 6638511F0B092A4800C6A735 /* md3.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1594, 3528}}"; + sepNavSelRange = "{1803, 6}"; + sepNavVisRect = "{{0, 421}, {1594, 796}}"; + }; }; - 661FFCA50AFED0DE00C77FFE /* PBXTextBookmark */ = { + 663851220B092A5700C6A735 /* rendermodel.cpp */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1916, 2268}}"; + sepNavSelRange = "{259, 0}"; + sepNavVisRect = "{{0, 1472}, {1594, 796}}"; + }; + }; + 6638512A0B092FF200C6A735 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 665CDCFA0AFE7ED80030D605 /* rendermd2.cpp */; - name = "rendermd2.cpp: 1"; + fRef = 6638511C0B092A3800C6A735 /* hudgun.cpp */; + name = "hudgun.cpp: 1"; rLen = 0; rLoc = 0; rType = 0; - vrLen = 1106; - vrLoc = 8865; + vrLen = 1364; + vrLoc = 0; + }; + 6638512B0B092FF200C6A735 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 663851220B092A5700C6A735 /* rendermodel.cpp */; + name = "rendermodel.cpp: checkmdl"; + rLen = 0; + rLoc = 259; + rType = 0; + vrLen = 897; + vrLoc = 0; + }; + 6638512E0B092FF200C6A735 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6638511C0B092A3800C6A735 /* hudgun.cpp */; + name = "hudgun.cpp: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1364; + vrLoc = 0; + }; + 6638512F0B092FF200C6A735 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 663851220B092A5700C6A735 /* rendermodel.cpp */; + name = "rendermodel.cpp: checkmdl"; + rLen = 0; + rLoc = 259; + rType = 0; + vrLen = 897; + vrLoc = 0; }; 664C02710AD44C89005C7BBB /* actioncube */ = { isa = PBXExecutable; @@ -720,16 +571,6 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - 664C029C0AD45137005C7BBB /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B96D0D570920970C00B6C936 /* Launcher.h */; - name = advancedOptions; - rLen = 0; - rLoc = 180; - rType = 0; - vrLen = 180; - vrLoc = 0; - }; 664C02A20AD45137005C7BBB /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = B96D0D580920970C00B6C936 /* Launcher.m */; @@ -820,16 +661,16 @@ }; 665CDCE00AFE7ED80030D605 /* bot.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1594, 6062}}"; - sepNavSelRange = "{1473, 5}"; - sepNavVisRect = "{{0, 560}, {1594, 671}}"; + sepNavIntBoundsRect = "{{0, 0}, {1595, 5992}}"; + sepNavSelRange = "{1501, 0}"; + sepNavVisRect = "{{0, 630}, {1595, 602}}"; }; }; 665CDCE20AFE7ED80030D605 /* bot_util.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1594, 7896}}"; - sepNavSelRange = "{215, 5}"; - sepNavVisRect = "{{0, 0}, {1594, 671}}"; + sepNavIntBoundsRect = "{{0, 0}, {1595, 7322}}"; + sepNavSelRange = "{350, 0}"; + sepNavVisRect = "{{0, 0}, {1595, 602}}"; }; }; 665CDCE40AFE7ED80030D605 /* bot_waypoint.cpp */ = { @@ -841,23 +682,23 @@ }; 665CDCE60AFE7ED80030D605 /* botmanager.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1594, 20342}}"; - sepNavSelRange = "{11869, 5}"; - sepNavVisRect = "{{0, 6280}, {1594, 671}}"; + sepNavIntBoundsRect = "{{0, 0}, {1595, 18844}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRect = "{{0, 0}, {1595, 602}}"; }; }; 665CDCEC0AFE7ED80030D605 /* console.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1594, 3486}}"; - sepNavSelRange = "{3054, 5}"; - sepNavVisRect = "{{0, 1254}, {1594, 671}}"; + sepNavIntBoundsRect = "{{0, 0}, {1594, 5124}}"; + sepNavSelRange = "{4637, 14}"; + sepNavVisRect = "{{0, 2185}, {1594, 796}}"; }; }; 665CDCED0AFE7ED80030D605 /* cube.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1594, 7112}}"; - sepNavSelRange = "{16701, 0}"; - sepNavVisRect = "{{0, 6392}, {1594, 671}}"; + sepNavIntBoundsRect = "{{0, 0}, {2342, 8442}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRect = "{{0, 1116}, {1594, 796}}"; }; }; 665CDCF80AFE7ED80030D605 /* renderextras.cpp */ = { @@ -869,30 +710,16 @@ }; 665CDCF90AFE7ED80030D605 /* rendergl.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1594, 5936}}"; - sepNavSelRange = "{562, 0}"; - sepNavVisRect = "{{0, 369}, {1594, 671}}"; - }; - }; - 665CDCFA0AFE7ED80030D605 /* rendermd2.cpp */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1594, 5152}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRect = "{{0, 4356}, {1594, 796}}"; - }; - }; - 665CDCFB0AFE7ED80030D605 /* rendermd3.cpp */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1595, 7462}}"; - sepNavSelRange = "{5160, 0}"; - sepNavVisRect = "{{0, 2310}, {1595, 602}}"; + sepNavIntBoundsRect = "{{0, 0}, {1595, 6314}}"; + sepNavSelRange = "{363, 0}"; + sepNavVisRect = "{{0, 0}, {1595, 602}}"; }; }; 665CDD010AFE7ED80030D605 /* serverbrowser.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1594, 4326}}"; - sepNavSelRange = "{641, 93}"; - sepNavVisRect = "{{0, 148}, {1594, 671}}"; + sepNavIntBoundsRect = "{{0, 0}, {1594, 5306}}"; + sepNavSelRange = "{117, 5}"; + sepNavVisRect = "{{0, 0}, {1594, 796}}"; }; }; 665CDD040AFE7ED80030D605 /* sound.cpp */ = { @@ -904,9 +731,9 @@ }; 665CDD060AFE7ED80030D605 /* tools.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1595, 3920}}"; - sepNavSelRange = "{5669, 30}"; - sepNavVisRect = "{{0, 2968}, {1595, 602}}"; + sepNavIntBoundsRect = "{{0, 0}, {1594, 6230}}"; + sepNavSelRange = "{125, 0}"; + sepNavVisRect = "{{0, 0}, {1594, 796}}"; }; }; 665CDD090AFE7ED80030D605 /* worldio.cpp */ = { @@ -923,16 +750,6 @@ sepNavVisRect = "{{0, 0}, {1595, 602}}"; }; }; - 665CDD560AFE818B0030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDD480AFE7FB70030D605 /* actioncube-Info.plist */; - name = "actioncube-Info.plist: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 658; - vrLoc = 0; - }; 665CDD570AFE818B0030D605 /* PBXBookmark */ = { isa = PBXBookmark; fRef = 665CDD4A0AFE7FBD0030D605 /* actioncube.icns */; @@ -971,13 +788,6 @@ path = "/Developer/SDKs/MacOSX10.4u.sdk/usr/include/c++/4.0.0/backward/backward_warning.h"; sourceTree = ""; }; - 665CDD5F0AFE818B0030D605 /* zlib.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = zlib.h; - path = /Users/julianmayer/Desktop/ActionCube/source/xcode/../include/zlib.h; - sourceTree = ""; - }; 665CDD620AFE818B0030D605 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 665CDD480AFE7FB70030D605 /* actioncube-Info.plist */; @@ -1046,23 +856,6 @@ path = "/Developer/SDKs/MacOSX10.4u.sdk/usr/include/c++/4.0.0/backward/new.h"; sourceTree = ""; }; - 665CDD6D0AFE818B0030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDD6E0AFE818B0030D605 /* zlib.h */; - name = "deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream))"; - rLen = 76; - rLoc = 41744; - rType = 0; - vrLen = 1286; - vrLoc = 41054; - }; - 665CDD6E0AFE818B0030D605 /* zlib.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = zlib.h; - path = /Users/julianmayer/Desktop/ActionCube/source/xcode/../include/zlib.h; - sourceTree = ""; - }; 665CDD720AFE822E0030D605 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 665CDC9B0AFE7ECD0030D605 /* peer.c */; @@ -1073,16 +866,6 @@ vrLen = 1846; vrLoc = 13535; }; - 665CDD730AFE822E0030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDD5C0AFE818B0030D605 /* backward_warning.h */; - name = "#warning This file includes at least one deprecated or antiquated header. \\"; - rLen = 76; - rLoc = 1475; - rType = 0; - vrLen = 1853; - vrLoc = 0; - }; 665CDD740AFE822E0030D605 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 665CDCDD0AFE7ED80030D605 /* ac_bot.h */; @@ -1113,16 +896,6 @@ vrLen = 1031; vrLoc = 0; }; - 665CDED60AFE823A0030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDCDC0AFE7ED80030D605 /* ac_bot.cpp */; - name = "ac_bot.cpp: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1145; - vrLoc = 0; - }; 665CDED90AFE823A0030D605 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 665CDCDC0AFE7ED80030D605 /* ac_bot.cpp */; @@ -1163,26 +936,6 @@ vrLen = 1440; vrLoc = 3791; }; - 665CDEF10AFE83B90030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDD090AFE7ED80030D605 /* worldio.cpp */; - name = zlib; - rLen = 4; - rLoc = 3683; - rType = 0; - vrLen = 1631; - vrLoc = 2894; - }; - 665CDEF90AFE841A0030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDD5F0AFE818B0030D605 /* zlib.h */; - name = "deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream))"; - rLen = 76; - rLoc = 41744; - rType = 0; - vrLen = 1149; - vrLoc = 0; - }; 665CDEFA0AFE841A0030D605 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 665CDEFB0AFE841A0030D605 /* zlib.h */; @@ -1200,23 +953,6 @@ path = /usr/include/zlib.h; sourceTree = ""; }; - 665CDEFD0AFE841A0030D605 /* zconf.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = zconf.h; - path = /Users/julianmayer/Desktop/ActionCube/source/include/zconf.h; - sourceTree = ""; - }; - 665CDEFE0AFE841A0030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDD5F0AFE818B0030D605 /* zlib.h */; - name = "deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream))"; - rLen = 76; - rLoc = 41744; - rType = 0; - vrLen = 1149; - vrLoc = 0; - }; 665CDEFF0AFE841A0030D605 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 665CDF000AFE841A0030D605 /* zlib.h */; @@ -1234,46 +970,6 @@ path = /usr/include/zlib.h; sourceTree = ""; }; - 665CDF030AFE847D0030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDD5F0AFE818B0030D605 /* zlib.h */; - name = "zlib.h: 1358"; - rLen = 0; - rLoc = 66213; - rType = 0; - vrLen = 1486; - vrLoc = 0; - }; - 665CDF040AFE847D0030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDEFD0AFE841A0030D605 /* zconf.h */; - name = "zconf.h: 334"; - rLen = 0; - rLoc = 9591; - rType = 0; - vrLen = 1717; - vrLoc = 0; - }; - 665CDF060AFE847D0030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDEFD0AFE841A0030D605 /* zconf.h */; - name = "zconf.h: 334"; - rLen = 0; - rLoc = 9591; - rType = 0; - vrLen = 1717; - vrLoc = 0; - }; - 665CDF0B0AFE84DD0030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDEFD0AFE841A0030D605 /* zconf.h */; - name = "zconf.h: 334"; - rLen = 0; - rLoc = 9591; - rType = 0; - vrLen = 1890; - vrLoc = 0; - }; 665CDF0C0AFE84DD0030D605 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 665CDC9C0AFE7ECD0030D605 /* protocol.c */; @@ -1284,16 +980,6 @@ vrLen = 2817; vrLoc = 41098; }; - 665CDF0E0AFE84DD0030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDCE20AFE7ED80030D605 /* bot_util.cpp */; - name = __linux__; - rLen = 3; - rLoc = 215; - rType = 0; - vrLen = 1199; - vrLoc = 0; - }; 665CDF0F0AFE84DD0030D605 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 665CDC9C0AFE7ECD0030D605 /* protocol.c */; @@ -1304,16 +990,6 @@ vrLen = 2817; vrLoc = 41098; }; - 665CDF350AFE87DA0030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDCE20AFE7ED80030D605 /* bot_util.cpp */; - name = "bot_util.cpp: 18"; - rLen = 0; - rLoc = 223; - rType = 0; - vrLen = 943; - vrLoc = 0; - }; 665CDF360AFE87DA0030D605 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 665CDCEC0AFE7ED80030D605 /* console.cpp */; @@ -1334,33 +1010,6 @@ vrLen = 1853; vrLoc = 0; }; - 665CDF380AFE87DA0030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDCE60AFE7ED80030D605 /* botmanager.cpp */; - name = "botmanager.cpp: 1224"; - rLen = 0; - rLoc = 36034; - rType = 0; - vrLen = 1334; - vrLoc = 35245; - }; - 665CDF390AFE87DA0030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDF3A0AFE87DA0030D605 /* glext.h */; - name = GL_COMBINE_EXT; - rLen = 14; - rLoc = 72155; - rType = 0; - vrLen = 1854; - vrLoc = 71329; - }; - 665CDF3A0AFE87DA0030D605 /* glext.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = glext.h; - path = "/Applications/_Games/sauerbraten-cvs/sauerbraten/src/include/GL/glext.h"; - sourceTree = ""; - }; 665CDF3B0AFE87DA0030D605 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 665CDF3C0AFE87DA0030D605 /* glext.h */; @@ -1378,16 +1027,6 @@ path = /System/Library/Frameworks/OpenGL.framework/Versions/A/Headers/glext.h; sourceTree = ""; }; - 665CDF3D0AFE87DA0030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDCF90AFE7ED80030D605 /* rendergl.cpp */; - name = "rendergl.cpp: GL_SOURCE1_RGB_EXT"; - rLen = 0; - rLoc = 242; - rType = 0; - vrLen = 1030; - vrLoc = 0; - }; 665CDF400AFE87DA0030D605 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 665CDCEC0AFE7ED80030D605 /* console.cpp */; @@ -1403,48 +1042,21 @@ fRef = 665CDCE60AFE7ED80030D605 /* botmanager.cpp */; name = "botmanager.cpp: 1224"; rLen = 0; - rLoc = 36034; + rLoc = 35892; rType = 0; - vrLen = 1334; + vrLen = 652; vrLoc = 35245; }; - 665CDF450AFE87DA0030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDF460AFE87DA0030D605 /* glext.h */; - name = GL_COMBINE_EXT; - rLen = 14; - rLoc = 72155; - rType = 0; - vrLen = 1854; - vrLoc = 71329; - }; - 665CDF460AFE87DA0030D605 /* glext.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = glext.h; - path = "/Applications/_Games/sauerbraten-cvs/sauerbraten/src/include/GL/glext.h"; - sourceTree = ""; - }; 665CDF470AFE87DA0030D605 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 665CDCF90AFE7ED80030D605 /* rendergl.cpp */; name = "rendergl.cpp: GL_SOURCE1_RGB_EXT"; rLen = 0; - rLoc = 242; + rLoc = 249; rType = 0; vrLen = 1030; vrLoc = 0; }; - 665CDF4A0AFE87E70030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDD060AFE7ED80030D605 /* tools.h */; - name = hashtable; - rLen = 9; - rLoc = 5451; - rType = 0; - vrLen = 1412; - vrLoc = 5123; - }; 665CDF4F0AFE881D0030D605 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 665CDD040AFE7ED80030D605 /* sound.cpp */; @@ -1472,16 +1084,6 @@ path = /Library/Frameworks/SDL.framework/Headers/SDL_stdinc.h; sourceTree = ""; }; - 665CDF590AFE88470030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDF560AFE881D0030D605 /* SDL_stdinc.h */; - name = SDL_free; - rLen = 8; - rLoc = 4070; - rType = 0; - vrLen = 1028; - vrLoc = 3570; - }; 665CDF5B0AFE88470030D605 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 665CDF560AFE881D0030D605 /* SDL_stdinc.h */; @@ -1499,16 +1101,6 @@ path = /Users/julianmayer/Documents/Development/_MACPORTS/sauerbraten/src/xcode/SDLMain.m; sourceTree = ""; }; - 665CDF610AFE88720030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = F5A47A9E01A0483001D3D55B /* SDLMain.m */; - name = "SDLMain.m: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1393; - vrLoc = 0; - }; 665CDF690AFE88F40030D605 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 665CDF560AFE881D0030D605 /* SDL_stdinc.h */; @@ -1569,16 +1161,6 @@ vrLen = 1168; vrLoc = 0; }; - 665CDF800AFE89C40030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = F5A47A9E01A0483001D3D55B /* SDLMain.m */; - name = "SDLMain.m: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1393; - vrLoc = 0; - }; 665CDF810AFE89C40030D605 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 665CDCDE0AFE7ED80030D605 /* ac_bot_ai.cpp */; @@ -1629,23 +1211,6 @@ vrLen = 308; vrLoc = 0; }; - 665CDF990AFE8CCF0030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDF9A0AFE8CCF0030D605 /* SDLMain.h */; - name = "(null): 1"; - rLen = 307; - rLoc = 0; - rType = 0; - vrLen = 307; - vrLoc = 0; - }; - 665CDF9A0AFE8CCF0030D605 /* SDLMain.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = SDLMain.h; - path = /Users/julianmayer/Desktop/Cube/cube_source/xcode/SDLMain.h; - sourceTree = ""; - }; 665CDF9B0AFE8CCF0030D605 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = F5A47A9D01A0482F01D3D55B /* SDLMain.h */; @@ -1656,23 +1221,6 @@ vrLen = 307; vrLoc = 0; }; - 665CDF9C0AFE8CCF0030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDF9D0AFE8CCF0030D605 /* SDLMain.m */; - name = "(null): 1"; - rLen = 7698; - rLoc = 0; - rType = 0; - vrLen = 1109; - vrLoc = 0; - }; - 665CDF9D0AFE8CCF0030D605 /* SDLMain.m */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = SDLMain.m; - path = /Users/julianmayer/Desktop/Cube/cube_source/xcode/SDLMain.m; - sourceTree = ""; - }; 665CDFA00AFE8CCF0030D605 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 665CDCE40AFE7ED80030D605 /* bot_waypoint.cpp */; @@ -1683,40 +1231,6 @@ vrLen = 1833; vrLoc = 2335; }; - 665CDFA40AFE8CCF0030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDFA50AFE8CCF0030D605 /* SDLMain.h */; - name = "(null): 1"; - rLen = 307; - rLoc = 0; - rType = 0; - vrLen = 307; - vrLoc = 0; - }; - 665CDFA50AFE8CCF0030D605 /* SDLMain.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = SDLMain.h; - path = /Users/julianmayer/Desktop/Cube/cube_source/xcode/SDLMain.h; - sourceTree = ""; - }; - 665CDFA70AFE8CCF0030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 665CDFA80AFE8CCF0030D605 /* SDLMain.m */; - name = "(null): 1"; - rLen = 7698; - rLoc = 0; - rType = 0; - vrLen = 1109; - vrLoc = 0; - }; - 665CDFA80AFE8CCF0030D605 /* SDLMain.m */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = SDLMain.m; - path = /Users/julianmayer/Desktop/Cube/cube_source/xcode/SDLMain.m; - sourceTree = ""; - }; 665CDFAF0AFE8E960030D605 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = B96D0D570920970C00B6C936 /* Launcher.h */; @@ -1727,76 +1241,44 @@ vrLen = 180; vrLoc = 0; }; - 665CDFB90AFE900F0030D605 /* PBXTextBookmark */ = { + 66C1FA230B09368000025143 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 665CDCE40AFE7ED80030D605 /* bot_waypoint.cpp */; - name = "bot_waypoint.cpp: 108"; + fRef = 665CDCF90AFE7ED80030D605 /* rendergl.cpp */; + name = "rendergl.cpp: 13"; rLen = 0; - rLoc = 2974; + rLoc = 363; rType = 0; - vrLen = 2030; - vrLoc = 2247; - }; - 665CDFC70AFE90BD0030D605 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B9CACA12092099DF00A13F04 /* launcher-Info.plist */; - name = "launcher-Info.plist: 29"; - rLen = 0; - rLoc = 804; - rType = 0; - vrLen = 1167; + vrLen = 1063; vrLoc = 0; }; - 665CDFD30AFE90F50030D605 /* PBXTextBookmark */ = { + 66C1FA240B09368000025143 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 089C165DFE840E0CC02AAC07 /* English */; - name = "English: 7"; + fRef = B96D0D580920970C00B6C936 /* Launcher.m */; + name = "Launcher.m: 46"; rLen = 0; - rLoc = 308; + rLoc = 1083; rType = 0; - vrLen = 308; + vrLen = 1238; + vrLoc = 1522; + }; + 66C1FA250B09368000025143 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 665CDCF90AFE7ED80030D605 /* rendergl.cpp */; + name = "rendergl.cpp: 13"; + rLen = 0; + rLoc = 363; + rType = 0; + vrLen = 1063; vrLoc = 0; }; - 665CDFDB0AFE927D0030D605 /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 665CDD4A0AFE7FBD0030D605 /* actioncube.icns */; - }; - 665CDFDC0AFE927D0030D605 /* PBXTextBookmark */ = { + 66C1FA260B09368000025143 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 665CDFDD0AFE927D0030D605 /* serverbrowser.cpp */; - name = "while (SDL_SemWaitTimeout(resolversem, 10) == SDL_MUTEX_TIMEDOUT) {pthread_testcancel();}"; - rLen = 89; - rLoc = 630; - rType = 0; - vrLen = 1243; - vrLoc = 0; - }; - 665CDFDD0AFE927D0030D605 /* serverbrowser.cpp */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.cpp.cpp; - name = serverbrowser.cpp; - path = /Users/julianmayer/Desktop/Cube/cube_source/src/serverbrowser.cpp; - sourceTree = ""; - }; - 665CDFDF0AFE927D0030D605 /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 665CDD4A0AFE7FBD0030D605 /* actioncube.icns */; - }; - 665CDFE10AFE927D0030D605 /* serverbrowser.cpp */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.cpp.cpp; - name = serverbrowser.cpp; - path = /Users/julianmayer/Desktop/Cube/cube_source/src/serverbrowser.cpp; - sourceTree = ""; - }; - 66C55B130AEECDBF002B666E /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = F5A47A9D01A0482F01D3D55B /* SDLMain.h */; - name = "SDLMain.h: 1"; + fRef = B96D0D580920970C00B6C936 /* Launcher.m */; + name = "Launcher.m: 6"; rLen = 0; - rLoc = 0; + rLoc = 119; rType = 0; - vrLen = 307; + vrLen = 1047; vrLoc = 0; }; B941988A09207E810029DAD1 /* actioncube */ = { @@ -1820,12 +1302,19 @@ }; B96D0D580920970C00B6C936 /* Launcher.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1594, 1526}}"; - sepNavSelRange = "{3093, 0}"; - sepNavVisRect = "{{0, 855}, {1594, 671}}"; + sepNavIntBoundsRect = "{{0, 0}, {1595, 1526}}"; + sepNavSelRange = "{119, 0}"; + sepNavVisRect = "{{0, 0}, {1595, 602}}"; sepNavWindowFrame = "{{15, -5}, {750, 1178}}"; }; }; + B96D0D6C0920976E00B6C936 /* main.m */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1594, 796}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRect = "{{0, 0}, {1594, 796}}"; + }; + }; B9CACA12092099DF00A13F04 /* launcher-Info.plist */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1594, 671}}"; diff --git a/source/xcode/actioncube.xcodeproj/julianmayer.perspective b/source/xcode/actioncube.xcodeproj/julianmayer.perspective index 7e771455..0855f476 100644 --- a/source/xcode/actioncube.xcodeproj/julianmayer.perspective +++ b/source/xcode/actioncube.xcodeproj/julianmayer.perspective @@ -272,9 +272,8 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 29 - 9 - 7 + 4 + 1 0 @@ -310,7 +309,7 @@ PBXProjectModuleGUID 664C02840AD44C8C005C7BBB PBXProjectModuleLabel - rendermd3.cpp + Launcher.m PBXSplitModuleInNavigatorKey Split0 @@ -318,56 +317,52 @@ PBXProjectModuleGUID 664C02850AD44C8C005C7BBB PBXProjectModuleLabel - rendermd3.cpp + Launcher.m _historyCapacity 0 bookmark - 6608DD2E0AFED669008A0167 + 66074C4A0B09355E003103CE history - 664C029C0AD45137005C7BBB - 66C55B130AEECDBF002B666E - 665CDD560AFE818B0030D605 665CDD590AFE818B0030D605 665CDD720AFE822E0030D605 - 665CDD730AFE822E0030D605 665CDD740AFE822E0030D605 - 665CDED60AFE823A0030D605 - 665CDEF10AFE83B90030D605 - 665CDEF90AFE841A0030D605 665CDEFA0AFE841A0030D605 - 665CDF0B0AFE84DD0030D605 665CDF0C0AFE84DD0030D605 - 665CDF390AFE87DA0030D605 665CDF3B0AFE87DA0030D605 - 665CDF4A0AFE87E70030D605 665CDF4F0AFE881D0030D605 - 665CDF590AFE88470030D605 - 665CDF800AFE89C40030D605 665CDF810AFE89C40030D605 - 665CDF990AFE8CCF0030D605 - 665CDF9C0AFE8CCF0030D605 - 665CDFB90AFE900F0030D605 - 665CDFC70AFE90BD0030D605 - 665CDFD30AFE90F50030D605 - 665CDFDB0AFE927D0030D605 - 665CDFDC0AFE927D0030D605 - 661FFC700AFECE0900C77FFE 661FFC710AFECE0900C77FFE 661FFC720AFECE0900C77FFE 661FFC730AFECE0900C77FFE 661FFC750AFECE0900C77FFE 661FFC770AFECE0900C77FFE 661FFC790AFECE0900C77FFE - 661FFC7A0AFECE0900C77FFE - 661FFC7B0AFECE0900C77FFE - 661FFC7C0AFECE0900C77FFE - 661FFC7D0AFECE0900C77FFE - 661FFC7E0AFECE0900C77FFE - 661FFC7F0AFECE0900C77FFE - 661FFCA00AFED0DE00C77FFE - 6608DD090AFED45B008A0167 - 6608DD0A0AFED45B008A0167 + 665CDD570AFE818B0030D605 + 665CDEE60AFE832D0030D605 + 665CDEE70AFE832D0030D605 + 665CDF370AFE87DA0030D605 + 665CDF690AFE88F40030D605 + 665CDF6A0AFE88F40030D605 + 665CDF6B0AFE88F40030D605 + 665CDF6C0AFE88F40030D605 + 665CDF970AFE8CCF0030D605 + 665CDF980AFE8CCF0030D605 + 665CDF9B0AFE8CCF0030D605 + 665CDFAF0AFE8E960030D605 + 661FFAE10AFEC8AD00C77FFE + 6638512A0B092FF200C6A735 + 66074C230B0933EB003103CE + 66074C370B093555003103CE + 66074C380B093555003103CE + 66074C390B093555003103CE + 66074C3A0B093555003103CE + 66074C3B0B093555003103CE + 66074C3C0B093555003103CE + 66074C3D0B093555003103CE + 66074C3E0B093555003103CE + 66074C3F0B093555003103CE + 663851290B092FF200C6A735 prevStack @@ -383,38 +378,39 @@ 665CDD780AFE822E0030D605 665CDED90AFE823A0030D605 665CDEDB0AFE823A0030D605 - 665CDEFE0AFE841A0030D605 665CDEFF0AFE841A0030D605 - 665CDF060AFE847D0030D605 665CDF0E0AFE84DD0030D605 665CDF0F0AFE84DD0030D605 665CDF400AFE87DA0030D605 665CDF430AFE87DA0030D605 - 665CDF450AFE87DA0030D605 665CDF470AFE87DA0030D605 665CDF530AFE881D0030D605 665CDF5B0AFE88470030D605 - 665CDF610AFE88720030D605 665CDF6E0AFE88F40030D605 665CDF700AFE88F40030D605 665CDF840AFE89C40030D605 665CDF860AFE89C40030D605 665CDFA00AFE8CCF0030D605 - 665CDFA40AFE8CCF0030D605 - 665CDFA70AFE8CCF0030D605 - 665CDFDF0AFE927D0030D605 661FFAE80AFEC8AD00C77FFE - 661FFAF50AFEC8AD00C77FFE 661FFC830AFECE0900C77FFE 661FFC840AFECE0900C77FFE 661FFC860AFECE0900C77FFE 661FFC870AFECE0900C77FFE 661FFC8C0AFECE0900C77FFE 661FFC8E0AFECE0900C77FFE - 661FFCA40AFED0DE00C77FFE - 661FFCA50AFED0DE00C77FFE - 6608DD0B0AFED45B008A0167 - 6608DD0C0AFED45B008A0167 + 664C02AA0AD45137005C7BBB + 665CDD630AFE818B0030D605 + 6638512E0B092FF200C6A735 + 6638512F0B092FF200C6A735 + 66074C400B093555003103CE + 66074C410B093555003103CE + 66074C420B093555003103CE + 66074C430B093555003103CE + 66074C440B093555003103CE + 66074C450B093555003103CE + 66074C460B093555003103CE + 66074C470B093555003103CE + 66074C480B093555003103CE SplitCount @@ -451,7 +447,7 @@ GeometryConfiguration Frame - {{10, 27}, {1641, 222}} + {{10, 27}, {0, -27}} Module XCDetailModule @@ -467,7 +463,7 @@ GeometryConfiguration Frame - {{10, 27}, {1641, 347}} + {{10, 27}, {1641, 222}} Module PBXProjectFindModule @@ -510,11 +506,11 @@ TableOfContents - 6608DCF00AFED248008A0167 + 66074C280B0933F0003103CE 1CA23ED40692098700951B8B - 6608DCF10AFED248008A0167 + 66074C290B0933F0003103CE 664C02840AD44C8C005C7BBB - 6608DCF20AFED248008A0167 + 66074C2A0B0933F0003103CE 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -577,9 +573,6 @@ 080E96DDFE201D6D7F000001 29B97315FDCFA39411CA2CEA 29B97317FDCFA39411CA2CEA - 29B97323FDCFA39411CA2CEA - 1058C7A0FEA54F0111CA2CBB - 1058C7A2FEA54F0111CA2CBB 19C28FACFE9D520D11CA2CBB PBXSmartGroupTreeModuleOutlineStateSelectionKey @@ -619,12 +612,14 @@ Dock + BecomeActive + ContentConfiguration PBXProjectModuleGUID 664C02840AD44C8C005C7BBB PBXProjectModuleLabel - rendermd3.cpp + Launcher.m PBXSplitModuleInNavigatorKey Split0 @@ -632,11 +627,11 @@ PBXProjectModuleGUID 664C02850AD44C8C005C7BBB PBXProjectModuleLabel - rendermd3.cpp + Launcher.m _historyCapacity 0 bookmark - 6608DD2F0AFED669008A0167 + 66C1FA260B09368000025143 history 665CDD570AFE818B0030D605 @@ -647,16 +642,10 @@ 665CDEE60AFE832D0030D605 665CDEE70AFE832D0030D605 665CDEFA0AFE841A0030D605 - 665CDF030AFE847D0030D605 - 665CDF040AFE847D0030D605 665CDF0C0AFE84DD0030D605 - 665CDF350AFE87DA0030D605 665CDF360AFE87DA0030D605 665CDF370AFE87DA0030D605 - 665CDF380AFE87DA0030D605 - 665CDF390AFE87DA0030D605 665CDF3B0AFE87DA0030D605 - 665CDF3D0AFE87DA0030D605 665CDF4F0AFE881D0030D605 665CDF690AFE88F40030D605 665CDF6A0AFE88F40030D605 @@ -665,23 +654,25 @@ 665CDF810AFE89C40030D605 665CDF970AFE8CCF0030D605 665CDF980AFE8CCF0030D605 - 665CDF990AFE8CCF0030D605 665CDF9B0AFE8CCF0030D605 665CDFAF0AFE8E960030D605 - 661FFAE00AFEC8AD00C77FFE 661FFAE10AFEC8AD00C77FFE - 661FFAE40AFEC8AD00C77FFE - 661FFAE50AFEC8AD00C77FFE 661FFAFD0AFEC8FE00C77FFE 661FFC710AFECE0900C77FFE 661FFC720AFECE0900C77FFE 661FFC730AFECE0900C77FFE 661FFC750AFECE0900C77FFE 661FFC770AFECE0900C77FFE - 661FFC790AFECE0900C77FFE - 6608DD090AFED45B008A0167 6608DD120AFED57F008A0167 - 6608DD130AFED57F008A0167 + 6638512A0B092FF200C6A735 + 6638512B0B092FF200C6A735 + 66074C1D0B0933C5003103CE + 66074C230B0933EB003103CE + 66074C3B0B093555003103CE + 66074C3F0B093555003103CE + 66074C4B0B09355E003103CE + 66C1FA230B09368000025143 + 66C1FA240B09368000025143 prevStack @@ -695,18 +686,14 @@ 665CDD650AFE818B0030D605 665CDD670AFE818B0030D605 665CDD680AFE818B0030D605 - 665CDD6D0AFE818B0030D605 665CDD760AFE822E0030D605 665CDD780AFE822E0030D605 665CDED90AFE823A0030D605 665CDEDB0AFE823A0030D605 665CDEFF0AFE841A0030D605 - 665CDF060AFE847D0030D605 - 665CDF0E0AFE84DD0030D605 665CDF0F0AFE84DD0030D605 665CDF400AFE87DA0030D605 665CDF430AFE87DA0030D605 - 665CDF450AFE87DA0030D605 665CDF470AFE87DA0030D605 665CDF530AFE881D0030D605 665CDF5B0AFE88470030D605 @@ -715,20 +702,19 @@ 665CDF840AFE89C40030D605 665CDF860AFE89C40030D605 665CDFA00AFE8CCF0030D605 - 665CDFA40AFE8CCF0030D605 - 661FFAE70AFEC8AD00C77FFE 661FFAE80AFEC8AD00C77FFE - 661FFAF50AFEC8AD00C77FFE 661FFC830AFECE0900C77FFE 661FFC840AFECE0900C77FFE 661FFC860AFECE0900C77FFE 661FFC870AFECE0900C77FFE 661FFC8C0AFECE0900C77FFE 661FFC8E0AFECE0900C77FFE - 661FFCA40AFED0DE00C77FFE - 661FFCA50AFED0DE00C77FFE - 6608DD140AFED57F008A0167 - 6608DD150AFED57F008A0167 + 6638512E0B092FF200C6A735 + 6638512F0B092FF200C6A735 + 66074C250B0933EB003103CE + 66074C440B093555003103CE + 66074C480B093555003103CE + 66C1FA250B09368000025143 SplitCount @@ -757,8 +743,6 @@ Tabs - BecomeActive - ContentConfiguration PBXProjectModuleGUID @@ -855,14 +839,14 @@ TableOfContents - 6608DD170AFED57F008A0167 + 66C1FA1F0B0935F900025143 1CA23EE50692099D00951B8B - 6608DD180AFED57F008A0167 + 66C1FA200B0935F900025143 664C02840AD44C8C005C7BBB - 6608DD190AFED57F008A0167 + 66C1FA210B0935F900025143 XCMainBuildResultsModuleGUID 1CA23EE80692099D00951B8B - 6608DD1A0AFED57F008A0167 + 66C1FA220B0935F900025143 ToolbarConfiguration xcode.toolbar.config.buildAndRun @@ -1031,7 +1015,7 @@ 5 WindowOrderList - /Users/julianmayer/Desktop/ActionCube/source/xcode/actioncube.xcodeproj + /Users/julianmayer/Documents/Development/_MACPORTS/ac/source/xcode/actioncube.xcodeproj WindowString -1 55 1848 1123 0 0 1920 1178 diff --git a/source/xcode/actioncube.xcodeproj/project.pbxproj b/source/xcode/actioncube.xcodeproj/project.pbxproj index 314554d0..3f2bd8cb 100644 --- a/source/xcode/actioncube.xcodeproj/project.pbxproj +++ b/source/xcode/actioncube.xcodeproj/project.pbxproj @@ -7,10 +7,15 @@ objects = { /* Begin PBXBuildFile section */ + 6638511D0B092A3800C6A735 /* hudgun.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6638511C0B092A3800C6A735 /* hudgun.cpp */; }; + 663851200B092A4800C6A735 /* md2.h in Headers */ = {isa = PBXBuildFile; fileRef = 6638511E0B092A4800C6A735 /* md2.h */; }; + 663851210B092A4800C6A735 /* md3.h in Headers */ = {isa = PBXBuildFile; fileRef = 6638511F0B092A4800C6A735 /* md3.h */; }; + 663851230B092A5700C6A735 /* rendermodel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 663851220B092A5700C6A735 /* rendermodel.cpp */; }; + 663851260B092A7500C6A735 /* tristrip.h in Headers */ = {isa = PBXBuildFile; fileRef = 663851240B092A7500C6A735 /* tristrip.h */; }; + 663851270B092A7500C6A735 /* vertmodel.h in Headers */ = {isa = PBXBuildFile; fileRef = 663851250B092A7500C6A735 /* vertmodel.h */; }; 665CDCA60AFE7ECD0030D605 /* callbacks.c in Sources */ = {isa = PBXBuildFile; fileRef = 665CDC6B0AFE7ECC0030D605 /* callbacks.c */; }; 665CDCB80AFE7ECD0030D605 /* host.c in Sources */ = {isa = PBXBuildFile; fileRef = 665CDC7E0AFE7ECD0030D605 /* host.c */; }; 665CDCCB0AFE7ECD0030D605 /* list.c in Sources */ = {isa = PBXBuildFile; fileRef = 665CDC930AFE7ECD0030D605 /* list.c */; }; - 665CDCCF0AFE7ECD0030D605 /* memory.c in Sources */ = {isa = PBXBuildFile; fileRef = 665CDC970AFE7ECD0030D605 /* memory.c */; }; 665CDCD20AFE7ECD0030D605 /* packet.c in Sources */ = {isa = PBXBuildFile; fileRef = 665CDC9A0AFE7ECD0030D605 /* packet.c */; }; 665CDCD30AFE7ECD0030D605 /* peer.c in Sources */ = {isa = PBXBuildFile; fileRef = 665CDC9B0AFE7ECD0030D605 /* peer.c */; }; 665CDCD40AFE7ECD0030D605 /* protocol.c in Sources */ = {isa = PBXBuildFile; fileRef = 665CDC9C0AFE7ECD0030D605 /* protocol.c */; }; @@ -44,8 +49,6 @@ 665CDD290AFE7ED80030D605 /* rendercubes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 665CDCF70AFE7ED80030D605 /* rendercubes.cpp */; }; 665CDD2A0AFE7ED80030D605 /* renderextras.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 665CDCF80AFE7ED80030D605 /* renderextras.cpp */; }; 665CDD2B0AFE7ED80030D605 /* rendergl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 665CDCF90AFE7ED80030D605 /* rendergl.cpp */; }; - 665CDD2C0AFE7ED80030D605 /* rendermd2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 665CDCFA0AFE7ED80030D605 /* rendermd2.cpp */; }; - 665CDD2D0AFE7ED80030D605 /* rendermd3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 665CDCFB0AFE7ED80030D605 /* rendermd3.cpp */; }; 665CDD2E0AFE7ED80030D605 /* renderparticles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 665CDCFC0AFE7ED80030D605 /* renderparticles.cpp */; }; 665CDD2F0AFE7ED80030D605 /* rendertext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 665CDCFD0AFE7ED80030D605 /* rendertext.cpp */; }; 665CDD300AFE7ED80030D605 /* rndmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 665CDCFE0AFE7ED80030D605 /* rndmap.cpp */; }; @@ -96,10 +99,15 @@ 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; + 6638511C0B092A3800C6A735 /* hudgun.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hudgun.cpp; sourceTree = ""; }; + 6638511E0B092A4800C6A735 /* md2.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = md2.h; sourceTree = ""; }; + 6638511F0B092A4800C6A735 /* md3.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = md3.h; sourceTree = ""; }; + 663851220B092A5700C6A735 /* rendermodel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = rendermodel.cpp; sourceTree = ""; }; + 663851240B092A7500C6A735 /* tristrip.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = tristrip.h; sourceTree = ""; }; + 663851250B092A7500C6A735 /* vertmodel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = vertmodel.h; sourceTree = ""; }; 665CDC6B0AFE7ECC0030D605 /* callbacks.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = callbacks.c; sourceTree = ""; }; 665CDC7E0AFE7ECD0030D605 /* host.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = host.c; sourceTree = ""; }; 665CDC930AFE7ECD0030D605 /* list.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = list.c; sourceTree = ""; }; - 665CDC970AFE7ECD0030D605 /* memory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = memory.c; sourceTree = ""; }; 665CDC9A0AFE7ECD0030D605 /* packet.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = packet.c; sourceTree = ""; }; 665CDC9B0AFE7ECD0030D605 /* peer.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = peer.c; sourceTree = ""; }; 665CDC9C0AFE7ECD0030D605 /* protocol.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = protocol.c; sourceTree = ""; }; @@ -133,8 +141,6 @@ 665CDCF70AFE7ED80030D605 /* rendercubes.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = rendercubes.cpp; sourceTree = ""; }; 665CDCF80AFE7ED80030D605 /* renderextras.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = renderextras.cpp; sourceTree = ""; }; 665CDCF90AFE7ED80030D605 /* rendergl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = rendergl.cpp; sourceTree = ""; }; - 665CDCFA0AFE7ED80030D605 /* rendermd2.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = rendermd2.cpp; sourceTree = ""; }; - 665CDCFB0AFE7ED80030D605 /* rendermd3.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = rendermd3.cpp; sourceTree = ""; }; 665CDCFC0AFE7ED80030D605 /* renderparticles.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = renderparticles.cpp; sourceTree = ""; }; 665CDCFD0AFE7ED80030D605 /* rendertext.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = rendertext.cpp; sourceTree = ""; }; 665CDCFE0AFE7ED80030D605 /* rndmap.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = rndmap.cpp; sourceTree = ""; }; @@ -158,7 +164,7 @@ B92DC0F909D08CF9008219BD /* SDL_image.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL_image.framework; path = /Library/Frameworks/SDL_image.framework; sourceTree = ""; }; B92DC0FA09D08CF9008219BD /* SDL_mixer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL_mixer.framework; path = /Library/Frameworks/SDL_mixer.framework; sourceTree = ""; }; B92DC0FB09D08CF9008219BD /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL.framework; path = /Library/Frameworks/SDL.framework; sourceTree = ""; }; - B94198CB09207E810029DAD1 /* actioncube.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = actioncube.app; sourceTree = BUILT_PRODUCTS_DIR; }; + B94198CB09207E810029DAD1 /* actioncube.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = actioncube.app; sourceTree = BUILT_PRODUCTS_DIR; }; B96D0D4C092096F200B6C936 /* launcher.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = launcher.app; sourceTree = BUILT_PRODUCTS_DIR; }; B96D0D570920970C00B6C936 /* Launcher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Launcher.h; sourceTree = ""; }; B96D0D580920970C00B6C936 /* Launcher.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = Launcher.m; sourceTree = ""; }; @@ -282,7 +288,6 @@ 665CDC6B0AFE7ECC0030D605 /* callbacks.c */, 665CDC7E0AFE7ECD0030D605 /* host.c */, 665CDC930AFE7ECD0030D605 /* list.c */, - 665CDC970AFE7ECD0030D605 /* memory.c */, 665CDC9A0AFE7ECD0030D605 /* packet.c */, 665CDC9B0AFE7ECD0030D605 /* peer.c */, 665CDC9C0AFE7ECD0030D605 /* protocol.c */, @@ -306,7 +311,10 @@ 665CDCED0AFE7ED80030D605 /* cube.h */, 665CDCEF0AFE7ED80030D605 /* editing.cpp */, 665CDCF00AFE7ED80030D605 /* entities.cpp */, + 6638511C0B092A3800C6A735 /* hudgun.cpp */, 665CDCF10AFE7ED80030D605 /* main.cpp */, + 6638511E0B092A4800C6A735 /* md2.h */, + 6638511F0B092A4800C6A735 /* md3.h */, 665CDCF30AFE7ED80030D605 /* menus.cpp */, 665CDCF40AFE7ED80030D605 /* pch.cpp */, 665CDCF50AFE7ED80030D605 /* physics.cpp */, @@ -314,8 +322,7 @@ 665CDCF70AFE7ED80030D605 /* rendercubes.cpp */, 665CDCF80AFE7ED80030D605 /* renderextras.cpp */, 665CDCF90AFE7ED80030D605 /* rendergl.cpp */, - 665CDCFA0AFE7ED80030D605 /* rendermd2.cpp */, - 665CDCFB0AFE7ED80030D605 /* rendermd3.cpp */, + 663851220B092A5700C6A735 /* rendermodel.cpp */, 665CDCFC0AFE7ED80030D605 /* renderparticles.cpp */, 665CDCFD0AFE7ED80030D605 /* rendertext.cpp */, 665CDCFE0AFE7ED80030D605 /* rndmap.cpp */, @@ -327,6 +334,8 @@ 665CDD040AFE7ED80030D605 /* sound.cpp */, 665CDD050AFE7ED80030D605 /* tools.cpp */, 665CDD060AFE7ED80030D605 /* tools.h */, + 663851240B092A7500C6A735 /* tristrip.h */, + 663851250B092A7500C6A735 /* vertmodel.h */, 665CDD070AFE7ED80030D605 /* weapon.cpp */, 665CDD080AFE7ED80030D605 /* world.cpp */, 665CDD090AFE7ED80030D605 /* worldio.cpp */, @@ -371,6 +380,10 @@ 665CDD1F0AFE7ED80030D605 /* cube.h in Headers */, 665CDD280AFE7ED80030D605 /* protos.h in Headers */, 665CDD380AFE7ED80030D605 /* tools.h in Headers */, + 663851200B092A4800C6A735 /* md2.h in Headers */, + 663851210B092A4800C6A735 /* md3.h in Headers */, + 663851260B092A7500C6A735 /* tristrip.h in Headers */, + 663851270B092A7500C6A735 /* vertmodel.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -480,7 +493,6 @@ 665CDCA60AFE7ECD0030D605 /* callbacks.c in Sources */, 665CDCB80AFE7ECD0030D605 /* host.c in Sources */, 665CDCCB0AFE7ECD0030D605 /* list.c in Sources */, - 665CDCCF0AFE7ECD0030D605 /* memory.c in Sources */, 665CDCD20AFE7ECD0030D605 /* packet.c in Sources */, 665CDCD30AFE7ECD0030D605 /* peer.c in Sources */, 665CDCD40AFE7ECD0030D605 /* protocol.c in Sources */, @@ -508,8 +520,6 @@ 665CDD290AFE7ED80030D605 /* rendercubes.cpp in Sources */, 665CDD2A0AFE7ED80030D605 /* renderextras.cpp in Sources */, 665CDD2B0AFE7ED80030D605 /* rendergl.cpp in Sources */, - 665CDD2C0AFE7ED80030D605 /* rendermd2.cpp in Sources */, - 665CDD2D0AFE7ED80030D605 /* rendermd3.cpp in Sources */, 665CDD2E0AFE7ED80030D605 /* renderparticles.cpp in Sources */, 665CDD2F0AFE7ED80030D605 /* rendertext.cpp in Sources */, 665CDD300AFE7ED80030D605 /* rndmap.cpp in Sources */, @@ -526,6 +536,8 @@ 665CDD3C0AFE7ED80030D605 /* worldlight.cpp in Sources */, 665CDD3D0AFE7ED80030D605 /* worldocull.cpp in Sources */, 665CDD3E0AFE7ED80030D605 /* worldrender.cpp in Sources */, + 6638511D0B092A3800C6A735 /* hudgun.cpp in Sources */, + 663851230B092A5700C6A735 /* rendermodel.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };