- 'BUBLIC_SERVER' replaced with 'PUBLIC_SERVER'

- small changes in Makefile


git-svn-id: http://opensvn.csie.org/tuxanci_ng@34 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e

8 files changed, 25 insertions, 25 deletions

diff --git a/include/arena.h b/include/arena.h
index c5f34b4..4dc5b83 100644
--- a/include/arena.h
+++ b/include/arena.h
@@ -4,14 +4,14 @@
 #define ARENA_H
 
 #include "main.h"
-#ifndef BUBLIC_SERVER
+#ifndef PUBLIC_SERVER
 #include "interface.h"
 #endif
 #include "list.h"
 
 typedef struct arena_struct
 {
-#ifndef BUBLIC_SERVER
+#ifndef PUBLIC_SERVER
 	char music[STR_SIZE];
 
 	SDL_Surface *background;
diff --git a/include/item.h b/include/item.h
index a3fa02c..b2c8098 100644
--- a/include/item.h
+++ b/include/item.h
@@ -4,7 +4,7 @@
 #define ITEM_H
 
 #include "main.h"
-#ifndef BUBLIC_SERVER
+#ifndef PUBLIC_SERVER
 #include "interface.h"
 #endif
 #include "list.h"
@@ -25,7 +25,7 @@ typedef struct item_struct
 	int count; 
 
 	tux_t *author;
-#ifndef BUBLIC_SERVER	
+#ifndef PUBLIC_SERVER	
 	SDL_Surface *img; //obrazok
 #endif	
 } item_t;
@@ -57,7 +57,7 @@ extern void initItem();
 extern item_t* newItem(int x, int y, int type, tux_t *author);
 extern item_t* getItemID(list_t *listItem, int id);
 extern void addNewItem(list_t *listItem, tux_t *author);
-#ifndef BUBLIC_SERVER	
+#ifndef PUBLIC_SERVER	
 extern void drawItem(item_t *p);
 extern void drawListItem(list_t *listItem);
 #endif
diff --git a/include/pipe.h b/include/pipe.h
index 867dcc8..af8e180 100644
--- a/include/pipe.h
+++ b/include/pipe.h
@@ -4,7 +4,7 @@
 #define PIPE_H
 
 #include "main.h"
-#ifndef BUBLIC_SERVER
+#ifndef PUBLIC_SERVER
 #include "interface.h"
 #endif
 #include "list.h"
@@ -23,22 +23,22 @@ typedef struct pipe_struct
 
 	int layer; // vrstva
 
-#ifndef BUBLIC_SERVER	
+#ifndef PUBLIC_SERVER	
 	SDL_Surface *img; //obrazok
 #endif
 } pipe_t;
 
-#ifndef BUBLIC_SERVER	
+#ifndef PUBLIC_SERVER	
 extern pipe_t* newPipe(int x, int y, int w, int h, int layer,
 		int id, int id_out, int position, SDL_Surface *img);
 #endif
 
-#ifdef BUBLIC_SERVER	
+#ifdef PUBLIC_SERVER	
 extern pipe_t* newPipe(int x, int y, int w, int h, int layer,
 		int id, int id_out, int position);
 #endif
 
-#ifndef BUBLIC_SERVER	
+#ifndef PUBLIC_SERVER	
 extern void drawPipe(pipe_t *p);
 extern void drawListPipe(list_t *listPipe);
 #endif
diff --git a/include/proto.h b/include/proto.h
index aba3fda..e083c6c 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -25,7 +25,7 @@
 #include "proto.h"
 #include "net_multiplayer.h"
 
-#ifndef BUBLIC_SERVER
+#ifndef PUBLIC_SERVER
 #include "network.h"
 #include "screen_world.h"
 #include "screen_setting.h"
@@ -33,7 +33,7 @@
 #include "client.h"
 #endif
 
-#ifdef BUBLIC_SERVER
+#ifdef PUBLIC_SERVER
 #include "publicServer.h"
 #endif
 
diff --git a/include/server.h b/include/server.h
index 3ee1933..397eb41 100644
--- a/include/server.h
+++ b/include/server.h
@@ -8,7 +8,7 @@
 #include "buffer.h"
 #include "myTimer.h"
 
-#ifndef BUBLIC_SERVER
+#ifndef PUBLIC_SERVER
 #include "interface.h"
 #endif
 
diff --git a/include/shot.h b/include/shot.h
index d0460e2..d3e9bcc 100644
--- a/include/shot.h
+++ b/include/shot.h
@@ -4,7 +4,7 @@
 #define SHOT_H
 
 #include "main.h"
-#ifndef BUBLIC_SERVER	
+#ifndef PUBLIC_SERVER	
 #include "interface.h"
 #endif	
 #include "list.h"
@@ -29,7 +29,7 @@ typedef struct shot_struct
 	tux_t *author;
 	bool_t isCanKillAuthor;
 
-#ifndef BUBLIC_SERVER	
+#ifndef PUBLIC_SERVER	
 	SDL_Surface *img;
 #endif	
 } shot_t; 
@@ -37,7 +37,7 @@ typedef struct shot_struct
 extern bool_t isShotInicialized();
 extern void initShot();
 extern shot_t* newShot(int x,int y, int px, int py, int gun, tux_t *author);
-#ifndef BUBLIC_SERVER	
+#ifndef PUBLIC_SERVER	
 extern void drawShot(shot_t *p);
 extern void drawListShot(list_t *listShot);
 #endif
diff --git a/include/teleport.h b/include/teleport.h
index fc039c0..1101a57 100644
--- a/include/teleport.h
+++ b/include/teleport.h
@@ -3,7 +3,7 @@
 
 #define TELEPORT_H
 
-#ifndef BUBLIC_SERVER
+#ifndef PUBLIC_SERVER
 #include "interface.h"
 #endif
 #include "main.h"
@@ -19,20 +19,20 @@ typedef struct teleport_struct
 
 	int layer; // vrstva
 
-#ifndef BUBLIC_SERVER	
+#ifndef PUBLIC_SERVER	
 	SDL_Surface *img; //obrazok
 #endif
 } teleport_t;
 
-#ifndef BUBLIC_SERVER	
+#ifndef PUBLIC_SERVER	
 extern teleport_t* newTeleport(int x, int y, int w, int h, int layer, SDL_Surface *img);
 #endif
 
-#ifdef BUBLIC_SERVER	
+#ifdef PUBLIC_SERVER	
 extern teleport_t* newTeleport(int x, int y, int w, int h, int layer);
 #endif
 
-#ifndef BUBLIC_SERVER	
+#ifndef PUBLIC_SERVER	
 extern void drawTeleport(teleport_t *p);
 extern void drawListTeleport(list_t *listTeleport);
 #endif
diff --git a/include/wall.h b/include/wall.h
index 329063d..1389539 100644
--- a/include/wall.h
+++ b/include/wall.h
@@ -5,7 +5,7 @@
 
 #include "main.h"
 
-#ifndef BUBLIC_SERVER
+#ifndef PUBLIC_SERVER
 #include "interface.h"
 #endif
 
@@ -24,17 +24,17 @@ typedef struct wall_struct
 
 	int layer; // vrstva
 
-#ifndef BUBLIC_SERVER	
+#ifndef PUBLIC_SERVER	
 	SDL_Surface *img; //obrazok
 #endif
 } wall_t;
 
-#ifndef BUBLIC_SERVER	
+#ifndef PUBLIC_SERVER	
 extern wall_t* newWall(int x, int y, int w, int h,
 	int img_x, int img_y, int layer, SDL_Surface *img);
 #endif
 
-#ifdef BUBLIC_SERVER	
+#ifdef PUBLIC_SERVER	
 extern wall_t* newWall(int x, int y, int w, int h,
 	int img_x, int img_y, int layer);
 #endif