Moved entites directory out of world.

common.mk

@@ -4,21 +4,21 @@ LOCALE_MO = $(patsubst %.po,%.mo,$(wildcard locale/*.po))
 
 SEARCHPATH += src 
 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/hub 
 SEARCHPATH += src/system 
 SEARCHPATH += src/util 
 SEARCHPATH += src/widgets 
 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 %.h $(SEARCHPATH)

src/entities/blobs/bob.h

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

src/entities/blobs/mia.h

@@ -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 void nothing(void);

src/entities/blobs/teeka.h

@@ -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 unitTick(void);

src/entities/boss/blaze.h

@@ -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 int getSpriteIndex(char *name);

src/entities/boss/blobBoss.h

@@ -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 int rrnd(int low, int high);

src/entities/boss/boss.h

@@ -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 lookForPlayer(void);

src/entities/boss/eyeDroidCommander.h

@@ -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 int getSpriteIndex(char *name);

src/entities/boss/frost.h

@@ -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 int getSpriteIndex(char *name);

src/entities/boss/tankCommander.h

@@ -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 int getSpriteIndex(char *name);

src/entities/boss/tankTrack.h

@@ -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 int getSpriteIndex(char *name);

src/entities/cannons/cannon.h

@@ -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 addExplosion(float x, float y, int radius, Entity *owner);

src/entities/decoration/debris.h

@@ -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 addFlameParticles(float x, float y);

src/entities/decoration/fleshChunk.h

@@ -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 addBlood(float x, float y);

src/entities/entities.h

@@ -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 float wrap(float value, float low, float high);

src/entities/items/battery.h

@@ -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 pickupItem(void);

src/entities/items/cell.h

@@ -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 int getSpriteIndex(char *name);

src/entities/items/cherry.h

@@ -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 setGameplayMessage(int type, char *format, ...);

src/entities/items/consumable.h

@@ -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);
 

src/entities/items/heart.h

@@ -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 setGameplayMessage(int type, char *format, ...);

src/entities/items/item.h

@@ -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 setGameplayMessage(int type, char *format, ...);

src/entities/items/key.h

@@ -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);

src/entities/items/keycard.h

@@ -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 updateObjective(char *targetName);

src/entities/items/weaponPickup.h

@@ -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 setGameplayMessage(int type, char *format, ...);

src/entities/misc/destructable.h

@@ -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 dropCarriedItem(void);

src/entities/misc/infoPoint.h

@@ -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 void initEntity(Entity *e);

src/entities/structures/cardReader.h

@@ -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 int getSpriteIndex(char *name);

src/entities/structures/door.h

@@ -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 int getSpriteIndex(char *name);

src/entities/structures/exit.h

@@ -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 void updateObjective(char *targetName);

src/entities/structures/horizontalDoor.h

@@ -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 int getSpriteIndex(char *name);

src/entities/structures/itemPad.h

@@ -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 int getSpriteIndex(char *name);

src/entities/structures/lift.h

@@ -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 int getSpriteIndex(char *name);

src/entities/structures/powerPoint.h

@@ -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 int getSpriteIndex(char *name);

src/entities/structures/powerPool.h

@@ -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 void initEntity(Entity *e);

src/entities/structures/pressurePlate.h

@@ -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 int getSpriteIndex(char *name);

src/entities/structures/pushBlock.h

@@ -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 playSound(int snd, int ch);

src/entities/structures/teleporter.h

@@ -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 playSound(int snd, int ch);

src/entities/traps/horizontalLaserTrap.h

@@ -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 int getSpriteIndex(char *name);

src/entities/traps/laserTrap.h

@@ -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 observeActivation(Entity *e);

src/entities/unit.h

@@ -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 lookForPlayer(void);