summaryrefslogtreecommitdiff
path: root/src/shot.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/shot.c')
-rw-r--r--src/shot.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/shot.c b/src/shot.c
index f9cfdb1..4b45c35 100644
--- a/src/shot.c
+++ b/src/shot.c
@@ -9,17 +9,17 @@
#include "net_multiplayer.h"
#include "proto.h"
-#ifndef BUBLIC_SERVER
+#ifndef PUBLIC_SERVER
#include "image.h"
#include "screen_world.h"
#include "layer.h"
#endif
-#ifdef BUBLIC_SERVER
+#ifdef PUBLIC_SERVER
#include "publicServer.h"
#endif
-#ifndef BUBLIC_SERVER
+#ifndef PUBLIC_SERVER
static SDL_Surface *g_shot_simple;
static SDL_Surface *g_shot_lasserX;
@@ -36,11 +36,11 @@ bool_t isShotInicialized()
void initShot()
{
-#ifndef BUBLIC_SERVER
+#ifndef PUBLIC_SERVER
assert( isImageInicialized() == TRUE );
#endif
-#ifndef BUBLIC_SERVER
+#ifndef PUBLIC_SERVER
g_shot_simple = addImageData("shot.png", IMAGE_ALPHA, "shot", IMAGE_GROUP_BASE);
g_shot_lasserX = addImageData("lasserX.png", IMAGE_NO_ALPHA, "lasserX", IMAGE_GROUP_BASE);
@@ -76,7 +76,7 @@ shot_t* newShot(int x,int y, int px, int py, int gun, tux_t *author)
case GUN_SIMPLE :
new->w = GUN_SHOT_WIDTH;
new->h = GUN_SHOT_HEIGHT;
-#ifndef BUBLIC_SERVER
+#ifndef PUBLIC_SERVER
new->img = g_shot_simple;
#endif
break;
@@ -88,7 +88,7 @@ shot_t* newShot(int x,int y, int px, int py, int gun, tux_t *author)
case TUX_LEFT :
new->w = GUN_LASSER_HORIZONTAL;
new->h = GUN_SHOT_VERTICAL;
-#ifndef BUBLIC_SERVER
+#ifndef PUBLIC_SERVER
new->img = g_shot_lasserX;
#endif
break;
@@ -96,7 +96,7 @@ shot_t* newShot(int x,int y, int px, int py, int gun, tux_t *author)
case TUX_DOWN :
new->w = GUN_SHOT_VERTICAL;
new->h = GUN_LASSER_HORIZONTAL;
-#ifndef BUBLIC_SERVER
+#ifndef PUBLIC_SERVER
new->img = g_shot_lasserY;
#endif
break;
@@ -111,7 +111,7 @@ shot_t* newShot(int x,int y, int px, int py, int gun, tux_t *author)
return new;
}
-#ifndef BUBLIC_SERVER
+#ifndef PUBLIC_SERVER
void drawShot(shot_t *p)
{
@@ -201,7 +201,7 @@ void transformOnlyLasser(shot_t *shot)
case TUX_LEFT :
shot->w = GUN_LASSER_HORIZONTAL;
shot->h = GUN_SHOT_VERTICAL;
-#ifndef BUBLIC_SERVER
+#ifndef PUBLIC_SERVER
shot->img = g_shot_lasserX;
#endif
break;
@@ -209,7 +209,7 @@ void transformOnlyLasser(shot_t *shot)
case TUX_DOWN :
shot->w = GUN_SHOT_VERTICAL;
shot->h = GUN_LASSER_HORIZONTAL;
-#ifndef BUBLIC_SERVER
+#ifndef PUBLIC_SERVER
shot->img = g_shot_lasserY;
#endif
break;