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

Rework Tilesheet

Browse source 
No more autocoloring!
(atleast for Maptiles)
This commit is contained in:
Andre Schweiger 2016-02-05 18:13:39 +01:00
parent 6f0ea3ef65
commit 0ef9e89705
14 changed files with 679 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

33
source/main.c
View file

@ -13,6 +13,13 @@
#include "Menu.h"
#include "texturepack.h"
void initMiniMapData() {
int i;
for(i = 0; i < 128 * 128; ++i) {
minimapData[i] = 0;
}
}
void initMiniMap(bool loadUpWorld) {
int i;
for (i = 0; i < 5; ++i) {
@ -36,6 +43,8 @@ void setupGame(bool loadUpWorld) {
memset(&eManager, 0, sizeof(eManager));
sf2d_set_clear_color(0xFF6C6D82); //sf2d_set_clear_color(RGBA8(0x82, 0x6D, 0x6C, 0xFF));
initMiniMapData();
if (!loadUpWorld) {
initNewMap();
initPlayer();
@ -62,6 +71,25 @@ void setupGame(bool loadUpWorld) {
initGame = 0;
}
void setupBGMap(bool loadUpWorld) {
// Reset entity manager.
memset(&eManager, 0, sizeof(eManager));
sf2d_set_clear_color(0xFF6C6D82); //sf2d_set_clear_color(RGBA8(0x82, 0x6D, 0x6C, 0xFF));
if(!loadUpWorld) {
newSeed();
createAndValidateTopMap(128, 128, map[1], data[1]);
} else {
loadWorld(currentFileName, &eManager, &player, (u8*) map, (u8*) data);
}
// Reset entity manager.
memset(&eManager, 0, sizeof(eManager));
sf2d_set_clear_color(0xFF6C6D82); //sf2d_set_clear_color(RGBA8(0x82, 0x6D, 0x6C, 0xFF));
initBGMap = 0;
}
int xscr = 0, yscr = 0;
void tick() {
if (player.p.isDead) {
@ -147,6 +175,7 @@ int main() {
csndInit();
noItem = newItem(ITEM_NULL, 0);
initMenus();
currentMenu = MENU_TITLE;
currentSelection = 0;
quitGame = false;
@ -163,8 +192,7 @@ int main() {
int i;
for (i = 0; i < 6; ++i) {
minimap[i] = sf2d_create_texture(128, 128, TEXFMT_RGBA8,
SF2D_PLACE_RAM);
minimap[i] = sf2d_create_texture(128, 128, TEXFMT_RGBA8, SF2D_PLACE_RAM);
sf2d_texture_tile32(minimap[i]);
}
@ -223,6 +251,7 @@ int main() {
if (quitGame) break;
if (initGame > 0) setupGame(initGame == 1 ? true : false);
if (initBGMap > 0) setupBGMap(initBGMap == 1 ? true : false);
if (currentMenu == 0) {
tick();