From c8a9209d77a896bf49227e5aeccd54e91ccf29cc Mon Sep 17 00:00:00 2001 From: xHire Date: Sat, 25 Oct 2008 14:11:06 +0200 Subject: Changed style of the code to the K&R standard --- src/base/shot.h | 61 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 31 deletions(-) (limited to 'src/base/shot.h') diff --git a/src/base/shot.h b/src/base/shot.h index 6a2a8e2..a9c04fe 100644 --- a/src/base/shot.h +++ b/src/base/shot.h @@ -1,35 +1,34 @@ #ifndef SHOT_H -#define SHOT_H -#ifdef __WIN32__ -#define random rand -#endif +# define SHOT_H +# ifdef __WIN32__ +# define random rand +# endif -#include "main.h" -#include "list.h" -#include "tux.h" -#include "arena.h" -#ifndef PUBLIC_SERVER -#include "image.h" -#endif +# include "main.h" +# include "list.h" +# include "tux.h" +# include "arena.h" +# ifndef PUBLIC_SERVER +# include "image.h" +# endif -typedef struct shot_struct -{ - int id; - int x; - int y; - int w; - int h; - int px; - int py; - int position; - int gun; - int author_id; - bool_t isCanKillAuthor; - bool_t del; -#ifndef PUBLIC_SERVER - image_t *img; -#endif +typedef struct shot_struct { + int id; + int x; + int y; + int w; + int h; + int px; + int py; + int position; + int gun; + int author_id; + bool_t isCanKillAuthor; + bool_t del; +# ifndef PUBLIC_SERVER + image_t *img; +# endif } shot_t; extern bool_t isShotInicialized(); @@ -39,12 +38,12 @@ extern shot_t *getShotID(list_t * listShot, int id); extern void replaceShotID(shot_t * shot, int id); extern void getStatusShot(void *p, int *id, int *x, int *y, int *w, int *h); extern void setStatusShot(void *p, int x, int y, int w, int h); -#ifndef PUBLIC_SERVER +# ifndef PUBLIC_SERVER extern void drawShot(shot_t * p); extern void drawListShot(list_t * listShot); -#endif +# endif extern int isConflictWithListShot(list_t * listShot, int x, int y, int w, - int h); + int h); extern void eventMoveListShot(arena_t * arena); extern void checkShotIsInTuxScreen(arena_t * arena); extern void boundBombBall(shot_t * shot); -- cgit v1.2.3