WallyHackenslacker/Not-so-Rogue-like
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Assorted bug fixes. Demo scenario complete.

Browse Source
This commit is contained in:
Wally Hackenslacker
2014-03-09 16:00:13 -04:30
parent 05d6914861
commit 83cdd38c41
10 changed files with 474 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/game_over.c
View File

@@ -10,11 +10,11 @@
#include "constants.h"
#include "game_over.h"
static const char * title = "TITLE PENDING";
static const char * subtitle = "A game for the Cyberpunk Jam 2014";
static const char * aWinnerIsYou = "You have completed the scenario!";
static const char * thanks = "Thank you for playing.";
static const char * goInfo = "Press enter to return to the main menu.";
static const char * title = "TITLE PENDING";
static const char * subtitle = "A game for the Cyberpunk Jam 2014";
static const char * aWinnerIsYou = "You have completed the scenario!";
static const char * thanks = "Thank you for playing.";
static const char * goInfo = "Press enter to return to the main menu.";
static bool enter;

80
src/in_game.c
View File

@@ -25,34 +25,34 @@ typedef struct PLAYER {
unsigned short y;
} player_t;
static bool **vis;
static bool **seen;
static bool ** wmap;
static bool w_mov = FALSE;
static bool uK, dK, lK, rK, esc;
static clock_t then, msgThen;
static player_t player;
static map_cell_t ** map;
static game_obj_t objs[MAX_OBJECTS];
static int mW, mH, nO;
static fov_settings_type fov_settings;
static int keys[MAX_KEYS];
static int freeKey;
static char msg[128];
static bool newMsg = FALSE;
static bool ** vis;
static bool ** seen;
static bool ** wmap;
static bool w_mov = FALSE;
static bool uK, dK, lK, rK, esc;
static clock_t then, msgThen;
static player_t player;
static map_cell_t ** map;
static game_obj_t objs[MAX_OBJECTS];
static int mW, mH, nO;
static fov_settings_type fov_settings;
static int keys[MAX_KEYS];
static int freeKey;
static char msg[128];
static bool newMsg = FALSE;
void input();
void input();
gsname_t update();
void render(int, int);
void drawGui(int, int);
void setPlayerStart();
void initObjects();
void initKeys();
void drawNeon(int, int, floor_t);
void apply(void *, int, int, int, int, void *);
bool opaque(void *, int, int);
void loadMap(const char *);
bool canMoveTo(int, int);
void render(int, int);
void drawGui(int, int);
void setPlayerStart();
void initObjects();
void initKeys();
void drawNeon(int, int, floor_t);
void apply(void *, int, int, int, int, void *);
bool opaque(void *, int, int);
void loadMap(const char *);
bool canMoveTo(int, int);
void initInGameState( gs_t * gs) {
int i, j;
@@ -167,6 +167,7 @@ gsname_t update(){
}
newMsg = TRUE;
msgThen = clock();
freeKey++;
}
}
}
@@ -418,28 +419,33 @@ void drawNeon(int i, int j, floor_t floor){
else attron(COLOR_PAIR(SN_COLOR));
}
n = map[i ][j - 1 < 0 ? mH - 1 : j - 1].f == floor;
s = map[i ][(j + 1) % mH ].f == floor;
e = map[i - 1 < 0 ? mW - 1 : i - 1][j ].f == floor;
w = map[(i + 1) % mW ][j ].f == floor;
w = map[i ][j - 1 < 0 ? mH - 1 : j - 1].f == floor;
e = map[i ][(j + 1) % mH ].f == floor;
s = map[i - 1 < 0 ? mW - 1 : i - 1][j ].f == floor;
n = map[(i + 1) % mW ][j ].f == floor;
if((n && s && e) && (!w)){
printw("\u2560");
return;
}
if((n || s) && (!e && !w)){
printw("\u2550");
if((n && s && w) && (!e)){
printw("\u2563");
return;
}
if((e || w) && (!n && !s)){
if((n || s) && (!e && !w)){
printw("\u2551");
return;
}
if((e || w) && (!n && !s)){
printw("\u2550");
return;
}
if((e && n) && (!s && !w)){
printw("\u255D");
printw("\u2554");
return;
}
@@ -454,17 +460,17 @@ void drawNeon(int i, int j, floor_t floor){
}
if((w && s) && (!n && !e)){
printw("\u2554");
printw("\u255D");
return;
}
if((s && e && w) && (!n)){
printw("\u2560");
printw("\u2569");
return;
}
if((n && w && e) && (!s)){
printw("\u2563");
printw("\u2566");
return;
}

6
src/intro.c
View File

@@ -16,9 +16,9 @@ void inInput();
gsname_t inUpdate();
void inRender(int, int);
static bool anyKey;
static clock_t then = 0, nThen = 0;
static int mRows = 0, mH = 0;
static bool anyKey;
static clock_t then = 0, nThen = 0;
static int mRows = 0, mH = 0;
void initIntroState(gs_t * gs){
gs->name = INTRO;

26
src/main.c
View File

@@ -18,25 +18,25 @@
void leave(void);
void manage_signal(int signal);
int start_ncurses(void);
int start_ncurses(void);
void set_colors(void);
void on_resize(int);
static int w = 0, h = 0;
static int w = 0, h = 0;
static bool resize = FALSE;
int main() {
bool finished = FALSE;
char * home_dir = getenv("HOME");
FILE * f; /* To avoid a warning. */
clock_t then, now, delta;
unsigned int fps = 0, pfps = 0;
char * data_dir;
char * log_file;
time_t raw_date;
struct tm * current_date;
gs_t * states;
int c_state;
bool finished = FALSE;
char * home_dir = getenv("HOME");
FILE * f; /* To avoid a warning. */
clock_t then, now, delta;
unsigned int fps = 0, pfps = 0;
char * data_dir;
char * log_file;
time_t raw_date;
struct tm * current_date;
gs_t * states;
int c_state;
atexit(leave);
signal(SIGINT, manage_signal);

14
src/main_menu.c
View File

@@ -10,14 +10,14 @@
#include "constants.h"
#include "main_menu.h"
static const char * title = "TITLE PENDING";
static const char * title = "TITLE PENDING";
static const char * subtitle = "A game for the Cyberpunk Jam 2014";
static const char * opt1 = "New game";
static const char * opt2 = "Replay intro";
static const char * opt3 = "Quit";
static const char * creds = "Designed and programmed by Miky";
static const char * info = "Press enter to select an option. Scroll with the arrow keys.";
static const char * info2 = "Press escape while in game to return to the main menu.";
static const char * opt1 = "New game";
static const char * opt2 = "Replay intro";
static const char * opt3 = "Quit";
static const char * creds = "Designed and programmed by Miky";
static const char * info = "Press enter to select an option. Scroll with the arrow keys.";
static const char * info2 = "Press escape while in game to return to the main menu.";
static int selOpt = 0;
static bool uK, dK, esc, enter;