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

added potion saving for reals this time

Browse source 
dont build this commit cause workin on something
This commit is contained in:
Elijah 2018-01-26 08:31:09 -06:00
parent 2a368a81c0
commit ddbb771e89
2 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/Globals.c
View file

@ -1,7 +1,7 @@
#include "Globals.h" #include "Globals.h"
#include "Menu.h" #include "Menu.h"
char versionText[34] = "Version 1.4.1"; char versionText[34] = "Version 1.5";
char fpsstr[34]; char fpsstr[34];
u8 currentMenu = 0; u8 currentMenu = 0;
@ -2287,6 +2287,11 @@ void tickPlayer(){
if(!playerUse()) currentMenu = MENU_INVENTORY; if(!playerUse()) currentMenu = MENU_INVENTORY;
} }
if (k_delete.clicked){
curInvSel = 0;
if(!playerUse()) currentMenu = MENU_ARMOR;
}
if(isSwimming()) ++player.p.swimTimer; if(isSwimming()) ++player.p.swimTimer;
if(UnderStrengthEffect) ++player.p.strengthTimer; if(UnderStrengthEffect) ++player.p.strengthTimer;
if(player.p.strengthTimer >= 2000) { if(player.p.strengthTimer >= 2000) {

35
source/SaveLoad.c
View file

@ -37,14 +37,6 @@ void saveCurrentWorld(char * filename, EntityManager * eManager, Entity * player
// Player Data // Player Data
fwrite(&player->p.score, sizeof(int), 1, file); fwrite(&player->p.score, sizeof(int), 1, file);
fwrite(&player->p.hasWonSaved, sizeof(bool), 1, file); fwrite(&player->p.hasWonSaved, sizeof(bool), 1, file);
fwrite(&UnderStrengthEffect, sizeof(bool), 1, file);
fwrite(&UnderSpeedEffect, sizeof(bool), 1, file);
fwrite(&regening, sizeof(bool), 1, file);
fwrite(&UnderSwimBreathEffect, sizeof(bool), 1, file);
fwrite(&player->p.strengthTimer, sizeof(int), 1, file);
fwrite(&player->p.speedTimer, sizeof(int), 1, file);
fwrite(&player->p.swimBreathTimer, sizeof(int), 1, file);
fwrite(&player->p.regenTimer, sizeof(int), 1, file);
fwrite(&player->p.health, sizeof(s16), 1, file); fwrite(&player->p.health, sizeof(s16), 1, file);
fwrite(&player->x, sizeof(s16), 1, file); fwrite(&player->x, sizeof(s16), 1, file);
fwrite(&player->y, sizeof(s16), 1, file); fwrite(&player->y, sizeof(s16), 1, file);
@ -140,6 +132,16 @@ void saveCurrentWorld(char * filename, EntityManager * eManager, Entity * player
fwrite(&season, sizeof(u8), 1, file); fwrite(&season, sizeof(u8), 1, file);
fwrite(&rain, sizeof(bool), 1, file); fwrite(&rain, sizeof(bool), 1, file);
//Potion Data
fwrite(&UnderStrengthEffect, sizeof(bool), 1, file);
fwrite(&UnderSpeedEffect, sizeof(bool), 1, file);
fwrite(&regening, sizeof(bool), 1, file);
fwrite(&UnderSwimBreathEffect, sizeof(bool), 1, file);
fwrite(&player->p.strengthTimer, sizeof(int), 1, file);
fwrite(&player->p.speedTimer, sizeof(int), 1, file);
fwrite(&player->p.swimBreathTimer, sizeof(int), 1, file);
fwrite(&player->p.regenTimer, sizeof(int), 1, file);
fclose(file); fclose(file);
} }
@ -151,14 +153,6 @@ int loadWorld(char * filename, EntityManager * eManager, Entity * player, u8 * m
fread(&player->p.score, sizeof(int), 1, file); fread(&player->p.score, sizeof(int), 1, file);
fread(&player->p.hasWonSaved, sizeof(bool), 1, file); fread(&player->p.hasWonSaved, sizeof(bool), 1, file);
fread(&UnderStrengthEffect, sizeof(bool), 1, file);
fread(&UnderSpeedEffect, sizeof(bool), 1, file);
fread(&regening, sizeof(bool), 1, file);
fread(&UnderSwimBreathEffect, sizeof(bool), 1, file);
fread(&player->p.strengthTimer, sizeof(int), 1, file);
fread(&player->p.speedTimer, sizeof(int), 1, file);
fread(&player->p.swimBreathTimer, sizeof(int), 1, file);
fread(&player->p.regenTimer, sizeof(int), 1, file);
fread(&player->p.health, sizeof(s16), 1, file); fread(&player->p.health, sizeof(s16), 1, file);
fread(&player->x, sizeof(s16), 1, file); fread(&player->x, sizeof(s16), 1, file);
fread(&player->y, sizeof(s16), 1, file); fread(&player->y, sizeof(s16), 1, file);
@ -419,6 +413,15 @@ int loadWorld(char * filename, EntityManager * eManager, Entity * player, u8 * m
fread(&day, sizeof(int), 1, file); fread(&day, sizeof(int), 1, file);
fread(&season, sizeof(u8), 1, file); fread(&season, sizeof(u8), 1, file);
fread(&rain, sizeof(bool), 1, file); fread(&rain, sizeof(bool), 1, file);
//Potion Data
fread(&UnderStrengthEffect, sizeof(bool), 1, file);
fread(&UnderSpeedEffect, sizeof(bool), 1, file);
fread(&regening, sizeof(bool), 1, file);
fread(&UnderSwimBreathEffect, sizeof(bool), 1, file);
fread(&player->p.strengthTimer, sizeof(int), 1, file);
fread(&player->p.speedTimer, sizeof(int), 1, file);
fread(&player->p.swimBreathTimer, sizeof(int), 1, file);
fread(&player->p.regenTimer, sizeof(int), 1, file);
fclose(file); fclose(file);
return 0; return 0;