diff options
| author | Eugene Sandulenko | 2015-12-08 20:10:26 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-23 21:33:56 +0100 |
| commit | d2a540ea557f1b0a2f8e1abc00ec82a068855796 (patch) | |
| tree | b76902726ab312b8400c63759a85e84de2efa866 | |
| parent | 151e27f4b1d5a98a3867c46d770b9b2a41f8905c (diff) | |
| download | scummvm-rg350-d2a540ea557f1b0a2f8e1abc00ec82a068855796.tar.gz scummvm-rg350-d2a540ea557f1b0a2f8e1abc00ec82a068855796.tar.bz2 scummvm-rg350-d2a540ea557f1b0a2f8e1abc00ec82a068855796.zip | |
LAB: Rename graphics.* to dispman.*
| -rw-r--r-- | engines/lab/dispman.cpp (renamed from engines/lab/graphics.cpp) | 1 | ||||
| -rw-r--r-- | engines/lab/dispman.h (renamed from engines/lab/graphics.h) | 6 | ||||
| -rw-r--r-- | engines/lab/lab.cpp | 1 | ||||
| -rw-r--r-- | engines/lab/lab.h | 1 | ||||
| -rw-r--r-- | engines/lab/module.mk | 2 | ||||
| -rw-r--r-- | engines/lab/resource.h | 2 | ||||
| -rw-r--r-- | engines/lab/transitions.cpp | 1 |
7 files changed, 5 insertions, 9 deletions
diff --git a/engines/lab/graphics.cpp b/engines/lab/dispman.cpp index efd24b294d..a7c71f2214 100644 --- a/engines/lab/graphics.cpp +++ b/engines/lab/dispman.cpp @@ -34,7 +34,6 @@ #include "lab/labfun.h" #include "lab/processroom.h" #include "lab/resource.h" -#include "lab/graphics.h" namespace Lab { diff --git a/engines/lab/graphics.h b/engines/lab/dispman.h index c2c3e824fd..bbbbe35126 100644 --- a/engines/lab/graphics.h +++ b/engines/lab/dispman.h @@ -28,8 +28,8 @@ * */ -#ifndef LAB_GRAPHICS_H -#define LAB_GRAPHICS_H +#ifndef LAB_DISPMAN_H +#define LAB_DISPMAN_H #include "graphics/palette.h" #include "lab/anim.h" @@ -166,4 +166,4 @@ public: } // End of namespace Lab -#endif // LAB_GRAPHICS_H +#endif // LAB_DISPMAN_H diff --git a/engines/lab/lab.cpp b/engines/lab/lab.cpp index d1de3e11f0..a5ae97c9b5 100644 --- a/engines/lab/lab.cpp +++ b/engines/lab/lab.cpp @@ -45,7 +45,6 @@ #include "lab/labfun.h" #include "lab/resource.h" #include "lab/anim.h" -#include "lab/graphics.h" namespace Lab { diff --git a/engines/lab/lab.h b/engines/lab/lab.h index 2604579ca9..110e47008c 100644 --- a/engines/lab/lab.h +++ b/engines/lab/lab.h @@ -42,7 +42,6 @@ #include "lab/music.h" #include "lab/resource.h" #include "lab/anim.h" -#include "lab/graphics.h" #include "lab/labsets.h" #include "lab/utils.h" diff --git a/engines/lab/module.mk b/engines/lab/module.mk index f4cb284813..0d05de275e 100644 --- a/engines/lab/module.mk +++ b/engines/lab/module.mk @@ -3,9 +3,9 @@ MODULE := engines/lab MODULE_OBJS := \ anim.o \ detection.o \ + dispman.o \ engine.o \ eventman.o \ - graphics.o \ image.o \ interface.o \ intro.o \ diff --git a/engines/lab/resource.h b/engines/lab/resource.h index cfba7abd57..c51e744e03 100644 --- a/engines/lab/resource.h +++ b/engines/lab/resource.h @@ -32,7 +32,7 @@ #define LAB_RESOURCE_H #include "lab/labfun.h" -#include "lab/graphics.h" +#include "lab/dispman.h" namespace Lab { diff --git a/engines/lab/transitions.cpp b/engines/lab/transitions.cpp index c611266020..53749e8dc7 100644 --- a/engines/lab/transitions.cpp +++ b/engines/lab/transitions.cpp @@ -30,7 +30,6 @@ #include "lab/lab.h" #include "lab/processroom.h" -#include "lab/graphics.h" namespace Lab { |