Made some changes for the timer to work on OS X. It is likely unoptimized, but more research will be done. Also, for some unknown reason, the OpenGL renderer now runs slower than the terrible software renderer (in OS X). No clue why as of yet.
parent
9b5a1ed4b3
commit
c6efd2245b
|
@ -1,7 +1,7 @@
|
|||
CC = gcc
|
||||
PREFIX = ./
|
||||
BINARY=timesynk
|
||||
OBJS = main.o c_extra.o state_menu.o ui/elements.o sdl/timer.o sdl/r_soft.o sdl/r_gl.o sdl/interface.o sdl/sdl_extra.o sdl/spritesheets.o sdl/font.o resources/badfont_large_png.o resources/badfont_medium_png.o
|
||||
OBJS = main.o c_extra.o state_menu.o ui/elements.o sdl/timer.o sdl/r_soft.o sdl/r_gl.o sdl/interface.o sdl/sdl_extra.o sdl/spritesheets.o sdl/font.o resources/badfont_large_png.o resources/badfont_medium_png.o resources/ui.o resources/menu_bg.o
|
||||
DEBUG = -g
|
||||
CFLAGS = -Wall -c $(DEBUG)
|
||||
SDL_LFLAGS = -lGL -lSDL -lSDL_image
|
||||
|
@ -18,8 +18,8 @@ endif
|
|||
$(BINARY): $(OBJS)
|
||||
$(CC) $(OBJS) $(SDL_LFLAGS) -o $(BINARY)
|
||||
|
||||
fonts:
|
||||
cd resources && ../../tools/bin2c badfont_medium.png && ../../tools/bin2c badfont_large.png
|
||||
res:
|
||||
cd resources && ../../tools/bin2c badfont_medium.png && ../../tools/bin2c badfont_large.png && ../../tools/bin2c ui.png && ../../tools/bin2c menu_bg.png
|
||||
|
||||
all: $(BINARY)
|
||||
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -0,0 +1,6 @@
|
|||
#ifndef menu_bg_png_H
|
||||
#define menu_bg_png_H
|
||||
extern unsigned char menu_bg_png[];
|
||||
extern unsigned int menu_bg_png_length;
|
||||
|
||||
#endif
|
File diff suppressed because one or more lines are too long
|
@ -0,0 +1,6 @@
|
|||
#ifndef ui_png_H
|
||||
#define ui_png_H
|
||||
extern unsigned char ui_png[];
|
||||
extern unsigned int ui_png_length;
|
||||
|
||||
#endif
|
|
@ -25,12 +25,12 @@ int interfaceInit() {
|
|||
|
||||
/* load our ui sprites */
|
||||
spritesheet_ui = newSpritesheet();
|
||||
loadSpritesheetFromFile(spritesheet_ui, "resources/ui.png", 64, 64, 8);
|
||||
loadSpritesheetFromMemory(spritesheet_ui, ui_png, ui_png_length, 64, 64, 8);
|
||||
setSpritesheetScale(spritesheet_ui, 2.0f, 2.0f);
|
||||
|
||||
/* load menu bg */
|
||||
menu_bg = newSpritesheet();
|
||||
loadSpritesheetFromFile(menu_bg, "resources/menu_bg.png", 640, 480, 1);
|
||||
loadSpritesheetFromMemory(menu_bg, menu_bg_png, menu_bg_png_length, 640, 480, 1);
|
||||
setSpritesheetScale(menu_bg, 2.0f, 2.0f);
|
||||
|
||||
/* set up our display */
|
||||
|
|
|
@ -18,6 +18,8 @@
|
|||
#include "r_gl.h"
|
||||
#include "../resources/badfont_large_png.h"
|
||||
#include "../resources/badfont_medium_png.h"
|
||||
#include "../resources/ui_png.h"
|
||||
#include "../resources/menu_bg_png.h"
|
||||
|
||||
#define R_SOFTWARE 0
|
||||
#define R_OPENGL 1
|
||||
|
|
|
@ -6,6 +6,17 @@ int getTime(struct PTime *time) {
|
|||
time->s = ticks/1000;
|
||||
time->m = ticks;
|
||||
time->n = ticks*1000000;
|
||||
#elif __MACH__
|
||||
clock_serv_t cclock;
|
||||
mach_timespec_t mts;
|
||||
host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
|
||||
clock_get_time(cclock, &mts);
|
||||
mach_port_deallocate(mach_task_self(), cclock);
|
||||
|
||||
time->s = mts.tv_sec;
|
||||
time->m = mts.tv_sec*1000;
|
||||
time->n = mts.tv_nsec;
|
||||
printf("LOL\n");
|
||||
#else
|
||||
struct timespec ts;
|
||||
clock_gettime(CLOCK_MONOTONIC, &ts);
|
||||
|
@ -23,7 +34,8 @@ void doSleep(long seconds, long milliseconds, long nanoseconds) {
|
|||
struct timespec ts;
|
||||
ts.tv_sec = seconds;
|
||||
ts.tv_nsec = (milliseconds*1000000) + nanoseconds;
|
||||
//printf("snoozing for %ld\n", ts.tv_nsec);
|
||||
if (ts.tv_nsec < 0) ts.tv_nsec = 0;
|
||||
printf("snoozing for %ld\n", ts.tv_nsec);
|
||||
/*if (nanosleep(&ts, NULL) < 0)
|
||||
printf("ERR: had trouble sleeping\n"); */ // FIXME: THIS ERRORS ALOT
|
||||
nanosleep(&ts, NULL);
|
||||
|
|
|
@ -2,6 +2,11 @@
|
|||
#define TIMER_H
|
||||
#include <time.h>
|
||||
|
||||
#ifdef __MACH__
|
||||
#include <mach/clock.h>
|
||||
#include <mach/mach.h>
|
||||
#endif
|
||||
|
||||
struct PTime {
|
||||
long s; // seconds
|
||||
long m; // milliseconds
|
||||
|
|
|
@ -9,7 +9,9 @@ void initMenuState() {
|
|||
s_menu_elements->user = g_screen;
|
||||
s_active_element = NULL;
|
||||
|
||||
s_quit_message = s_quit_yes = s_quit_no = NULL;
|
||||
s_quit_message = NULL;
|
||||
s_quit_yes = NULL;
|
||||
s_quit_no = NULL;
|
||||
|
||||
struct Dimension dimen = { 0, 0, 128, 32};
|
||||
struct Element *element = newElement(E_TYPE_BUTTON, 0, g_r_setupElement, dimen);
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -228,6 +228,8 @@
|
|||
<key>Layout</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>BecomeActive</key>
|
||||
<true/>
|
||||
<key>ContentConfiguration</key>
|
||||
<dict>
|
||||
<key>PBXBottomSmartGroupGIDs</key>
|
||||
|
@ -266,8 +268,8 @@
|
|||
<string>29B97314FDCFA39411CA2CEA</string>
|
||||
<string>29B97317FDCFA39411CA2CEA</string>
|
||||
<string>1C37FBAC04509CD000000102</string>
|
||||
<string>20A19DB218B8A04500FAE3FF</string>
|
||||
<string>20A19DB318B8A04500FAE3FF</string>
|
||||
<string>20B2ED9D18BCAD1D00A898D2</string>
|
||||
<string>20B2EDCC18BCB09000A898D2</string>
|
||||
<string>1C37FAAC04509CD000000102</string>
|
||||
<string>1C37FABC05509CD000000102</string>
|
||||
</array>
|
||||
|
@ -275,13 +277,13 @@
|
|||
<array>
|
||||
<array>
|
||||
<integer>48</integer>
|
||||
<integer>40</integer>
|
||||
<integer>38</integer>
|
||||
<integer>35</integer>
|
||||
<integer>47</integer>
|
||||
<integer>45</integer>
|
||||
<integer>42</integer>
|
||||
</array>
|
||||
</array>
|
||||
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
|
||||
<string>{{0, 628}, {186, 364}}</string>
|
||||
<string>{{0, 469}, {186, 364}}</string>
|
||||
</dict>
|
||||
<key>PBXTopSmartGroupGIDs</key>
|
||||
<array/>
|
||||
|
@ -300,7 +302,7 @@
|
|||
<real>186</real>
|
||||
</array>
|
||||
<key>RubberWindowFrame</key>
|
||||
<string>0 323 810 423 0 0 1024 746 </string>
|
||||
<string>-3 323 810 423 0 0 1024 746 </string>
|
||||
</dict>
|
||||
<key>Module</key>
|
||||
<string>PBXSmartGroupTreeModule</string>
|
||||
|
@ -311,14 +313,12 @@
|
|||
<key>Dock</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>BecomeActive</key>
|
||||
<true/>
|
||||
<key>ContentConfiguration</key>
|
||||
<dict>
|
||||
<key>PBXProjectModuleGUID</key>
|
||||
<string>1CE0B20306471E060097A5F4</string>
|
||||
<key>PBXProjectModuleLabel</key>
|
||||
<string>r_gl.c</string>
|
||||
<string>r_soft.c</string>
|
||||
<key>PBXSplitModuleInNavigatorKey</key>
|
||||
<dict>
|
||||
<key>Split0</key>
|
||||
|
@ -326,11 +326,11 @@
|
|||
<key>PBXProjectModuleGUID</key>
|
||||
<string>1CE0B20406471E060097A5F4</string>
|
||||
<key>PBXProjectModuleLabel</key>
|
||||
<string>r_gl.c</string>
|
||||
<string>r_soft.c</string>
|
||||
<key>_historyCapacity</key>
|
||||
<integer>0</integer>
|
||||
<key>bookmark</key>
|
||||
<string>20A19DC218B8A06000FAE3FF</string>
|
||||
<string>20B2EE0B18BCB65800A898D2</string>
|
||||
<key>history</key>
|
||||
<array>
|
||||
<string>206D60391808F3A600C0DE49</string>
|
||||
|
@ -371,7 +371,13 @@
|
|||
<string>209EE346188D6D72007B3526</string>
|
||||
<string>20A19DB418B8A04500FAE3FF</string>
|
||||
<string>20A19DB518B8A04500FAE3FF</string>
|
||||
<string>20A19DB618B8A04500FAE3FF</string>
|
||||
<string>20B2EDCE18BCB09000A898D2</string>
|
||||
<string>20B2EDCF18BCB09000A898D2</string>
|
||||
<string>20B2EDD018BCB09000A898D2</string>
|
||||
<string>20B2EDF318BCB32C00A898D2</string>
|
||||
<string>20B2EE0118BCB62700A898D2</string>
|
||||
<string>20B2EE0218BCB62700A898D2</string>
|
||||
<string>20B2EE0318BCB62700A898D2</string>
|
||||
</array>
|
||||
<key>prevStack</key>
|
||||
<array>
|
||||
|
@ -415,8 +421,14 @@
|
|||
<string>20EE4E3D186EB345003FF203</string>
|
||||
<string>2019284E187269BC006071D0</string>
|
||||
<string>20E4F80818777D6600D8069C</string>
|
||||
<string>20A19DB718B8A04500FAE3FF</string>
|
||||
<string>20A19DB818B8A04500FAE3FF</string>
|
||||
<string>20B2EDD218BCB09000A898D2</string>
|
||||
<string>20B2EDD318BCB09000A898D2</string>
|
||||
<string>20B2EDD418BCB09000A898D2</string>
|
||||
<string>20B2EDD518BCB09000A898D2</string>
|
||||
<string>20B2EDF518BCB32C00A898D2</string>
|
||||
<string>20B2EE0418BCB62700A898D2</string>
|
||||
<string>20B2EE0518BCB62700A898D2</string>
|
||||
</array>
|
||||
</dict>
|
||||
<key>SplitCount</key>
|
||||
|
@ -430,7 +442,7 @@
|
|||
<key>Frame</key>
|
||||
<string>{{0, 0}, {602, 253}}</string>
|
||||
<key>RubberWindowFrame</key>
|
||||
<string>0 323 810 423 0 0 1024 746 </string>
|
||||
<string>-3 323 810 423 0 0 1024 746 </string>
|
||||
</dict>
|
||||
<key>Module</key>
|
||||
<string>PBXNavigatorGroup</string>
|
||||
|
@ -450,7 +462,7 @@
|
|||
<key>Frame</key>
|
||||
<string>{{0, 258}, {602, 124}}</string>
|
||||
<key>RubberWindowFrame</key>
|
||||
<string>0 323 810 423 0 0 1024 746 </string>
|
||||
<string>-3 323 810 423 0 0 1024 746 </string>
|
||||
</dict>
|
||||
<key>Module</key>
|
||||
<string>XCDetailModule</string>
|
||||
|
@ -474,9 +486,9 @@
|
|||
</array>
|
||||
<key>TableOfContents</key>
|
||||
<array>
|
||||
<string>20A19D9D18B8999300FAE3FF</string>
|
||||
<string>20B2EDA718BCAD2700A898D2</string>
|
||||
<string>1CE0B1FE06471DED0097A5F4</string>
|
||||
<string>20A19D9E18B8999300FAE3FF</string>
|
||||
<string>20B2EDA818BCAD2700A898D2</string>
|
||||
<string>1CE0B20306471E060097A5F4</string>
|
||||
<string>1CE0B20506471E060097A5F4</string>
|
||||
</array>
|
||||
|
@ -610,13 +622,15 @@
|
|||
<integer>5</integer>
|
||||
<key>WindowOrderList</key>
|
||||
<array>
|
||||
<string>1C78EAAD065D492600B07095</string>
|
||||
<string>20B2EDD818BCB09000A898D2</string>
|
||||
<string>20B2EDD918BCB09000A898D2</string>
|
||||
<string>1CD10A99069EF8BA00B06720</string>
|
||||
<string>20F6A1B417E95A6200BAD261</string>
|
||||
<string>1C78EAAD065D492600B07095</string>
|
||||
<string>/Users/kts/Devel/timesynk/xcode/timesynk.xcodeproj</string>
|
||||
</array>
|
||||
<key>WindowString</key>
|
||||
<string>0 323 810 423 0 0 1024 746 </string>
|
||||
<string>-3 323 810 423 0 0 1024 746 </string>
|
||||
<key>WindowToolsV3</key>
|
||||
<array>
|
||||
<dict>
|
||||
|
@ -637,7 +651,7 @@
|
|||
<key>PBXProjectModuleGUID</key>
|
||||
<string>1CD0528F0623707200166675</string>
|
||||
<key>PBXProjectModuleLabel</key>
|
||||
<string></string>
|
||||
<string>r_gl.c</string>
|
||||
<key>StatusBarVisibility</key>
|
||||
<true/>
|
||||
</dict>
|
||||
|
@ -646,7 +660,7 @@
|
|||
<key>Frame</key>
|
||||
<string>{{0, 0}, {500, 218}}</string>
|
||||
<key>RubberWindowFrame</key>
|
||||
<string>118 235 500 500 0 0 1024 746 </string>
|
||||
<string>442 246 500 500 0 0 1024 746 </string>
|
||||
</dict>
|
||||
<key>Module</key>
|
||||
<string>PBXNavigatorGroup</string>
|
||||
|
@ -654,6 +668,8 @@
|
|||
<string>218pt</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>BecomeActive</key>
|
||||
<true/>
|
||||
<key>ContentConfiguration</key>
|
||||
<dict>
|
||||
<key>PBXProjectModuleGUID</key>
|
||||
|
@ -670,7 +686,7 @@
|
|||
<key>Frame</key>
|
||||
<string>{{0, 223}, {500, 236}}</string>
|
||||
<key>RubberWindowFrame</key>
|
||||
<string>118 235 500 500 0 0 1024 746 </string>
|
||||
<string>442 246 500 500 0 0 1024 746 </string>
|
||||
</dict>
|
||||
<key>Module</key>
|
||||
<string>PBXBuildResultsModule</string>
|
||||
|
@ -693,18 +709,18 @@
|
|||
<key>TableOfContents</key>
|
||||
<array>
|
||||
<string>20F6A1B417E95A6200BAD261</string>
|
||||
<string>20A19DBA18B8A04500FAE3FF</string>
|
||||
<string>20B2EDC418BCB08C00A898D2</string>
|
||||
<string>1CD0528F0623707200166675</string>
|
||||
<string>XCMainBuildResultsModuleGUID</string>
|
||||
</array>
|
||||
<key>ToolbarConfiguration</key>
|
||||
<string>xcode.toolbar.config.buildV3</string>
|
||||
<key>WindowString</key>
|
||||
<string>118 235 500 500 0 0 1024 746 </string>
|
||||
<string>442 246 500 500 0 0 1024 746 </string>
|
||||
<key>WindowToolGUID</key>
|
||||
<string>20F6A1B417E95A6200BAD261</string>
|
||||
<key>WindowToolIsVisible</key>
|
||||
<false/>
|
||||
<true/>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>FirstTimeWindowDisplayed</key>
|
||||
|
@ -813,13 +829,13 @@
|
|||
<key>TableOfContents</key>
|
||||
<array>
|
||||
<string>1CD10A99069EF8BA00B06720</string>
|
||||
<string>20A19DBB18B8A04500FAE3FF</string>
|
||||
<string>20B2EDC518BCB08C00A898D2</string>
|
||||
<string>1C162984064C10D400B95A72</string>
|
||||
<string>20A19DBC18B8A04500FAE3FF</string>
|
||||
<string>20A19DBD18B8A04500FAE3FF</string>
|
||||
<string>20A19DBE18B8A04500FAE3FF</string>
|
||||
<string>20A19DBF18B8A04500FAE3FF</string>
|
||||
<string>20A19DC018B8A04500FAE3FF</string>
|
||||
<string>20B2EDC618BCB08C00A898D2</string>
|
||||
<string>20B2EDC718BCB08C00A898D2</string>
|
||||
<string>20B2EDC818BCB08C00A898D2</string>
|
||||
<string>20B2EDC918BCB08C00A898D2</string>
|
||||
<string>20B2EDCA18BCB08C00A898D2</string>
|
||||
</array>
|
||||
<key>ToolbarConfiguration</key>
|
||||
<string>xcode.toolbar.config.debugV3</string>
|
||||
|
@ -828,7 +844,7 @@
|
|||
<key>WindowToolGUID</key>
|
||||
<string>1CD10A99069EF8BA00B06720</string>
|
||||
<key>WindowToolIsVisible</key>
|
||||
<false/>
|
||||
<true/>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>Identifier</key>
|
||||
|
@ -946,6 +962,8 @@
|
|||
<key>Dock</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>BecomeActive</key>
|
||||
<true/>
|
||||
<key>ContentConfiguration</key>
|
||||
<dict>
|
||||
<key>PBXProjectModuleGUID</key>
|
||||
|
@ -981,7 +999,7 @@
|
|||
<key>TableOfContents</key>
|
||||
<array>
|
||||
<string>1C78EAAD065D492600B07095</string>
|
||||
<string>20A19DC118B8A04500FAE3FF</string>
|
||||
<string>20B2EDCB18BCB08C00A898D2</string>
|
||||
<string>1C78EAAC065D492600B07095</string>
|
||||
</array>
|
||||
<key>ToolbarConfiguration</key>
|
||||
|
@ -991,7 +1009,7 @@
|
|||
<key>WindowToolGUID</key>
|
||||
<string>1C78EAAD065D492600B07095</string>
|
||||
<key>WindowToolIsVisible</key>
|
||||
<false/>
|
||||
<true/>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>Identifier</key>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
uiCtxt = {
|
||||
sepNavIntBoundsRect = "{{0, 0}, {810, 5376}}";
|
||||
sepNavSelRange = "{0, 11264}";
|
||||
sepNavVisRange = "{0, 563}";
|
||||
sepNavVisRange = "{0, 517}";
|
||||
};
|
||||
};
|
||||
089C165DFE840E0CC02AAC07 /* English */ = {
|
||||
|
@ -534,21 +534,53 @@
|
|||
executableUserSymbolLevel = 0;
|
||||
libgmallocEnabled = 0;
|
||||
name = engine;
|
||||
savedGlobals = {
|
||||
};
|
||||
sourceDirectories = (
|
||||
);
|
||||
variableFormatDictionary = {
|
||||
};
|
||||
};
|
||||
208EB14618B8989D00CD2A39 /* c_extra.c */ = {
|
||||
uiCtxt = {
|
||||
sepNavIntBoundsRect = "{{0, 0}, {726, 742}}";
|
||||
sepNavSelRange = "{0, 0}";
|
||||
sepNavVisRange = "{0, 363}";
|
||||
};
|
||||
};
|
||||
208EB14D18B8989D00CD2A39 /* badfont_large_png.c */ = {
|
||||
uiCtxt = {
|
||||
sepNavIntBoundsRect = "{{0, 0}, {113922, 221}}";
|
||||
sepNavSelRange = "{0, 0}";
|
||||
sepNavVisRange = "{0, 19074}";
|
||||
};
|
||||
};
|
||||
208EB15618B8989D00CD2A39 /* interface.c */ = {
|
||||
uiCtxt = {
|
||||
sepNavIntBoundsRect = "{{0, 0}, {541, 2506}}";
|
||||
sepNavSelRange = "{246, 0}";
|
||||
sepNavVisRange = "{449, 458}";
|
||||
sepNavIntBoundsRect = "{{0, 0}, {780, 3318}}";
|
||||
sepNavSelRange = "{7380, 0}";
|
||||
sepNavVisRange = "{576, 467}";
|
||||
};
|
||||
};
|
||||
208EB15818B8989D00CD2A39 /* r_gl.c */ = {
|
||||
uiCtxt = {
|
||||
sepNavIntBoundsRect = "{{0, 0}, {636, 2170}}";
|
||||
sepNavSelRange = "{4612, 0}";
|
||||
sepNavVisRange = "{3996, 616}";
|
||||
sepNavIntBoundsRect = "{{0, 0}, {1710, 3262}}";
|
||||
sepNavSelRange = "{8637, 0}";
|
||||
sepNavVisRange = "{2544, 1074}";
|
||||
};
|
||||
};
|
||||
208EB15A18B8989D00CD2A39 /* r_soft.c */ = {
|
||||
uiCtxt = {
|
||||
sepNavIntBoundsRect = "{{0, 0}, {846, 2590}}";
|
||||
sepNavSelRange = "{1324, 0}";
|
||||
sepNavVisRange = "{1100, 479}";
|
||||
};
|
||||
};
|
||||
208EB15C18B8989D00CD2A39 /* sdl_extra.c */ = {
|
||||
uiCtxt = {
|
||||
sepNavIntBoundsRect = "{{0, 0}, {1308, 1190}}";
|
||||
sepNavSelRange = "{353, 0}";
|
||||
sepNavVisRange = "{0, 694}";
|
||||
};
|
||||
};
|
||||
2090287B17E95E780051A253 /* timesynk_Prefix.pch */ = {
|
||||
|
@ -653,26 +685,6 @@
|
|||
vrLen = 458;
|
||||
vrLoc = 449;
|
||||
};
|
||||
20A19DB618B8A04500FAE3FF /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
fRef = 208EB15818B8989D00CD2A39 /* r_gl.c */;
|
||||
name = "r_gl.c: 1";
|
||||
rLen = 0;
|
||||
rLoc = 0;
|
||||
rType = 0;
|
||||
vrLen = 409;
|
||||
vrLoc = 0;
|
||||
};
|
||||
20A19DB718B8A04500FAE3FF /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
fRef = 206D60441808F90700C0DE49 /* tiles.h */;
|
||||
name = "tiles.h: 1";
|
||||
rLen = 0;
|
||||
rLoc = 76;
|
||||
rType = 0;
|
||||
vrLen = 492;
|
||||
vrLoc = 0;
|
||||
};
|
||||
20A19DB818B8A04500FAE3FF /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
fRef = 208EB15618B8989D00CD2A39 /* interface.c */;
|
||||
|
@ -683,16 +695,6 @@
|
|||
vrLen = 458;
|
||||
vrLoc = 449;
|
||||
};
|
||||
20A19DC218B8A06000FAE3FF /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
fRef = 208EB15818B8989D00CD2A39 /* r_gl.c */;
|
||||
name = "r_gl.c: 153";
|
||||
rLen = 0;
|
||||
rLoc = 4612;
|
||||
rType = 0;
|
||||
vrLen = 616;
|
||||
vrLoc = 3996;
|
||||
};
|
||||
20A770E9183786F100BC220B /* inventory.c */ = {
|
||||
uiCtxt = {
|
||||
sepNavIntBoundsRect = "{{0, 0}, {1266, 2254}}";
|
||||
|
@ -720,6 +722,160 @@
|
|||
vrLen = 317;
|
||||
vrLoc = 0;
|
||||
};
|
||||
20B2EDB218BCAD6C00A898D2 /* timer.c */ = {
|
||||
uiCtxt = {
|
||||
sepNavIntBoundsRect = "{{0, 0}, {439, 630}}";
|
||||
sepNavSelRange = "{1073, 0}";
|
||||
sepNavVisRange = "{0, 386}";
|
||||
};
|
||||
};
|
||||
20B2EDCE18BCB09000A898D2 /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
fRef = 208EB14D18B8989D00CD2A39 /* badfont_large_png.c */;
|
||||
name = "badfont_large_png.c: 1";
|
||||
rLen = 0;
|
||||
rLoc = 0;
|
||||
rType = 0;
|
||||
vrLen = 19074;
|
||||
vrLoc = 0;
|
||||
};
|
||||
20B2EDCF18BCB09000A898D2 /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
fRef = 208EB14618B8989D00CD2A39 /* c_extra.c */;
|
||||
name = "c_extra.c: 1";
|
||||
rLen = 0;
|
||||
rLoc = 0;
|
||||
rType = 0;
|
||||
vrLen = 363;
|
||||
vrLoc = 0;
|
||||
};
|
||||
20B2EDD018BCB09000A898D2 /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
fRef = 20B2EDB218BCAD6C00A898D2 /* timer.c */;
|
||||
name = "timer.c: 42";
|
||||
rLen = 0;
|
||||
rLoc = 1073;
|
||||
rType = 0;
|
||||
vrLen = 387;
|
||||
vrLoc = 0;
|
||||
};
|
||||
20B2EDD218BCB09000A898D2 /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
fRef = 208EB15818B8989D00CD2A39 /* r_gl.c */;
|
||||
name = "r_gl.c: 134";
|
||||
rLen = 0;
|
||||
rLoc = 4612;
|
||||
rType = 0;
|
||||
vrLen = 634;
|
||||
vrLoc = 4001;
|
||||
};
|
||||
20B2EDD318BCB09000A898D2 /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
fRef = 208EB14D18B8989D00CD2A39 /* badfont_large_png.c */;
|
||||
name = "badfont_large_png.c: 1";
|
||||
rLen = 0;
|
||||
rLoc = 0;
|
||||
rType = 0;
|
||||
vrLen = 19074;
|
||||
vrLoc = 0;
|
||||
};
|
||||
20B2EDD418BCB09000A898D2 /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
fRef = 208EB14618B8989D00CD2A39 /* c_extra.c */;
|
||||
name = "c_extra.c: 1";
|
||||
rLen = 0;
|
||||
rLoc = 0;
|
||||
rType = 0;
|
||||
vrLen = 363;
|
||||
vrLoc = 0;
|
||||
};
|
||||
20B2EDD518BCB09000A898D2 /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
fRef = 20B2EDB218BCAD6C00A898D2 /* timer.c */;
|
||||
name = "timer.c: 42";
|
||||
rLen = 0;
|
||||
rLoc = 1073;
|
||||
rType = 0;
|
||||
vrLen = 387;
|
||||
vrLoc = 0;
|
||||
};
|
||||
20B2EDF318BCB32C00A898D2 /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
fRef = 208EB15C18B8989D00CD2A39 /* sdl_extra.c */;
|
||||
name = "sdl_extra.c: 12";
|
||||
rLen = 0;
|
||||
rLoc = 353;
|
||||
rType = 0;
|
||||
vrLen = 694;
|
||||
vrLoc = 0;
|
||||
};
|
||||
20B2EDF518BCB32C00A898D2 /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
fRef = 208EB15C18B8989D00CD2A39 /* sdl_extra.c */;
|
||||
name = "sdl_extra.c: 12";
|
||||
rLen = 0;
|
||||
rLoc = 353;
|
||||
rType = 0;
|
||||
vrLen = 694;
|
||||
vrLoc = 0;
|
||||
};
|
||||
20B2EE0118BCB62700A898D2 /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
fRef = 208EB15818B8989D00CD2A39 /* r_gl.c */;
|
||||
name = "r_gl.c: 56";
|
||||
rLen = 0;
|
||||
rLoc = 1311;
|
||||
rType = 0;
|
||||
vrLen = 333;
|
||||
vrLoc = 1079;
|
||||
};
|
||||
20B2EE0218BCB62700A898D2 /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
fRef = 002F3A2C09D0888800EBEB88 /* SDLMain.m */;
|
||||
name = "SDLMain.m: 1";
|
||||
rLen = 11264;
|
||||
rLoc = 0;
|
||||
rType = 0;
|
||||
vrLen = 517;
|
||||
vrLoc = 0;
|
||||
};
|
||||
20B2EE0318BCB62700A898D2 /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
fRef = 208EB15A18B8989D00CD2A39 /* r_soft.c */;
|
||||
rLen = 0;
|
||||
rLoc = 45;
|
||||
rType = 1;
|
||||
};
|
||||
20B2EE0418BCB62700A898D2 /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
fRef = 208EB15818B8989D00CD2A39 /* r_gl.c */;
|
||||
name = "r_gl.c: 56";
|
||||
rLen = 0;
|
||||
rLoc = 1311;
|
||||
rType = 0;
|
||||
vrLen = 333;
|
||||
vrLoc = 1079;
|
||||
};
|
||||
20B2EE0518BCB62700A898D2 /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
fRef = 002F3A2C09D0888800EBEB88 /* SDLMain.m */;
|
||||
name = "SDLMain.m: 1";
|
||||
rLen = 11264;
|
||||
rLoc = 0;
|
||||
rType = 0;
|
||||
vrLen = 517;
|
||||
vrLoc = 0;
|
||||
};
|
||||
20B2EE0B18BCB65800A898D2 /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
fRef = 208EB15A18B8989D00CD2A39 /* r_soft.c */;
|
||||
name = "r_soft.c: 46";
|
||||
rLen = 0;
|
||||
rLoc = 1324;
|
||||
rType = 0;
|
||||
vrLen = 479;
|
||||
vrLoc = 1100;
|
||||
};
|
||||
20CD05AE180FBCD8005A8231 /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
fRef = 204F942518005466007B4DAD /* map.h */;
|
||||
|
@ -1400,8 +1556,8 @@
|
|||
PBXFileDataSource_Warnings_ColumnID,
|
||||
);
|
||||
};
|
||||
PBXPerProjectTemplateStateSaveDate = 414751118;
|
||||
PBXWorkspaceStateSaveDate = 414751118;
|
||||
PBXPerProjectTemplateStateSaveDate = 415018268;
|
||||
PBXWorkspaceStateSaveDate = 415018268;
|
||||
};
|
||||
perUserProjectItems = {
|
||||
2007C93017ECF2EB00268653 /* PBXTextBookmark */ = 2007C93017ECF2EB00268653 /* PBXTextBookmark */;
|
||||
|
@ -1446,12 +1602,24 @@
|
|||
209EE346188D6D72007B3526 /* PBXTextBookmark */ = 209EE346188D6D72007B3526 /* PBXTextBookmark */;
|
||||
20A19DB418B8A04500FAE3FF /* PBXTextBookmark */ = 20A19DB418B8A04500FAE3FF /* PBXTextBookmark */;
|
||||
20A19DB518B8A04500FAE3FF /* PBXTextBookmark */ = 20A19DB518B8A04500FAE3FF /* PBXTextBookmark */;
|
||||
20A19DB618B8A04500FAE3FF /* PBXTextBookmark */ = 20A19DB618B8A04500FAE3FF /* PBXTextBookmark */;
|
||||
20A19DB718B8A04500FAE3FF /* PBXTextBookmark */ = 20A19DB718B8A04500FAE3FF /* PBXTextBookmark */;
|
||||
20A19DB818B8A04500FAE3FF /* PBXTextBookmark */ = 20A19DB818B8A04500FAE3FF /* PBXTextBookmark */;
|
||||
20A19DC218B8A06000FAE3FF /* PBXTextBookmark */ = 20A19DC218B8A06000FAE3FF /* PBXTextBookmark */;
|
||||
20A770F81837870D00BC220B /* PBXTextBookmark */ = 20A770F81837870D00BC220B /* PBXTextBookmark */;
|
||||
20A770FB1837870D00BC220B /* PBXTextBookmark */ = 20A770FB1837870D00BC220B /* PBXTextBookmark */;
|
||||
20B2EDCE18BCB09000A898D2 /* PBXTextBookmark */ = 20B2EDCE18BCB09000A898D2 /* PBXTextBookmark */;
|
||||
20B2EDCF18BCB09000A898D2 /* PBXTextBookmark */ = 20B2EDCF18BCB09000A898D2 /* PBXTextBookmark */;
|
||||
20B2EDD018BCB09000A898D2 /* PBXTextBookmark */ = 20B2EDD018BCB09000A898D2 /* PBXTextBookmark */;
|
||||
20B2EDD218BCB09000A898D2 /* PBXTextBookmark */ = 20B2EDD218BCB09000A898D2 /* PBXTextBookmark */;
|
||||
20B2EDD318BCB09000A898D2 /* PBXTextBookmark */ = 20B2EDD318BCB09000A898D2 /* PBXTextBookmark */;
|
||||
20B2EDD418BCB09000A898D2 /* PBXTextBookmark */ = 20B2EDD418BCB09000A898D2 /* PBXTextBookmark */;
|
||||
20B2EDD518BCB09000A898D2 /* PBXTextBookmark */ = 20B2EDD518BCB09000A898D2 /* PBXTextBookmark */;
|
||||
20B2EDF318BCB32C00A898D2 /* PBXTextBookmark */ = 20B2EDF318BCB32C00A898D2 /* PBXTextBookmark */;
|
||||
20B2EDF518BCB32C00A898D2 /* PBXTextBookmark */ = 20B2EDF518BCB32C00A898D2 /* PBXTextBookmark */;
|
||||
20B2EE0118BCB62700A898D2 /* PBXTextBookmark */ = 20B2EE0118BCB62700A898D2 /* PBXTextBookmark */;
|
||||
20B2EE0218BCB62700A898D2 /* PBXTextBookmark */ = 20B2EE0218BCB62700A898D2 /* PBXTextBookmark */;
|
||||
20B2EE0318BCB62700A898D2 /* PBXTextBookmark */ = 20B2EE0318BCB62700A898D2 /* PBXTextBookmark */;
|
||||
20B2EE0418BCB62700A898D2 /* PBXTextBookmark */ = 20B2EE0418BCB62700A898D2 /* PBXTextBookmark */;
|
||||
20B2EE0518BCB62700A898D2 /* PBXTextBookmark */ = 20B2EE0518BCB62700A898D2 /* PBXTextBookmark */;
|
||||
20B2EE0B18BCB65800A898D2 /* PBXTextBookmark */ = 20B2EE0B18BCB65800A898D2 /* PBXTextBookmark */;
|
||||
20CD05AE180FBCD8005A8231 /* PBXTextBookmark */ = 20CD05AE180FBCD8005A8231 /* PBXTextBookmark */;
|
||||
20DE9D35180500990047B2DD /* PBXTextBookmark */ = 20DE9D35180500990047B2DD /* PBXTextBookmark */;
|
||||
20DE9D36180500990047B2DD /* PBXTextBookmark */ = 20DE9D36180500990047B2DD /* PBXTextBookmark */;
|
||||
|
|
|
@ -51,6 +51,10 @@
|
|||
208EB17918B8990300CD2A39 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 208EB17818B8990300CD2A39 /* OpenGL.framework */; };
|
||||
209A27C81812257000B15CEC /* npc.c in Sources */ = {isa = PBXBuildFile; fileRef = 209A27C61812256F00B15CEC /* npc.c */; };
|
||||
20A770EB183786F100BC220B /* inventory.c in Sources */ = {isa = PBXBuildFile; fileRef = 20A770E9183786F100BC220B /* inventory.c */; };
|
||||
20B2EDB418BCAD6C00A898D2 /* timer.c in Sources */ = {isa = PBXBuildFile; fileRef = 20B2EDB218BCAD6C00A898D2 /* timer.c */; };
|
||||
20B2EDE218BCB10D00A898D2 /* menu_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 20B2EDDD18BCB10D00A898D2 /* menu_bg.png */; };
|
||||
20B2EDE318BCB10D00A898D2 /* menu_bg_png.c in Sources */ = {isa = PBXBuildFile; fileRef = 20B2EDDE18BCB10D00A898D2 /* menu_bg_png.c */; };
|
||||
20B2EDE418BCB10D00A898D2 /* ui_png.c in Sources */ = {isa = PBXBuildFile; fileRef = 20B2EDE018BCB10D00A898D2 /* ui_png.c */; };
|
||||
20DE9D071804FE1A0047B2DD /* context.c in Sources */ = {isa = PBXBuildFile; fileRef = 20DE9D051804FE1A0047B2DD /* context.c */; };
|
||||
20EE4DDE186EA900003FF203 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 206D60281808F0E200C0DE49 /* SDL_image.framework */; };
|
||||
20EE4DDF186EA907003FF203 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F39F909D0881F00EBEB88 /* SDL.framework */; };
|
||||
|
@ -160,6 +164,13 @@
|
|||
20A770E8183786F100BC220B /* controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = controller.h; path = ../controller.h; sourceTree = SOURCE_ROOT; };
|
||||
20A770E9183786F100BC220B /* inventory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = inventory.c; path = ../inventory.c; sourceTree = SOURCE_ROOT; };
|
||||
20A770EA183786F100BC220B /* inventory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = inventory.h; path = ../inventory.h; sourceTree = SOURCE_ROOT; };
|
||||
20B2EDB218BCAD6C00A898D2 /* timer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = timer.c; path = ../engine/sdl/timer.c; sourceTree = SOURCE_ROOT; };
|
||||
20B2EDB318BCAD6C00A898D2 /* timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = timer.h; path = ../engine/sdl/timer.h; sourceTree = SOURCE_ROOT; };
|
||||
20B2EDDD18BCB10D00A898D2 /* menu_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = menu_bg.png; path = ../engine/resources/menu_bg.png; sourceTree = SOURCE_ROOT; };
|
||||
20B2EDDE18BCB10D00A898D2 /* menu_bg_png.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = menu_bg_png.c; path = ../engine/resources/menu_bg_png.c; sourceTree = SOURCE_ROOT; };
|
||||
20B2EDDF18BCB10D00A898D2 /* menu_bg_png.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = menu_bg_png.h; path = ../engine/resources/menu_bg_png.h; sourceTree = SOURCE_ROOT; };
|
||||
20B2EDE018BCB10D00A898D2 /* ui_png.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ui_png.c; path = ../engine/resources/ui_png.c; sourceTree = SOURCE_ROOT; };
|
||||
20B2EDE118BCB10D00A898D2 /* ui_png.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ui_png.h; path = ../engine/resources/ui_png.h; sourceTree = SOURCE_ROOT; };
|
||||
20DE9D051804FE1A0047B2DD /* context.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = context.c; path = ../context.c; sourceTree = SOURCE_ROOT; };
|
||||
20DE9D061804FE1A0047B2DD /* context.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = context.h; path = ../context.h; sourceTree = SOURCE_ROOT; };
|
||||
20EE4DD8186EA8AC003FF203 /* Tile Editor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Tile Editor.app"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
|
@ -312,6 +323,13 @@
|
|||
29B97314FDCFA39411CA2CEA /* SDL_test */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
20B2EDDD18BCB10D00A898D2 /* menu_bg.png */,
|
||||
20B2EDDE18BCB10D00A898D2 /* menu_bg_png.c */,
|
||||
20B2EDDF18BCB10D00A898D2 /* menu_bg_png.h */,
|
||||
20B2EDE018BCB10D00A898D2 /* ui_png.c */,
|
||||
20B2EDE118BCB10D00A898D2 /* ui_png.h */,
|
||||
20B2EDB218BCAD6C00A898D2 /* timer.c */,
|
||||
20B2EDB318BCAD6C00A898D2 /* timer.h */,
|
||||
208EB14618B8989D00CD2A39 /* c_extra.c */,
|
||||
208EB14718B8989D00CD2A39 /* c_extra.h */,
|
||||
208EB14818B8989D00CD2A39 /* globals.h */,
|
||||
|
@ -492,6 +510,7 @@
|
|||
208EB16818B8989D00CD2A39 /* badfont_large.png in Resources */,
|
||||
208EB16A18B8989D00CD2A39 /* badfont_medium.png in Resources */,
|
||||
208EB16C18B8989D00CD2A39 /* ui.png in Resources */,
|
||||
20B2EDE218BCB10D00A898D2 /* menu_bg.png in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
@ -535,6 +554,9 @@
|
|||
208EB17218B8989D00CD2A39 /* spritesheets.c in Sources */,
|
||||
208EB17318B8989D00CD2A39 /* state_menu.c in Sources */,
|
||||
208EB17418B8989D00CD2A39 /* elements.c in Sources */,
|
||||
20B2EDB418BCAD6C00A898D2 /* timer.c in Sources */,
|
||||
20B2EDE318BCB10D00A898D2 /* menu_bg_png.c in Sources */,
|
||||
20B2EDE418BCB10D00A898D2 /* ui_png.c in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue