diff --git a/interface/sdl.c b/interface/sdl.c index e18ea73..b60f1b4 100644 --- a/interface/sdl.c +++ b/interface/sdl.c @@ -17,6 +17,8 @@ int interfaceInit() { // Load it up! SDL_Init(SDL_INIT_VIDEO); + // Enable Unicode, for later text input + SDL_EnableUNICODE(1); // Set up our SDL Window if ((screen = SDL_SetVideoMode(800, 600, 32, SDL_SWSURFACE)) == NULL) { return ERROR; @@ -24,6 +26,7 @@ int interfaceInit() { SDL_WM_SetCaption(NAME, NULL); camera_surface = SDL_CreateRGBSurface(screen->flags, 512, 512, screen->format->BitsPerPixel, screen->format->Rmask, screen->format->Gmask, screen->format->Bmask, screen->format->Amask); + font_spritesheet = IMG_Load_RW(SDL_RWFromMem(&font_images, font_images_length), 1); player_spritesheet = IMG_Load_RW(SDL_RWFromMem(&player_images, player_images_length), 1); wall_spritesheet = IMG_Load_RW(SDL_RWFromMem(&wall_images, wall_images_length), 1); floor_spritesheet = IMG_Load_RW(SDL_RWFromMem(&floor_images, floor_images_length), 1); @@ -108,7 +111,12 @@ void interfaceLoop() { is_running = 0; break; case SDL_KEYDOWN: - (*current_context)(event.key.keysym.sym); + if (SDL_GetModState() & KMOD_SHIFT) { + (*current_context)(toupper(event.key.keysym.sym)); + } else { + (*current_context)(event.key.keysym.sym); + } + //(*current_context)(event.key.keysym.sym); /*if (event.key.keysym.sym == SDLK_q) { is_running = 0; } else if (event.key.keysym.sym == SDLK_UP) { @@ -134,7 +142,17 @@ void interfaceDraw() { } void interfacePrint(const char *string) { - + int i = 0; + SDL_Rect print_area = {0, 512, 600, 32}; + SDL_FillRect(screen, &print_area, SDL_MapRGB(screen->format,128, 128, 0)); + while (string[i] != '\0') { + int y_offset = string[i] / 16; // 16 tiles across in spritesheet + int x_offset = string[i] - (y_offset*16); + SDL_Rect character_offset = { x_offset*TILE_WIDTH, y_offset*TILE_HEIGHT, TILE_WIDTH, TILE_HEIGHT}; + SDL_Rect render_position = {i*TILE_WIDTH, 512, TILE_WIDTH, TILE_HEIGHT}; + SDL_BlitSurface(font_spritesheet, &character_offset, screen, &render_position); + i++; + } } void interfaceClose() { diff --git a/interface/sdl.h b/interface/sdl.h index 2682f7f..6ee313c 100644 --- a/interface/sdl.h +++ b/interface/sdl.h @@ -2,6 +2,7 @@ #define SDL_H #include "../player.h" // for races/class totals SDL_Surface* screen; + SDL_Surface* font_spritesheet; SDL_Surface* player_spritesheet; SDL_Surface* shadow_spritesheet; SDL_Surface* wall_spritesheet; diff --git a/pack_tiles.c b/pack_tiles.c index 8a2769f..c8abd28 100644 --- a/pack_tiles.c +++ b/pack_tiles.c @@ -30,6 +30,7 @@ int main(int argc, char **argv) { fprintf(tiles_h, "#ifndef TILES_H\n#define TILES_H\n"); fprintf(tiles_h, "#define TILE_WIDTH 16\n#define TILE_HEIGHT 32\n"); + convert("tiles/font.png", "font_images"); convert("tiles/players.png", "player_images"); convert("tiles/walls.png", "wall_images"); convert("tiles/floors.png", "floor_images"); diff --git a/tiles.o b/tiles.o index 37d9058..31cd068 100644 Binary files a/tiles.o and b/tiles.o differ diff --git a/tiles/font.png b/tiles/font.png index 803780a..68162ff 100644 Binary files a/tiles/font.png and b/tiles/font.png differ diff --git a/tiles/tiles.c b/tiles/tiles.c index bc26942..df39b88 100644 --- a/tiles/tiles.c +++ b/tiles/tiles.c @@ -1,4 +1,9 @@ /** WARNING - THIS FILE IS AUTOGENERATED BY pack_tiles, EDITS TO THIS FILE MAY BE OVERWRITTEN **/ +unsigned char font_images[] = { +0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x08,0x06,0x00,0x00,0x00,0x5c,0x72,0xa8,0x66,0x00,0x00,0x09,0xf1,0x49,0x44,0x41,0x54,0x78,0x9c,0xed,0xdd,0xd9,0xd6,0xdb,0xa6,0x1a,0x00,0xd0,0x3f,0x5d,0x7d,0xff,0x57,0xf6,0xb9,0x38,0xd5,0x0a,0x51,0x84,0xc4,0x3c,0xc8,0x7b,0x5f,0xb5,0x49,0x04,0x08,0xc1,0xc7,0x60,0x1b,0xfd,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x50,0xe0,0x57,0xef,0x0c,0x3e,0x9f,0xcf,0xe7,0xaf,0x4c,0x7f,0xfd,0xea,0x9e,0x2f,0xb0,0x80,0x73,0x00,0xb8,0x0a,0x08,0x23,0xf2,0x3d,0xfe,0x6c,0x54,0xfe,0xb0,0x83,0x7f,0x66,0x17,0xa0,0x87,0xcf,0xe7,0xf3,0x89,0xcd,0x32,0xcc,0x3e,0xe0,0xb7,0x57,0x06,0x00,0x20,0x8d,0x00,0x00,0x5f,0xec,0x55,0x01,0x20,0x5c,0xe3,0x5b,0xeb,0xc3,0xb3,0x7f,0x67,0x17,0xa0,0xa5,0x63,0x7d,0x7f,0xec,0x01,0x08,0x02,0x70,0xef,0x55,0x01,0xe0,0xe7,0xe7,0xcf,0x0d,0xc0,0x70,0xc3,0xef,0x6a,0x66,0x60,0x43,0x90,0x6f,0xf7,0xba,0x00,0x10,0x73,0xcc,0x08,0x74,0x7a,0xf8,0xed,0x55,0x7b,0x00,0x40,0x9e,0xa1,0x01,0xc0,0x08,0x0c,0x6b,0x19,0xb2,0x04,0x98,0xf9,0xed,0x3f,0x20,0x6e,0x48,0x00,0x18,0x3d,0xea,0x9f,0x03,0x81,0x59,0x07,0x7c,0x89,0xbb,0xdf,0x00,0x98,0x21,0xc0,0xcb,0xdd,0x75,0x72,0x81,0x00,0xfe,0xf4,0x35,0x1f,0x03,0x1e,0x2c,0x07,0xe0,0xb7,0xee,0x9f,0x02,0x18,0x6d,0x61,0x5d,0x5d,0x67,0x00,0xb1,0xef,0xe5,0xcf,0x18,0x85,0x05,0x22,0x18,0x28,0xd6,0xe1,0x7a,0x77,0xc4,0x59,0xf9,0x02,0x01,0x1d,0x11,0xd6,0x37,0x64,0x09,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xb4,0xe6,0xb7,0xf1,0x8b,0x89,0x7d,0x7d,0xda,0x39,0x06,0x6c,0xe7,0x9b,0x4f,0xdf,0xf9,0x44,0x3c,0x5d,0x53,0xf2,0x77,0x39,0xe5,0xa9,0x49,0x83,0x31,0x46,0xfe,0x90,0x2e,0xfa,0x63,0xa0,0xab,0xcc,0x56,0xf8,0x1d,0x7f,0x6e,0x19,0x8e,0xeb,0x4b,0xae,0x2b,0xbd,0xdf,0xbb,0x3c,0x63,0xe9,0x3e,0xe5,0x57,0x5b,0x96,0xd4,0x34,0x7a,0x1d,0xdd,0x9e,0xdb,0x9e,0x1c,0x21,0x3f,0xc6,0x65,0x00,0xb8,0x6a,0xc0,0x33,0x46,0x8f,0x73,0x23,0x38,0x46,0xb1,0xd4,0x86,0x7c,0xfc,0xf7,0x8c,0x86,0x14,0xcb,0x73,0x54,0x59,0x4a,0x03,0xdf,0x53,0x9a,0x39,0xe9,0x5d,0x3d,0x83,0x11,0x1d,0xbb,0xc7,0xbd,0xbf,0x55,0x74,0x06,0x50,0x5b,0x79,0xe1,0x83,0x6e,0xf5,0xd0,0x8f,0xd7,0x7b,0xa5,0xa6,0xd7,0xf2,0x1e,0x76,0xb1,0x42,0xe3,0xaf,0x2d,0x43,0x8b,0x7a,0x5f,0xf1,0xfe,0x53,0xea,0x65,0xf4,0x40,0x9b,0x7c,0x26,0x60,0xd8,0xf9,0x7a,0x16,0x28,0xb5,0x2c,0x77,0x7f,0xdf,0x23,0xe0,0xa4,0x5e,0xb3,0x42,0xd0,0xe8,0x95,0x7f,0xea,0x1b,0x97,0x7f,0xfd,0xe7,0xfc,0xe7,0x2b,0xd4,0x4d,0xaa,0xda,0x76,0x5e,0xf3,0x76,0xea,0x5e,0x6f,0xb6,0xbe,0x4a,0x33,0xeb,0x50,0xd0,0xe3,0xc1,0xa6,0x6c,0x66,0xf5,0x5a,0x47,0x8e,0xea,0xfc,0x87,0xf0,0x9e,0x57,0x08,0x7e,0x77,0x76,0xea,0x60,0x31,0xa3,0xee,0x61,0xc5,0xe7,0x19,0xde,0xfb,0xb9,0x9f,0xd5,0x96,0x35,0x76,0xfd,0x63,0x00,0x68,0x51,0x49,0xbd,0x22,0xda,0x59,0xcf,0xc6,0x33,0xba,0x63,0x7d,0x02,0x23,0xf3,0xfd,0x06,0xa3,0x96,0x49,0x57,0xed,0xbe,0x76,0x66,0x90,0x7b,0xcd,0xd3,0x92,0xb9,0xf9,0x91,0x60,0xad,0x3a,0xe1,0x79,0x0f,0xe1,0xe7,0x67,0xfe,0xa6,0xce,0xf1,0xf0,0x46,0x6c,0x62,0xc5,0x36,0x60,0x67,0xd7,0xc1,0xee,0x66,0xcd,0x92,0x66,0xce,0xce,0xee,0xf2,0xed,0x72,0x26,0x60,0x2c,0xc2,0xd5,0x74,0xe4,0x1d,0x1a,0x7e,0xaf,0x87,0x3c,0x63,0xf6,0x31,0x32,0xbf,0x51,0x76,0x5b,0x22,0xd5,0x0c,0x38,0x57,0x7d,0xed,0x2a,0xbd,0x2e,0x01,0xe0,0x6e,0x03,0xe8,0x69,0x4a,0x12,0x4b,0x6f,0x97,0x87,0x77,0xd5,0x79,0x72,0xca,0x5d,0x73,0x9f,0x57,0xf5,0x94,0x3a,0x7b,0xc8,0xf9,0x77,0xbb,0xcd,0x48,0x66,0xce,0x20,0x5b,0x2c,0x7f,0x7b,0x2e,0x19,0x86,0xbf,0x1a,0xac,0xb6,0x71,0xd7,0xa4,0x31,0xc2,0xb9,0x6c,0x25,0x01,0xaf,0x95,0xd4,0x7c,0xaf,0x96,0x5b,0x77,0x56,0xae,0xff,0x98,0x95,0xca,0x9c,0x33,0xa0,0xf5,0xde,0x3f,0x6b,0xfa,0x6a,0xb0,0xde,0x0d,0x7d,0xf6,0x43,0x2c,0xb9,0xbf,0x5f,0xff,0x49,0xd9,0xd4,0x6b,0xf9,0xa0,0x73,0xd2,0x1a,0xb5,0xeb,0x5e,0x93,0x4f,0x6e,0xdd,0x84,0x75,0x3d,0x6a,0x13,0x3a,0x66,0x76,0xbb,0xbd,0x93,0x3d,0x03,0x58,0x7d,0x7d,0xb8,0xea,0x68,0x9b,0x1a,0xed,0x6b,0xcb,0x11,0x8e,0x2e,0x2b,0x3c,0xab,0xb0,0x0c,0x39,0xcb,0x8c,0xd8,0x32,0x26,0x55,0xce,0x8c,0xe6,0x29,0xff,0x37,0xcb,0x0a,0x00,0xab,0x57,0x4c,0xf8,0xd0,0x57,0x2e,0xe7,0x28,0x2b,0x2c,0x9b,0x4a,0x66,0x4c,0xb5,0xfb,0x28,0x57,0xd7,0xad,0x10,0x0c,0x4b,0xf5,0x0c,0xe6,0x49,0x01,0x60,0xb7,0x0e,0xb5,0xd3,0xa6,0xe1,0xa1,0x57,0x99,0xcf,0x1d,0xe0,0x29,0xfd,0x1d,0xeb,0x2e,0x55,0xce,0x7d,0x3d,0x75,0xb8,0x58,0x3a,0xbd,0x3a,0x6a,0xc9,0xf3,0xb8,0x9a,0x49,0x9d,0xd3,0x79,0x0c,0x00,0xe1,0xfa,0xf5,0x8d,0x8d,0x22,0xd5,0xce,0x23,0xc8,0xcf,0xcf,0xfc,0x75,0x70,0x8e,0xda,0x99,0xcb,0xd5,0x35,0x39,0xe9,0xd4,0xb4,0xf3,0x55,0xfa,0x48,0x6a,0xbf,0x4d,0x9a,0x01,0xb4,0xba,0xa9,0x1d,0x83,0x48,0xea,0xba,0xb5,0x85,0x56,0xa3,0x6f,0x2c,0x9d,0xd4,0xf4,0x57,0x78,0x46,0x6f,0x98,0xba,0x87,0x66,0xd4,0x69,0x4a,0x1d,0x36,0xfb,0x18,0x30,0x65,0x13,0xac,0x64,0x27,0xb7,0xb4,0x3c,0x57,0xf9,0xd5,0xae,0x23,0x77,0xd2,0x7b,0x49,0x31,0xca,0x8e,0x75,0x5f,0xaa,0xd7,0xbd,0x56,0xcf,0x00,0xce,0x62,0xa3,0x4b,0xe9,0xb5,0x57,0x5a,0x54,0xc6,0x39,0x8d,0xdc,0x69,0xe5,0x8e,0x33,0x96,0xd0,0x4e,0xd3,0x7e,0xe6,0x88,0x6e,0x64,0xdc,0x35,0xfc,0x9a,0x8e,0xb1,0x7b,0xa7,0xba,0x73,0xd7,0xd9,0xde,0x7a,0xcf,0x94,0x99,0xfd,0xe9,0xcc,0xad,0xa7,0x51,0xc3,0xa8,0x02,0xef,0xd0,0xf4,0x9b,0x80,0xc0,0x5e,0x8a,0x8f,0x26,0x5a,0x72,0xea,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xeb,0xeb,0xf9,0xc5,0x3b,0x5f,0x04,0x62,0x18,0xdf,0x20,0x5d,0x8f,0x00,0xf0,0x85,0x7a,0x77,0xc4,0x5d,0x3b,0xfa,0x8a,0xe5,0xee,0x5d,0xa6,0xe1,0xa7,0x02,0x43,0x8e,0x56,0x3f,0xe9,0x1e,0xfd,0xe3,0x9b,0x16,0x3f,0x0c,0x1b,0x11,0x90,0x6e,0x5f,0x0f,0x1e,0x1a,0xfd,0xd5,0xdf,0x96,0xbf,0xac,0x6b,0xf5,0xf0,0x53,0xd2,0xe9,0xf9,0x6b,0xc7,0x15,0x7e,0x49,0x59,0x5a,0x86,0x94,0xeb,0x62,0xcf,0x3c,0xf7,0x70,0x90,0x15,0xda,0x6f,0x2c,0xbf,0x9c,0x7b,0x18,0x71,0x28,0x4a,0xd2,0xeb,0xc1,0x5b,0x1d,0x09,0x96,0xda,0x11,0xef,0xfe,0x5d,0xc9,0xa1,0x22,0xa5,0x01,0xe3,0xac,0x77,0x23,0xba,0x2b,0x6b,0xea,0x2f,0x34,0x6b,0xca,0xf8,0x94,0x46,0x4e,0x5d,0x9e,0x1b,0x70,0xed,0x19,0x10,0x39,0x79,0xf7,0x3a,0x0c,0xe5,0x8d,0x92,0xf6,0x00,0x6a,0x1b,0x55,0x4e,0x00,0x69,0x39,0x55,0xcb,0x6d,0xb0,0x61,0x39,0x0f,0x47,0x59,0x5a,0x36,0xa6,0xbb,0xce,0x5c,0x3a,0xf3,0x69,0x31,0x5a,0xb4,0xba,0xc7,0x5d,0x3b,0xde,0x2a,0x07,0xa8,0x8c,0x0c,0x5e,0x43,0xf6,0x00,0x66,0x34,0x88,0xdc,0x4a,0x5c,0x65,0x6d,0xd8,0xa2,0x03,0xd7,0x34,0xa0,0x96,0xa3,0x67,0xcb,0xa5,0xd7,0xae,0x41,0x65,0x75,0xaf,0xfc,0x14,0x60,0x85,0x28,0x7e,0xe7,0x69,0x24,0x3f,0x97,0xbf,0xc5,0xfd,0xe4,0xa4,0xd1,0x62,0x24,0x0c,0x67,0x4f,0x35,0xe9,0xd4,0xe4,0x5f,0x72,0x0f,0xab,0xcc,0x02,0x42,0x3d,0xcb,0x94,0x14,0x00,0x4a,0x33,0x6f,0x1d,0xb9,0x73,0xd7,0x81,0xad,0xf2,0xcd,0xd1,0xeb,0x61,0xe5,0xce,0x66,0x5a,0x96,0xa1,0xd5,0x1e,0x50,0x69,0xde,0xb3,0xf2,0x9d,0x91,0xe6,0xe8,0xfb,0x7d,0x0c,0x00,0x2d,0xd7,0xe4,0x25,0xc2,0xb5,0xf9,0x8c,0xfc,0x77,0x55,0x3b,0x93,0x38,0x5f,0xbf,0x63,0xe7,0xaf,0x99,0x05,0xac,0x10,0xc8,0xcf,0xd7,0xf5,0x28,0x4f,0x74,0x0f,0x60,0x76,0xc7,0x0f,0xad,0x50,0x86,0x1c,0xb1,0x75,0xf4,0x8c,0xd1,0xec,0xfc,0x1c,0x4b,0x82,0xc0,0x6e,0xf5,0xdf,0x4a,0xd8,0xe9,0x56,0xa8,0x83,0x1e,0x65,0x88,0xce,0x00,0x5a,0xef,0x7c,0x8f,0x74,0x3c,0xb8,0xd9,0xb3,0x86,0xd9,0xf9,0xb7,0xd8,0x7c,0x6b,0x55,0x96,0x92,0xbc,0x57,0x68,0x7f,0xa3,0xcb,0x30,0x3a,0xbf,0x61,0x9b,0x80,0xa5,0x8d,0xa9,0xb4,0x33,0x87,0xd3,0xb8,0x19,0xcb,0x88,0x92,0x11,0x37,0x34,0x3b,0x78,0x1c,0x1d,0x70,0xc5,0x4d,0xb1,0x1c,0xbb,0x97,0xbf,0xb7,0xa1,0x9f,0x02,0xd4,0x04,0x81,0xda,0xf5,0xdc,0x8c,0xd1,0x24,0x0c,0x02,0xb9,0x53,0xef,0xde,0x65,0x22,0xdd,0x9b,0x83,0xc8,0xb0,0x00,0xd0,0xaa,0xe1,0xed,0xfa,0x20,0x66,0x2e,0xa9,0x74,0x7a,0x62,0xa6,0x7c,0x0f,0xa0,0x66,0x26,0xd0,0xba,0x2c,0xbd,0xad,0xb8,0x97,0x72,0x57,0x9e,0xab,0x8f,0xfc,0x46,0x8f,0x80,0xad,0xd7,0xff,0x2d,0xca,0xff,0xd6,0x59,0xc0,0xb4,0x5f,0x03,0xae,0xb2,0xc9,0xb3,0xba,0x16,0x1f,0x85,0x8d,0xca,0xab,0xa5,0xbb,0xce,0xd6,0x62,0x73,0x73,0xc6,0xa7,0x31,0xab,0xd4,0x6d,0x68,0x68,0x00,0x08,0x3f,0x56,0xda,0x25,0x9a,0xce,0x7c,0x68,0xbb,0xd4,0x51,0x2f,0xad,0xeb,0xbe,0xc5,0x2c,0xa0,0x55,0x59,0x56,0xd1,0x3d,0x00,0x84,0x91,0x6f,0xe6,0x17,0x4b,0x76,0xeb,0x4c,0x33,0x37,0x2d,0x73,0xff,0x6e,0x64,0x39,0x56,0x4e,0xfb,0xb0,0x5b,0x5b,0xfb,0x4b,0xcb,0x1b,0xc8,0xfd,0x18,0xae,0x47,0xe5,0xad,0xf0,0x9d,0x00,0xe6,0xd3,0x06,0xfe,0xd6,0x7d,0x06,0x30,0x6b,0xda,0x34,0x73,0xb6,0xc1,0x9a,0xb4,0x03,0x00,0x00,0xe0,0xcb,0x59,0x13,0xc1,0x4b,0xa4,0x6e,0x72,0xda,0x0b,0x01,0x00,0x00,0x00,0x00,0x00,0xb8,0xe4,0xb7,0x05,0xbc,0xc5,0x2b,0x5f,0x0c,0xd2,0xd3,0x37,0x74,0xfc,0xd5,0xee,0x71,0xd7,0x73,0x15,0x77,0x10,0x0d,0x00,0xb3,0x47,0xb9,0xd9,0xf9,0xdf,0xf1,0x45,0x8a,0x74,0xb5,0xcf,0x71,0xf6,0x41,0x1a,0x2b,0xb7,0xc3,0x16,0x6e,0x8f,0x05,0x1f,0x59,0x90,0x55,0xcb,0x40,0x9d,0x15,0x8f,0x44,0xcb,0xb5,0x7b,0xf9,0xef,0x24,0xbf,0x19,0x08,0x66,0x78,0x73,0xe7,0x5b,0xc1,0x6d,0x00,0x50,0xf9,0xf0,0x6e,0x8f,0x33,0x80,0x9d,0xce,0xef,0x03,0xf2,0x24,0x7d,0x0a,0x60,0x26,0x40,0xa9,0x15,0x07,0x8f,0x9e,0x65,0x5a,0xf1,0x7e,0xef,0x4c,0x3b,0x16,0x9c,0x7b,0x57,0x0d,0x69,0xf6,0x41,0xaa,0x33,0x8f,0x77,0x6b,0x91,0xf7,0x71,0x3f,0x06,0xb4,0xdf,0x04,0x80,0x02,0xa9,0x0d,0xb2,0xb4,0x03,0xf5,0x6a,0xa8,0x25,0xe9,0x5e,0x9d,0xe8,0xbc,0x9b,0x9a,0xfa,0x0c,0x8f,0xb2,0x6f,0x5f,0xb2,0xf9,0x04,0x80,0x4e,0xce,0x8d,0x26,0xb7,0x03,0xcd,0x7e,0x95,0xda,0x5b,0x1a,0xfd,0xec,0xfb,0xc8,0xcd,0x7f,0x74,0x79,0x97,0x0f,0x00,0xb5,0xa3,0x61,0x8f,0xd1,0xf4,0xe9,0xd5,0x5a,0xad,0xf3,0x2b,0x71,0x2e,0xc7,0xd1,0xb0,0x4a,0x02,0xc2,0xce,0xa3,0xff,0x4c,0x47,0xbd,0xd5,0x2c,0xa5,0x5a,0xb4,0xa7,0xbb,0x34,0x86,0x06,0x80,0x9a,0xe8,0x56,0x12,0x49,0x6b,0xf3,0x2e,0x6d,0xf8,0x2b,0x74,0xfe,0xd6,0x65,0x98,0x7d,0x4f,0xbb,0x09,0x9f,0x41,0xd8,0x01,0x8f,0x6f,0x16,0xa6,0x2e,0x21,0xcf,0x01,0x3c,0x35,0xef,0xf0,0xff,0xef,0x02,0x7f,0xb7,0x00,0xd0,0x62,0xd4,0xb8,0x9a,0x46,0x97,0xac,0x5f,0x4b,0xca,0x73,0x95,0x57,0x38,0x8a,0xa6,0xcc,0x02,0x62,0x65,0x49,0xb9,0xae,0xc7,0x26,0xe0,0xec,0xe9,0xf0,0x2c,0x2b,0xcc,0xca,0x8e,0xbc,0x53,0x3b,0x74,0xed,0xb3,0x4a,0xbd,0xb6,0x4b,0x00,0x88,0x55,0xf8,0x88,0xa9,0x64,0x2c,0xef,0x91,0x0f,0xbf,0x34,0xaf,0x92,0x68,0x7f,0xd6,0xab,0x93,0xef,0x1a,0x3c,0xc2,0x3a,0x5d,0x21,0x10,0xac,0xa6,0xdb,0x0c,0x60,0x85,0x68,0xdb,0xd2,0x4e,0x1d,0xa0,0x75,0x59,0x77,0xb9,0xef,0x3b,0x23,0xef,0xa1,0xb6,0xfe,0x5b,0x3c,0xbf,0xd4,0xc1,0x76,0xd8,0x1e,0xc0,0xa8,0x8d,0xa4,0x70,0xbd,0xd3,0xf3,0xa1,0xaf,0x1a,0x10,0xce,0xeb,0xce,0xab,0xbf,0x5b,0xd5,0xaa,0x81,0x2b,0x37,0x9d,0x99,0xb3,0xcf,0xdc,0xfc,0x96,0xde,0x03,0x28,0xdd,0xb5,0x2e,0xbd,0xee,0xca,0x55,0x30,0xb9,0x4b,0x3f,0x65,0x8f,0x60,0x84,0xda,0xe5,0xd7,0xac,0xce,0x73,0xf6,0xd6,0x4f,0x20,0xee,0xea,0x65,0x76,0xdb,0xe9,0x66,0xe4,0xc3,0x6c,0xb5,0x09,0x19,0x4b,0xe7,0x29,0xfd,0xbb,0x6b,0x53,0xf2,0x2d,0xb9,0x6e,0x56,0xba,0xad,0x9c,0x37,0x41,0x57,0x2f,0xef,0x1b,0x2c,0xff,0x3d,0x80,0x1a,0xb5,0xd3,0xe0,0x9a,0x28,0x1d,0x7e,0xe4,0x93,0x9b,0xef,0x37,0x53,0x5f,0x7c,0xbd,0x6f,0x9d,0x01,0x00,0x15,0x52,0x96,0x25,0xa3,0xca,0xc2,0x1e,0x1c,0x0a,0x0a,0x5f,0xec,0xd5,0x7b,0x00,0xfc,0x9f,0x75,0x35,0x7c,0x81,0xab,0x29,0xbe,0x69,0x3f,0x77,0x8c,0x08,0x2f,0x73,0xee,0xf0,0x46,0x7d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x96,0x54,0x73,0x32,0x8e,0x53,0x75,0x78,0xab,0xe8,0x99,0x80,0x77,0x6f,0xbe,0xe9,0x57,0x9c,0x3f,0xf3,0x77,0x9a,0x0d,0xf4,0xf5,0x78,0x28,0x68,0xc9,0x2b,0xb6,0x5b,0x1e,0x4b,0xe5,0x40,0x4b,0x0e,0x61,0xbb,0xd2,0x1e,0xda,0xb8,0x0d,0x00,0xb9,0x95,0x7c,0xd5,0x59,0x6b,0xa7,0xde,0x2d,0x1e,0x74,0xcb,0x74,0x8e,0xff,0xd6,0x00,0xc7,0x09,0xdb,0x95,0x99,0x61,0x5b,0xcd,0x8f,0x05,0x5f,0xed,0xe1,0xd4,0xbc,0x9f,0x2f,0x7c,0x09,0xe8,0x4a,0x0d,0x6f,0xa5,0xb2,0xf4,0x72,0x15,0x6c,0xbf,0xe1,0xbe,0x47,0xbb,0x0d,0x00,0x25,0x9d,0xa7,0xe5,0x86,0xd9,0xec,0xa5,0xc3,0xac,0x11,0x3f,0xd6,0xd0,0xdf,0xbe,0x1c,0xba,0xab,0x6f,0x9d,0x7f,0xb0,0xd6,0xaf,0xd7,0x1e,0x9d,0x7f,0xcb,0x40,0xd4,0x32,0x10,0xa6,0xa4,0x55,0x72,0x6d,0x8b,0xfb,0x8d,0xbd,0x91,0x37,0xf5,0x4d,0xbd,0x77,0xff,0x2e,0x35,0x8d,0xd8,0xb5,0x25,0xd7,0xf1,0xec,0xd5,0x6f,0x06,0x9a,0x79,0x46,0x7e,0xeb,0xf5,0x6a,0x8b,0xb4,0x52,0xd2,0x08,0x97,0x3d,0xe1,0x9f,0xa5,0xa4,0x1f,0x9b,0xaa,0xaf,0xb0,0x0f,0xc4,0xb5,0xcb,0x00,0xf0,0x86,0x88,0x1b,0x9b,0x42,0xef,0xd0,0x98,0xc2,0x4e,0x58,0x5a,0xde,0xab,0x4e,0x98,0xd2,0xf9,0xef,0xfe,0xbf,0xa6,0x1c,0x25,0x75,0xbf,0xcb,0xf3,0xda,0x59,0x74,0x06,0xa0,0xe2,0xe7,0x0a,0x47,0xd3,0xd4,0x7f,0x7f,0xde,0xb8,0xac,0x55,0xda,0x01,0x5b,0x94,0x41,0xe7,0x1f,0x63,0xd9,0x25,0x40,0xeb,0x87,0xbf,0xd2,0xac,0x26,0xa7,0x71,0xe7,0x8c,0x9e,0xe7,0x8e,0x57,0xb2,0x89,0x19,0xe6,0x55,0x53,0x67,0x2d,0x3e,0x41,0xb9,0xcb,0x5f,0x70,0xe8,0x68,0xa5,0xce,0xd2,0xc2,0xac,0x0d,0xc5,0xf3,0xc6,0xd7,0x27,0x50,0x53,0x9e,0x9e,0xce,0x65,0xb3,0x79,0xf7,0x6e,0xcb,0xce,0x00,0x6a,0xad,0xd0,0xf8,0x8e,0x51,0xf0,0xbc,0x9e,0x5f,0xa1,0x6c,0x57,0xae,0xca,0x65,0xa4,0x05,0x8a,0xac,0x1a,0xe8,0xf8,0xed,0x9f,0xd9,0x05,0x00,0xe6,0x11,0x00,0xe8,0xc2,0xe8,0x0f,0x00,0xb0,0xaa,0xff,0x01,0xc7,0xa1,0x90,0xc0,0x95,0xc3,0x38,0x13,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, +}; +unsigned int font_images_length = 2602; + unsigned char player_images[] = { 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xa0,0x08,0x03,0x00,0x00,0x00,0xc4,0xae,0x99,0xbe,0x00,0x00,0x00,0x6f,0x50,0x4c,0x54,0x45,0x6d,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x00,0x00,0x71,0x00,0x00,0xaa,0x41,0x00,0x00,0x1c,0x00,0x71,0x41,0x00,0x10,0x00,0x00,0xff,0x14,0x14,0x14,0x71,0x00,0x00,0x41,0x10,0x00,0x20,0x20,0x20,0x41,0x00,0xff,0xaa,0x00,0x00,0x41,0x20,0x00,0x2c,0x2c,0x2c,0xff,0x00,0x00,0x38,0x38,0x38,0x71,0x38,0x00,0x45,0x45,0x45,0x51,0x51,0x51,0xaa,0x55,0x00,0x61,0x61,0x61,0x55,0x55,0xff,0x71,0x71,0x71,0x00,0xaa,0x00,0x82,0x82,0x82,0x7d,0x7d,0xff,0xff,0x7d,0x00,0x00,0xbe,0xff,0xff,0xbe,0x00,0x7d,0xff,0x00,0x55,0xff,0xff,0xff,0xff,0x00,0xff,0xff,0x55,0xff,0xff,0xff,0x48,0x6e,0x9b,0x02,0x00,0x00,0x00,0x01,0x74,0x52,0x4e,0x53,0x00,0x40,0xe6,0xd8,0x66,0x00,0x00,0x00,0x09,0x70,0x48,0x59,0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b,0x13,0x01,0x00,0x9a,0x9c,0x18,0x00,0x00,0x00,0x07,0x74,0x49,0x4d,0x45,0x07,0xdd,0x0a,0x0f,0x06,0x22,0x1e,0x29,0x97,0xaa,0x57,0x00,0x00,0x03,0x44,0x49,0x44,0x41,0x54,0x68,0xde,0xed,0x9a,0x6b,0x7b,0xa2,0x30,0x10,0x85,0x33,0xc5,0x54,0xa1,0xd4,0xa5,0x61,0x03,0x55,0x56,0x58,0x52,0xfe,0xff,0x6f,0xdc,0x99,0x44,0xbc,0x7e,0x9d,0x63,0x9f,0xba,0x0c,0x3e,0xa0,0x5f,0xce,0xcb,0x99,0xc9,0x8d,0xa0,0x31,0xcf,0x13,0x9f,0x9f,0x60,0xfd,0xd5,0x0a,0x4a,0x18,0x57,0x58,0x07,0x63,0xb7,0xea,0x90,0xfa,0x9d,0xf7,0xbe,0x03,0x12,0xba,0x0e,0xab,0x2f,0x84,0x8e,0xb0,0x6d,0x88,0xe8,0xa7,0x03,0x4c,0x51,0x40,0xe5,0x9b,0xa6,0x28,0x9a,0x06,0x78,0xfb,0xdd,0xd8,0x34,0x1e,0x67,0xa2,0x28,0xc6,0xae,0x6b,0x81,0x00,0x2a,0xba,0xee,0x77,0xdb,0x02,0x01,0xd4,0xb5,0x6d,0x5b,0x11,0x8d,0x98,0xce,0x66,0x6d,0xd3,0xfa,0xb6,0xaa,0xac,0x24,0x0a,0x04,0x68,0x2a,0x0e,0xee,0xcf,0x2d,0x02,0xe0,0xad,0x33,0x8d,0xb5,0x5f,0xb6,0x91,0x44,0x21,0x46,0x6a,0x67,0x04,0xf0,0x97,0x13,0x85,0x01,0x38,0x39,0x6d,0x36,0x59,0xd6,0x34,0x30,0x03,0x51,0x5f,0x08,0x06,0x68,0x20,0x5a,0x68,0x40,0x00,0x31,0x90,0x00,0xa0,0xf1,0x88,0xc5,0x5f,0x18,0xf2,0x02,0x03,0xc4,0xfc,0x6f,0x50,0x45,0x48,0x06,0xe2,0x19,0x35,0x60,0x5b,0x9b,0xa5,0x8b,0x81,0x01,0x0c,0x14,0x60,0x4f,0x00,0x98,0x85,0x25,0xfe,0xc3,0xa0,0xab,0x0b,0x64,0x15,0x70,0x3e,0xc3,0x96,0xaa,0xe0,0xd5,0x2a,0x7a,0x31,0xfc,0x45,0xf4,0x85,0xbd,0x79,0xa4,0x03,0x38,0xc0,0xec,0xc1,0x4d,0xa8,0xae,0xb1,0x80,0x5a,0x1c,0x10,0xb0,0x9d,0x0a,0x80,0x08,0x48,0xb8,0x02,0x10,0xac,0x19,0x25,0x75,0x34,0x60,0xbf,0x47,0x01,0x52,0x95,0xf7,0x1c,0xa8,0xc1,0x9a,0xa0,0x80,0xfd,0x93,0x00,0x0c,0x1e,0x40,0x20,0xfd,0x33,0x00,0x35,0x1c,0x3d,0x02,0x60,0x70,0xdd,0xf8,0x59,0x00,0x69,0xb4,0x58,0x56,0xa0,0x77,0x33,0x4d,0x0d,0xd5,0xab,0xeb,0x5a,0x15,0x70,0xa7,0x87,0x33,0xf0,0x16,0xcf,0xde,0x39,0xa7,0xbd,0x7c,0x3e,0x7e,0x7b,0x93,0x2f,0x7e,0xf4,0xaa,0x00,0xba,0x05,0xb0,0x3e,0x79,0x5d,0x40,0x7d,0x09,0xf0,0x92,0x21,0xaf,0x6c,0x80,0x2e,0x6a,0xc0,0x3f,0x64,0x57,0x50,0x73,0xdd,0x70,0x93,0x22,0x32,0x6a,0x35,0xf8,0x95,0x16,0x0e,0x37,0x00,0xa3,0x08,0x58,0xdf,0x3c,0x23,0x71,0x8a,0xf2,0x7c,0x27,0xad,0xa8,0xcc,0x73,0x0d,0xfd,0xb5,0xa8,0xdb,0x8a,0x0f,0x9a,0x01,0x3e,0x1f,0x77,0x3b,0x26,0xe4,0x4e,0x07,0xc0,0x77,0x6f,0x25,0xa2,0x09,0x49,0x91,0x77,0xe3,0x2e,0xb6,0x23,0xef,0xb4,0x00,0x62,0xa0,0x4a,0x0f,0x4b,0x11,0x10,0xf5,0x4b,0x1d,0x80,0xb9,0x70,0x40,0x31,0x45,0x44,0x2e,0xea,0x97,0xc6,0x93,0x06,0x40,0x74,0x63,0x0d,0xcc,0xd1,0x01,0x47,0x29,0xfa,0xa5,0xc6,0x2c,0x36,0x03,0x24,0xce,0x00,0x53,0x4a,0x18,0x35,0x80,0x6c,0x9f,0xb9,0x23,0x80,0x53,0xe4,0xc8,0x6c,0x5e,0xf9,0x30,0xc6,0xa9,0xd4,0xc0,0x89,0x6c,0xdc,0xa0,0x8b,0x7a,0x6f,0x72,0xc9,0x84,0xa0,0x06,0x70,0x73,0x47,0x4b,0x00,0xf9,0xe6,0x4b,0xa7,0x94,0xa2,0xf5,0x3a,0xb5,0x7e,0x3a,0xad,0x4c,0xe2,0x89,0xf5,0x5d,0xae,0x52,0xe4,0x59,0xf4,0x54,0xe4,0x74,0x8a,0xfa,0xb9,0xca,0x1e,0x54,0x12,0x75,0xd2,0x0d,0x92,0x5e,0x9c,0x32,0x5d,0x69,0x5d,0x5e,0xa9,0x00,0x64,0x2c,0x8a,0x7a,0x25,0x9d,0xf5,0xd8,0x40,0x95,0x57,0xb9,0xca,0x68,0x2a,0x00,0x16,0x4f,0x80,0x39,0xca,0xf7,0xf7,0xcc,0xe5,0x99,0xce,0x78,0xcd,0x80,0x92,0xf3,0x74,0x09,0x78,0x67,0xfd,0xd7,0x75,0xa9,0x04,0x38,0x36,0xa1,0xf5,0x15,0x40,0xb4,0x33,0x4d,0xc0,0xed,0x86,0x8d,0xfc,0x78,0x55,0x5c,0x4f,0xdf,0x6d,0x6a,0xdd,0x23,0x55,0x3a,0xc3,0xb5,0x25,0x3d,0xc2,0xad,0xde,0x79,0x01,0x40,0xaa,0xfa,0xcf,0xf3,0x0c,0x53,0xa0,0xe5,0xd1,0x80,0x02,0x0f,0xc0,0x32,0x0a,0xd3,0x83,0x6b,0xdc,0x17,0xfd,0x23,0x5a,0x51,0x78,0x00,0x20,0x40,0x01,0xdb,0x6d,0x80,0x3a,0x08,0x7d,0xbf,0x0d,0x01,0x08,0xe8,0x39,0xb6,0x40,0x07,0x21,0x02,0x50,0x16,0xc4,0x01,0xf5,0x3d,0x6e,0x6c,0x65,0xc0,0x34,0x11,0x4d,0x13,0xb2,0xc8,0xd0,0x17,0x73,0x0f,0x01,0x44,0xc2,0x16,0x06,0x10,0x71,0x0e,0x94,0x89,0x82,0x08,0xfb,0xd2,0x86,0x08,0x4c,0x38,0x8b,0x87,0x00,0xe9,0x6b,0xf3,0x3b,0x21,0x06,0x60,0x86,0xbc,0x53,0x33,0xa5,0x30,0x11,0x18,0x00,0x77,0x80,0xa9,0xc1,0x11,0xb0,0x8d,0xbd,0xc1,0xfc,0x54,0x40,0x08,0x64,0x02,0x70,0x3e,0x90,0xfc,0xe3,0x5e,0xda,0x14,0xc7,0xa7,0x36,0x5a,0x5e,0x49,0x2c,0xb1,0xc4,0x12,0x4b,0x7c,0x77,0xfc,0x01,0xeb,0x7f,0x0c,0x1f,0xd8,0xfb,0x1f,0x86,0x03,0xd4,0xc3,0xc0,0xc7,0x01,0x9b,0xa3,0x01,0xac,0x1f,0x86,0x03,0x96,0xc0,0xf3,0xf9,0x01,0x3a,0xa3,0x4f,0x34,0x1d,0xd0,0x7f,0xbe,0x04,0x17,0x01,0xbb,0xe6,0x81,0xfe,0x69,0xce,0xb4,0xad,0x4f,0x41,0xe4,0x30,0x00,0x56,0xf6,0xde,0x11,0x0d,0x20,0xc0,0x9c,0xa3,0x01,0x5f,0x05,0xf3,0xb3,0x01,0xe0,0xad,0xf6,0x30,0xc8,0x07,0xdb,0xcd,0xbe,0xeb,0xe9,0xe2,0x1f,0x31,0x44,0x2f,0xdf,0x6e,0xb1,0xd3,0xe8,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, }; diff --git a/tiles/tiles.h b/tiles/tiles.h index 17ea061..960077d 100644 --- a/tiles/tiles.h +++ b/tiles/tiles.h @@ -3,6 +3,9 @@ #define TILES_H #define TILE_WIDTH 16 #define TILE_HEIGHT 32 +extern unsigned char font_images[]; +extern unsigned int font_images_length; + extern unsigned char player_images[]; extern unsigned int player_images_length; diff --git a/xcode/build/timesynk.build/timesynk.pbxindex/categories.pbxbtree b/xcode/build/timesynk.build/timesynk.pbxindex/categories.pbxbtree index c56b6c9..bb19b0f 100644 Binary files a/xcode/build/timesynk.build/timesynk.pbxindex/categories.pbxbtree and b/xcode/build/timesynk.build/timesynk.pbxindex/categories.pbxbtree differ diff --git a/xcode/build/timesynk.build/timesynk.pbxindex/cdecls.pbxbtree b/xcode/build/timesynk.build/timesynk.pbxindex/cdecls.pbxbtree index 4c0eab4..2cccd9d 100644 Binary files a/xcode/build/timesynk.build/timesynk.pbxindex/cdecls.pbxbtree and b/xcode/build/timesynk.build/timesynk.pbxindex/cdecls.pbxbtree differ diff --git a/xcode/build/timesynk.build/timesynk.pbxindex/decls.pbxbtree b/xcode/build/timesynk.build/timesynk.pbxindex/decls.pbxbtree index 46f7ded..b3c9490 100644 Binary files a/xcode/build/timesynk.build/timesynk.pbxindex/decls.pbxbtree and b/xcode/build/timesynk.build/timesynk.pbxindex/decls.pbxbtree differ diff --git a/xcode/build/timesynk.build/timesynk.pbxindex/files.pbxbtree b/xcode/build/timesynk.build/timesynk.pbxindex/files.pbxbtree index 3638109..fee513e 100644 Binary files a/xcode/build/timesynk.build/timesynk.pbxindex/files.pbxbtree and b/xcode/build/timesynk.build/timesynk.pbxindex/files.pbxbtree differ diff --git a/xcode/build/timesynk.build/timesynk.pbxindex/imports.pbxbtree b/xcode/build/timesynk.build/timesynk.pbxindex/imports.pbxbtree index e7e44a9..61ad163 100644 Binary files a/xcode/build/timesynk.build/timesynk.pbxindex/imports.pbxbtree and b/xcode/build/timesynk.build/timesynk.pbxindex/imports.pbxbtree differ diff --git a/xcode/build/timesynk.build/timesynk.pbxindex/pbxindex.header b/xcode/build/timesynk.build/timesynk.pbxindex/pbxindex.header index 2e5d278..dc83f4a 100644 Binary files a/xcode/build/timesynk.build/timesynk.pbxindex/pbxindex.header and b/xcode/build/timesynk.build/timesynk.pbxindex/pbxindex.header differ diff --git a/xcode/build/timesynk.build/timesynk.pbxindex/refs.pbxbtree b/xcode/build/timesynk.build/timesynk.pbxindex/refs.pbxbtree index 4afa552..caf2531 100644 Binary files a/xcode/build/timesynk.build/timesynk.pbxindex/refs.pbxbtree and b/xcode/build/timesynk.build/timesynk.pbxindex/refs.pbxbtree differ diff --git a/xcode/build/timesynk.build/timesynk.pbxindex/strings.pbxstrings/control b/xcode/build/timesynk.build/timesynk.pbxindex/strings.pbxstrings/control index 40d43b1..24699a7 100644 Binary files a/xcode/build/timesynk.build/timesynk.pbxindex/strings.pbxstrings/control and b/xcode/build/timesynk.build/timesynk.pbxindex/strings.pbxstrings/control differ diff --git a/xcode/build/timesynk.build/timesynk.pbxindex/strings.pbxstrings/strings b/xcode/build/timesynk.build/timesynk.pbxindex/strings.pbxstrings/strings index fd6ff29..19c1566 100644 Binary files a/xcode/build/timesynk.build/timesynk.pbxindex/strings.pbxstrings/strings and b/xcode/build/timesynk.build/timesynk.pbxindex/strings.pbxstrings/strings differ diff --git a/xcode/build/timesynk.build/timesynk.pbxindex/symbols0.pbxsymbols b/xcode/build/timesynk.build/timesynk.pbxindex/symbols0.pbxsymbols index 895190e..335b545 100644 Binary files a/xcode/build/timesynk.build/timesynk.pbxindex/symbols0.pbxsymbols and b/xcode/build/timesynk.build/timesynk.pbxindex/symbols0.pbxsymbols differ diff --git a/xcode/timesynk.xcodeproj/kts.mode1v3 b/xcode/timesynk.xcodeproj/kts.mode1v3 index e3121f8..562ae14 100644 --- a/xcode/timesynk.xcodeproj/kts.mode1v3 +++ b/xcode/timesynk.xcodeproj/kts.mode1v3 @@ -216,10 +216,10 @@ _historyCapacity 0 bookmark - 203852F11810908E00BA5BC2 + 2076112A1810D62500D8CB9A history - 2088594E180FE315007E7565 + 203852F11810908E00BA5BC2 SplitCount @@ -359,7 +359,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - game.c + sdl.c PBXSplitModuleInNavigatorKey Split0 @@ -367,11 +367,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - game.c + sdl.c _historyCapacity 0 bookmark - 203852F01810908E00BA5BC2 + 207611291810D62500D8CB9A history 20567ECF17E95DEC0002B1A9 @@ -397,10 +397,10 @@ 20CD0579180FBCD8005A8231 20CD057A180FBCD8005A8231 20CD057B180FBCD8005A8231 - 20CD057C180FBCD8005A8231 20CD057D180FBCD8005A8231 20CD057E180FBCD8005A8231 - 2088594D180FE315007E7565 + 207610F21810CDC500D8CB9A + 207610EF1810CDBC00D8CB9A prevStack @@ -431,6 +431,7 @@ 206D605B1808F99A00C0DE49 206D60B7180907AC00C0DE49 20CD05AE180FBCD8005A8231 + 207610F31810CDC500D8CB9A SplitCount @@ -488,9 +489,9 @@ TableOfContents - 203852E31810908D00BA5BC2 + 207610D21810A9BF00D8CB9A 1CE0B1FE06471DED0097A5F4 - 203852E41810908D00BA5BC2 + 207610D31810A9BF00D8CB9A 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -624,8 +625,8 @@ 5 WindowOrderList - 203852EE1810908D00BA5BC2 - 203852EF1810908D00BA5BC2 + 207610E01810AB3300D8CB9A + 207610E11810AB3300D8CB9A 1C78EAAD065D492600B07095 1CD10A99069EF8BA00B06720 20F6A1B417E95A6200BAD261 @@ -649,12 +650,14 @@ Dock + BecomeActive + ContentConfiguration PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - + sdl.c StatusBarVisibility @@ -710,7 +713,7 @@ TableOfContents 20F6A1B417E95A6200BAD261 - 203852E61810908D00BA5BC2 + 207610D51810A9BF00D8CB9A 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -830,13 +833,13 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 203852E71810908D00BA5BC2 + 207610D91810AB3300D8CB9A 1C162984064C10D400B95A72 - 203852E81810908D00BA5BC2 - 203852E91810908D00BA5BC2 - 203852EA1810908D00BA5BC2 - 203852EB1810908D00BA5BC2 - 203852EC1810908D00BA5BC2 + 207610DA1810AB3300D8CB9A + 207610DB1810AB3300D8CB9A + 207610DC1810AB3300D8CB9A + 207610DD1810AB3300D8CB9A + 207610DE1810AB3300D8CB9A ToolbarConfiguration xcode.toolbar.config.debugV3 @@ -998,7 +1001,7 @@ TableOfContents 1C78EAAD065D492600B07095 - 203852ED1810908D00BA5BC2 + 207610DF1810AB3300D8CB9A 1C78EAAC065D492600B07095 ToolbarConfiguration diff --git a/xcode/timesynk.xcodeproj/kts.pbxuser b/xcode/timesynk.xcodeproj/kts.pbxuser index 173173c..8e19a3c 100644 --- a/xcode/timesynk.xcodeproj/kts.pbxuser +++ b/xcode/timesynk.xcodeproj/kts.pbxuser @@ -42,16 +42,6 @@ vrLen = 508; vrLoc = 0; }; - 203852F01810908E00BA5BC2 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 20568DD217EBE9490022F314 /* game.c */; - name = "game.c: 22"; - rLen = 0; - rLoc = 433; - rType = 0; - vrLen = 1212; - vrLoc = 12; - }; 203852F11810908E00BA5BC2 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 20F6A1F017E95B6F00BAD261 /* sdl.c */; @@ -443,7 +433,15 @@ vrLen = 1159; vrLoc = 0; }; - 2088594D180FE315007E7565 /* PBXTextBookmark */ = { + 207610EF1810CDBC00D8CB9A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + comments = "error: 'tile_rect' undeclared (first use in this function)"; + fRef = 20F6A1F017E95B6F00BAD261 /* sdl.c */; + rLen = 1; + rLoc = 152; + rType = 1; + }; + 207610F21810CDC500D8CB9A /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 20568DD217EBE9490022F314 /* game.c */; name = "game.c: 22"; @@ -453,15 +451,35 @@ vrLen = 1212; vrLoc = 12; }; - 2088594E180FE315007E7565 /* PBXTextBookmark */ = { + 207610F31810CDC500D8CB9A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 20568DD217EBE9490022F314 /* game.c */; + name = "game.c: 22"; + rLen = 0; + rLoc = 433; + rType = 0; + vrLen = 1212; + vrLoc = 12; + }; + 207611291810D62500D8CB9A /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 20F6A1F017E95B6F00BAD261 /* sdl.c */; - name = "sdl.c: 5"; + name = "sdl.c: 146"; rLen = 0; - rLoc = 101; + rLoc = 5730; rType = 0; - vrLen = 1500; - vrLoc = 1969; + vrLen = 1135; + vrLoc = 5154; + }; + 2076112A1810D62500D8CB9A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 20F6A1F017E95B6F00BAD261 /* sdl.c */; + name = "sdl.c: 161"; + rLen = 0; + rLoc = 6289; + rType = 0; + vrLen = 1339; + vrLoc = 1475; }; 2090287B17E95E780051A253 /* timesynk_Prefix.pch */ = { uiCtxt = { @@ -551,16 +569,6 @@ vrLen = 607; vrLoc = 0; }; - 20CD057C180FBCD8005A8231 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 20F6A1F017E95B6F00BAD261 /* sdl.c */; - name = "sdl.c: 79"; - rLen = 0; - rLoc = 3320; - rType = 0; - vrLen = 1791; - vrLoc = 1999; - }; 20CD057D180FBCD8005A8231 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 204F942518005466007B4DAD /* map.h */; @@ -755,9 +763,9 @@ }; 20F6A1F017E95B6F00BAD261 /* sdl.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1224, 1862}}"; - sepNavSelRange = "{101, 0}"; - sepNavVisRange = "{1969, 1500}"; + sepNavIntBoundsRect = "{{0, 0}, {1224, 2226}}"; + sepNavSelRange = "{6289, 0}"; + sepNavVisRange = "{1475, 1339}"; sepNavWindowFrame = "{{174, 72}, {750, 558}}"; }; }; @@ -883,13 +891,12 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 403738651; - PBXWorkspaceStateSaveDate = 403738651; + PBXPerProjectTemplateStateSaveDate = 403745201; + PBXWorkspaceStateSaveDate = 403745201; }; perUserProjectItems = { 2002F0D917E972B3003CF277 /* PlistBookmark */ = 2002F0D917E972B3003CF277 /* PlistBookmark */; 2007C93017ECF2EB00268653 /* PBXTextBookmark */ = 2007C93017ECF2EB00268653 /* PBXTextBookmark */; - 203852F01810908E00BA5BC2 /* PBXTextBookmark */ = 203852F01810908E00BA5BC2 /* PBXTextBookmark */; 203852F11810908E00BA5BC2 /* PBXTextBookmark */ = 203852F11810908E00BA5BC2 /* PBXTextBookmark */; 203B68D117F7D77900272675 /* PBXTextBookmark */ = 203B68D117F7D77900272675 /* PBXTextBookmark */; 204F943D18005532007B4DAD /* PBXTextBookmark */ = 204F943D18005532007B4DAD /* PBXTextBookmark */; @@ -920,8 +927,11 @@ 206D60B4180907AC00C0DE49 /* PBXTextBookmark */ = 206D60B4180907AC00C0DE49 /* PBXTextBookmark */; 206D60B7180907AC00C0DE49 /* PBXTextBookmark */ = 206D60B7180907AC00C0DE49 /* PBXTextBookmark */; 206D60C918090A6700C0DE49 /* PBXTextBookmark */ = 206D60C918090A6700C0DE49 /* PBXTextBookmark */; - 2088594D180FE315007E7565 /* PBXTextBookmark */ = 2088594D180FE315007E7565 /* PBXTextBookmark */; - 2088594E180FE315007E7565 /* PBXTextBookmark */ = 2088594E180FE315007E7565 /* PBXTextBookmark */; + 207610EF1810CDBC00D8CB9A /* PBXTextBookmark */ = 207610EF1810CDBC00D8CB9A /* PBXTextBookmark */; + 207610F21810CDC500D8CB9A /* PBXTextBookmark */ = 207610F21810CDC500D8CB9A /* PBXTextBookmark */; + 207610F31810CDC500D8CB9A /* PBXTextBookmark */ = 207610F31810CDC500D8CB9A /* PBXTextBookmark */; + 207611291810D62500D8CB9A /* PBXTextBookmark */ = 207611291810D62500D8CB9A /* PBXTextBookmark */; + 2076112A1810D62500D8CB9A /* PBXTextBookmark */ = 2076112A1810D62500D8CB9A /* PBXTextBookmark */; 2090289E17E95F9E0051A253 /* PBXTextBookmark */ = 2090289E17E95F9E0051A253 /* PBXTextBookmark */; 2090289F17E95F9E0051A253 /* PBXTextBookmark */ = 2090289F17E95F9E0051A253 /* PBXTextBookmark */; 209028A517E95F9E0051A253 /* PBXTextBookmark */ = 209028A517E95F9E0051A253 /* PBXTextBookmark */; @@ -930,7 +940,6 @@ 20CD0579180FBCD8005A8231 /* PBXTextBookmark */ = 20CD0579180FBCD8005A8231 /* PBXTextBookmark */; 20CD057A180FBCD8005A8231 /* PBXTextBookmark */ = 20CD057A180FBCD8005A8231 /* PBXTextBookmark */; 20CD057B180FBCD8005A8231 /* PBXTextBookmark */ = 20CD057B180FBCD8005A8231 /* PBXTextBookmark */; - 20CD057C180FBCD8005A8231 /* PBXTextBookmark */ = 20CD057C180FBCD8005A8231 /* PBXTextBookmark */; 20CD057D180FBCD8005A8231 /* PBXTextBookmark */ = 20CD057D180FBCD8005A8231 /* PBXTextBookmark */; 20CD057E180FBCD8005A8231 /* PBXTextBookmark */ = 20CD057E180FBCD8005A8231 /* PBXTextBookmark */; 20CD05AE180FBCD8005A8231 /* PBXTextBookmark */ = 20CD05AE180FBCD8005A8231 /* PBXTextBookmark */;