diff options
| author | Filippos Karapetis | 2009-05-13 16:52:41 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-05-13 16:52:41 +0000 |
| commit | e940bcff23f0b5bf340b00a44368944489145535 (patch) | |
| tree | ba53d6fc95fb49c130117a38eeeed5c9502d32a8 /engines/sci/gfx | |
| parent | 9cdb4c36a7b474b36cab35215ed66e390becedd3 (diff) | |
| download | scummvm-rg350-e940bcff23f0b5bf340b00a44368944489145535.tar.gz scummvm-rg350-e940bcff23f0b5bf340b00a44368944489145535.tar.bz2 scummvm-rg350-e940bcff23f0b5bf340b00a44368944489145535.zip | |
- Simplified SCI version detection a bit and clarified the different version feature flags (not used yet)
- Removed the version verification functions (they were only used for two specific cases, but the SCI executable reader is able to detect the exact SCI game version anyway, so there is no point in having these)
- Removed the empty GameFlags structure and replaced it with a 32-bit integer instead
svn-id: r40524
Diffstat (limited to 'engines/sci/gfx')
| -rw-r--r-- | engines/sci/gfx/gfx_gui.cpp | 1 | ||||
| -rw-r--r-- | engines/sci/gfx/gfx_res_options.cpp | 1 | ||||
| -rw-r--r-- | engines/sci/gfx/gfx_res_options.h | 1 | ||||
| -rw-r--r-- | engines/sci/gfx/gfx_resmgr.cpp | 1 | ||||
| -rw-r--r-- | engines/sci/gfx/gfx_widgets.cpp | 1 | ||||
| -rw-r--r-- | engines/sci/gfx/menubar.cpp | 1 | ||||
| -rw-r--r-- | engines/sci/gfx/operations.cpp | 2 |
7 files changed, 7 insertions, 1 deletions
diff --git a/engines/sci/gfx/gfx_gui.cpp b/engines/sci/gfx/gfx_gui.cpp index 70ff0faf7d..392b5510f5 100644 --- a/engines/sci/gfx/gfx_gui.cpp +++ b/engines/sci/gfx/gfx_gui.cpp @@ -23,6 +23,7 @@ * */ +#include "sci/sci.h" #include "sci/engine/state.h" #include "sci/gfx/operations.h" #include "sci/gfx/gfx_widgets.h" diff --git a/engines/sci/gfx/gfx_res_options.cpp b/engines/sci/gfx/gfx_res_options.cpp index 187aafbbe8..a96949bf43 100644 --- a/engines/sci/gfx/gfx_res_options.cpp +++ b/engines/sci/gfx/gfx_res_options.cpp @@ -23,6 +23,7 @@ * */ +#include "sci/sci.h" #include "sci/gfx/gfx_system.h" #include "sci/gfx/gfx_options.h" #include "sci/gfx/gfx_resmgr.h" diff --git a/engines/sci/gfx/gfx_res_options.h b/engines/sci/gfx/gfx_res_options.h index bae9551663..f01f93d21b 100644 --- a/engines/sci/gfx/gfx_res_options.h +++ b/engines/sci/gfx/gfx_res_options.h @@ -30,6 +30,7 @@ #ifdef CUSTOM_GRAPHICS_OPTIONS +#include "sci/sci.h" #include "sci/gfx/gfx_resource.h" #include "sci/gfx/gfx_resmgr.h" diff --git a/engines/sci/gfx/gfx_resmgr.cpp b/engines/sci/gfx/gfx_resmgr.cpp index 35b71236b9..c1c747eab5 100644 --- a/engines/sci/gfx/gfx_resmgr.cpp +++ b/engines/sci/gfx/gfx_resmgr.cpp @@ -29,6 +29,7 @@ // filenames, are misleading. This should be renamed to "Graphics manager" // or something like that. +#include "sci/sci.h" #include "sci/gfx/gfx_resource.h" #include "sci/gfx/gfx_tools.h" #include "sci/gfx/gfx_driver.h" diff --git a/engines/sci/gfx/gfx_widgets.cpp b/engines/sci/gfx/gfx_widgets.cpp index 9252fa750d..29690e0fe2 100644 --- a/engines/sci/gfx/gfx_widgets.cpp +++ b/engines/sci/gfx/gfx_widgets.cpp @@ -23,6 +23,7 @@ * */ +#include "sci/sci.h" #include "sci/gfx/gfx_gui.h" // for kWindowAutoRestore #include "sci/gfx/gfx_widgets.h" #include "sci/gfx/gfx_state_internal.h" diff --git a/engines/sci/gfx/menubar.cpp b/engines/sci/gfx/menubar.cpp index f463b5c7c4..9d3ed6a4a5 100644 --- a/engines/sci/gfx/menubar.cpp +++ b/engines/sci/gfx/menubar.cpp @@ -28,6 +28,7 @@ ** used for any actual actions on behalf of the interpreter. */ +#include "sci/sci.h" #include "sci/engine/state.h" #include "sci/gfx/menubar.h" #include "sci/engine/kernel.h" diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp index 9646b29c73..ad210b9508 100644 --- a/engines/sci/gfx/operations.cpp +++ b/engines/sci/gfx/operations.cpp @@ -25,9 +25,9 @@ // Graphical operations, called from the widget state manager +#include "sci/sci.h" #include "sci/gfx/operations.h" #include "sci/gfx/font.h" -#include "sci/sci.h" // for g_engine, evil hack #include "sci/console.h" #include "common/system.h" |