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/proto.h | 78 +++++++++++++++++++++++++++----------------------------- 1 file changed, 38 insertions(+), 40 deletions(-) (limited to 'src/base/proto.h') diff --git a/src/base/proto.h b/src/base/proto.h index 6442469..590317b 100644 --- a/src/base/proto.h +++ b/src/base/proto.h @@ -1,42 +1,42 @@ #ifndef MY_PROTO -#define MY_PROTO - -#include -#include -#include -#include - -#include "main.h" -#include "list.h" -#include "item.h" -#include "shot.h" -#include "arenaFile.h" -#include "myTimer.h" -#include "server.h" -#include "net_multiplayer.h" - -#ifndef PUBLIC_SERVER -#include "screen_world.h" -#include "screen_setting.h" -#include "screen_choiceArena.h" -#include "client.h" -#endif - -#ifdef PUBLIC_SERVER -#include "publicServer.h" -#endif - -#define PROTO_ERROR_CODE_UNKNOWN 0 -#define PROTO_ERROR_CODE_BAD_VERSION 1 -#define PROTO_ERROR_CODE_BAD_NAME 2 -#define PROTO_ERROR_CODE_BAD_COMMAND 3 -#define PROTO_ERROR_CODE_TIMEOUT 4 -#define PROTO_ERROR_LIMIT_MAX_CLIENT 5 +# define MY_PROTO + +# include +# include +# include +# include + +# include "main.h" +# include "list.h" +# include "item.h" +# include "shot.h" +# include "arenaFile.h" +# include "myTimer.h" +# include "server.h" +# include "net_multiplayer.h" + +# ifndef PUBLIC_SERVER +# include "screen_world.h" +# include "screen_setting.h" +# include "screen_choiceArena.h" +# include "client.h" +# endif + +# ifdef PUBLIC_SERVER +# include "publicServer.h" +# endif + +# define PROTO_ERROR_CODE_UNKNOWN 0 +# define PROTO_ERROR_CODE_BAD_VERSION 1 +# define PROTO_ERROR_CODE_BAD_NAME 2 +# define PROTO_ERROR_CODE_BAD_COMMAND 3 +# define PROTO_ERROR_CODE_TIMEOUT 4 +# define PROTO_ERROR_LIMIT_MAX_CLIENT 5 extern void proto_send_error_server(int type, client_t * client, - int errorcode); + int errorcode); extern void proto_recv_error_client(char *msg); extern void proto_send_hello_client(char *name); @@ -52,17 +52,16 @@ extern void proto_send_check_client(int id); extern void proto_recv_check_server(client_t * client, char *msg); extern void proto_send_init_server(int type, client_t * client, - client_t * client2); + client_t * client2); extern void proto_recv_init_client(char *msg); extern void proto_send_event_server(int type, client_t * client, tux_t * tux, - int action); + int action); extern void proto_recv_event_client(char *msg); extern void proto_send_event_client(int action); extern void proto_recv_event_server(client_t * client, char *msg); -extern void proto_send_newtux_server(int type, client_t * client, - tux_t * tux); +extern void proto_send_newtux_server(int type, client_t * client, tux_t * tux); extern void proto_recv_newtux_client(char *msg); extern void proto_send_kill_server(int type, client_t * client, tux_t * tux); @@ -74,8 +73,7 @@ extern void proto_recv_score_client(char *msg); extern void proto_send_del_server(int type, client_t * client, int id); extern void proto_recv_del_client(char *msg); -extern void proto_send_additem_server(int type, client_t * client, - item_t * p); +extern void proto_send_additem_server(int type, client_t * client, item_t * p); extern void proto_recv_additem_client(char *msg); extern void proto_send_shot_server(int type, client_t * client, shot_t * p); -- cgit v1.2.3