From c7e3639663643855f130ec64a219ef0cb44eb2ad Mon Sep 17 00:00:00 2001 From: Robert Jordan Date: Wed, 20 May 2015 11:52:40 -0400 Subject: [PATCH] Sprite build command build uses ../../data/g2.dat and all numbered images in ../../resources/g2/. No other parameters needed. Also changed speed button hyper arrows to support game speeds inbetween 4 and 8. --- data/g2.dat | Bin 20774 -> 20666 bytes resources/g2/4.png | Bin 246 -> 229 bytes src/cmdline_sprite.c | 69 ++++++++++++++++++++++++++++++++++++++ src/sprites.h | 2 +- src/windows/top_toolbar.c | 7 ++-- 5 files changed, 75 insertions(+), 3 deletions(-) diff --git a/data/g2.dat b/data/g2.dat index ce7d217b48656c328464e8872ed8150f21b63b4f..697d7bbdf80047027fafa70dcc65cd62a409d7b3 100644 GIT binary patch delta 143 zcmZ3sh;i3KMpjk^28N`GtnQ4Q8+|?e8LK8w^WRv^(8>^(nwk>V0;E#nni=9!;u;y_ zgcu|k6c{uaj2LVg+!*{B!WkGD;~H7w+8E+8;((|fNT-8PJ7ZjW8VI#B#igZykUaxX U3}_S(0aZa5Ky4{;Km;)a0AoNY-~a#s delta 252 zcmZXOu?YfE5JYFhk0J;n*nyc1*nuX;bufth`)3PAa;T}GAIw!SzeunMYjQ(b;VsJ! z!_K^KeBK!XfX_KBIBAPzN#twU?q)}*s-h0IqV`Z!Lya-T90k_c;)DlYAjPiO69?i@ n%}5t$BS$u^_GGF~p4?H2N-LWm&^NR7aM)X?*lGDuj{lZlh6_*L diff --git a/resources/g2/4.png b/resources/g2/4.png index 29118138d8c658dfb0fb77eb27194a10f6fe8a63..24395cc1b733bb3d547ebfb03c6c3d859e5ca747 100644 GIT binary patch delta 176 zcmeyy_>@txGr-TCmrII^fq{Y7)59eQNOOWP2OE%lFp*7QqMkI@AqED%LyV#tUJVn2 z)hm)cT^vI+f|D5->#E!SC$I@9Y<|d~vg1eX|9XMmGi_eZ3_go~*BQnL_V9)>F)A=l zaQXMMV1tU0^ePr62POs1?_Xafc&3=eIDVi8li>SscWUgd8}) a!0^#De!EDoGr-TCmrII^fq{Y7)59eQNQ(k7CkGplyvv+k2Ba8^gWR1M)}51iIZ;uX z>o5ZY-(kk%`72T;x~bQsd%8G=XapxSFxFMK{ZC*M2sqTnJmJBk?|=V0nyBWiC=_6r z{9<1`Pq>Sobe0NB1B-*u&*z5^PMWe|p_>zf2ZPGPeQ~lno}AKo318}}cPOal+>+p6 rQsDEMAY^vMg2h2>NeeF{4-Z4d5y96Ra?9=lox|Yi>gTe~DWM4f;6OfS diff --git a/src/cmdline_sprite.c b/src/cmdline_sprite.c index d98fb2eb1b..56f6e7835e 100644 --- a/src/cmdline_sprite.c +++ b/src/cmdline_sprite.c @@ -412,6 +412,75 @@ int cmdline_for_sprite(const char **argv, int argc) return -1; return 1; + } + else if (_strcmpi(argv[0], "build") == 0) { + /*if (argc < 3) { + fprintf(stderr, "usage: sprite build [spritefile] [resources]\n"); + return -1; + }*/ + + const char *spriteFilePath = "../../data/g2.dat"; + const char *resourcePath = "../../resources/g2/"; + char imagePath[256], number[8]; + + bool fileExists = true; + FILE *file; + + spriteFileHeader.num_entries = 0; + spriteFileHeader.total_size = 0; + sprite_file_save(spriteFilePath); + + //sprite_file_close(); + + printf("Building: %s\n", spriteFilePath); + for (int i = 0; fileExists; i++) { + itoa(i, number, 10); + strcpy(imagePath, resourcePath); + strcat(imagePath, number); + strcat(imagePath, ".png"); + if (file = fopen(imagePath, "r")) { + fclose(file); + rct_g1_element spriteElement; + uint8 *buffer; + int bufferLength; + if (!sprite_file_import(imagePath, &spriteElement, &buffer, &bufferLength)) { + fprintf(stderr, "Could not import image file: %s\nCanceling\n", imagePath); + printf("Could not import image file: %s\nCanceling\n", imagePath); + return -1; + } + + if (!sprite_file_open(spriteFilePath)) { + fprintf(stderr, "Unable to open sprite file: %s\nCanceling\n", spriteFilePath); + printf("Unable to open sprite file: %s\nCanceling\n", spriteFilePath); + return -1; + } + + spriteFileHeader.num_entries++; + spriteFileHeader.total_size += bufferLength; + spriteFileEntries = realloc(spriteFileEntries, spriteFileHeader.num_entries * sizeof(rct_g1_element)); + spriteFileData = realloc(spriteFileData, spriteFileHeader.total_size); + spriteFileEntries[spriteFileHeader.num_entries - 1] = spriteElement; + memcpy(spriteFileData + (spriteFileHeader.total_size - bufferLength), buffer, bufferLength); + spriteFileEntries[spriteFileHeader.num_entries - 1].offset = spriteFileData + (spriteFileHeader.total_size - bufferLength); + + free(buffer); + + if (!sprite_file_save(spriteFilePath)) { + printf("Could not save sprite file: %s\nCanceling\n", imagePath); + return -1; + } + printf("Added: %s\n", imagePath); + } + else { + + printf("Could not find file: %s\n", imagePath); + fileExists = false; + } + } + + + printf("Finished\n", imagePath); + return 1; } else { fprintf(stderr, "Unknown sprite command."); return -1; diff --git a/src/sprites.h b/src/sprites.h index 6b30a0f6fb..cb48b5c5ce 100644 --- a/src/sprites.h +++ b/src/sprites.h @@ -351,7 +351,7 @@ enum { SPR_G2_TITLE = SPR_G2_BEGIN + 1, SPR_G2_FASTFORWARD = SPR_G2_BEGIN + 2, SPR_G2_SPEED_ARROW = SPR_G2_BEGIN + 3, - SPR_G2_HYPER_ARROWS = SPR_G2_BEGIN + 4 + SPR_G2_HYPER_ARROW = SPR_G2_BEGIN + 4 }; #endif diff --git a/src/windows/top_toolbar.c b/src/windows/top_toolbar.c index 7ad7199397..e2984ac975 100644 --- a/src/windows/top_toolbar.c +++ b/src/windows/top_toolbar.c @@ -647,9 +647,12 @@ static void window_top_toolbar_paint() for (int i = 0; i < gGameSpeed && gGameSpeed <= 4; i++) { gfx_draw_sprite(dpi, SPR_G2_SPEED_ARROW, x + 5 + i * 5, y + 15, 0); } - if (gGameSpeed == 8) { - gfx_draw_sprite(dpi, SPR_G2_HYPER_ARROWS, x + 5, y + 15, 0); + for (int i = 0; i < 3 && i < gGameSpeed - 4 && gGameSpeed >= 5; i++) { + gfx_draw_sprite(dpi, SPR_G2_HYPER_ARROW, x + 5 + i * 6, y + 15, 0); } + /*if (gGameSpeed >= 8) { + gfx_draw_sprite(dpi, SPR_G2_HYPER_ARROWS, x + 5, y + 15, 0); + }*/ } // Draw cheats button