From d3db893190862f53f9b262b1f9074bdc69402de2 Mon Sep 17 00:00:00 2001 From: Steve Date: Sat, 3 Feb 2018 18:32:12 +0000 Subject: [PATCH] Moved nothing() to MIA. --- src/combat/combat.c | 4 ---- src/combat/combat.h | 1 - src/entities/blobs/mia.c | 6 ++++++ src/entities/blobs/mia.h | 1 - 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/combat/combat.c b/src/combat/combat.c index 437c4aa..ba39665 100644 --- a/src/combat/combat.c +++ b/src/combat/combat.c @@ -23,10 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. static int isBlockedByMap(Entity *src, Entity *dest); static int isBlockedByEntities(Entity *src, Entity *dest); -void nothing(void) -{ -} - void lookForPlayer(void) { diff --git a/src/combat/combat.h b/src/combat/combat.h index 465572a..a75cb41 100644 --- a/src/combat/combat.h +++ b/src/combat/combat.h @@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" extern int isSolid(int x, int y); -extern int lineIntersectsRect(SDL_Rect r, int x1, int y1, int x2, int y2); extern Entity **getAllEntsWithin(int x, int y, int w, int h, Entity *ignore); extern int lineRectIntersection(int x1, int y1, int x2, int y2, SDL_Rect *r); diff --git a/src/entities/blobs/mia.c b/src/entities/blobs/mia.c index d79df3e..78f1a26 100644 --- a/src/entities/blobs/mia.c +++ b/src/entities/blobs/mia.c @@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. static void init(void); static void reset(void); static void tick(void); +static void nothing(void); static void touch(Entity *other); static void preTeleport(void); static void teleport(void); @@ -151,6 +152,11 @@ static void teleport(void) } } +static void nothing(void) +{ + +} + static void load(cJSON *root) { MIA *m; diff --git a/src/entities/blobs/mia.h b/src/entities/blobs/mia.h index 3578db7..42f6383 100644 --- a/src/entities/blobs/mia.h +++ b/src/entities/blobs/mia.h @@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../json/cJSON.h" extern Sprite *getSprite(char *name); -extern void nothing(void); extern void addMIATeleportStars(float x, float y); extern void addTeleportStars(Entity *e); extern void setGameplayMessage(int type, char *format, ...);