Fix some warnings

MatthewL246 · Nov 26, 2023 · 1bb7682 · 1bb7682
1 parent d145a2c
commit 1bb7682
Show file tree

Hide file tree

Showing 13 changed files with 58 additions and 67 deletions.
diff --git a/source/bullet.c b/source/bullet.c
@@ -1,8 +1,8 @@
-#include <malloc.h>
-#include <math.h>
-
 #include "bullet.h"
+
 #include "drawing.h"
+#include <malloc.h>
+#include <math.h>
 
 Bullet *bulletsHead = NULL;
 Bullet *bulletsTail = NULL;
@@ -53,7 +53,7 @@ void RemoveBullet(Bullet *bullet)
     free(bullet);
 }
 
-void MoveAllBullets()
+void MoveAllBullets(void)
 {
     Bullet *currentBullet = bulletsHead;
 

diff --git a/source/bullet.h b/source/bullet.h
@@ -1,5 +1,4 @@
-#ifndef BULLET_H
-#define BULLET_H
+#pragma once
 
 #include "structs.h"
 #include "tower.h"
@@ -22,6 +21,4 @@ void AddBullet(Tower *fromTower);
 
 void RemoveBullet(Bullet *bullet);
 
-void MoveAllBullets();
-
-#endif
+void MoveAllBullets(void);
diff --git a/source/drawing.c b/source/drawing.c
@@ -1,12 +1,12 @@
-#include <coreinit/screen.h>
-#include <math.h>
-#include <stdbool.h>
-#include <stdio.h>
+#include "drawing.h"
 
 #include "bullet.h"
-#include "drawing.h"
 #include "enemy.h"
 #include "tower.h"
+#include <coreinit/screen.h>
+#include <math.h>
+#include <stdbool.h>
+#include <stdio.h>
 
 const int DRC_TOUCH_TOP = 3900;
 const int DRC_TOUCH_BOTTOM = 180;
@@ -54,7 +54,7 @@ void DrawPoint(Point point, Color color, int size, bool drawOnBothScreens)
     }
 }
 
-void DrawAllTowers()
+void DrawAllTowers(void)
 {
     Tower *currentTower = towersHead;
 
@@ -69,7 +69,7 @@ void DrawAllTowers()
     }
 }
 
-void DrawAllBullets()
+void DrawAllBullets(void)
 {
     Bullet *currentBullet = bulletsHead;
 
@@ -80,7 +80,7 @@ void DrawAllBullets()
     }
 }
 
-void DrawAllEnemies()
+void DrawAllEnemies(void)
 {
     Enemy *currentEnemy = enemiesHead;
 

diff --git a/source/drawing.h b/source/drawing.h
@@ -1,10 +1,8 @@
-#ifndef DRAWING_H
-#define DRAWING_H
-
-#include <stdbool.h>
+#pragma once
 
 #include "structs.h"
 #include <coreinit/time.h>
+#include <stdbool.h>
 
 #define DRC_SCREEN_WIDTH 854
 #define DRC_SCREEN_HEIGHT 480
@@ -13,10 +11,8 @@ Point MapTouchToDrcScreen(int touchX, int touchY);
 
 void DrawPoint(Point point, Color color, int size, bool drawOnBothScreens);
 
-void DrawAllTowers();
-
-void DrawAllBullets();
+void DrawAllTowers(void);
 
-void DrawAllEnemies();
+void DrawAllBullets(void);
 
-#endif
+void DrawAllEnemies(void);
diff --git a/source/enemy.c b/source/enemy.c
@@ -1,12 +1,12 @@
-#include <malloc.h>
+#include "enemy.h"
 
 #include "drawing.h"
-#include "enemy.h"
+#include <malloc.h>
 
 Enemy *enemiesHead = NULL;
 Enemy *enemiesTail = NULL;
 
-void AddEnemy()
+void AddEnemy(void)
 {
     Enemy *newEnemy = malloc(sizeof(Enemy));
     newEnemy->position = (Point){0, DRC_SCREEN_HEIGHT / 2};
@@ -55,7 +55,7 @@ void RemoveEnemy(Enemy *enemy)
     free(enemy);
 }
 
-void MoveAllEnemies()
+void MoveAllEnemies(void)
 {
     Enemy *currentEnemy = enemiesHead;
 

diff --git a/source/enemy.h b/source/enemy.h
@@ -1,5 +1,4 @@
-#ifndef ENEMY_H
-#define ENEMY_H
+#pragma once
 
 #include "structs.h"
 
@@ -16,10 +15,8 @@ typedef struct Enemy
 
 extern Enemy *enemiesHead;
 
-void AddEnemy();
+void AddEnemy(void);
 
 void RemoveEnemy(Enemy *enemy);
 
-void MoveAllEnemies();
-
-#endif
+void MoveAllEnemies(void);
diff --git a/source/game.c b/source/game.c
@@ -1,3 +1,10 @@
+#include "game.h"
+
+#include "bullet.h"
+#include "drawing.h"
+#include "enemy.h"
+#include "structs.h"
+#include "tower.h"
 #include <coreinit/screen.h>
 #include <coreinit/time.h>
 #include <malloc.h>
@@ -8,13 +15,7 @@
 #include <vpad/input.h>
 #include <whb/log.h>
 
-#include "bullet.h"
-#include "drawing.h"
-#include "enemy.h"
-#include "structs.h"
-#include "tower.h"
-
-void CheckBulletEnemyCollisions()
+void CheckBulletEnemyCollisions(void)
 {
     Bullet *currentBullet = bulletsHead;
 
@@ -98,7 +99,7 @@ int GameLoop(VPADStatus status, OSTick deltaTime)
     return 0;
 }
 
-void GameShutdown()
+void GameShutdown(void)
 {
     // Free all towers, bullets, and enemies
     while (towersHead)
@@ -118,7 +119,7 @@ void GameShutdown()
 int profilerMessageCounter = 0;
 OSTick fromTime = 0;
 
-void ProfilerStartFrame()
+void ProfilerStartFrame(void)
 {
     profilerMessageCounter = 0;
     fromTime = OSGetTick();
@@ -128,7 +129,7 @@ void ProfilerLogTime(char *title, OSTick time)
 {
     unsigned frametimeMicroseconds = OSTicksToMicroseconds(time);
     char profilerLogString[100];
-    snprintf(profilerLogString, 100, "%s: %.2f ms", title, frametimeMicroseconds / 1000.0);
+    snprintf(profilerLogString, sizeof(profilerLogString), "%s: %.2f ms", title, frametimeMicroseconds / 1000.0);
     OSScreenPutFontEx(SCREEN_DRC, 0, profilerMessageCounter, profilerLogString);
     OSScreenPutFontEx(SCREEN_TV, 0, profilerMessageCounter, profilerLogString);
     profilerMessageCounter++;

diff --git a/source/game.h b/source/game.h
@@ -1,8 +1,13 @@
+#pragma once
+
+#include <coreinit/time.h>
+#include <vpad/input.h>
+
 int GameLoop(VPADStatus status, OSTick deltaTime);
 
-void GameShutdown();
+void GameShutdown(void);
 
-void ProfilerStartFrame();
+void ProfilerStartFrame(void);
 
 void ProfilerLog(char *title);
 

diff --git a/source/main.c b/source/main.c
@@ -1,11 +1,11 @@
-#include <malloc.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <math.h>
-#include <coreinit/time.h>
 #include <coreinit/cache.h>
 #include <coreinit/screen.h>
 #include <coreinit/thread.h>
+#include <coreinit/time.h>
+#include <malloc.h>
+#include <math.h>
+#include <stdbool.h>
+#include <stdio.h>
 #include <vpad/input.h>
 #include <whb/log.h>
 #include <whb/log_cafe.h>

diff --git a/source/structs.c b/source/structs.c
@@ -1,7 +1,7 @@
-#include <stdbool.h>
-
 #include "structs.h"
 
+#include <stdbool.h>
+
 bool PointEquals(Point a, Point b)
 {
     return a.x == b.x && a.y == b.y;

diff --git a/source/structs.h b/source/structs.h
@@ -1,5 +1,4 @@
-#ifndef STRUCTS_H
-#define STRUCTS_H
+#pragma once
 
 #include <stdbool.h>
 
@@ -27,5 +26,3 @@ typedef struct Color
 } Color;
 
 bool ColorEquals(Color a, Color b);
-
-#endif
diff --git a/source/tower.c b/source/tower.c
@@ -1,8 +1,8 @@
-#include <malloc.h>
-#include <math.h>
+#include "tower.h"
 
 #include "bullet.h"
-#include "tower.h"
+#include <malloc.h>
+#include <math.h>
 
 Tower *towersHead = NULL;
 Tower *towersTail = NULL;

diff --git a/source/tower.h b/source/tower.h
@@ -1,9 +1,9 @@
-#ifndef TOWER_H
-#define TOWER_H
+#pragma once
 
 #include "structs.h"
 
-#define INVALID_TOWER_TARGET (Point){-1, -1}
+#define INVALID_TOWER_TARGET \
+    (Point) { -1, -1 }
 
 typedef struct Bullet Bullet;
 
@@ -28,5 +28,3 @@ void RemoveTower(Tower *tower);
 void SetLastTowerTarget(Point targetPosition);
 
 void FireAllTowers(unsigned gameLoopCounter);
-
-#endif