Cleaning up stuff

This commit is contained in:
tognee 2019-09-18 00:09:46 +02:00
parent 5423be67ca
commit a5ea06a928
44 changed files with 7329 additions and 7432 deletions

View file

@ -1,7 +1,7 @@
#include <3ds.h>
#include <sf2d.h>
#include <sfil.h>
#include <string.h>
#include <string.h>
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
@ -31,23 +31,23 @@ void setupGame() {
synchronizerInit(rand(), 1, 0);
synchronizerSetPlayerUID(0, localUID);
synchronizerStart();
initGame = 0;
}
void setupGameServer() {
size_t size;
networkHostStopConnections();
networkStart();
//send start info (seed)
size = writeStartPacket(networkWriteBuffer, rand());
networkSend(networkWriteBuffer, size);
processPacket(networkWriteBuffer, size);
networkSendWaitFlush();
//send save file if loading
FILE *file = fopen(currentFileName, "rb");
if(file!=NULL) {
@ -55,12 +55,12 @@ void setupGameServer() {
networkSendWaitFlush();
fclose(file);
}
//send start command
size = writeStartRequestPacket(networkWriteBuffer);
networkSend(networkWriteBuffer, size);
processPacket(networkWriteBuffer, size);
initMPGame = 0;
}
@ -68,15 +68,15 @@ void setupBGMap() {
// Reset entity manager.
memset(&eManager, 0, sizeof(eManager));
sf2d_set_clear_color(0xFF6C6D82);
srand(time(NULL));
createAndValidateTopMap(128, 128, 1, worldData.map[1], worldData.data[1]);
// Reset entity manager.
memset(&eManager, 0, sizeof(eManager));
sf2d_set_clear_color(0xFF6C6D82);
initBGMap = 0;
}
static void task_apt_hook(APT_HookType hook, void* param) {
@ -111,49 +111,49 @@ int main() {
sf2d_init();
csndInit();
networkInit();
srand(time(NULL));
//load or create localUID
if ((file = fopen("m3ds_uid.bin", "rb"))) {
fread(&localUID, sizeof(u32), 1, file);
fclose(file);
} else {
localUID = (((u32) (rand()%256))<<24) | (((u32) (rand()%256))<<16) | (((u32) (rand()%256))<<8) | (((u32) (rand()%256)));
if ((file = fopen("m3ds_uid.bin", "wb"))) {
fwrite(&localUID, sizeof(u32), 1, file);
fclose(file);
}
}
noItem = newItem(ITEM_NULL, 0);
initMenus();
currentMenu = MENU_TITLE;
currentSelection = 0;
quitGame = false;
initBGMap = 1;
icons = sfil_load_PNG_buffer(icons2_png, SF2D_PLACE_RAM);
icons = sfil_load_PNG_buffer(icons_png, SF2D_PLACE_RAM);
playerSprites = sfil_load_PNG_buffer(player_png, SF2D_PLACE_RAM);
font = sfil_load_PNG_buffer(Font_png, SF2D_PLACE_RAM);
bottombg = sfil_load_PNG_buffer(bottombg_png, SF2D_PLACE_RAM);
loadSounds();
playMusic(&music_menu);
bakeLights();
int i;
for (i = 0; i < 6; ++i) {
minimap[i] = sf2d_create_texture(128, 128, TEXFMT_RGBA8, SF2D_PLACE_RAM);
sf2d_texture_tile32(minimap[i]);
}
reloadColors();
sf2d_set_vblank_wait(true);
sf2d_set_clear_color(0xFF);
@ -163,18 +163,18 @@ int main() {
localInputs.k_down.input = KEY_DDOWN | KEY_CPAD_DOWN | KEY_CSTICK_DOWN;
localInputs.k_left.input = KEY_DLEFT | KEY_CPAD_LEFT | KEY_CSTICK_LEFT;
localInputs.k_right.input = KEY_DRIGHT | KEY_CPAD_RIGHT | KEY_CSTICK_RIGHT;
localInputs.k_attack.input = KEY_A | KEY_B | KEY_L | KEY_ZR;
localInputs.k_menu.input = KEY_X | KEY_Y | KEY_R | KEY_ZL;
localInputs.k_attack.input = KEY_A | KEY_B;
localInputs.k_menu.input = KEY_X | KEY_Y;
localInputs.k_pause.input = KEY_START;
localInputs.k_accept.input = KEY_A;
localInputs.k_decline.input = KEY_B;
localInputs.k_delete.input = KEY_X;
localInputs.k_menuNext.input = KEY_R;
localInputs.k_menuPrev.input = KEY_L;
localInputs.k_menuNext.input = KEY_R | KEY_ZR;
localInputs.k_menuPrev.input = KEY_L | KEY_ZL;
/* If btnSave exists, then use that. */
if ((file = fopen("btnSave.bin", "rb"))) {
fread(&(localInputs.k_up.input), sizeof(int), 1, file);
fread(&(localInputs.k_up.input), sizeof(int), 1, file);
fread(&(localInputs.k_down.input), sizeof(int), 1, file);
fread(&(localInputs.k_left.input), sizeof(int), 1, file);
fread(&(localInputs.k_right.input), sizeof(int), 1, file);
@ -188,15 +188,15 @@ int main() {
fread(&(localInputs.k_menuPrev.input), sizeof(int), 1, file);
fclose(file);
}
/* If lastTP exists, then use that. */
if ((file = fopen("lastTP.bin", "r"))) {
char fnbuf[256];
fgets(fnbuf, 256, file); // get directory to texturepack
loadTexturePack(fnbuf);
loadTexturePack(fnbuf);
fclose(file);
}
initPlayers();
initRecipes();
initTrades();
@ -208,7 +208,7 @@ int main() {
if (initGame > 0 && --initGame==0) setupGame();
if (initMPGame > 0 && --initMPGame==0) setupGameServer();
if (initBGMap > 0 && --initBGMap==0) setupBGMap();
if (currentMenu == MENU_NONE) {
tickGame();
renderGame();
@ -216,14 +216,14 @@ int main() {
//input scanning ingame is handled by the synchronizer
hidScanInput();
tickKeys(&localInputs, hidKeysHeld(), hidKeysDown());
tickMenu(currentMenu);
renderMenu(currentMenu, xscr, yscr);
}
sf2d_swapbuffers();
}
stopMusic();
freeTrades();