Commit 7a883b18 authored by Gerhard Stein's avatar Gerhard Stein

Reorgnanisation of the projects files (galaxy)

parent c69241da
......@@ -19,7 +19,7 @@
#include <vector>
#include <string>
#include <map>
#include "engine/galaxy/EGAStructs.h"
#include "engine/galaxy/res/EGAStructs.h"
#include "hardware/Configurator.h"
#include "fileio/CExeFile.h"
#include "CTileProperties.h"
......
......@@ -11,7 +11,7 @@
#include "CGameMain.h"
#include "engine/vorticon/CEGAGraphicsVort.h"
#include "engine/galaxy/CEGAGraphicsGalaxy.h"
#include "engine/galaxy/res/CEGAGraphicsGalaxy.h"
#include "engine/CMessages.h"
#include "fileio/ResourceMgmt.h"
#include "fileio/CSaveGameController.h"
......
......@@ -15,7 +15,7 @@
#include "sdl/music/CMusic.h"
#include "graphics/effects/CColorMerge.h"
#include "graphics/effects/CDimDark.h"
#include "dialog/CMessageBoxBitmapGalaxy.h"
#include "common/dialog/CMessageBoxBitmapGalaxy.h"
#include "CLogFile.h"
#include "CMapPlayGalaxy.h"
......
......@@ -6,15 +6,15 @@
*/
#include "CMapPlayGalaxy.h"
#include "ai/platform/CPlatform.h"
#include "engine/galaxy/ai/CPlayerBase.h"
#include "common/ai/platform/CPlatform.h"
#include "common/ai/CPlayerBase.h"
#include "common/CBehaviorEngine.h"
#include "ep4/CMapLoaderGalaxyEp4.h"
#include "ep5/CMapLoaderGalaxyEp5.h"
#include "ep6/CMapLoaderGalaxyEp6.h"
#include "ai/ep4/CInchWorm.h"
#include "ai/ep4/CFoot.h"
#include "ai/ep4/CSmokePuff.h"
#include "ep4/ai/CInchWorm.h"
#include "ep4/ai/CFoot.h"
#include "ep4/ai/CSmokePuff.h"
#include "CLogFile.h"
CMapPlayGalaxy::CMapPlayGalaxy(CExeFile &ExeFile, CInventory &Inventory, stCheat &Cheatmode) :
......
......@@ -14,8 +14,8 @@
#include "common/Cheat.h"
#include "fileio/CExeFile.h"
#include "engine/galaxy/CInventory.h"
#include "engine/galaxy/CGalaxySpriteObject.h"
#include "engine/galaxy/common/CInventory.h"
#include "engine/galaxy/common/CGalaxySpriteObject.h"
#include "common/CBehaviorEngine.h"
#include "ep4/CMapLoaderGalaxyEp4.h"
#include "ep5/CMapLoaderGalaxyEp5.h"
......
......@@ -6,11 +6,11 @@
*/
#include "CPlayGameGalaxy.h"
#include "CMapLoaderGalaxy.h"
#include "common/CMapLoaderGalaxy.h"
#include "graphics/CGfxEngine.h"
#include "dialog/CMessageBoxBitmapGalaxy.h"
#include "dialog/CMessageBoxSelection.h"
#include "common/dialog/CMessageBoxBitmapGalaxy.h"
#include "common/dialog/CMessageBoxSelection.h"
#include "sdl/CVideoDriver.h"
#include "sdl/input/CInput.h"
#include "sdl/sound/CSound.h"
......
......@@ -9,10 +9,10 @@
#define CPLAYGAMEGALAXY_H_
#include "engine/playgame/CPlayGame.h"
#include "engine/galaxy/CInventory.h"
#include "dialog/CMessageBoxGalaxy.h"
#include "common/CInventory.h"
#include "common/dialog/CMessageBoxGalaxy.h"
#include "common/CMap.h"
#include "CWorldMap.h"
#include "common/CWorldMap.h"
#include "CLevelPlay.h"
#include <memory>
#include <vector>
......
......@@ -12,10 +12,10 @@
#include "sdl/input/CInput.h"
#include "graphics/effects/CScrollEffect.h"
// TODO: We should sort these classes
#include "CStatusScreenGalaxyEp4.h"
#include "CStatusScreenGalaxyEp5.h"
#include "CStatusScreenGalaxyEp6.h"
#include "engine/galaxy/ep4/CStatusScreenGalaxyEp4.h"
#include "engine/galaxy/ep5/CStatusScreenGalaxyEp5.h"
#include "engine/galaxy/ep6/CStatusScreenGalaxyEp6.h"
CInventory::CInventory(const std::string& levelname) :
......
......@@ -13,7 +13,7 @@
#define CINVENTORY_H_
#include "common/CHUD.h"
#include "ItemsGalaxy.h"
#include "engine/galaxy/res/ItemsGalaxy.h"
#include "CStatusScreenGalaxy.h"
#include "fileio/CSaveGameController.h"
#include <memory>
......
......@@ -24,7 +24,7 @@
/// AI Headers
// General stuff
#include "engine/galaxy/ai/CSpriteItem.h"
#include "engine/galaxy/common/ai/CSpriteItem.h"
#include <fstream>
......
......@@ -12,8 +12,8 @@
#include "fileio/TypeDefinitions.h"
#include "common/CMap.h"
#include "common/Cheat.h"
#include "engine/galaxy/CInventory.h"
#include "engine/galaxy/CGalaxySpriteObject.h"
#include "engine/galaxy/common/CInventory.h"
#include "engine/galaxy/common/CGalaxySpriteObject.h"
#include <memory>
#include <vector>
......
......@@ -13,7 +13,7 @@
#include <SDL.h>
#include <string>
#include <memory>
#include "ItemsGalaxy.h"
#include "engine/galaxy/res/ItemsGalaxy.h"
class CStatusScreenGalaxy
{
......
......@@ -10,7 +10,7 @@
#ifndef CWORLDMAP_H_
#define CWORLDMAP_H_
#include "CMapPlayGalaxy.h"
#include "engine/galaxy/CMapPlayGalaxy.h"
namespace galaxy {
......
#include "Autogun.h"
#include "engine/galaxy/ai/CPlayerBase.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
namespace galaxy
{
......
#ifndef AUTOGUN_H
#define AUTOGUN_H
#include "engine/galaxy/CGalaxySpriteObject.h"
#include "engine/galaxy/common/CGalaxySpriteObject.h"
namespace galaxy
{
......
......@@ -10,7 +10,7 @@
#ifndef CBULLET_H_
#define CBULLET_H_
#include "engine/galaxy/CGalaxySpriteObject.h"
#include "engine/galaxy/common/CGalaxySpriteObject.h"
namespace galaxy
{
......
......@@ -6,7 +6,7 @@
*/
#include "CEnemyShot.h"
#include "engine/galaxy/ai/CPlayerBase.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
namespace galaxy {
......
......@@ -11,7 +11,7 @@
#ifndef CENEMYSHOT_H_
#define CENEMYSHOT_H_
#include "engine/galaxy/CGalaxySpriteObject.h"
#include "engine/galaxy/common/CGalaxySpriteObject.h"
namespace galaxy {
......
......@@ -11,7 +11,7 @@
#ifndef CFLAG_H_
#define CFLAG_H_
#include "engine/galaxy/CGalaxySpriteObject.h"
#include "engine/galaxy/common/CGalaxySpriteObject.h"
#include "CVec.h"
const Uint16 WAVING_BASEFRAME = 181;
......
......@@ -8,7 +8,7 @@
#ifndef CITEMEFFECT_H_
#define CITEMEFFECT_H_
#include "engine/galaxy/CGalaxySpriteObject.h"
#include "engine/galaxy/common/CGalaxySpriteObject.h"
namespace galaxy {
......
......@@ -15,12 +15,12 @@
#ifndef CPLAYERBASE_H_
#define CPLAYERBASE_H_
#include "engine/galaxy/CGalaxySpriteObject.h"
#include "engine/galaxy/common/CGalaxySpriteObject.h"
#include "common/Playerdefines.h"
#include "engine/CEvent.h"
#include "common/Cheat.h"
#include "engine/CCamera.h"
#include "engine/galaxy/CInventory.h"
#include "engine/galaxy/common/CInventory.h"
namespace galaxy
{
......
......@@ -8,7 +8,7 @@
*/
#include "CPlayerWM.h"
#include "engine/galaxy/ai/CFlag.h"
#include "engine/galaxy/common/ai/CFlag.h"
#include "common/CBehaviorEngine.h"
#include "sdl/input/CInput.h"
#include "sdl/sound/CSound.h"
......
......@@ -12,7 +12,7 @@
#ifndef CSPRITEITEM_H_
#define CSPRITEITEM_H_
#include "engine/galaxy/CGalaxySpriteObject.h"
#include "engine/galaxy/common/CGalaxySpriteObject.h"
namespace galaxy {
......
......@@ -11,7 +11,7 @@
#ifndef CSTARRING_H_
#define CSTARRING_H_
#include "engine/galaxy/CGalaxySpriteObject.h"
#include "engine/galaxy/common/CGalaxySpriteObject.h"
namespace galaxy
{
......
......@@ -13,7 +13,7 @@
#include "CStunnable.h"
#include "CBullet.h"
#include "common/CBehaviorEngine.h"
#include "engine/galaxy/ai/CStarRing.h"
#include "engine/galaxy/common/ai/CStarRing.h"
namespace galaxy
......
......@@ -8,8 +8,8 @@
#ifndef CSTUNNABLE_H_
#define CSTUNNABLE_H_
#include "engine/galaxy/CGalaxySpriteObject.h"
#include "engine/galaxy/ai/CBullet.h"
#include "engine/galaxy/common/CGalaxySpriteObject.h"
#include "engine/galaxy/common/ai/CBullet.h"
#include <map>
namespace galaxy
......
......@@ -10,8 +10,8 @@
#ifndef CPLATFORM_H_
#define CPLATFORM_H_
#include "engine/galaxy/CGalaxySpriteObject.h"
#include "engine/galaxy/ai/CPlayerLevel.h"
#include "engine/galaxy/common/CGalaxySpriteObject.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
namespace galaxy {
......
......@@ -6,15 +6,16 @@
*
* This small header just pinpoints to the galaxy platforms that
* the game engine offers.
* TODO: Remove that file as soon as it is not needed anymore!
*/
#ifndef PLATFORMS_H_
#define PLATFORMS_H_
#include "engine/galaxy/ai/platform/CPlatformHorizontal.h"
#include "engine/galaxy/ai/platform/CPlatformVertical.h"
#include "engine/galaxy/ai/platform/CVarPlatform.h"
#include "engine/galaxy/ai/platform/CPlatformMoveAway.h"
#include "engine/galaxy/ai/platform/CPlatformDrop.h"
#include "platform/CPlatformHorizontal.h"
#include "platform/CPlatformVertical.h"
#include "platform/CVarPlatform.h"
#include "platform/CPlatformMoveAway.h"
#include "platform/CPlatformDrop.h"
#endif /* PLATFORMS_H_ */
......@@ -8,38 +8,37 @@
#include "CMapLoaderGalaxyEp4.h"
// Episode 4
#include "engine/galaxy/ai/CPlayerWM.h"
#include "engine/galaxy/ai/CPlayerLevel.h"
#include "engine/galaxy/ai/ep4/CPlayerDive.h"
#include "engine/galaxy/ai/ep4/CPoisonSlug.h"
#include "engine/galaxy/ai/ep4/CMadMushroom.h"
#include "engine/galaxy/ai/ep4/CCouncilMember.h"
#include "engine/galaxy/ai/ep4/CMiragia.h"
#include "engine/galaxy/ai/ep4/CDiveSuit.h"
#include "engine/galaxy/ai/ep4/CArachnut.h"
#include "engine/galaxy/ai/ep4/CBounder.h"
#include "engine/galaxy/ai/ep4/CDopeFish.h"
#include "engine/galaxy/ai/ep4/CWaterMine.h"
#include "engine/galaxy/ai/ep4/CDevilSprite.h"
#include "engine/galaxy/ai/ep4/CSchoolFish.h"
#include "engine/galaxy/ai/ep4/CLick.h"
#include "engine/galaxy/ai/ep4/CLindsey.h"
#include "engine/galaxy/ai/ep4/CWormmouth.h"
#include "engine/galaxy/ai/ep4/CSkypest.h"
#include "engine/galaxy/ai/ep4/CMimrock.h"
#include "engine/galaxy/ai/ep4/CEgg.h"
#include "engine/galaxy/ai/ep4/CBerkeloid.h"
#include "engine/galaxy/ai/ep4/CBlueBird.h"
#include "engine/galaxy/ai/ep4/CThunderCloud.h"
#include "engine/galaxy/ai/ep4/CTreasureEater.h"
#include "engine/galaxy/ai/ep4/CInchWorm.h"
#include "engine/galaxy/ai/ep4/CFoot.h"
#include "engine/galaxy/ai/platforms.h"
#include "engine/galaxy/ai/CFlag.h"
#include "engine/galaxy/ai/Autogun.h"
#include "engine/galaxy/ai/CSpriteItem.h"
#include "engine/galaxy/common/ai/CPlayerWM.h"
#include "engine/galaxy/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"
#include "engine/galaxy/ep4/ai/CCouncilMember.h"
#include "engine/galaxy/ep4/ai/CMiragia.h"
#include "engine/galaxy/ep4/ai/CDiveSuit.h"
#include "engine/galaxy/ep4/ai/CArachnut.h"
#include "engine/galaxy/ep4/ai/CBounder.h"
#include "engine/galaxy/ep4/ai/CDopeFish.h"
#include "engine/galaxy/ep4/ai/CWaterMine.h"
#include "engine/galaxy/ep4/ai/CDevilSprite.h"
#include "engine/galaxy/ep4/ai/CSchoolFish.h"
#include "engine/galaxy/ep4/ai/CLick.h"
#include "engine/galaxy/ep4/ai/CLindsey.h"
#include "engine/galaxy/ep4/ai/CWormmouth.h"
#include "engine/galaxy/ep4/ai/CSkypest.h"
#include "engine/galaxy/ep4/ai/CMimrock.h"
#include "engine/galaxy/ep4/ai/CEgg.h"
#include "engine/galaxy/ep4/ai/CBerkeloid.h"
#include "engine/galaxy/ep4/ai/CBlueBird.h"
#include "engine/galaxy/ep4/ai/CThunderCloud.h"
#include "engine/galaxy/ep4/ai/CTreasureEater.h"
#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"
namespace galaxy
{
......
......@@ -8,7 +8,7 @@
#ifndef CMAPLOADERGALAXYEP4_H_
#define CMAPLOADERGALAXYEP4_H_
#include "../CMapLoaderGalaxy.h"
#include "engine/galaxy/common/CMapLoaderGalaxy.h"
namespace galaxy
{
......
......@@ -10,7 +10,7 @@
#ifndef CSTATUSSCREENGALAXYEP4_H_
#define CSTATUSSCREENGALAXYEP4_H_
#include "CStatusScreenGalaxy.h"
#include "engine/galaxy/common/CStatusScreenGalaxy.h"
class CStatusScreenGalaxyEp4 : public CStatusScreenGalaxy {
public:
......
......@@ -6,8 +6,8 @@
*/
#include "CArachnut.h"
#include "engine/galaxy/ai/CPlayerLevel.h"
#include "engine/galaxy/ai/CBullet.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "engine/galaxy/common/ai/CBullet.h"
#include "misc.h"
namespace galaxy
......
......@@ -8,7 +8,7 @@
#ifndef CARACHNUT_H_
#define CARACHNUT_H_
#include "engine/galaxy/CGalaxySpriteObject.h"
#include "engine/galaxy/common/CGalaxySpriteObject.h"
namespace galaxy {
......
......@@ -6,8 +6,8 @@
*/
#include "CBerkeloid.h"
#include "engine/galaxy/ai/CPlayerLevel.h"
#include "engine/galaxy/ai/CBullet.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "engine/galaxy/common/ai/CBullet.h"
#include "misc.h"
namespace galaxy {
......
......@@ -8,7 +8,7 @@
#ifndef CBERKELOID_H_
#define CBERKELOID_H_
#include "engine/galaxy/CGalaxySpriteObject.h"
#include "engine/galaxy/common/CGalaxySpriteObject.h"
namespace galaxy {
......
......@@ -6,8 +6,8 @@
*/
#include "CBlueBird.h"
#include "engine/galaxy/ai/CPlayerLevel.h"
#include "engine/galaxy/ai/CBullet.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "engine/galaxy/common/ai/CBullet.h"
#include "misc.h"
namespace galaxy {
......
......@@ -8,7 +8,7 @@
#ifndef CBLUEBIRD_H_
#define CBLUEBIRD_H_
#include "engine/galaxy/CGalaxySpriteObject.h"
#include "engine/galaxy/common/CGalaxySpriteObject.h"
namespace galaxy {
......
......@@ -8,8 +8,8 @@
#ifndef CBOUNDER_H_
#define CBOUNDER_H_
#include "engine/galaxy/ai/CStunnable.h"
#include "engine/galaxy/ai/CPlayerLevel.h"
#include "engine/galaxy/common/ai/CStunnable.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
namespace galaxy {
......
......@@ -10,7 +10,7 @@
#ifndef CBUBBLES_H_
#define CBUBBLES_H_
#include "engine/galaxy/CGalaxySpriteObject.h"
#include "engine/galaxy/common/CGalaxySpriteObject.h"
namespace galaxy {
......
......@@ -6,7 +6,7 @@
*/
#include "CCouncilMember.h"
#include "engine/galaxy/ai/CPlayerLevel.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "misc.h"
#include "sdl/sound/CSound.h"
#include "sdl/music/CMusic.h"
......
......@@ -10,7 +10,7 @@
#ifndef CCOUNCIL_MEMBER_H_
#define CCOUNCIL_MEMBER_H_
#include "engine/galaxy/CGalaxySpriteObject.h"
#include "engine/galaxy/common/CGalaxySpriteObject.h"
#include <map>
#include <string>
......
......@@ -6,8 +6,8 @@
*/
#include "CDevilSprite.h"
#include "engine/galaxy/ai/CPlayerBase.h"
#include "engine/galaxy/ai/CEnemyShot.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include "engine/galaxy/common/ai/CEnemyShot.h"
namespace galaxy {
......
......@@ -8,7 +8,7 @@
#ifndef CDEVILSPRITE_H_
#define CDEVILSPRITE_H_
#include "engine/galaxy/CGalaxySpriteObject.h"
#include "engine/galaxy/common/CGalaxySpriteObject.h"
namespace galaxy {
......
......@@ -6,7 +6,7 @@
*/
#include "CDiveSuit.h"
#include "engine/galaxy/ai/CPlayerLevel.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
namespace galaxy {
......
......@@ -8,7 +8,7 @@
#ifndef CDIVESUIT_H_
#define CDIVESUIT_H_
#include "engine/galaxy/CGalaxySpriteObject.h"
#include "engine/galaxy/common/CGalaxySpriteObject.h"
namespace galaxy {
......
......@@ -6,8 +6,8 @@
*/
#include "CDopeFish.h"
#include "engine/galaxy/ai/ep4/CPlayerDive.h"
#include "engine/galaxy/ai/ep4/CSchoolFish.h"
#include "CPlayerDive.h"
#include "CSchoolFish.h"
#include "CBubbles.h"
namespace galaxy
......
......@@ -8,7 +8,7 @@
#ifndef CDOPEFISH_H_
#define CDOPEFISH_H_
#include "engine/galaxy/CGalaxySpriteObject.h"
#include "engine/galaxy/common/CGalaxySpriteObject.h"
namespace galaxy {
......
......@@ -6,9 +6,9 @@
*/
#include "CEgg.h"
#include "engine/galaxy/ai/CPlayerLevel.h"
#include "engine/galaxy/ai/CBullet.h"
#include "engine/galaxy/ai/ep4/CBlueBird.h"
#include "engine/galaxy/common/ai/CPlayerLevel.h"
#include "engine/galaxy/common/ai/CBullet.h"
#include "CBlueBird.h"
namespace galaxy
{
......
......@@ -10,7 +10,7 @@
#ifndef CEGG_H_
#define CEGG_H_
#include "engine/galaxy/CGalaxySpriteObject.h"
#include "engine/galaxy/common/CGalaxySpriteObject.h"
namespace galaxy
{
......
......@@ -6,7 +6,7 @@
*/
#include "CFoot.h"
#include "engine/galaxy/ai/CPlayerBase.h"
#include "engine/galaxy/common/ai/CPlayerBase.h"
#include "common/CBehaviorEngine.h"
namespace galaxy {
......
......@@ -8,7 +8,7 @@
#ifndef CFOOT_H_
#define CFOOT_H_
#include "engine/galaxy/CGalaxySpriteObject.h"
#include "engine/galaxy/common/CGalaxySpriteObject.h"
namespace galaxy {
......