diff options
| author | Eugene Sandulenko | 2018-03-24 02:42:51 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-03-24 02:45:26 +0100 |
| commit | 55245a8ccab7b31f6c5158b1f980903bc6234205 (patch) | |
| tree | 58ebf629fd48ca1ac4bccf9e505e9934c55ce354 | |
| parent | ff11cee4808019c3304f0a298274554a68d78dcf (diff) | |
| download | scummvm-rg350-55245a8ccab7b31f6c5158b1f980903bc6234205.tar.gz scummvm-rg350-55245a8ccab7b31f6c5158b1f980903bc6234205.tar.bz2 scummvm-rg350-55245a8ccab7b31f6c5158b1f980903bc6234205.zip | |
BLADERUNNER: Moved PoliceMaze to script/
| -rw-r--r-- | engines/bladerunner/bladerunner.cpp | 2 | ||||
| -rw-r--r-- | engines/bladerunner/module.mk | 2 | ||||
| -rw-r--r-- | engines/bladerunner/scene.cpp | 2 | ||||
| -rw-r--r-- | engines/bladerunner/script/police_maze.cpp (renamed from engines/bladerunner/police_maze.cpp) | 2 | ||||
| -rw-r--r-- | engines/bladerunner/script/police_maze.h (renamed from engines/bladerunner/police_maze.h) | 4 | ||||
| -rw-r--r-- | engines/bladerunner/script/script.cpp | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp index aa1fb97163..0fd7663271 100644 --- a/engines/bladerunner/bladerunner.cpp +++ b/engines/bladerunner/bladerunner.cpp @@ -45,7 +45,6 @@ #include "bladerunner/outtake.h" #include "bladerunner/obstacles.h" #include "bladerunner/overlays.h" -#include "bladerunner/police_maze.h" #include "bladerunner/regions.h" #include "bladerunner/scene.h" #include "bladerunner/scene_objects.h" @@ -54,6 +53,7 @@ #include "bladerunner/script/ai_script.h" #include "bladerunner/script/init_script.h" #include "bladerunner/script/kia_script.h" +#include "bladerunner/script/police_maze.h" #include "bladerunner/script/scene_script.h" #include "bladerunner/settings.h" #include "bladerunner/shape.h" diff --git a/engines/bladerunner/module.mk b/engines/bladerunner/module.mk index f7f7984508..bf90922ebf 100644 --- a/engines/bladerunner/module.mk +++ b/engines/bladerunner/module.mk @@ -40,7 +40,6 @@ MODULE_OBJS = \ obstacles.o \ outtake.o \ overlays.o \ - police_maze.o \ regions.o \ scene.o \ scene_objects.o \ @@ -50,6 +49,7 @@ MODULE_OBJS = \ script/kia_script.o \ script/vk_script.o \ script/esper_script.o \ + script/police_maze.o \ script/ai_script.o \ script/ai/answering_machine.o \ script/ai/baker.o \ diff --git a/engines/bladerunner/scene.cpp b/engines/bladerunner/scene.cpp index 6b0404d351..84d0dd4bd6 100644 --- a/engines/bladerunner/scene.cpp +++ b/engines/bladerunner/scene.cpp @@ -29,13 +29,13 @@ #include "bladerunner/game_info.h" #include "bladerunner/items.h" #include "bladerunner/overlays.h" -#include "bladerunner/police_maze.h" #include "bladerunner/regions.h" #include "bladerunner/scene_objects.h" #include "bladerunner/screen_effects.h" #include "bladerunner/set.h" #include "bladerunner/settings.h" #include "bladerunner/slice_renderer.h" +#include "bladerunner/script/police_maze.h" #include "bladerunner/script/scene_script.h" #include "bladerunner/ui/spinner.h" #include "bladerunner/vqa_player.h" diff --git a/engines/bladerunner/police_maze.cpp b/engines/bladerunner/script/police_maze.cpp index 43e4457f41..41a33ff691 100644 --- a/engines/bladerunner/police_maze.cpp +++ b/engines/bladerunner/script/police_maze.cpp @@ -24,9 +24,9 @@ #include "bladerunner/game_constants.h" #include "bladerunner/items.h" #include "bladerunner/mouse.h" -#include "bladerunner/police_maze.h" #include "bladerunner/scene.h" #include "bladerunner/scene_objects.h" +#include "bladerunner/script/police_maze.h" #include "bladerunner/script/scene_script.h" namespace BladeRunner { diff --git a/engines/bladerunner/police_maze.h b/engines/bladerunner/script/police_maze.h index 1cb9da5555..5c5da099cd 100644 --- a/engines/bladerunner/police_maze.h +++ b/engines/bladerunner/script/police_maze.h @@ -20,8 +20,8 @@ * */ -#ifndef BLADERUNNER_POLICE_MAZE_H -#define BLADERUNNER_POLICE_MAZE_H +#ifndef BLADERUNNER_SCRIPT_POLICE_MAZE_H +#define BLADERUNNER_SCRIPT_POLICE_MAZE_H #include "bladerunner/script/script.h" #include "bladerunner/vector.h" diff --git a/engines/bladerunner/script/script.cpp b/engines/bladerunner/script/script.cpp index 3c1f041d57..5f39646ea0 100644 --- a/engines/bladerunner/script/script.cpp +++ b/engines/bladerunner/script/script.cpp @@ -39,13 +39,13 @@ #include "bladerunner/movement_track.h" #include "bladerunner/music.h" #include "bladerunner/overlays.h" -#include "bladerunner/police_maze.h" #include "bladerunner/regions.h" #include "bladerunner/set.h" #include "bladerunner/settings.h" #include "bladerunner/set_effects.h" #include "bladerunner/scene.h" #include "bladerunner/scene_objects.h" +#include "bladerunner/script/police_maze.h" #include "bladerunner/slice_animations.h" #include "bladerunner/slice_renderer.h" #include "bladerunner/suspects_database.h" |