Commit eaeb0882 authored by Bruno Freitas Tissei's avatar Bruno Freitas Tissei
Browse files

Fix merge

parents 71bb727d d5b2c6b5
75 05 150
1000 724 1000
0 0 0
412 228 136
1000 988 0
620 324 660
420 124 460
620 324 660
1000 1000 1000
0000000000000000000000000000000000000000
1111111111111111111111111111111111111111
16M2222222222222226111111111111111111111
156M222222222222264111111111111111111111
1726M22222222222627111111111111111111111
16726M2222222226276111111111111111111111
126726M222222262762111111111111111111111
1226726M22222627622111111111111111111111
12226726M2226276222111111111111111111111
122226726M262762222111111111111111111111
1222226726627622222111111111111111111111
1222222672276222222111111111111111111111
1111111111111111111111111111111111111111
1111111111111111111111111111111111111111
1111111111111111111111111111111111111111
1111111111111111111111111111111111111111
1111111111111111111111111111111111111111
1111111111111111111111111111111111111111
1111111111111111111111111111111111111111
1111111111111111111111111111111111111111
1111111111111111111111111111111111111111
1111111111111111111111111111111111111111
1111111111111111111111111111111111111111
75 05 150
1000 724 1000
0 0 0
412 228 136
1000 988 0
620 324 660
420 124 460
620 324 660
1000 1000 1000
0000000000000000000000000000000000000000
1111111111111111111111111111111111111111
1000000050000000000111111111111111111111
1000000000000000000111111111111111111111
1000000000000000000111111111111111111111
1000000000000000000111111111111111111111
1000000000000000004111111111111111111111
1000000000000000000111111111111111111111
100000000000000MMMM111111111111111111111
100000000000000MMMM111111111111111111111
100000000000000MMMM111111111111111111111
177777777777777MMMM111111111111111111111
1111111111111111111111111111111111111111
1111111111111111111111111111111111111111
1111111111111111111111111111111111111111
1111111111111111111111111111111111111111
1111111111111111111111111111111111111111
1111111111111111111111111111111111111111
1111111111111111111111111111111111111111
1111111111111111111111111111111111111111
1111111111111111111111111111111111111111
1111111111111111111111111111111111111111
1111111111111111111111111111111111111111
#include "maps.h" #include "maps.h"
#include "physics.h" #include "physics.h"
char mapfile[5][100] = {"./sprites/map1.txt", "./sprites/map2.txt", "./sprites/map3.txt", "./sprites/map4.txt", "./sprites/map5.txt"}; char mapfile[7][100] = {"./sprites/map1.txt", "./sprites/map2.txt", "./sprites/map3.txt", "./sprites/map4.txt", "./sprites/map5.txt", "./sprites/map6.txt", "./sprites/map7.txt"};
int colors[8][3]; int colors[8][3];
......
...@@ -4,7 +4,7 @@ int menuColors[3][3]; ...@@ -4,7 +4,7 @@ int menuColors[3][3];
char input[WIDTH]; char input[WIDTH];
int offmenuy, offmenux; int offmenuy, offmenux;
int row, col; int row, col;
char mps[5] = {'a', 'b', 'c', 'd', 'e'}; char mps[7] = {'a', 'b', 'c', 'd', 'e', 'f', 'g'};
int currmap = 0; int currmap = 0;
int buffer; int buffer;
...@@ -52,11 +52,11 @@ int updateMenu(menu *menu, int action, int *loadMenu) { ...@@ -52,11 +52,11 @@ int updateMenu(menu *menu, int action, int *loadMenu) {
} }
switch(action){ switch(action){
case 6: case 6:
currmap = (currmap + 1) % 5; currmap = (currmap + 1) % 6;
menu->grid[21][22] = mps[currmap]; menu->grid[21][22] = mps[currmap];
break; break;
case 4: case 4:
currmap = currmap == 0 ? 4 : currmap - 1; currmap = currmap == 0 ? 6 : currmap - 1;
menu->grid[21][22] = mps[currmap]; menu->grid[21][22] = mps[currmap];
break; break;
case 1: case 1:
...@@ -125,6 +125,9 @@ void renderMenu(menu *menu){ ...@@ -125,6 +125,9 @@ void renderMenu(menu *menu){
case('e'): case('e'):
renderChar(E, i, j, offmenux, offmenuy, 2); renderChar(E, i, j, offmenux, offmenuy, 2);
break; break;
case('f'):
renderChar(F, i, j, offmenux, offmenuy, 2);
break;
case('g'): case('g'):
renderChar(G, i, j, offmenux, offmenuy, 2); renderChar(G, i, j, offmenux, offmenuy, 2);
break; break;
......
...@@ -36,6 +36,7 @@ char B[3][6] = {" __ ", " |__) ", " |__) "}; ...@@ -36,6 +36,7 @@ char B[3][6] = {" __ ", " |__) ", " |__) "};
char C[3][6] = {" __ ", " | ", " |__ "}; char C[3][6] = {" __ ", " | ", " |__ "};
char D[3][6] = {" __ ", " | \\ ", " |__/ "}; char D[3][6] = {" __ ", " | \\ ", " |__/ "};
char E[3][6] = {" __ ", " |__ ", " |__ "}; char E[3][6] = {" __ ", " |__ ", " |__ "};
char F[3][6] = {" __ ", " |__ ", " | "};
char G[3][6] = {" __ ", " | _ ", " |__| "}; char G[3][6] = {" __ ", " | _ ", " |__| "};
char H[3][6] = {" ", " |__| ", " | | "}; char H[3][6] = {" ", " |__| ", " | | "};
char I[3][6] = {" ___ ", " | ", " _|_ "}; char I[3][6] = {" ___ ", " | ", " _|_ "};
......
...@@ -49,6 +49,7 @@ char B[3][6]; ...@@ -49,6 +49,7 @@ char B[3][6];
char C[3][6]; char C[3][6];
char D[3][6]; char D[3][6];
char E[3][6]; char E[3][6];
char F[3][6];
char G[3][6]; char G[3][6];
char H[3][6]; char H[3][6];
char I[3][6]; char I[3][6];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment