BRNSystems/mazegame
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Compare commits

base: BRNSystems:926d3873e4838142fb4866b65ca2b440a4c89981
Branches Tags
BRNSystems:master
BRNSystems:1.0.2 BRNSystems:1.0.1 BRNSystems:1.0.0
...
compare: BRNSystems:c5af2046e2082cda0c92ffef42f77f8da5b41d4e
Branches Tags
BRNSystems:master
BRNSystems:1.0.2 BRNSystems:1.0.1 BRNSystems:1.0.0

2 Commits
926d3873e4 ... c5af2046e2

Author SHA1 Message Date
Bruno Rybársky
c5af2046e2 beautify 2022-05-29 10:22:29 +02:00
Bruno Rybársky
daf638d060 clean up comments 2022-05-29 10:21:25 +02:00
1 changed files with 103 additions and 143 deletions
Expand all files Collapse all files

246
main.c
View File

@@ -1,10 +1,17 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <time.h> #include <stdlib.h>
#include <time.h>
#include <stdint.h> #include <stdint.h>
#include <ncurses.h> #include <ncurses.h>
#include <unistd.h> #include <unistd.h>
#include <math.h> #include <math.h>
uint16_t Hole_Div = 40; uint16_t Hole_Div = 40;
uint16_t SCR_X; uint16_t SCR_X;
uint16_t SCR_Y; uint16_t SCR_Y;
@@ -44,149 +51,113 @@ uint16_t goal_y = 0;
uint16_t rng_tmp = 0; uint16_t rng_tmp = 0;
uint16_t orient = 0; uint16_t orient = 0;
uint16_t inputs_tmp = 0; uint16_t inputs_tmp = 0;
struct Object * rendered;
struct Object *rendered; struct Bullet * bullets;
struct Bullet *bullets; char * playfield;
char *playfield;
int randomInt(int lower, int upper) { int randomInt(int lower, int upper) {
return rand() % (upper - lower + 1) + lower; return rand() % (upper - lower + 1) + lower;
} }
void generate_maze() {
void generate_maze(){
//fill playfield with blank //fill playfield with blank
for (uint16_t y = 0; y < SCR_Y; y++) { for (uint16_t y = 0; y < SCR_Y; y++) {
for (uint16_t x = 0; x < SCR_X; x++) { for (uint16_t x = 0; x < SCR_X; x++) {
//playfield[y][x] = blank_char; playfield[y * SCR_X + x] = blank_char;
//do it in one dimension
playfield[y*SCR_X + x] = blank_char;
} }
} }
//fill every other row with walls //fill every other row with walls
for (uint16_t y = 0; y < SCR_Y; y += 2) { for (uint16_t y = 0; y < SCR_Y; y += 2) {
for (uint16_t x = 0; x < SCR_X; x++) { for (uint16_t x = 0; x < SCR_X; x++) {
//playfield[y][x] = wall_char; playfield[y * SCR_X + x] = wall_char;
//do it in one dimension
playfield[y*SCR_X + x] = wall_char;
} }
} }
//punch holes in the walls //punch holes in the walls
for (uint16_t y = 0; y < SCR_Y; y++) { for (uint16_t y = 0; y < SCR_Y; y++) {
//punch holes in the walls depending on the SCR_X //punch holes in the walls depending on the SCR_X
for (uint16_t ix = 0; ix < ((SCR_X-(SCR_X%Hole_Div))/Hole_Div); ix += 1) { for (uint16_t ix = 0; ix < ((SCR_X - (SCR_X % Hole_Div)) / Hole_Div); ix += 1) {
rng_tmp = randomInt(1, SCR_X); rng_tmp = randomInt(1, SCR_X);
//playfield[y][rng_tmp] = blank_char;
//do it in one dimension playfield[y * SCR_X + rng_tmp] = blank_char;
playfield[y*SCR_X + rng_tmp] = blank_char;
} }
if (orient == 0) { if (orient == 0) {
if(y == 0){ if (y == 0) {
//playfield[y][rng_tmp] = goal_char;
//do it in one dimension playfield[y * SCR_X + rng_tmp] = goal_char;
playfield[y*SCR_X + rng_tmp] = goal_char;
goal_x = rng_tmp; goal_x = rng_tmp;
goal_y = y; goal_y = y;
} }
if (y == SCR_Y -1){ if (y == SCR_Y - 1) {
//playfield[y][rng_tmp] = player_char;
//do it in one dimension playfield[y * SCR_X + rng_tmp] = player_char;
playfield[y*SCR_X + rng_tmp] = player_char;
player_x = rng_tmp; player_x = rng_tmp;
player_y = y; player_y = y;
} }
} else { } else {
if(y == SCR_Y -1){ if (y == SCR_Y - 1) {
//playfield[y][rng_tmp] = goal_char;
//do it in one dimension playfield[y * SCR_X + rng_tmp] = goal_char;
playfield[y*SCR_X + rng_tmp] = goal_char;
goal_x = rng_tmp; goal_x = rng_tmp;
goal_y = y; goal_y = y;
} }
if (y == 0){ if (y == 0) {
//playfield[y][rng_tmp] = player_char;
//do it in one dimension playfield[y * SCR_X + rng_tmp] = player_char;
playfield[y*SCR_X + rng_tmp] = player_char;
player_x = rng_tmp; player_x = rng_tmp;
player_y = y; player_y = y;
} }
} }
} }
} }
void render_maze() {
void render_maze(){
//fill rendered with blank //fill rendered with blank
for (uint16_t y = 0; y < SCR_Y; y++) { for (uint16_t y = 0; y < SCR_Y; y++) {
for (uint16_t x = 0; x < SCR_X; x++) { for (uint16_t x = 0; x < SCR_X; x++) {
//rendered[y][x] = blank_char;
//do it in one dimension rendered[y * SCR_X + x].letter = blank_char;
rendered[y*SCR_X + x].letter = blank_char; rendered[y * SCR_X + x].color = blank_color;
rendered[y*SCR_X + x].color = blank_color; rendered[y * SCR_X + x].x = x;
rendered[y*SCR_X + x].x = x; rendered[y * SCR_X + x].y = y;
rendered[y*SCR_X + x].y = y;
} }
} }
for (uint16_t y = 0; y < SCR_Y; y++) { for (uint16_t y = 0; y < SCR_Y; y++) {
for (uint16_t x = 0; x < SCR_X; x++) { for (uint16_t x = 0; x < SCR_X; x++) {
//letter = playfield[y - 1][x- 1];
//do it in one dimension letter = playfield[(y) * SCR_X + (x)];
letter = playfield[(y)*SCR_X + (x)];
//rendered[x][y].letter = letter; rendered[(y) * SCR_X + (x)].letter = letter;
//do it in one dimension
rendered[(y)*SCR_X + (x)].letter = letter; rendered[(y) * SCR_X + (x)].x = x;
//rendered[x][y].x = x;
//do it in one dimension rendered[(y) * SCR_X + (x)].y = y;
rendered[(y)*SCR_X + (x)].x = x; if (letter == goal_char) {
//rendered[x][y].y = y;
//do it in one dimension rendered[(y) * SCR_X + (x)].color = goal_color;
rendered[(y)*SCR_X + (x)].y = y; } else if (letter == player_char) {
if (letter == goal_char){
//rendered[x][y].color = goal_color; rendered[(y) * SCR_X + (x)].color = player_color;
//do it in one dimension } else if (letter == blank_char) {
rendered[(y)*SCR_X + (x)].color = goal_color;
} rendered[(y) * SCR_X + (x)].color = blank_color;
else if (letter == player_char){ } else if (letter == wall_char) {
//rendered[x][y].color = player_color;
//do it in one dimension rendered[(y) * SCR_X + (x)].color = wall_color;
rendered[(y)*SCR_X + (x)].color = player_color;
}
else if (letter == blank_char){
//rendered[x][y].color = blank_color;
//do it in one dimension
rendered[(y)*SCR_X + (x)].color = blank_color;
}
else if (letter == wall_char){
//rendered[x][y].color = wall_color;
//do it in one dimension
rendered[(y)*SCR_X + (x)].color = wall_color;
} }
} }
} }
} }
void draw_maze() {
void draw_maze(){
//FILE *fp;
//fp = fopen("logx", "w");
for (uint16_t y = 0; y < SCR_Y; y++) { for (uint16_t y = 0; y < SCR_Y; y++) {
for (uint16_t x = 0; x < SCR_X; x++) { for (uint16_t x = 0; x < SCR_X; x++) {
//attron(COLOR_PAIR(rendered[x][y].color));
//do it in one dimension attron(COLOR_PAIR(rendered[(y) * SCR_X + (x)].color));
attron(COLOR_PAIR(rendered[(y)*SCR_X + (x)].color));
//mvaddch(y, x, rendered[x][y].letter); mvaddch(y, x, rendered[(y) * SCR_X + (x)].letter);
//do it in one dimension
mvaddch(y, x, rendered[(y)*SCR_X + (x)].letter); attroff(COLOR_PAIR(rendered[(y) * SCR_X + (x)].color));
//fprintf(fp, "%c, x:%d y:%d\n", rendered[(y)*SCR_X + (x)].letter, rendered[(y)*SCR_X + (x)].x, rendered[(y)*SCR_X + (x)].y);
//attroff(COLOR_PAIR(rendered[x][y].color));
//do it in one dimension
attroff(COLOR_PAIR(rendered[(y)*SCR_X + (x)].color));
} }
} }
//fclose(fp);
refresh(); refresh();
} }
void init() {
void init(){
initscr(); initscr();
//get screen size //get screen size
getmaxyx(stdscr, SCR_Y, SCR_X); getmaxyx(stdscr, SCR_Y, SCR_X);
@@ -207,84 +178,74 @@ void init(){
clear(); clear();
srand(time(NULL)); srand(time(NULL));
} }
int keyinput() {
int keyinput(){
inchar = getch(); inchar = getch();
if (inchar == 'q'){ if (inchar == 'q') {
return 1; return 1;
} }
if (inchar == 'w'){ if (inchar == 'w') {
//if (playfield[player_y - 1][player_x] == blank_char){ //if (playfield[player_y - 1][player_x] == blank_char){
if (player_y > 0&&playfield[(player_y-1)*SCR_X + player_x] == blank_char){ if (player_y > 0 && playfield[(player_y - 1) * SCR_X + player_x] == blank_char) {
//playfield[player_y][player_x] = blank_char;
//do it in one dimension playfield[(player_y) * SCR_X + player_x] = blank_char;
playfield[(player_y)*SCR_X + player_x] = blank_char;
player_y--; player_y--;
//playfield[player_y][player_x] = player_char;
//do it in one dimension playfield[(player_y) * SCR_X + player_x] = player_char;
playfield[(player_y)*SCR_X + player_x] = player_char; //}else if (playfield[player_y - 1][player_x] == goal_char){
//}else if (playfield[player_y - 1][player_x] == goal_char){ } else if (playfield[(player_y - 1) * SCR_X + player_x] == goal_char) {
}else if (playfield[(player_y-1)*SCR_X + player_x] == goal_char){
return 2; return 2;
} }
} }
if (inchar == 'a'){ if (inchar == 'a') {
//if (playfield[player_y][player_x - 1] == blank_char){ //if (playfield[player_y][player_x - 1] == blank_char){
if (player_x > 0 &&playfield[(player_y)*SCR_X + (player_x-1)] == blank_char){ if (player_x > 0 && playfield[(player_y) * SCR_X + (player_x - 1)] == blank_char) {
//playfield[player_y][player_x] = blank_char;
//do it in one dimension playfield[(player_y) * SCR_X + player_x] = blank_char;
playfield[(player_y)*SCR_X + player_x] = blank_char;
player_x--; player_x--;
//playfield[player_y][player_x] = player_char;
//do it in one dimension playfield[(player_y) * SCR_X + player_x] = player_char;
playfield[(player_y)*SCR_X + player_x] = player_char;
} }
//else if (playfield[player_y][player_x - 1] == goal_char){ //else if (playfield[player_y][player_x - 1] == goal_char){
else if (playfield[(player_y)*SCR_X + (player_x-1)] == goal_char){ else if (playfield[(player_y) * SCR_X + (player_x - 1)] == goal_char) {
return 2; return 2;
} }
} }
if (inchar == 's'){ if (inchar == 's') {
//if (playfield[player_y + 1][player_x] == blank_char){ //if (playfield[player_y + 1][player_x] == blank_char){
if (player_x < SCR_X - 1 &&playfield[(player_y+1)*SCR_X + player_x] == blank_char){ if (player_x < SCR_X - 1 && playfield[(player_y + 1) * SCR_X + player_x] == blank_char) {
// playfield[player_y][player_x] = blank_char; playfield[(player_y) * SCR_X + player_x] = blank_char;
playfield[(player_y)*SCR_X + player_x] = blank_char;
player_y++; player_y++;
// playfield[player_y][player_x] = player_char; playfield[(player_y) * SCR_X + player_x] = player_char;
playfield[(player_y)*SCR_X + player_x] = player_char; // }else if (playfield[player_y + 1][player_x] == goal_char){
// }else if (playfield[player_y + 1][player_x] == goal_char){ } else if (playfield[(player_y + 1) * SCR_X + player_x] == goal_char) {
}else if (playfield[(player_y+1)*SCR_X + player_x] == goal_char){
return 2; return 2;
} }
} }
if (inchar == 'd'){ if (inchar == 'd') {
// if (playfield[player_y][player_x + 1] == blank_char){ // if (playfield[player_y][player_x + 1] == blank_char){
if (player_x < SCR_X - 1 &&playfield[(player_y)*SCR_X + (player_x+1)] == blank_char){ if (player_x < SCR_X - 1 && playfield[(player_y) * SCR_X + (player_x + 1)] == blank_char) {
//playfield[player_y][player_x] = blank_char; playfield[(player_y) * SCR_X + player_x] = blank_char;
playfield[(player_y)*SCR_X + player_x] = blank_char;
player_x++; player_x++;
//playfield[player_y][player_x] = player_char; playfield[(player_y) * SCR_X + player_x] = player_char;
playfield[(player_y)*SCR_X + player_x] = player_char;
} }
//else if (playfield[player_y][player_x + 1] == goal_char){ //else if (playfield[player_y][player_x + 1] == goal_char){
else if (playfield[(player_y)*SCR_X + (player_x+1)] == goal_char){ else if (playfield[(player_y) * SCR_X + (player_x + 1)] == goal_char) {
return 2; return 2;
} }
} }
} }
int main(int argc, char * argv[]) {
int main(int argc, char *argv[]){
init(); init();
//parse the command line arguments for width and height //parse the command line arguments for width and height
if (argc == 3){ if (argc == 3) {
SCR_X = atoi(argv[1]); SCR_X = atoi(argv[1]);
SCR_Y = atoi(argv[2]); SCR_Y = atoi(argv[2]);
} }
if (argc == 2){ if (argc == 2) {
Hole_Div = atoi(argv[1]); Hole_Div = atoi(argv[1]);
} }
if (argc == 4){ if (argc == 4) {
SCR_X = atoi(argv[1]); SCR_X = atoi(argv[1]);
SCR_Y = atoi(argv[2]); SCR_Y = atoi(argv[2]);
Hole_Div = atoi(argv[3]); Hole_Div = atoi(argv[3]);
@@ -292,14 +253,13 @@ int main(int argc, char *argv[]){
generate_maze(); generate_maze();
render_maze(); render_maze();
draw_maze(); draw_maze();
while (1) while (1) {
{
inputs_tmp = keyinput(); inputs_tmp = keyinput();
if (inputs_tmp == 1){ if (inputs_tmp == 1) {
break; break;
} }
if (inputs_tmp == 2){ if (inputs_tmp == 2) {
if (orient == 0){ if (orient == 0) {
orient = 1; orient = 1;
} else { } else {
orient = 0; orient = 0;
@@ -308,7 +268,7 @@ int main(int argc, char *argv[]){
} }
render_maze(); render_maze();
draw_maze(); draw_maze();
usleep(round(1000000/FPS)); usleep(round(1000000 / FPS));
} }
endwin(); endwin();
free(playfield); free(playfield);