From a35610d9a0038bdf23c513d675e72f61790194a6 Mon Sep 17 00:00:00 2001 From: Andre Schweiger Date: Mon, 28 Dec 2015 23:42:52 +0100 Subject: [PATCH] Add quickslots --- data/bottombg.png | Bin 6524 -> 6660 bytes source/Globals.c | 27 ++++++++++++++++++++++++++- source/Globals.h | 2 ++ source/Menu.c | 4 +--- source/Render.c | 21 ++++++++++++++++++--- source/main.c | 1 + 6 files changed, 48 insertions(+), 7 deletions(-) diff --git a/data/bottombg.png b/data/bottombg.png index 33a08a4a6ed24290a6a94113b6634a81574849b2..0c174bf4c5e43be246bbd211df4815f172c08c86 100644 GIT binary patch delta 5840 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 100 && k_touch.py < 228 && k_touch.px > 96 && k_touch.px < 228){ + if(k_touch.py > 100 && k_touch.py < 228 && k_touch.px > 10 && k_touch.px < 142){ shouldRenderMap = true; } } } +void tickTouchQuickSelect() { + if (currentMenu == 0) { + int i = 0; + Inventory * inv = player.p.inv; + Item * item; + + for (i = 0; i < 8; ++i) { + if((inv->lastSlot) > i) { + int xip = i % 4; + int yip = i / 4; + + if(k_touch.py > 72*2+yip*21*2 && k_touch.py < 72*2+yip*21*2+21*2 && k_touch.px > 76*2+xip*21*2 && k_touch.px < 76*2+xip*21*2+21*2) { + playerSetActiveItem(&inv->items[i]); + } + } + } + } +} + void hurtEntity(Entity* e, int damage, int dir, u32 hurtColor){ if (e->hurtTime > 0) return; int xd = player.x - e->x; @@ -1461,6 +1480,12 @@ bool isSwimming(){ return getTile(player.x>>4,player.y>>4)==TILE_WATER; } +void playerSetActiveItem(Item * item) { + player.p.activeItem = item; + if(player.p.activeItem->id > 27 && player.p.activeItem->id < 34) player.p.isCarrying = true; + else player.p.isCarrying = false; +} + void reloadColors() { dirtColor[0] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 0)); dirtColor[1] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 1)); diff --git a/source/Globals.h b/source/Globals.h index be50ad1..ba4a0f8 100644 --- a/source/Globals.h +++ b/source/Globals.h @@ -105,6 +105,7 @@ s8 itemTileInteract(int tile, Item* item, int x, int y, int px, int py, int dir) void tickEntity(Entity* e); void tickTouchMap(); +void tickTouchQuickSelect(); void trySpawn(int count, int level); @@ -128,5 +129,6 @@ bool playerUseEnergy(int amount); void playerHurtTile(int tile, int xt, int yt, int damage, int dir); bool playerIntersectsEntity(Entity* e); void playerEntityInteract(Entity* e); +void playerSetActiveItem(Item * item); void reloadColors(); \ No newline at end of file diff --git a/source/Menu.c b/source/Menu.c index 7a49e77..6bd9951 100644 --- a/source/Menu.c +++ b/source/Menu.c @@ -409,9 +409,7 @@ void tickMenu(int menu){ median = player.p.inv->items[curInvSel]; // create copy of item. removeItemFromInventory(curInvSel, player.p.inv); // remove original pushItemToInventoryFront(median, player.p.inv); // add copy to front - player.p.activeItem = &player.p.inv->items[0]; // active item = copy. - if(player.p.activeItem->id > 27 && player.p.activeItem->id < 34) player.p.isCarrying = true; - else player.p.isCarrying = false; + playerSetActiveItem(&player.p.inv->items[0]); // active item = copy. } currentMenu = MENU_NONE; } diff --git a/source/Render.c b/source/Render.c index 2f5601b..921989b 100644 --- a/source/Render.c +++ b/source/Render.c @@ -626,15 +626,30 @@ void renderGui() { else render(i * 8 + 6, 14, 191, 152, 0); } - sf2d_draw_texture(minimap[currentLevel], 96, 102); + sf2d_draw_texture(minimap[currentLevel], 10, 102); renderItemWithTextCentered(player.p.activeItem, 320, 66); itoa(player.p.score, scoreT, 10); // integer to base10 string drawText("Score:",214,12); drawText(scoreT,(140-(strlen(scoreT)*12))/2 + 180,29); if(currentLevel == 0){ - renderc(44 + (awX/32), 47 + (awY/32), 88, 216, 8, 8, 0); // Mini-AWizard head. + renderc(1 + (awX/32), 47 + (awY/32), 88, 216, 8, 8, 0); // Mini-AWizard head. } - renderc(44 + (player.x/32), 47 + (player.y/32), 88, 208, 8, 8, 0); // Mini-Player head. + renderc(1 + (player.x/32), 47 + (player.y/32), 88, 208, 8, 8, 0); // Mini-Player head. + + //quick select + drawText("Quickselect:",164,118); + + Inventory * inv = player.p.inv; + Item * item; + for (i = 0; i < 8; ++i) { + if((inv->lastSlot) > i) { + int xip = i % 4; + int yip = i / 4; + + item = &inv->items[i]; + renderItemIcon(item->id, item->countLevel, 81+xip*21, 77+yip*21); + } + } } void renderPlayer() { diff --git a/source/main.c b/source/main.c index cee125a..fcf2853 100644 --- a/source/main.c +++ b/source/main.c @@ -110,6 +110,7 @@ void tick() { } tickTouchMap(); + tickTouchQuickSelect(); int i; for (i = 0; i < 324; ++i) {