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

Moved entites directory out of world.

This commit is contained in:
Steve 2018-01-28 09:40:43 +00:00
parent 7d6ca19c77
commit 0bbff1cb85
79 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common.mk
View File

@ -4,21 +4,21 @@ LOCALE_MO = $(patsubst %.po,%.mo,$(wildcard locale/*.po))
SEARCHPATH += src SEARCHPATH += src
SEARCHPATH += src/combat SEARCHPATH += src/combat
SEARCHPATH += src/entities
SEARCHPATH += src/entities/blobs
SEARCHPATH += src/entities/boss
SEARCHPATH += src/entities/cannons
SEARCHPATH += src/entities/decoration
SEARCHPATH += src/entities/items
SEARCHPATH += src/entities/misc
SEARCHPATH += src/entities/structures
SEARCHPATH += src/entities/traps
SEARCHPATH += src/game SEARCHPATH += src/game
SEARCHPATH += src/hub SEARCHPATH += src/hub
SEARCHPATH += src/system SEARCHPATH += src/system
SEARCHPATH += src/util SEARCHPATH += src/util
SEARCHPATH += src/widgets SEARCHPATH += src/widgets
SEARCHPATH += src/world SEARCHPATH += src/world
SEARCHPATH += src/world/entities
SEARCHPATH += src/world/entities/blobs
SEARCHPATH += src/world/entities/boss
SEARCHPATH += src/world/entities/cannons
SEARCHPATH += src/world/entities/decoration
SEARCHPATH += src/world/entities/items
SEARCHPATH += src/world/entities/misc
SEARCHPATH += src/world/entities/structures
SEARCHPATH += src/world/entities/traps
vpath %.c $(SEARCHPATH) vpath %.c $(SEARCHPATH)
vpath %.h $(SEARCHPATH) vpath %.h $(SEARCHPATH)

0
src/world/entities/blobs/bob.c → src/entities/blobs/bob.c
View File

2
src/world/entities/blobs/bob.h → src/entities/blobs/bob.h
View File

@ -18,4 +18,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"

0
src/world/entities/blobs/mia.c → src/entities/blobs/mia.c
View File

2
src/world/entities/blobs/mia.h → src/entities/blobs/mia.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern int getSpriteIndex(char *name); extern int getSpriteIndex(char *name);
extern void nothing(void); extern void nothing(void);

0
src/world/entities/blobs/teeka.c → src/entities/blobs/teeka.c
View File

2
src/world/entities/blobs/teeka.h → src/entities/blobs/teeka.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initUnit(Entity *e); extern void initUnit(Entity *e);
extern void unitTick(void); extern void unitTick(void);

0
src/world/entities/boss/blaze.c → src/entities/boss/blaze.c
View File

2
src/world/entities/boss/blaze.h → src/entities/boss/blaze.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initBlobBoss(Boss *b); extern void initBlobBoss(Boss *b);
extern int getSpriteIndex(char *name); extern int getSpriteIndex(char *name);

0
src/world/entities/boss/blobBoss.c → src/entities/boss/blobBoss.c
View File

2
src/world/entities/boss/blobBoss.h → src/entities/boss/blobBoss.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initBoss(Entity *e); extern void initBoss(Entity *e);
extern int rrnd(int low, int high); extern int rrnd(int low, int high);

0
src/world/entities/boss/boss.c → src/entities/boss/boss.c
View File

2
src/world/entities/boss/boss.h → src/entities/boss/boss.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initEntity(Entity *e); extern void initEntity(Entity *e);
extern void lookForPlayer(void); extern void lookForPlayer(void);

0
src/world/entities/boss/eyeDroidCommander.c → src/entities/boss/eyeDroidCommander.c
View File

2
src/world/entities/boss/eyeDroidCommander.h → src/entities/boss/eyeDroidCommander.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initBoss(Entity *e); extern void initBoss(Entity *e);
extern int getSpriteIndex(char *name); extern int getSpriteIndex(char *name);

0
src/world/entities/boss/frost.c → src/entities/boss/frost.c
View File

2
src/world/entities/boss/frost.h → src/entities/boss/frost.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initBlobBoss(Entity *e); extern void initBlobBoss(Entity *e);
extern int getSpriteIndex(char *name); extern int getSpriteIndex(char *name);

0
src/world/entities/boss/tankCommander.c → src/entities/boss/tankCommander.c
View File

2
src/world/entities/boss/tankCommander.h → src/entities/boss/tankCommander.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initBoss(Entity *e); extern void initBoss(Entity *e);
extern int getSpriteIndex(char *name); extern int getSpriteIndex(char *name);

0
src/world/entities/boss/tankTrack.c → src/entities/boss/tankTrack.c
View File

2
src/world/entities/boss/tankTrack.h → src/entities/boss/tankTrack.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initBoss(Entity *e); extern void initBoss(Entity *e);
extern int getSpriteIndex(char *name); extern int getSpriteIndex(char *name);

0
src/world/entities/cannons/cannon.c → src/entities/cannons/cannon.c
View File

2
src/world/entities/cannons/cannon.h → src/entities/cannons/cannon.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initUnit(Entity *e); extern void initUnit(Entity *e);
extern void addExplosion(float x, float y, int radius, Entity *owner); extern void addExplosion(float x, float y, int radius, Entity *owner);

0
src/world/entities/decoration/debris.c → src/entities/decoration/debris.c
View File

2
src/world/entities/decoration/debris.h → src/entities/decoration/debris.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initEntity(Entity *e); extern void initEntity(Entity *e);
extern void addFlameParticles(float x, float y); extern void addFlameParticles(float x, float y);

0
src/world/entities/decoration/fleshChunk.c → src/entities/decoration/fleshChunk.c
View File

2
src/world/entities/decoration/fleshChunk.h → src/entities/decoration/fleshChunk.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initEntity(Entity *e); extern void initEntity(Entity *e);
extern void addBlood(float x, float y); extern void addBlood(float x, float y);

0
src/world/entities/entities.c → src/entities/entities.c
View File

2
src/world/entities/entities.h → src/entities/entities.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../common.h" #include "../common.h"
extern Sprite *getSpriteByIndex(int x); extern Sprite *getSpriteByIndex(int x);
extern float wrap(float value, float low, float high); extern float wrap(float value, float low, float high);

0
src/world/entities/items/battery.c → src/entities/items/battery.c
View File

2
src/world/entities/items/battery.h → src/entities/items/battery.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void playSound(int snd, int ch); extern void playSound(int snd, int ch);
extern void pickupItem(void); extern void pickupItem(void);

0
src/world/entities/items/cell.c → src/entities/items/cell.c
View File

2
src/world/entities/items/cell.h → src/entities/items/cell.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initItem(Entity *e); extern void initItem(Entity *e);
extern int getSpriteIndex(char *name); extern int getSpriteIndex(char *name);

0
src/world/entities/items/cherry.c → src/entities/items/cherry.c
View File

2
src/world/entities/items/cherry.h → src/entities/items/cherry.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initConsumable(Entity *e); extern void initConsumable(Entity *e);
extern void setGameplayMessage(int type, char *format, ...); extern void setGameplayMessage(int type, char *format, ...);

0
src/world/entities/items/consumable.c → src/entities/items/consumable.c
View File

2
src/world/entities/items/consumable.h → src/entities/items/consumable.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initEntity(Entity *e); extern void initEntity(Entity *e);

0
src/world/entities/items/heart.c → src/entities/items/heart.c
View File

2
src/world/entities/items/heart.h → src/entities/items/heart.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void playSound(int snd, int ch); extern void playSound(int snd, int ch);
extern void setGameplayMessage(int type, char *format, ...); extern void setGameplayMessage(int type, char *format, ...);

0
src/world/entities/items/item.c → src/entities/items/item.c
View File

2
src/world/entities/items/item.h → src/entities/items/item.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void playSound(int snd, int ch); extern void playSound(int snd, int ch);
extern void setGameplayMessage(int type, char *format, ...); extern void setGameplayMessage(int type, char *format, ...);

0
src/world/entities/items/key.c → src/entities/items/key.c
View File

2
src/world/entities/items/key.h → src/entities/items/key.h
View File

@ -18,6 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initItem(Entity *e); extern void initItem(Entity *e);

0
src/world/entities/items/keycard.c → src/entities/items/keycard.c
View File

2
src/world/entities/items/keycard.h → src/entities/items/keycard.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initItem(Entity *e); extern void initItem(Entity *e);
extern void updateObjective(char *targetName); extern void updateObjective(char *targetName);

0
src/world/entities/items/weaponPickup.c → src/entities/items/weaponPickup.c
View File

2
src/world/entities/items/weaponPickup.h → src/entities/items/weaponPickup.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void playSound(int snd, int ch); extern void playSound(int snd, int ch);
extern void setGameplayMessage(int type, char *format, ...); extern void setGameplayMessage(int type, char *format, ...);

0
src/world/entities/misc/destructable.c → src/entities/misc/destructable.c
View File

2
src/world/entities/misc/destructable.h → src/entities/misc/destructable.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void activateEntities(char *names, int activate); extern void activateEntities(char *names, int activate);
extern void dropCarriedItem(void); extern void dropCarriedItem(void);

0
src/world/entities/misc/infoPoint.c → src/entities/misc/infoPoint.c
View File

2
src/world/entities/misc/infoPoint.h → src/entities/misc/infoPoint.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern int getSpriteIndex(char *name); extern int getSpriteIndex(char *name);
extern void initEntity(Entity *e); extern void initEntity(Entity *e);

0
src/world/entities/structures/cardReader.c → src/entities/structures/cardReader.c
View File

2
src/world/entities/structures/cardReader.h → src/entities/structures/cardReader.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initEntity(Entity *e); extern void initEntity(Entity *e);
extern int getSpriteIndex(char *name); extern int getSpriteIndex(char *name);

0
src/world/entities/structures/door.c → src/entities/structures/door.c
View File

2
src/world/entities/structures/door.h → src/entities/structures/door.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initEntity(Entity *e); extern void initEntity(Entity *e);
extern int getSpriteIndex(char *name); extern int getSpriteIndex(char *name);

0
src/world/entities/structures/exit.c → src/entities/structures/exit.c
View File

2
src/world/entities/structures/exit.h → src/entities/structures/exit.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern int getSpriteIndex(char *name); extern int getSpriteIndex(char *name);
extern void updateObjective(char *targetName); extern void updateObjective(char *targetName);

0
src/world/entities/structures/horizontalDoor.c → src/entities/structures/horizontalDoor.c
View File

2
src/world/entities/structures/horizontalDoor.h → src/entities/structures/horizontalDoor.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initDoor(Entity *e); extern void initDoor(Entity *e);
extern int getSpriteIndex(char *name); extern int getSpriteIndex(char *name);

0
src/world/entities/structures/itemPad.c → src/entities/structures/itemPad.c
View File

2
src/world/entities/structures/itemPad.h → src/entities/structures/itemPad.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initEntity(Entity *e); extern void initEntity(Entity *e);
extern int getSpriteIndex(char *name); extern int getSpriteIndex(char *name);

0
src/world/entities/structures/lift.c → src/entities/structures/lift.c
View File

2
src/world/entities/structures/lift.h → src/entities/structures/lift.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initEntity(Entity *e); extern void initEntity(Entity *e);
extern int getSpriteIndex(char *name); extern int getSpriteIndex(char *name);

0
src/world/entities/structures/powerPoint.c → src/entities/structures/powerPoint.c
View File

2
src/world/entities/structures/powerPoint.h → src/entities/structures/powerPoint.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initEntity(Entity *e); extern void initEntity(Entity *e);
extern int getSpriteIndex(char *name); extern int getSpriteIndex(char *name);

0
src/world/entities/structures/powerPool.c → src/entities/structures/powerPool.c
View File

2
src/world/entities/structures/powerPool.h → src/entities/structures/powerPool.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern int getSpriteIndex(char *name); extern int getSpriteIndex(char *name);
extern void initEntity(Entity *e); extern void initEntity(Entity *e);

0
src/world/entities/structures/pressurePlate.c → src/entities/structures/pressurePlate.c
View File

2
src/world/entities/structures/pressurePlate.h → src/entities/structures/pressurePlate.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initEntity(Entity *e); extern void initEntity(Entity *e);
extern int getSpriteIndex(char *name); extern int getSpriteIndex(char *name);

0
src/world/entities/structures/pushBlock.c → src/entities/structures/pushBlock.c
View File

2
src/world/entities/structures/pushBlock.h → src/entities/structures/pushBlock.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initEntity(Entity *e); extern void initEntity(Entity *e);
extern void playSound(int snd, int ch); extern void playSound(int snd, int ch);

0
src/world/entities/structures/teleporter.c → src/entities/structures/teleporter.c
View File

2
src/world/entities/structures/teleporter.h → src/entities/structures/teleporter.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initEntity(Entity *e); extern void initEntity(Entity *e);
extern void playSound(int snd, int ch); extern void playSound(int snd, int ch);

0
src/world/entities/traps/horizontalLaserTrap.c → src/entities/traps/horizontalLaserTrap.c
View File

2
src/world/entities/traps/horizontalLaserTrap.h → src/entities/traps/horizontalLaserTrap.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initLaserTrap(Entity *e); extern void initLaserTrap(Entity *e);
extern int getSpriteIndex(char *name); extern int getSpriteIndex(char *name);

0
src/world/entities/traps/laserTrap.c → src/entities/traps/laserTrap.c
View File

2
src/world/entities/traps/laserTrap.h → src/entities/traps/laserTrap.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../../common.h" #include "../../common.h"
extern void initEntity(Entity *e); extern void initEntity(Entity *e);
extern void observeActivation(Entity *e); extern void observeActivation(Entity *e);

0
src/world/entities/unit.c → src/entities/unit.c
View File

2
src/world/entities/unit.h → src/entities/unit.h
View File

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../common.h" #include "../common.h"
extern void initEntity(Entity *e); extern void initEntity(Entity *e);
extern void lookForPlayer(void); extern void lookForPlayer(void);