Commit b3267d2f authored by Gerhard Stein's avatar Gerhard Stein

Cleanups

parent 6e51c132
......@@ -8,8 +8,8 @@
#include "CMapLoaderGalaxyEp4.h"
// Episode 4
#include "engine/galaxy/common/ai/CPlayerWM.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "../../common/ai/CPlayerWM.h"
#include "../../common/ai/CPlayerLevel.h"
#include "engine/galaxy/ep4/ai/CPlayerDive.h"
#include "engine/galaxy/ep4/ai/CPoisonSlug.h"
#include "engine/galaxy/ep4/ai/CMadMushroom.h"
......@@ -35,10 +35,10 @@
#include "engine/galaxy/ep4/ai/CInchWorm.h"
#include "engine/galaxy/ep4/ai/CFoot.h"
#include "engine/galaxy/common/ai/platforms.h"
#include "engine/galaxy/common/ai/CFlag.h"
#include "engine/galaxy/common/ai/Autogun.h"
#include "engine/galaxy/common/ai/CSpriteItem.h"
#include "../../common/ai/platforms.h"
#include "../../common/ai/CFlag.h"
#include "../../common/ai/Autogun.h"
#include "../../common/ai/CSpriteItem.h"
namespace galaxy
{
......
......@@ -6,8 +6,8 @@
*/
#include "CArachnut.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "engine/galaxy/common/ai/CBullet.h"
#include "../../common/ai/CPlayerLevel.h"
#include "../../common/ai/CBullet.h"
#include "misc.h"
namespace galaxy
......
......@@ -6,8 +6,8 @@
*/
#include "CBerkeloid.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "engine/galaxy/common/ai/CBullet.h"
#include "../../common/ai/CPlayerLevel.h"
#include "../../common/ai/CBullet.h"
#include "misc.h"
namespace galaxy {
......
......@@ -6,8 +6,8 @@
*/
#include "CBlueBird.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "engine/galaxy/common/ai/CBullet.h"
#include "../../common/ai/CPlayerLevel.h"
#include "../../common/ai/CBullet.h"
#include "misc.h"
namespace galaxy {
......
......@@ -8,8 +8,8 @@
#ifndef CBOUNDER_H_
#define CBOUNDER_H_
#include "engine/galaxy/common/ai/CStunnable.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "../../common/ai/CStunnable.h"
#include "../../common/ai/CPlayerLevel.h"
namespace galaxy {
......
......@@ -6,7 +6,7 @@
*/
#include "CCouncilMember.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "../../common/ai/CPlayerLevel.h"
#include "misc.h"
#include "sdl/sound/CSound.h"
#include "sdl/music/CMusic.h"
......
......@@ -6,8 +6,8 @@
*/
#include "CDevilSprite.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include "engine/galaxy/common/ai/CEnemyShot.h"
#include "../../common/ai/CPlayerBase.h"
#include "../../common/ai/CEnemyShot.h"
namespace galaxy {
......
......@@ -6,7 +6,7 @@
*/
#include "CDiveSuit.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "../../common/ai/CPlayerLevel.h"
namespace galaxy {
......
......@@ -6,8 +6,8 @@
*/
#include "CEgg.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "engine/galaxy/common/ai/CBullet.h"
#include "../../common/ai/CPlayerLevel.h"
#include "../../common/ai/CBullet.h"
#include "CBlueBird.h"
namespace galaxy
......
......@@ -6,7 +6,7 @@
*/
#include "CFoot.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include "../../common/ai/CPlayerBase.h"
#include "common/CBehaviorEngine.h"
namespace galaxy {
......
......@@ -6,7 +6,7 @@
*/
#include "CInchWorm.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include "../../common/ai/CPlayerBase.h"
namespace galaxy {
......
......@@ -7,7 +7,7 @@
#include "CLick.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include "../../common/ai/CPlayerBase.h"
#include "misc.h"
namespace galaxy {
......
......@@ -12,7 +12,7 @@
#ifndef CLICK_H_
#define CLICK_H_
#include "engine/galaxy/common/ai/CStunnable.h"
#include "../../common/ai/CStunnable.h"
namespace galaxy {
......
......@@ -6,7 +6,7 @@
*/
#include "CLindsey.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "../../common/ai/CPlayerLevel.h"
namespace galaxy {
......
......@@ -6,8 +6,8 @@
*/
#include "CMadMushroom.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "engine/galaxy/common/ai/CBullet.h"
#include "../../common/ai/CPlayerLevel.h"
#include "../../common/ai/CBullet.h"
int bounceAmount;
......
......@@ -6,7 +6,7 @@
*/
#include "CMimrock.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include "../../common/ai/CPlayerBase.h"
#include "misc.h"
namespace galaxy {
......
......@@ -8,7 +8,7 @@
#ifndef CMIMROCK_H_
#define CMIMROCK_H_
#include "engine/galaxy/common/ai/CStunnable.h"
#include "../../common/ai/CStunnable.h"
namespace galaxy {
......
......@@ -6,7 +6,7 @@
*/
#include "CMiragia.h"
#include "engine/galaxy/common/ai/CPlayerWM.h"
#include "../../common/ai/CPlayerWM.h"
namespace galaxy
{
......
......@@ -8,7 +8,7 @@
#ifndef CPLAYERDIVE_H_
#define CPLAYERDIVE_H_
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include "../../common/ai/CPlayerBase.h"
namespace galaxy {
......
......@@ -8,7 +8,7 @@
#include "CPoisonSlug.h"
#include "CSlugSlime.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include "../../common/ai/CPlayerBase.h"
#include "misc.h"
namespace galaxy {
......
......@@ -11,7 +11,7 @@
#define CPOISONSLUG_H_
#include <vector>
#include "engine/galaxy/common/ai/CStunnable.h"
#include "../../common/ai/CStunnable.h"
namespace galaxy {
......
......@@ -6,7 +6,7 @@
*/
#include "CSchoolFish.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include "../../common/ai/CPlayerBase.h"
namespace galaxy {
......
......@@ -6,7 +6,7 @@
*/
#include "CSkypest.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "../../common/ai/CPlayerLevel.h"
namespace galaxy {
......
......@@ -6,7 +6,7 @@
*/
#include "CSlugSlime.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include "../../common/ai/CPlayerBase.h"
namespace galaxy
{
......
......@@ -6,8 +6,8 @@
*/
#include "CThunderCloud.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "engine/galaxy/common/ai/CBullet.h"
#include "../../common/ai/CPlayerLevel.h"
#include "../../common/ai/CBullet.h"
#include "misc.h"
namespace galaxy {
......
......@@ -6,10 +6,10 @@
*/
#include "CTreasureEater.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "engine/galaxy/common/ai/CBullet.h"
#include "engine/galaxy/common/ai/CSpriteItem.h"
#include "engine/galaxy/common/ai/CItemEffect.h"
#include "../../common/ai/CPlayerLevel.h"
#include "../../common/ai/CBullet.h"
#include "../../common/ai/CSpriteItem.h"
#include "../../common/ai/CItemEffect.h"
#include "misc.h"
namespace galaxy {
......
......@@ -8,7 +8,7 @@
#ifndef CTREASUREEATER_H_
#define CTREASUREEATER_H_
#include "engine/galaxy/common/ai/CStunnable.h"
#include "../../common/ai/CStunnable.h"
namespace galaxy {
......
......@@ -6,7 +6,7 @@
*/
#include "CWaterMine.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include "../../common/ai/CPlayerBase.h"
namespace galaxy {
......
......@@ -6,7 +6,7 @@
*/
#include "CWormmouth.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include "../../common/ai/CPlayerBase.h"
#include "misc.h"
namespace galaxy {
......
......@@ -8,7 +8,7 @@
#ifndef CWORMMOUTH_H_
#define CWORMMOUTH_H_
#include "engine/galaxy/common/ai/CStunnable.h"
#include "../../common/ai/CStunnable.h"
namespace galaxy {
......
......@@ -23,15 +23,15 @@
#include "ai/CShikadiMaster.h"
// Episode 5
#include "engine/galaxy/common/ai/CPlayerWM.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "../common/ai/CPlayerWM.h"
#include "../common/ai/CPlayerLevel.h"
// TODO: I'm not sure yet if those are really common platforms
#include "engine/galaxy/common/ai/platforms.h"
#include "engine/galaxy/common/ai/CFlag.h"
#include "engine/galaxy/common/ai/CSpriteItem.h"
#include <engine/galaxy/common/ai/platform/CPlatformSit.h>
#include <engine/galaxy/common/ai/Autogun.h>
#include "../common/ai/platforms.h"
#include "../common/ai/CFlag.h"
#include "../common/ai/CSpriteItem.h"
#include "../common/ai/platform/CPlatformSit.h"
#include "../common/ai/Autogun.h"
namespace galaxy
{
......
......@@ -7,8 +7,7 @@
#include "CAmpton.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include <engine/galaxy/common/ai/CPlayerLevel.h>
#include "../../common/ai/CPlayerLevel.h"
#include "misc.h"
......
......@@ -11,7 +11,7 @@
#define CAMPTON_H_
#include <vector>
#include "engine/galaxy/common/ai/CStunnable.h"
#include "../../common/ai/CStunnable.h"
namespace galaxy {
......
......@@ -7,7 +7,7 @@
#include "CFuse.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "../../common/ai/CPlayerLevel.h"
#include "misc.h"
/*
......
......@@ -11,7 +11,7 @@
#define CFUSE_H_
#include <vector>
#include "engine/galaxy/common/CGalaxySpriteObject.h"
#include "../../common/CGalaxySpriteObject.h"
namespace galaxy {
......
......@@ -7,7 +7,7 @@
#include "CKorath.h"
#include <engine/galaxy/common/ai/CPlayerLevel.h>
#include "../../common/ai/CPlayerLevel.h"
#include "misc.h"
/*
......
......@@ -11,7 +11,7 @@
#define CKORATH_H_
#include <vector>
#include "engine/galaxy/common/ai/CStunnable.h"
#include "../../common/ai/CStunnable.h"
namespace galaxy {
......
......@@ -7,8 +7,7 @@
#include "CMastersShot.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include <engine/galaxy/common/ai/CPlayerLevel.h>
#include "../../common/ai/CPlayerLevel.h"
#include "misc.h"
/*
......
......@@ -11,7 +11,7 @@
#define CMASTERSSHOT_H_
#include <vector>
#include "engine/galaxy/common/ai/CStunnable.h"
#include "../../common/ai/CStunnable.h"
namespace galaxy {
......
......@@ -7,8 +7,8 @@
#include "CMastersSpark.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include <engine/galaxy/common/ai/CPlayerLevel.h>
#include "../../common/ai/CPlayerBase.h"
#include "../../common/ai/CPlayerLevel.h"
#include "misc.h"
/*
......
......@@ -11,7 +11,7 @@
#define CMASTERSSPARK_H_
#include <vector>
#include "engine/galaxy/common/ai/CStunnable.h"
#include "../../common/ai/CStunnable.h"
namespace galaxy {
......
......@@ -8,8 +8,8 @@
#include "CRoboRed.h"
#include "CRedShot.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "../../common/ai/CPlayerBase.h"
#include "../../common/ai/CPlayerLevel.h"
#include "misc.h"
/*
......
......@@ -11,7 +11,7 @@
#define CROBORED_H_
#include <vector>
#include "engine/galaxy/common/ai/CStunnable.h"
#include "../../common/ai/CStunnable.h"
namespace galaxy {
......
......@@ -7,7 +7,7 @@
#include "CShelly.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "../../common/ai/CPlayerLevel.h"
#include "misc.h"
/*
......
......@@ -11,7 +11,7 @@
#define CSHELLY_H_
#include <vector>
#include "engine/galaxy/common/ai/CStunnable.h"
#include "../../common/ai/CStunnable.h"
namespace galaxy {
......
......@@ -5,12 +5,13 @@
* Author: Gerstrong
*/
#include <base/video/CVideoDriver.h>
#include "sdl/music/CMusic.h"
#include <base/video/CVideoDriver.h>
#include "CShikadiMine.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "../../common/ai/CPlayerBase.h"
#include "../../common/ai/CPlayerLevel.h"
#include "misc.h"
/*
......
......@@ -7,9 +7,9 @@
#include "CShockshound.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include <engine/galaxy/common/ai/CPlayerLevel.h>
#include <engine/galaxy/common/ai/CEnemyShot.h>
#include "../../common/ai/CPlayerBase.h"
#include "../../common/ai/CPlayerLevel.h"
#include "../../common/ai/CEnemyShot.h"
#include "misc.h"
/*
......
......@@ -11,7 +11,7 @@
#define CSHOCKSHOUND_H_
#include <vector>
#include "engine/galaxy/common/ai/CStunnable.h"
#include "../../common/ai/CStunnable.h"
namespace galaxy {
......
......@@ -7,7 +7,7 @@
#include "CSlicestar.h"
#include <engine/galaxy/common/ai/CPlayerLevel.h>
#include "../../common/ai/CPlayerLevel.h"
namespace galaxy {
......
......@@ -11,7 +11,7 @@
#define CSLICESTAR_H_
#include <vector>
#include "engine/galaxy/common/ai/CStunnable.h"
#include "../../common/ai/CStunnable.h"
namespace galaxy {
......
......@@ -7,7 +7,7 @@
#include "CSparky.h"
#include <engine/galaxy/common/ai/CPlayerLevel.h>
#include "../../common/ai/CPlayerLevel.h"
#include "misc.h"
......
......@@ -11,7 +11,7 @@
#define CSPARKY_H_
#include <vector>
#include "engine/galaxy/common/ai/CStunnable.h"
#include "../../common/ai/CStunnable.h"
namespace galaxy {
......
......@@ -7,8 +7,7 @@
#include "CSphereful.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include <engine/galaxy/common/ai/CPlayerLevel.h>
#include "../../common/ai/CPlayerLevel.h"
#include "misc.h"
/*
......
......@@ -11,7 +11,7 @@
#define CSPHEREFUL_H_
#include <vector>
#include "engine/galaxy/common/ai/CStunnable.h"
#include "../../common/ai/CStunnable.h"
namespace galaxy {
......
......@@ -7,7 +7,7 @@
#include "CSpindred.h"
#include <engine/galaxy/common/ai/CPlayerLevel.h>
#include "../../common/ai/CPlayerLevel.h"
#include "misc.h"
/*
......
......@@ -11,7 +11,7 @@
#define CSPINDRED_H_
#include <vector>
#include "engine/galaxy/common/ai/CStunnable.h"
#include "../../common/ai/CStunnable.h"
namespace galaxy {
......
......@@ -7,8 +7,7 @@
#include "CSpirogrip.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include <engine/galaxy/common/ai/CPlayerLevel.h>
#include "../../common/ai/CPlayerLevel.h"
#include "misc.h"
/*
......
......@@ -11,7 +11,7 @@
#define CSPIROGRIP_H_
#include <vector>
#include "engine/galaxy/common/ai/CStunnable.h"
#include "../../common/ai/CStunnable.h"
namespace galaxy {
......
......@@ -7,8 +7,8 @@
#include "CVolteface.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include <engine/galaxy/common/ai/CPlayerLevel.h>
#include "../../common/ai/CPlayerBase.h"
#include "../../common/ai/CPlayerLevel.h"
#include "misc.h"
/*
......
......@@ -11,8 +11,8 @@
#define CVOLTEFACE_H_
#include <vector>
#include "engine/galaxy/common/ai/CStunnable.h"
#include "engine/galaxy/common/ai/CMoveTarget.h"
#include "../../common/ai/CStunnable.h"
#include "../../common/ai/CMoveTarget.h"
namespace galaxy {
......
......@@ -27,12 +27,12 @@
#include "ai/CSatelite.h"
#include "ai/CMolly.h"
#include "engine/galaxy/common/ai/CPlayerWM.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "../../common/ai/CPlayerWM.h"
#include "../../common/ai/CPlayerLevel.h"
#include "engine/galaxy/common/ai/platforms.h"
#include "engine/galaxy/common/ai/CFlag.h"
#include "engine/galaxy/common/ai/CSpriteItem.h"
#include "../../common/ai/platforms.h"
#include "../../common/ai/CFlag.h"
#include "../../common/ai/CSpriteItem.h"
#include <engine/galaxy/common/ai/platform/CPlatformSit.h>
#include <engine/galaxy/common/ai/Autogun.h>
......
#ifndef CBABOBBA_H
#define CBABOBBA_H
#include "engine/galaxy/common/ai/CStunnable.h"
#include "../../common/ai/CStunnable.h"
#include <engine/galaxy/common/ai/CGalaxyActionSpriteObject.h>
namespace galaxy {
......
#include "CBipShip.h"
#include "CBip.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "../../common/ai/CPlayerLevel.h"
#include <engine/galaxy/common/ai/CBullet.h>
#include <engine/galaxy/common/ai/CEnemyShot.h>
......
......@@ -7,7 +7,7 @@
#include "CBloog.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include "../../common/ai/CPlayerBase.h"
namespace galaxy {
......
......@@ -10,7 +10,7 @@
#ifndef CBLOOG_H_
#define CBLOOG_H_
#include "engine/galaxy/common/ai/CStunnable.h"
#include "../../common/ai/CStunnable.h"
namespace galaxy {
......