From e140127180cc4af9f75e9ed49050e2051312b854 Mon Sep 17 00:00:00 2001 From: fickleheart Date: Wed, 6 Feb 2019 20:25:45 -0600 Subject: [PATCH] Format for better consistency with the codebase --- src/d_netcmd.c | 7 +++---- src/g_game.c | 13 ++++++------- src/g_game.h | 4 ++-- src/p_local.h | 2 +- src/p_user.c | 3 +-- 5 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index ab0f4bf3..6fb8aa70 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -1892,8 +1892,8 @@ static void Command_ResetCamera_f(void) P_ResetCamera(&players[displayplayer], &camera); } -static INT32/* Consider replacing nametonum with this */ -LookupPlayer (const char *s) +/* Consider replacing nametonum with this */ +static INT32 LookupPlayer(const char *s) { INT32 playernum; @@ -1923,8 +1923,7 @@ LookupPlayer (const char *s) #define PRINTVIEWPOINT( pre,suf ) \ CONS_Printf(pre"viewing \x84(%d) \x83%s\x80"suf".\n",\ (*displayplayerp), player_names[(*displayplayerp)]); -static void -Command_View_f (void) +static void Command_View_f(void) { INT32 *displayplayerp; INT32 olddisplayplayer; diff --git a/src/g_game.c b/src/g_game.c index a69d76ee..c100ce92 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -2120,8 +2120,7 @@ static INT32 G_FindView(INT32 startview) return startview; } -INT32 * -G_GetDisplayplayerPtr (UINT8 viewnum) +INT32 *G_GetDisplayplayerPtr(UINT8 viewnum) { switch (viewnum) { @@ -2132,11 +2131,11 @@ G_GetDisplayplayerPtr (UINT8 viewnum) return &displayplayer; } -/* -Ensure a viewpoint is valid. -*/ -void -G_ResetView (UINT8 viewnum) +// +// G_ResetView +// Ensures a viewpoint is valid. +// +void G_ResetView(UINT8 viewnum) { INT32 *displayplayerp; camera_t *camerap; diff --git a/src/g_game.h b/src/g_game.h index a28a709e..cf7dda09 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -226,10 +226,10 @@ void G_EndGame(void); // moved from y_inter.c/h and renamed void G_Ticker(boolean run); boolean G_Responder(event_t *ev); -INT32 * G_GetDisplayplayerPtr (UINT8 viewnum); +INT32 *G_GetDisplayplayerPtr(UINT8 viewnum); void G_ResetViews(void); -void G_ResetView (UINT8 viewnum); +void G_ResetView(UINT8 viewnum); void G_AddPlayer(INT32 playernum); diff --git a/src/p_local.h b/src/p_local.h index 46afc75e..12d582aa 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -126,7 +126,7 @@ extern fixed_t t_cam2_dist, t_cam2_height, t_cam2_rotate; extern fixed_t t_cam3_dist, t_cam3_height, t_cam3_rotate; extern fixed_t t_cam4_dist, t_cam4_height, t_cam4_rotate; -camera_t * P_GetCameraPtr (UINT8 viewnum); +camera_t *P_GetCameraPtr(UINT8 viewnum); fixed_t P_GetPlayerHeight(player_t *player); fixed_t P_GetPlayerSpinHeight(player_t *player); diff --git a/src/p_user.c b/src/p_user.c index ce8e3f07..803f1c13 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -8124,8 +8124,7 @@ fixed_t t_cam4_rotate = -42; #define MAXCAMERADIST 140*FRACUNIT // Max distance the camera can be in front of the player (2D mode) -camera_t * -P_GetCameraPtr (UINT8 viewnum) +camera_t *P_GetCameraPtr(UINT8 viewnum) { switch (viewnum) {