Skip to content

Commit

Permalink
NEVERHOOD: Move module files to own subdirectory
Browse files Browse the repository at this point in the history
  • Loading branch information
@johndoe123 @wjp
johndoe123 authored and wjp committed May 8, 2013
1 parent 1022996 commit 78e0d6a
Show file tree
Hide file tree
Showing 46 changed files with 168 additions and 169 deletions.
1 change: 0 additions & 1 deletion engines/neverhood/detection.cpp
View file
Expand Up @@ -235,4 +235,3 @@ SaveStateDescriptor NeverhoodMetaEngine::querySaveMetaInfos(const char *target,
#else
REGISTER_PLUGIN_STATIC(NEVERHOOD, PLUGIN_TYPE_ENGINE, NeverhoodMetaEngine);
#endif

42 changes: 21 additions & 21 deletions engines/neverhood/gamemodule.cpp
View file
Expand Up @@ -24,27 +24,27 @@

#include "neverhood/graphics.h"
#include "neverhood/menumodule.h"
#include "neverhood/module1000.h"
#include "neverhood/module1100.h"
#include "neverhood/module1200.h"
#include "neverhood/module1300.h"
#include "neverhood/module1400.h"
#include "neverhood/module1500.h"
#include "neverhood/module1600.h"
#include "neverhood/module1700.h"
#include "neverhood/module1800.h"
#include "neverhood/module1900.h"
#include "neverhood/module2000.h"
#include "neverhood/module2100.h"
#include "neverhood/module2200.h"
#include "neverhood/module2300.h"
#include "neverhood/module2400.h"
#include "neverhood/module2500.h"
#include "neverhood/module2600.h"
#include "neverhood/module2700.h"
#include "neverhood/module2800.h"
#include "neverhood/module2900.h"
#include "neverhood/module3000.h"
#include "neverhood/modules/module1000.h"
#include "neverhood/modules/module1100.h"
#include "neverhood/modules/module1200.h"
#include "neverhood/modules/module1300.h"
#include "neverhood/modules/module1400.h"
#include "neverhood/modules/module1500.h"
#include "neverhood/modules/module1600.h"
#include "neverhood/modules/module1700.h"
#include "neverhood/modules/module1800.h"
#include "neverhood/modules/module1900.h"
#include "neverhood/modules/module2000.h"
#include "neverhood/modules/module2100.h"
#include "neverhood/modules/module2200.h"
#include "neverhood/modules/module2300.h"
#include "neverhood/modules/module2400.h"
#include "neverhood/modules/module2500.h"
#include "neverhood/modules/module2600.h"
#include "neverhood/modules/module2700.h"
#include "neverhood/modules/module2800.h"
#include "neverhood/modules/module2900.h"
#include "neverhood/modules/module3000.h"

namespace Neverhood {

Expand Down
4 changes: 2 additions & 2 deletions engines/neverhood/module.cpp
View file
Expand Up @@ -23,8 +23,8 @@
#include "neverhood/module.h"
#include "neverhood/navigationscene.h"
#include "neverhood/smackerscene.h"
#include "neverhood/module1000.h"
#include "neverhood/module1500.h"
#include "neverhood/modules/module1000.h"
#include "neverhood/modules/module1500.h"

namespace Neverhood {

Expand Down
42 changes: 21 additions & 21 deletions engines/neverhood/module.mk
View file
Expand Up @@ -13,27 +13,27 @@ MODULE_OBJS = \
menumodule.o \
microtiles.o \
module.o \
module1000.o \
module1100.o \
module1200.o \
module1300.o \
module1400.o \
module1500.o \
module1600.o \
module1700.o \
module1800.o \
module1900.o \
module2000.o \
module2100.o \
module2200.o \
module2300.o \
module2400.o \
module2500.o \
module2600.o \
module2700.o \
module2800.o \
module2900.o \
module3000.o \
modules/module1000.o \
modules/module1100.o \
modules/module1200.o \
modules/module1300.o \
modules/module1400.o \
modules/module1500.o \
modules/module1600.o \
modules/module1700.o \
modules/module1800.o \
modules/module1900.o \
modules/module2000.o \
modules/module2100.o \
modules/module2200.o \
modules/module2300.o \
modules/module2400.o \
modules/module2500.o \
modules/module2600.o \
modules/module2700.o \
modules/module2800.o \
modules/module2900.o \
modules/module3000.o \
mouse.o \
navigationscene.o \
neverhood.o \
Expand Down
2 changes: 1 addition & 1 deletion engines/neverhood/module1000.cpp → engines/neverhood/modules/module1000.cpp
View file
Expand Up @@ -20,7 +20,7 @@
*
*/

#include "neverhood/module1000.h"
#include "neverhood/modules/module1000.h"

namespace Neverhood {

Expand Down
6 changes: 3 additions & 3 deletions engines/neverhood/module1000.h → engines/neverhood/modules/module1000.h
View file
Expand Up @@ -20,8 +20,8 @@
*
*/

#ifndef NEVERHOOD_MODULE1000_H
#define NEVERHOOD_MODULE1000_H
#ifndef NEVERHOOD_MODULES_MODULE1000_H
#define NEVERHOOD_MODULES_MODULE1000_H

#include "neverhood/neverhood.h"
#include "neverhood/module.h"
Expand Down Expand Up @@ -297,4 +297,4 @@ class Scene1005 : public Scene {

} // End of namespace Neverhood

#endif /* NEVERHOOD_MODULE1000_H */
#endif /* NEVERHOOD_MODULES_MODULE1000_H */
2 changes: 1 addition & 1 deletion engines/neverhood/module1100.cpp → engines/neverhood/modules/module1100.cpp
View file
Expand Up @@ -20,7 +20,7 @@
*
*/

#include "neverhood/module1100.h"
#include "neverhood/modules/module1100.h"
#include "neverhood/gamemodule.h"
#include "neverhood/navigationscene.h"

Expand Down
6 changes: 3 additions & 3 deletions engines/neverhood/module1100.h → engines/neverhood/modules/module1100.h
View file
Expand Up @@ -20,8 +20,8 @@
*
*/

#ifndef NEVERHOOD_MODULE1100_H
#define NEVERHOOD_MODULE1100_H
#ifndef NEVERHOOD_MODULES_MODULE1100_H
#define NEVERHOOD_MODULES_MODULE1100_H

#include "neverhood/neverhood.h"
#include "neverhood/module.h"
Expand Down Expand Up @@ -127,4 +127,4 @@ class Scene1109 : public Scene {

} // End of namespace Neverhood

#endif /* NEVERHOOD_MODULE1100_H */
#endif /* NEVERHOOD_MODULES_MODULE1100_H */
2 changes: 1 addition & 1 deletion engines/neverhood/module1200.cpp → engines/neverhood/modules/module1200.cpp
View file
Expand Up @@ -20,7 +20,7 @@
*
*/

#include "neverhood/module1200.h"
#include "neverhood/modules/module1200.h"

namespace Neverhood {

Expand Down
6 changes: 3 additions & 3 deletions engines/neverhood/module1200.h → engines/neverhood/modules/module1200.h
View file
Expand Up @@ -20,8 +20,8 @@
*
*/

#ifndef NEVERHOOD_MODULE1200_H
#define NEVERHOOD_MODULE1200_H
#ifndef NEVERHOOD_MODULES_MODULE1200_H
#define NEVERHOOD_MODULES_MODULE1200_H

#include "neverhood/neverhood.h"
#include "neverhood/module.h"
Expand Down Expand Up @@ -213,4 +213,4 @@ class Scene1202 : public Scene {

} // End of namespace Neverhood

#endif /* NEVERHOOD_MODULE1200_H */
#endif /* NEVERHOOD_MODULES_MODULE1200_H */
10 changes: 5 additions & 5 deletions engines/neverhood/module1300.cpp → engines/neverhood/modules/module1300.cpp
View file
Expand Up @@ -20,11 +20,11 @@
*
*/

#include "neverhood/module1300.h"
#include "neverhood/module1000.h"
#include "neverhood/module1200.h"
#include "neverhood/module1400.h"
#include "neverhood/module2200.h"
#include "neverhood/modules/module1300.h"
#include "neverhood/modules/module1000.h"
#include "neverhood/modules/module1200.h"
#include "neverhood/modules/module1400.h"
#include "neverhood/modules/module2200.h"
#include "neverhood/gamemodule.h"
#include "neverhood/diskplayerscene.h"
#include "neverhood/menumodule.h"
Expand Down
6 changes: 3 additions & 3 deletions engines/neverhood/module1300.h → engines/neverhood/modules/module1300.h
View file
Expand Up @@ -20,8 +20,8 @@
*
*/

#ifndef NEVERHOOD_MODULE1300_H
#define NEVERHOOD_MODULE1300_H
#ifndef NEVERHOOD_MODULES_MODULE1300_H
#define NEVERHOOD_MODULES_MODULE1300_H

#include "neverhood/neverhood.h"
#include "neverhood/module.h"
Expand Down Expand Up @@ -292,4 +292,4 @@ class Scene1317 : public Scene {

} // End of namespace Neverhood

#endif /* NEVERHOOD_MODULE1300_H */
#endif /* NEVERHOOD_MODULES_MODULE1300_H */
8 changes: 4 additions & 4 deletions engines/neverhood/module1400.cpp → engines/neverhood/modules/module1400.cpp
View file
Expand Up @@ -20,10 +20,10 @@
*
*/

#include "neverhood/module1400.h"
#include "neverhood/module1000.h"
#include "neverhood/module2100.h"
#include "neverhood/module2200.h"
#include "neverhood/modules/module1400.h"
#include "neverhood/modules/module1000.h"
#include "neverhood/modules/module2100.h"
#include "neverhood/modules/module2200.h"
#include "neverhood/diskplayerscene.h"
#include "neverhood/gamemodule.h"

Expand Down
8 changes: 4 additions & 4 deletions engines/neverhood/module1400.h → engines/neverhood/modules/module1400.h
View file
Expand Up @@ -20,13 +20,13 @@
*
*/

#ifndef NEVERHOOD_MODULE1400_H
#define NEVERHOOD_MODULE1400_H
#ifndef NEVERHOOD_MODULES_MODULE1400_H
#define NEVERHOOD_MODULES_MODULE1400_H

#include "neverhood/neverhood.h"
#include "neverhood/module.h"
#include "neverhood/scene.h"
#include "neverhood/module1200.h"
#include "neverhood/modules/module1200.h"

namespace Neverhood {

Expand Down Expand Up @@ -278,4 +278,4 @@ class Scene1405 : public Scene {

} // End of namespace Neverhood

#endif /* NEVERHOOD_MODULE1400_H */
#endif /* NEVERHOOD_MODULES_MODULE1400_H */
2 changes: 1 addition & 1 deletion engines/neverhood/module1500.cpp → engines/neverhood/modules/module1500.cpp
View file
Expand Up @@ -20,7 +20,7 @@
*
*/

#include "neverhood/module1500.h"
#include "neverhood/modules/module1500.h"

namespace Neverhood {

Expand Down
6 changes: 3 additions & 3 deletions engines/neverhood/module1500.h → engines/neverhood/modules/module1500.h
View file
Expand Up @@ -22,8 +22,8 @@

// TODO: I couldn't come up with a better name than 'Module' so far

#ifndef NEVERHOOD_MODULE1500_H
#define NEVERHOOD_MODULE1500_H
#ifndef NEVERHOOD_MODULES_MODULE1500_H
#define NEVERHOOD_MODULES_MODULE1500_H

#include "neverhood/neverhood.h"
#include "neverhood/module.h"
Expand Down Expand Up @@ -55,4 +55,4 @@ class Scene1501 : public Scene {

} // End of namespace Neverhood

#endif /* NEVERHOOD_MODULE1500_H */
#endif /* NEVERHOOD_MODULES_MODULE1500_H */
6 changes: 3 additions & 3 deletions engines/neverhood/module1600.cpp → engines/neverhood/modules/module1600.cpp
View file
Expand Up @@ -20,10 +20,10 @@
*
*/

#include "neverhood/module1600.h"
#include "neverhood/modules/module1600.h"
#include "neverhood/gamemodule.h"
#include "neverhood/module1200.h"
#include "neverhood/module2200.h"
#include "neverhood/modules/module1200.h"
#include "neverhood/modules/module2200.h"

namespace Neverhood {

Expand Down
8 changes: 4 additions & 4 deletions engines/neverhood/module1600.h → engines/neverhood/modules/module1600.h
View file
Expand Up @@ -20,13 +20,13 @@
*
*/

#ifndef NEVERHOOD_MODULE1600_H
#define NEVERHOOD_MODULE1600_H
#ifndef NEVERHOOD_MODULES_MODULE1600_H
#define NEVERHOOD_MODULES_MODULE1600_H

#include "neverhood/neverhood.h"
#include "neverhood/module.h"
#include "neverhood/scene.h"
#include "neverhood/module3000.h"
#include "neverhood/modules/module3000.h"

namespace Neverhood {

Expand Down Expand Up @@ -180,4 +180,4 @@ class Scene1609 : public Scene {

} // End of namespace Neverhood

#endif /* NEVERHOOD_MODULE1600_H */
#endif /* NEVERHOOD_MODULES_MODULE1600_H */
2 changes: 1 addition & 1 deletion engines/neverhood/module1700.cpp → engines/neverhood/modules/module1700.cpp
View file
Expand Up @@ -20,7 +20,7 @@
*
*/

#include "neverhood/module1700.h"
#include "neverhood/modules/module1700.h"
#include "neverhood/gamemodule.h"

namespace Neverhood {
Expand Down
6 changes: 3 additions & 3 deletions engines/neverhood/module1700.h → engines/neverhood/modules/module1700.h
View file
Expand Up @@ -20,8 +20,8 @@
*
*/

#ifndef NEVERHOOD_MODULE1700_H
#define NEVERHOOD_MODULE1700_H
#ifndef NEVERHOOD_MODULES_MODULE1700_H
#define NEVERHOOD_MODULES_MODULE1700_H

#include "neverhood/neverhood.h"
#include "neverhood/module.h"
Expand Down Expand Up @@ -69,4 +69,4 @@ class Scene1705 : public Scene {

} // End of namespace Neverhood

#endif /* NEVERHOOD_MODULE1700_H */
#endif /* NEVERHOOD_MODULES_MODULE1700_H */
2 changes: 1 addition & 1 deletion engines/neverhood/module1800.cpp → engines/neverhood/modules/module1800.cpp
View file
Expand Up @@ -20,7 +20,7 @@
*
*/

#include "neverhood/module1800.h"
#include "neverhood/modules/module1800.h"
#include "neverhood/navigationscene.h"
#include "neverhood/menumodule.h"

Expand Down
6 changes: 3 additions & 3 deletions engines/neverhood/module1800.h → engines/neverhood/modules/module1800.h
View file
Expand Up @@ -20,8 +20,8 @@
*
*/

#ifndef NEVERHOOD_MODULE1800_H
#define NEVERHOOD_MODULE1800_H
#ifndef NEVERHOOD_MODULES_MODULE1800_H
#define NEVERHOOD_MODULES_MODULE1800_H

#include "neverhood/neverhood.h"
#include "neverhood/module.h"
Expand All @@ -43,4 +43,4 @@ class Module1800 : public Module {

} // End of namespace Neverhood

#endif /* NEVERHOOD_MODULE1800_H */
#endif /* NEVERHOOD_MODULES_MODULE1800_H */
2 changes: 1 addition & 1 deletion engines/neverhood/module1900.cpp → engines/neverhood/modules/module1900.cpp
View file
Expand Up @@ -20,7 +20,7 @@
*
*/

#include "neverhood/module1900.h"
#include "neverhood/modules/module1900.h"
#include "neverhood/gamemodule.h"

namespace Neverhood {
Expand Down

0 comments on commit 78e0d6a

Please sign in to comment.