Removes the UNUSED macro. Pointless obscuring of logic. (#159)

LiquidityC · web-flow · commit 6f35f24c1a2d · 2026-03-13T16:00:57.000Z
diff --git a/src/defines.h b/src/defines.h
@@ -65,8 +65,6 @@
 #define strdup SDL_strdup
 #endif // _WIN32
 
-#define UNUSED(x) (void)(x)
-
 #define UNPACK_COLOR(color) color.r, color.g, color.b, color.a
 #define C_WHITE (SDL_Color){255, 255, 255, 255}
 #define C_RED (SDL_Color){255, 0, 0, 255}
diff --git a/src/gamestate.h b/src/gamestate.h
@@ -23,6 +23,7 @@ typedef enum GameState_t {
 	MENU,
 	CREDITS,
 	SCORE_SCREEN,
+	SEED_ENTRY,
 	PLAYING,
 	IN_GAME_MENU,
 	CHARACTER_MENU,
diff --git a/src/hiscore.c b/src/hiscore.c
@@ -167,8 +167,8 @@ hiscore_get_top10(void)
 static int
 load_top_gold_cb(void *result, int count, char **values, char **colNames)
 {
-	UNUSED(count);
-	UNUSED(colNames);
+	(void)count;
+	(void)colNames;
 
 	double *gold = result;
 	*gold = atof(values[0]);
diff --git a/src/main.c b/src/main.c
@@ -289,7 +289,7 @@ startGame(void)
 static void
 exitGame(void *unused)
 {
-	UNUSED(unused);
+	(void)unused;
 	gGameState = QUIT;
 }
 
@@ -302,7 +302,7 @@ gameCompleted(void)
 static void
 toggleInGameMenu(void *unused)
 {
-	UNUSED(unused);
+	(void)unused;
 	if (gGameState == PLAYING || gGameState == GAME_OVER || gGameState == COMPLETED)
 		gGameState = IN_GAME_MENU;
 	else if (is_player_dead())
@@ -329,7 +329,7 @@ on_character_select(const char *str)
 static void
 goToCharacterMenu(void *unused)
 {
-	UNUSED(unused);
+	(void)unused;
 	charSelectMenu = menu_create_character_selector(on_character_select, gCamera);
 	characterSelectScreen = screen_create_characterselect(gRenderer);
 	gGameState = CHARACTER_MENU;
@@ -423,7 +423,7 @@ startArcadeGame(void *unused)
 static void
 goToMainMenu(void *unused)
 {
-	UNUSED(unused);
+	(void)unused;
 	save_load();
 	gui_clear_message_log();
 	gGameState = MENU;
@@ -439,7 +439,7 @@ goToMainMenu(void *unused)
 static void
 goToGameSelectMenu(void *unused)
 {
-	UNUSED(unused);
+	(void)unused;
 	int item_count = 3;
 #ifdef STEAM_BUILD
 	item_count += 1;
@@ -474,7 +474,7 @@ goToGameSelectMenu(void *unused)
 static void
 showHowToTooltip(void *unused)
 {
-	UNUSED(unused);
+	(void)unused;
 	toggleInGameMenu(NULL);
 	gGui->activeTooltip = tooltip_manager_get_tooltip(TOOLTIP_TYPE_HOWTO);
 }
@@ -511,14 +511,14 @@ createInGameGameOverMenu(void)
 static void
 viewCredits(void *unused)
 {
-	UNUSED(unused);
+	(void)unused;
 	gGameState = CREDITS;
 }
 
 static void
 viewScoreScreen(void *unused)
 {
-	UNUSED(unused);
+	(void)unused;
 	gGameState = SCORE_SCREEN;
 }
 
@@ -1381,7 +1381,7 @@ validate_lib_checksum(void)
 int
 main(int argc, char *argv[])
 {
-	UNUSED(argc);
+	(void)argc;
 
 #ifdef CHECKSUM_VALIDATION
 	validate_lib_checksum();
diff --git a/src/map_lua.c b/src/map_lua.c
@@ -63,7 +63,7 @@ l_create_map(lua_State *L)
 static int
 l_print_info(lua_State *L)
 {
-	UNUSED(L); // Compilers keep warning about L being unused
+	(void)L; // Compilers keep warning about L being unused
 	debug(luaL_checkstring(L, 1));
 	return 0;
 }
diff --git a/src/settings.c b/src/settings.c
@@ -69,7 +69,7 @@ create_tables(void)
 static int
 load_settings_cb(void *unused, int count, char **values, char **colNames)
 {
-	UNUSED(unused);
+	(void)unused;
 
 	int i = 0;
 	while (i < count) {
diff --git a/src/skill.c b/src/skill.c
@@ -333,7 +333,7 @@ check_skill_validity(Position *playerPos, Position *targetPos, SkillData *data)
 static bool
 vampiric_blow_skill(Skill *skill, SkillData *data)
 {
-	UNUSED(skill);
+	(void)skill;
 
 	Position playerPos, targetPos;
 	Player *player = data->player;
@@ -412,7 +412,7 @@ create_vampiric_blow(Camera *cam)
 static bool
 skill_use_flurry(Skill *skill, SkillData *data)
 {
-	UNUSED(skill);
+	(void)skill;
 
 	Position playerPos, targetPos;
 	if (!check_skill_validity(&playerPos, &targetPos, data)) {
@@ -489,7 +489,7 @@ skill_throw_dagger_available(Player *player)
 static bool
 skill_throw_dagger(Skill *skill, SkillData *data)
 {
-	UNUSED(skill);
+	(void)skill;
 
 	if (data->player->daggers == 0)
 		return false;
@@ -542,7 +542,7 @@ create_throw_dagger(void)
 static bool
 skill_bash(Skill *skill, SkillData *data)
 {
-	UNUSED(skill);
+	(void)skill;
 
 	Position playerPos, targetPos;
 	if (!check_skill_validity(&playerPos, &targetPos, data)) {
@@ -614,7 +614,7 @@ create_bash(Camera *cam)
 static bool
 skill_trip(Skill *skill, SkillData *data)
 {
-	UNUSED(skill);
+	(void)skill;
 
 	Position playerPos, targetPos;
 	if (!check_skill_validity(&playerPos, &targetPos, data)) {
@@ -688,7 +688,7 @@ create_trip(Camera *cam)
 static bool
 skill_backstab(Skill *skill, SkillData *data)
 {
-	UNUSED(skill);
+	(void)skill;
 
 	Position playerPos, targetPos;
 	if (!check_skill_validity(&playerPos, &targetPos, data)) {
@@ -770,7 +770,7 @@ create_backstab(Camera *cam)
 static bool
 skill_phase(Skill *skill, SkillData *data)
 {
-	UNUSED(skill);
+	(void)skill;
 	mixer_play_effect(FADE_OUT);
 	data->player->phase_count = 3;
 	return true;
@@ -805,7 +805,7 @@ skill_sip_health_available(Player *player)
 static bool
 skill_sip_health(Skill *skill, SkillData *data)
 {
-	UNUSED(skill);
+	(void)skill;
 	player_sip_health(data->player);
 	return true;
 }
@@ -870,7 +870,7 @@ skill_charge_check_path(SkillData *data, Position origin, Position dest)
 static bool
 skill_charge(Skill *skill, SkillData *data)
 {
-	UNUSED(skill);
+	(void)skill;
 
 	Player *player = data->player;
 	RoomMatrix *matrix = data->matrix;
@@ -954,7 +954,7 @@ create_charge(void)
 static bool
 skill_blink(Skill *skill, SkillData *data)
 {
-	UNUSED(skill);
+	(void)skill;
 
 	Player *player = data->player;
 	RoomMatrix *matrix = data->matrix;
@@ -1023,7 +1023,7 @@ create_blink(void)
 static bool
 skill_erupt(Skill *skill, SkillData *data)
 {
-	UNUSED(skill);
+	(void)skill;
 
 	Player *player = data->player;
 	RoomMatrix *rm = data->matrix;
diff --git a/src/skillbar.c b/src/skillbar.c
@@ -323,7 +323,7 @@ render_skills(Player *player, Camera *cam)
 static void
 render_artifacts(SkillBar *bar, Camera *cam)
 {
-	UNUSED(bar);
+	(void)bar;
 	for (size_t i = 0; i < LAST_ARTIFACT_EFFECT; ++i) {
 		if (bar->artifacts[i].lvl == 0)
 			continue;
diff --git a/src/util.c b/src/util.c
@@ -35,7 +35,7 @@ void
 m_strcpy(char *dest, size_t destsz, const char *src)
 {
 #ifndef _MSC_VER
-	UNUSED(destsz);
+	(void)destsz;
 	strncpy(dest, src, destsz);
 #else  // _MSC_VER
 	strcpy_s(dest, destsz, src);
@@ -46,8 +46,8 @@ void
 m_strncat(char *dest, size_t destsz, char *src, size_t srcsz)
 {
 #ifndef _MSC_VER
-	UNUSED(destsz);
-	UNUSED(srcsz);
+	(void)destsz;
+	(void)srcsz;
 	strncat(dest, src, srcsz);
 #else  // _MSC_VER
 	strncat_s(dest, destsz, src, srcsz);
@@ -61,7 +61,7 @@ m_sprintf(char *dest, size_t destsz, const char *format, ...)
 
 	va_start(args, format);
 #ifndef _MSC_VER
-	UNUSED(destsz);
+	(void)destsz;
 	vsnprintf(dest, destsz, format, args);
 #else  // _MSC_VER
 	vsprintf_s(dest, destsz, format, args);
@@ -73,7 +73,7 @@ void
 m_vsprintf(char *dest, size_t sz, const char *fmt, va_list args)
 {
 #ifndef _MSC_VER
-	UNUSED(sz);
+	(void)sz;
 	vsnprintf(dest, sz, fmt, args);
 #else  // _MSC_VER
 	vsprintf_s(dest, sz, fmt, args);
@@ -108,10 +108,10 @@ log_print(FILE *out, const char *prefix, const char *file, int line, const char
 	fprintf(out, "[%s][%5s][%20s:%-3d][%20s()] ", tstamp, prefix, file, line, function);
 #endif // _WIN32
 #else  // DEBUG
-	UNUSED(prefix);
-	UNUSED(file);
-	UNUSED(line);
-	UNUSED(function);
+	(void)prefix;
+	(void)file;
+	(void)line;
+	(void)function;
 #endif // DEBUG
 	va_start(args, fmt);
 	vfprintf(out, fmt, args);

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ startGame(void)`
`289`	`289`	`static void`
`290`	`290`	`exitGame(void *unused)`
`291`	`291`	`{`
`292`		`- UNUSED(unused);`
	`292`	`+ (void)unused;`
`293`	`293`	`gGameState = QUIT;`
`294`	`294`	`}`
`295`	`295`
`@@ -302,7 +302,7 @@ gameCompleted(void)`
`302`	`302`	`static void`
`303`	`303`	`toggleInGameMenu(void *unused)`
`304`	`304`	`{`
`305`		`- UNUSED(unused);`
	`305`	`+ (void)unused;`
`306`	`306`	`if (gGameState == PLAYING \|\| gGameState == GAME_OVER \|\| gGameState == COMPLETED)`
`307`	`307`	`gGameState = IN_GAME_MENU;`
`308`	`308`	`else if (is_player_dead())`
`@@ -329,7 +329,7 @@ on_character_select(const char *str)`
`329`	`329`	`static void`
`330`	`330`	`goToCharacterMenu(void *unused)`
`331`	`331`	`{`
`332`		`- UNUSED(unused);`
	`332`	`+ (void)unused;`
`333`	`333`	`charSelectMenu = menu_create_character_selector(on_character_select, gCamera);`
`334`	`334`	`characterSelectScreen = screen_create_characterselect(gRenderer);`
`335`	`335`	`gGameState = CHARACTER_MENU;`
`@@ -423,7 +423,7 @@ startArcadeGame(void *unused)`
`423`	`423`	`static void`
`424`	`424`	`goToMainMenu(void *unused)`
`425`	`425`	`{`
`426`		`- UNUSED(unused);`
	`426`	`+ (void)unused;`
`427`	`427`	`save_load();`
`428`	`428`	`gui_clear_message_log();`
`429`	`429`	`gGameState = MENU;`
`@@ -439,7 +439,7 @@ goToMainMenu(void *unused)`
`439`	`439`	`static void`
`440`	`440`	`goToGameSelectMenu(void *unused)`
`441`	`441`	`{`
`442`		`- UNUSED(unused);`
	`442`	`+ (void)unused;`
`443`	`443`	`int item_count = 3;`
`444`	`444`	`#ifdef STEAM_BUILD`
`445`	`445`	`item_count += 1;`
`@@ -474,7 +474,7 @@ goToGameSelectMenu(void *unused)`
`474`	`474`	`static void`
`475`	`475`	`showHowToTooltip(void *unused)`
`476`	`476`	`{`
`477`		`- UNUSED(unused);`
	`477`	`+ (void)unused;`
`478`	`478`	`toggleInGameMenu(NULL);`
`479`	`479`	`gGui->activeTooltip = tooltip_manager_get_tooltip(TOOLTIP_TYPE_HOWTO);`
`480`	`480`	`}`
`@@ -511,14 +511,14 @@ createInGameGameOverMenu(void)`
`511`	`511`	`static void`
`512`	`512`	`viewCredits(void *unused)`
`513`	`513`	`{`
`514`		`- UNUSED(unused);`
	`514`	`+ (void)unused;`
`515`	`515`	`gGameState = CREDITS;`
`516`	`516`	`}`
`517`	`517`
`518`	`518`	`static void`
`519`	`519`	`viewScoreScreen(void *unused)`
`520`	`520`	`{`
`521`		`- UNUSED(unused);`
	`521`	`+ (void)unused;`
`522`	`522`	`gGameState = SCORE_SCREEN;`
`523`	`523`	`}`
`524`	`524`
`@@ -1381,7 +1381,7 @@ validate_lib_checksum(void)`
`1381`	`1381`	`int`
`1382`	`1382`	`main(int argc, char *argv[])`
`1383`	`1383`	`{`
`1384`		`- UNUSED(argc);`
	`1384`	`+ (void)argc;`
`1385`	`1385`
`1386`	`1386`	`#ifdef CHECKSUM_VALIDATION`
`1387`	`1387`	`validate_lib_checksum();`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ l_create_map(lua_State *L)`
`63`	`63`	`static int`
`64`	`64`	`l_print_info(lua_State *L)`
`65`	`65`	`{`
`66`		`- UNUSED(L); // Compilers keep warning about L being unused`
	`66`	`+ (void)L; // Compilers keep warning about L being unused`
`67`	`67`	`debug(luaL_checkstring(L, 1));`
`68`	`68`	`return 0;`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ create_tables(void)`
`69`	`69`	`static int`
`70`	`70`	`load_settings_cb(void unused, int count, char values, char *colNames)`
`71`	`71`	`{`
`72`		`- UNUSED(unused);`
	`72`	`+ (void)unused;`
`73`	`73`
`74`	`74`	`int i = 0;`
`75`	`75`	`while (i < count) {`
Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ render_skills(Player player, Camera cam)`
`323`	`323`	`static void`
`324`	`324`	`render_artifacts(SkillBar bar, Camera cam)`
`325`	`325`	`{`
`326`		`- UNUSED(bar);`
	`326`	`+ (void)bar;`
`327`	`327`	`for (size_t i = 0; i < LAST_ARTIFACT_EFFECT; ++i) {`
`328`	`328`	`if (bar->artifacts[i].lvl == 0)`
`329`	`329`	`continue;`