walkero
/
blobwarsAttrition
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Moved nothing() to MIA.

This commit is contained in:
Steve 2018-02-03 18:32:12 +00:00
parent 3d2000e818
commit d3db893190
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/combat/combat.c
View File

@ -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 isBlockedByMap(Entity *src, Entity *dest);
static int isBlockedByEntities(Entity *src, Entity *dest); static int isBlockedByEntities(Entity *src, Entity *dest);
void nothing(void)
{
}
void lookForPlayer(void) void lookForPlayer(void)
{ {

1
src/combat/combat.h
View File

@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "../common.h" #include "../common.h"
extern int isSolid(int x, int y); 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 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); extern int lineRectIntersection(int x1, int y1, int x2, int y2, SDL_Rect *r);

6
src/entities/blobs/mia.c
View File

@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
static void init(void); static void init(void);
static void reset(void); static void reset(void);
static void tick(void); static void tick(void);
static void nothing(void);
static void touch(Entity *other); static void touch(Entity *other);
static void preTeleport(void); static void preTeleport(void);
static void teleport(void); static void teleport(void);
@ -151,6 +152,11 @@ static void teleport(void)
} }
} }
static void nothing(void)
{
}
static void load(cJSON *root) static void load(cJSON *root)
{ {
MIA *m; MIA *m;

1
src/entities/blobs/mia.h
View File

@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "../../json/cJSON.h" #include "../../json/cJSON.h"
extern Sprite *getSprite(char *name); extern Sprite *getSprite(char *name);
extern void nothing(void);
extern void addMIATeleportStars(float x, float y); extern void addMIATeleportStars(float x, float y);
extern void addTeleportStars(Entity *e); extern void addTeleportStars(Entity *e);
extern void setGameplayMessage(int type, char *format, ...); extern void setGameplayMessage(int type, char *format, ...);