Minor code fixes and a slight tweak to the blue color

This commit is contained in:
Linus Probert 2018-08-16 14:09:54 +02:00
parent 6af8d9dd8f
commit 549f47ae0b
4 changed files with 4 additions and 12 deletions

View File

@ -65,7 +65,7 @@
#define C_WHITE (SDL_Color) { 255, 255, 255, 255 } #define C_WHITE (SDL_Color) { 255, 255, 255, 255 }
#define C_RED (SDL_Color) { 255, 0, 0, 255 } #define C_RED (SDL_Color) { 255, 0, 0, 255 }
#define C_GREEN (SDL_Color) { 0, 255, 0, 255 } #define C_GREEN (SDL_Color) { 0, 255, 0, 255 }
#define C_BLUE (SDL_Color) { 0, 0, 255, 255 } #define C_BLUE (SDL_Color) { 60, 134, 252, 255 }
#define C_YELLOW (SDL_Color) { 255, 255, 0, 255 } #define C_YELLOW (SDL_Color) { 255, 255, 0, 255 }
#define C_BLACK (SDL_Color) { 0, 0, 0, 255 } #define C_BLACK (SDL_Color) { 0, 0, 0, 255 }
#define C_PURPLE (SDL_Color) { 137, 16, 229, 255 } #define C_PURPLE (SDL_Color) { 137, 16, 229, 255 }

View File

@ -216,14 +216,6 @@ startGame(void *unused)
player_destroy(gPlayer); player_destroy(gPlayer);
gPlayer = player_create(WARRIOR, gRenderer); gPlayer = player_create(WARRIOR, gRenderer);
mixer_play_music(GAME_MUSIC0 + get_random(2)); mixer_play_music(GAME_MUSIC0 + get_random(2));
#ifdef DEBUG
// This block is for testing
cLevel = 1;
if (cLevel % 5 == 0)
mixer_play_music(BOSS_MUSIC0);
for (size_t i = 1; i < cLevel; ++i)
player_levelup(gPlayer);
#endif // DEBUG
resetGame(); resetGame();
gui_clear_message_log(); gui_clear_message_log();
gui_log("The Dungeon Crawl begins!"); gui_log("The Dungeon Crawl begins!");

View File

@ -318,7 +318,7 @@ particle_engine_heat()
h = get_random(2) + 2; h = get_random(2) + 2;
yvel = get_random(50) - 200; yvel = get_random(50) - 200;
xvel = get_random(100) * -get_random(1); xvel = get_random(100) * -((int) get_random(1));
lt = get_random(500); lt = get_random(500);

View File

@ -34,8 +34,8 @@
#define debug(...) do {} while(0) #define debug(...) do {} while(0)
#define info(...) do {} while(0) #define info(...) do {} while(0)
#endif // DEBUG #endif // DEBUG
#define error(...) log_print(stderr, "ERROR", __FNAME__, __LINE__, __func__, __VA_ARGS__)
#define error(...) log_print(stderr, "ERROR", __FNAME__, __LINE__, __func__, __VA_ARGS__)
#ifdef DEBUG #ifdef DEBUG
#define fatal(...) \ #define fatal(...) \
{ \ { \
@ -44,7 +44,7 @@
getchar(); \ getchar(); \
exit(-1); \ exit(-1); \
} }
#else #else // DEBUG
#define fatal(...) \ #define fatal(...) \
{ \ { \
log_print(stderr, "FATAL", __FNAME__, __LINE__, __func__, __VA_ARGS__); \ log_print(stderr, "FATAL", __FNAME__, __LINE__, __func__, __VA_ARGS__); \