Raiza.dev/Minicraft3DS
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add quickslots

Browse source
This commit is contained in:
Andre Schweiger 2015-12-28 23:42:52 +01:00
parent ccdb63fb1e
commit a35610d9a0
6 changed files with 48 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

27
source/Globals.c
View file

@ -192,12 +192,31 @@ void tickTouchMap(){
}
} else {
// touch minimap to bring up zoomed map.
if(k_touch.py > 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));