SCI: Renamed include/gfx_*.h to gfx/gfx_*.h and likewise for sfx header files

svn-id: r38735
This commit is contained in:
Max Horn 2009-02-21 19:33:01 +00:00
parent dbfe031ef2
commit eb37789f6f
66 changed files with 114 additions and 125 deletions

View File

@ -38,7 +38,7 @@
#include "sci/engine/gc.h"
#include "sci/include/sciresource.h"
#include "sci/include/engine.h"
#include "sci/include/gfx_operations.h"
#include "sci/gfx/gfx_operations.h"
#include "sci/engine/kernel_types.h"
namespace Sci {

View File

@ -27,7 +27,7 @@
#include "sci/include/sciresource.h"
#include "sci/include/engine.h"
#include "sci/include/gfx_widgets.h"
#include "sci/gfx/gfx_widgets.h"
#include "sci/engine/sci_graphics.h"
#include "sci/include/sci_widgets.h"

View File

@ -24,7 +24,7 @@
*/
#include "sci/include/engine.h"
#include "sci/include/sfx_player.h"
#include "sci/sfx/sfx_player.h"
namespace Sci {

View File

@ -32,8 +32,8 @@
#include <stdarg.h>
#include <time.h> // FIXME: For struct tm
#include "sci/include/sci_memory.h"
#include "sci/include/gfx_operations.h"
#include "sci/include/sfx_engine.h"
#include "sci/gfx/gfx_operations.h"
#include "sci/sfx/sfx_engine.h"
#include "sci/include/engine.h"
#include "sci/engine/heap.h"
#include "common/stream.h"

View File

@ -32,8 +32,8 @@
#include <stdarg.h>
#include <time.h> // FIXME: For struct tm
#include "sci/include/sci_memory.h"
#include "sci/include/gfx_operations.h"
#include "sci/include/sfx_engine.h"
#include "sci/gfx/gfx_operations.h"
#include "sci/sfx/sfx_engine.h"
#include "sci/include/engine.h"
#include "sci/engine/heap.h"
#include "common/stream.h"

View File

@ -32,7 +32,7 @@
#include "sci/engine/kernel_types.h"
#include "sci/engine/seg_manager.h"
#include "sci/engine/gc.h"
#include "sci/include/sfx_player.h"
#include "sci/sfx/sfx_player.h"
#ifdef HAVE_SETJMP_H
#include <setjmp.h>

View File

@ -25,8 +25,8 @@
/** Antialiasing code **/
#include "sci/include/gfx_system.h"
#include "sci/include/gfx_tools.h"
#include "sci/gfx/gfx_system.h"
#include "sci/gfx/gfx_tools.h"
namespace Sci {

View File

@ -1,6 +1,6 @@
/* Auto-generated by bdftofont.c */
#include "sci/include/gfx_system.h"
#include "sci/gfx/gfx_system.h"
namespace Sci {

View File

@ -1,6 +1,6 @@
/* Auto-generated by bdftofont.c */
#include "sci/include/gfx_system.h"
#include "sci/gfx/gfx_system.h"
namespace Sci {

View File

@ -24,9 +24,9 @@
*/
#include "sci/include/gfx_system.h"
#include "sci/include/gfx_resource.h"
#include "sci/include/gfx_tools.h"
#include "sci/gfx/gfx_system.h"
#include "sci/gfx/gfx_resource.h"
#include "sci/gfx/gfx_tools.h"
namespace Sci {

View File

@ -27,8 +27,8 @@
#include "common/system.h"
#include "common/events.h"
#include "sci/include/gfx_driver.h"
#include "sci/include/gfx_tools.h"
#include "sci/gfx/gfx_driver.h"
#include "sci/gfx/gfx_tools.h"
namespace Sci {

View File

@ -26,7 +26,7 @@
#ifndef _SCI_GFX_DRIVER_H_
#define _SCI_GFX_DRIVER_H_
#include "sci/include/gfx_system.h"
#include "sci/gfx/gfx_system.h"
#include "sci/include/uinput.h"
namespace Sci {

View File

@ -28,10 +28,10 @@
#ifndef _GFX_OPERATIONS_H_
#define _GFX_OPERATIONS_H_
#include "sci/include/gfx_resmgr.h"
#include "sci/include/gfx_tools.h"
#include "sci/include/gfx_options.h"
#include "sci/include/gfx_system.h"
#include "sci/gfx/gfx_resmgr.h"
#include "sci/gfx/gfx_tools.h"
#include "sci/gfx/gfx_options.h"
#include "sci/gfx/gfx_system.h"
#include "sci/include/uinput.h"
namespace Sci {

View File

@ -27,9 +27,9 @@
#ifndef _GFX_OPTIONS_H_
#define _GFX_OPTIONS_H_
#include "sci/include/gfx_resource.h"
#include "sci/include/gfx_tools.h"
#include "sci/include/gfx_res_options.h"
#include "sci/gfx/gfx_resource.h"
#include "sci/gfx/gfx_tools.h"
#include "sci/gfx/gfx_res_options.h"
namespace Sci {

View File

@ -23,9 +23,9 @@
*
*/
#include "sci/include/gfx_system.h"
#include "sci/include/gfx_options.h"
#include "sci/include/gfx_resmgr.h"
#include "sci/gfx/gfx_system.h"
#include "sci/gfx/gfx_options.h"
#include "sci/gfx/gfx_resmgr.h"
#include <ctype.h>

View File

@ -28,8 +28,8 @@
#ifndef _GFX_RES_OPTIONS_H_
#define _GFX_RES_OPTIONS_H_
#include "sci/include/gfx_resource.h"
#include "sci/include/gfx_resmgr.h"
#include "sci/gfx/gfx_resource.h"
#include "sci/gfx/gfx_resmgr.h"
namespace Sci {

View File

@ -30,8 +30,8 @@
// filenames, are misleading. This should be renamed to "Graphics manager"
// or something like that.
#include "sci/include/gfx_resource.h"
#include "sci/include/sbtree.h"
#include "sci/gfx/gfx_resource.h"
#include "sci/gfx/sbtree.h"
namespace Sci {

View File

@ -23,9 +23,9 @@
*
*/
#include "sci/include/gfx_system.h"
#include "sci/include/gfx_resource.h"
#include "sci/include/gfx_tools.h"
#include "sci/gfx/gfx_system.h"
#include "sci/gfx/gfx_resource.h"
#include "sci/gfx/gfx_tools.h"
namespace Sci {

View File

@ -28,8 +28,8 @@
#ifndef _GFX_RESOURCE_H_
#define _GFX_RESOURCE_H_
#include "sci/include/gfx_system.h"
#include "sci/include/gfx_driver.h"
#include "sci/gfx/gfx_system.h"
#include "sci/gfx/gfx_driver.h"
namespace Sci {

View File

@ -26,11 +26,11 @@
#ifndef _GFX_STATE_INTERNAL_H_
#define _GFX_STATE_INTERNAL_H_
#include "sci/include/gfx_tools.h"
#include "sci/include/gfx_options.h"
#include "sci/include/gfx_operations.h"
#include "sci/include/gfx_resmgr.h"
#include "sci/include/gfx_system.h"
#include "sci/gfx/gfx_tools.h"
#include "sci/gfx/gfx_options.h"
#include "sci/gfx/gfx_operations.h"
#include "sci/gfx/gfx_resmgr.h"
#include "sci/gfx/gfx_system.h"
namespace Sci {

View File

@ -27,8 +27,8 @@
** for use with the graphical state manager
*/
#include "sci/include/gfx_system.h"
#include "sci/include/gfx_tools.h"
#include "sci/gfx/gfx_system.h"
#include "sci/gfx/gfx_tools.h"
#define DRAWLINE_FUNC _gfx_draw_line_buffer_1
#define PIXELWIDTH 1

View File

@ -24,7 +24,7 @@
*/
#include "sci/include/sci_memory.h"
#include "sci/include/gfx_tools.h"
#include "sci/gfx/gfx_tools.h"
namespace Sci {

View File

@ -29,8 +29,8 @@
#ifndef _GFX_TOOLS_H_
#define _GFX_TOOLS_H_
#include "sci/include/gfx_system.h"
#include "sci/include/gfx_driver.h"
#include "sci/gfx/gfx_system.h"
#include "sci/gfx/gfx_driver.h"
namespace Sci {

View File

@ -28,7 +28,7 @@
#ifndef _GFX_WIDGETS_H_
#define _GFX_WIDGETS_H_
#include "sci/include/gfx_state_internal.h"
#include "sci/gfx/gfx_state_internal.h"
namespace Sci {

View File

@ -26,7 +26,7 @@
// Graphical operations, called from the widget state manager
#include "sci/include/sci_memory.h"
#include "sci/include/gfx_operations.h"
#include "sci/gfx/gfx_operations.h"
#include <ctype.h>

View File

@ -29,11 +29,11 @@
// filenames, are misleading. This should be renamed to "Graphics manager"
// or something like that.
#include "sci/include/gfx_resource.h"
#include "sci/include/gfx_tools.h"
#include "sci/include/gfx_driver.h"
#include "sci/include/gfx_resmgr.h"
#include "sci/include/gfx_state_internal.h"
#include "sci/gfx/gfx_resource.h"
#include "sci/gfx/gfx_tools.h"
#include "sci/gfx/gfx_driver.h"
#include "sci/gfx/gfx_resmgr.h"
#include "sci/gfx/gfx_state_internal.h"
#include "common/system.h"

View File

@ -23,9 +23,9 @@
*
*/
#include "sci/include/gfx_system.h"
#include "sci/include/gfx_resource.h"
#include "sci/include/gfx_tools.h"
#include "sci/gfx/gfx_system.h"
#include "sci/gfx/gfx_resource.h"
#include "sci/gfx/gfx_tools.h"
namespace Sci {

View File

@ -24,9 +24,9 @@
*/
#include "sci/include/sci_memory.h"
#include "sci/include/gfx_system.h"
#include "sci/include/gfx_resource.h"
#include "sci/include/gfx_tools.h"
#include "sci/gfx/gfx_system.h"
#include "sci/gfx/gfx_resource.h"
#include "sci/gfx/gfx_tools.h"
namespace Sci {

View File

@ -26,8 +26,8 @@
/* SCI1 palette resource defrobnicator */
#include "sci/include/sci_memory.h"
#include "sci/include/gfx_system.h"
#include "sci/include/gfx_resource.h"
#include "sci/gfx/gfx_system.h"
#include "sci/gfx/gfx_resource.h"
namespace Sci {

View File

@ -25,8 +25,8 @@
#include <time.h> // for time() to seed rand() via srand()
#include "sci/include/sci_memory.h"
#include "sci/include/gfx_resource.h"
#include "sci/include/gfx_tools.h"
#include "sci/gfx/gfx_resource.h"
#include "sci/gfx/gfx_tools.h"
namespace Sci {

View File

@ -23,7 +23,7 @@
*
*/
#include "sci/include/gfx_resource.h"
#include "sci/gfx/gfx_resource.h"
namespace Sci {

View File

@ -27,9 +27,9 @@
#include "sci/include/sci_memory.h"
#include "sci/include/sciresource.h"
#include "sci/include/gfx_widgets.h"
#include "sci/include/gfx_resmgr.h"
#include "sci/include/gfx_options.h"
#include "sci/gfx/gfx_widgets.h"
#include "sci/gfx/gfx_resmgr.h"
#include "sci/gfx/gfx_options.h"
#include "common/util.h"

View File

@ -24,9 +24,9 @@
*/
#include "sci/include/sci_memory.h"
#include "sci/include/gfx_system.h"
#include "sci/include/gfx_resource.h"
#include "sci/include/gfx_tools.h"
#include "sci/gfx/gfx_system.h"
#include "sci/gfx/gfx_resource.h"
#include "sci/gfx/gfx_tools.h"
namespace Sci {

View File

@ -26,9 +26,9 @@
// SCI 1 view resource defrobnicator
#include "sci/include/sci_memory.h"
#include "sci/include/gfx_system.h"
#include "sci/include/gfx_resource.h"
#include "sci/include/gfx_tools.h"
#include "sci/gfx/gfx_system.h"
#include "sci/gfx/gfx_resource.h"
#include "sci/gfx/gfx_tools.h"
namespace Sci {

View File

@ -27,9 +27,7 @@
#include "sci/include/sci_memory.h"
#include "sci/include/sbtree.h"
#include <stdlib.h>
#include <stdio.h>
#include "sci/gfx/sbtree.h"
namespace Sci {

View File

@ -23,8 +23,8 @@
*
*/
#include "sci/include/gfx_operations.h"
#include "sci/include/gfx_widgets.h"
#include "sci/gfx/gfx_operations.h"
#include "sci/gfx/gfx_widgets.h"
#include "sci/include/engine.h"
#include "sci/include/menubar.h"
#include "sci/include/sci_widgets.h"

View File

@ -24,7 +24,7 @@
*/
#include "sci/include/sci_memory.h"
#include "sci/include/gfx_widgets.h"
#include "sci/gfx/gfx_widgets.h"
namespace Sci {

View File

@ -42,8 +42,8 @@ namespace Common {
#include "sci/include/menubar.h"
#include "sci/include/versions.h"
#include "sci/include/kernel.h"
#include "sci/include/gfx_state_internal.h"
#include "sci/include/sfx_engine.h"
#include "sci/gfx/gfx_state_internal.h"
#include "sci/sfx/sfx_engine.h"
namespace Sci {

View File

@ -28,8 +28,8 @@
#ifndef _SCI_MENUBAR_H_
#define _SCI_MENUBAR_H_
#include "sci/include/gfx_operations.h"
#include "sci/include/gfx_widgets.h"
#include "sci/gfx/gfx_operations.h"
#include "sci/gfx/gfx_widgets.h"
namespace Sci {

View File

@ -39,7 +39,7 @@
#include "sci/include/vm_types.h"
#define SCI_CONSOLE
#include "sci/include/gfx_operations.h"
#include "sci/gfx/gfx_operations.h"
namespace Sci {

View File

@ -38,15 +38,6 @@ namespace Sci {
#undef SCI_REQUIRE_RESOURCE_FILES
//#define SCI_VERBOSE_RESMGR 1
// FIXME: Get rid of G_DIR_SEPARATOR / G_DIR_SEPARATOR_S
#if _MSC_VER
# define G_DIR_SEPARATOR_S "\\"
# define G_DIR_SEPARATOR '\\'
#else
# define G_DIR_SEPARATOR_S "/"
# define G_DIR_SEPARATOR '/'
#endif
const char* sci_version_types[] = {
"SCI version undetermined (Autodetect failed / not run)",
"SCI version 0.xxx",

View File

@ -26,9 +26,9 @@
/* Sound subsystem core: Event handler, sound player dispatching */
#include <stdio.h>
#include "sci/include/sfx_timer.h"
#include "sci/include/sfx_iterator_internal.h"
#include "sci/include/sfx_player.h"
#include "sci/sfx/sfx_timer.h"
#include "sci/sfx/sfx_iterator_internal.h"
#include "sci/sfx/sfx_player.h"
#include "sci/sfx/mixer.h"
#include "sci/include/sci_midi.h"
#include "common/mutex.h"

View File

@ -27,8 +27,8 @@
#include <stdio.h>
#include "common/util.h"
#include "sci/include/sfx_iterator_internal.h"
#include "sci/include/sfx_player.h"
#include "sci/sfx/sfx_iterator_internal.h"
#include "sci/sfx/sfx_player.h"
#include "sci/tools.h"
#include "sci/include/sci_memory.h"

View File

@ -26,7 +26,7 @@
#ifndef SCI_SFX_MIXER_H
#define SCI_SFX_MIXER_H
#include "sci/include/sfx_pcm.h"
#include "sci/sfx/sfx_pcm.h"
namespace Sci {

View File

@ -23,7 +23,7 @@
*
*/
#include "sci/include/sfx_iterator.h"
#include "sci/sfx/sfx_iterator.h"
#include "sci/tools.h" /* for BREAKPOINT */
#include "sci/include/sci_memory.h"

View File

@ -23,8 +23,8 @@
*
*/
#include "sci/include/sfx_time.h"
#include "sci/include/sfx_pcm.h"
#include "sci/sfx/sfx_time.h"
#include "sci/sfx/sfx_pcm.h"
#include "engines/engine.h"
#include "sound/audiostream.h"
#include "sound/mixer.h"

View File

@ -23,7 +23,7 @@
*
*/
#include "sci/include/sfx_player.h"
#include "sci/sfx/sfx_player.h"
namespace Sci {

View File

@ -27,7 +27,7 @@
#include "common/util.h"
#include "common/file.h"
#include "sci/include/sfx_player.h"
#include "sci/sfx/sfx_player.h"
#include "sci/sfx/softseq.h"
#include "sci/sfx/mixer.h"

View File

@ -27,7 +27,7 @@
** prays for some reasonable amount of soft real-time, but it's close
** enough, I guess. */
#include "sci/include/sfx_player.h"
#include "sci/sfx/sfx_player.h"
#include "sci/sfx/sequencer.h"
namespace Sci {

View File

@ -30,7 +30,7 @@
#include "common/scummsys.h"
#include "sci/tools.h" // For GTimeVal
#include "sci/include/sfx_core.h"
#include "sci/sfx/sfx_core.h"
#include "sci/sfx/device.h"
#include "sci/include/scitypes.h"

View File

@ -27,9 +27,9 @@
#ifndef _SFX_ENGINE_H_
#define _SFX_ENGINE_H_
#include "sci/include/sfx_core.h"
#include "sci/include/sfx_songlib.h"
#include "sci/include/sfx_iterator.h"
#include "sci/sfx/sfx_core.h"
#include "sci/sfx/sfx_songlib.h"
#include "sci/sfx/sfx_iterator.h"
#include "sci/include/sciresource.h"
namespace Sci {

View File

@ -28,7 +28,7 @@
#ifndef _SCI_SFX_ITERATOR_H_
#define _SCI_SFX_ITERATOR_H_
#include "sci/include/sfx_pcm.h"
#include "sci/sfx/sfx_pcm.h"
namespace Sci {

View File

@ -26,7 +26,7 @@
#ifndef _SFX_ITERATOR_INTERNAL_
#define _SFX_ITERATOR_INTERNAL_
#include "sci/include/sfx_iterator.h"
#include "sci/sfx/sfx_iterator.h"
#include "sci/include/sci_midi.h"
namespace Sci {

View File

@ -26,9 +26,9 @@
#ifndef _SFX_PCM_H_
#define _SFX_PCM_H_
#include "sci/include/sfx_core.h"
#include "sci/include/sfx_timer.h"
#include "sci/include/sfx_time.h"
#include "sci/sfx/sfx_core.h"
#include "sci/sfx/sfx_timer.h"
#include "sci/sfx/sfx_time.h"
#include "sci/include/scitypes.h"
namespace Sci {

View File

@ -28,8 +28,8 @@
#ifndef _SFX_PLAYER_H
#define _SFX_PLAYER_H
#include "sci/include/sfx_engine.h"
#include "sci/include/sfx_iterator.h"
#include "sci/sfx/sfx_engine.h"
#include "sci/sfx/sfx_iterator.h"
#include "sci/include/sciresource.h"
namespace Sci {

View File

@ -32,7 +32,7 @@
#include "sci/tools.h" // For GTimeVal
#include "sci/include/scitypes.h"
#include "sci/include/sfx_iterator.h"
#include "sci/sfx/sfx_iterator.h"
namespace Sci {

View File

@ -26,7 +26,7 @@
#ifndef _FREESCI_SFX_TIMER_H_
#define _FREESCI_SFX_TIMER_H_
#include "sci/include/sfx_core.h"
#include "sci/sfx/sfx_core.h"
namespace Sci {

View File

@ -26,8 +26,8 @@
#ifndef SCI_SFX_SOFTSEQ_H
#define SCI_SFX_SOFTSEQ_H
#include "sci/include/sfx_core.h"
#include "sci/include/sfx_pcm.h"
#include "sci/sfx/sfx_core.h"
#include "sci/sfx/sfx_pcm.h"
#include "sci/sfx/sequencer.h"
#include "sci/tools.h"

View File

@ -43,7 +43,7 @@
***************************************************************************/
#include "sci/tools.h"
#include "sci/include/sfx_iterator.h"
#include "sci/sfx/sfx_iterator.h"
#include "../softseq.h"
#include "../adlib.h"
#include <math.h>

View File

@ -24,7 +24,7 @@
*/
#include <stdio.h>
#include "sci/include/sfx_engine.h"
#include "sci/sfx/sfx_engine.h"
#include "sci/include/sci_memory.h"
namespace Sci {

View File

@ -23,7 +23,7 @@
*
*/
#include "sci/include/sfx_time.h"
#include "sci/sfx/sfx_time.h"
#include "sci/tools.h"
namespace Sci {

View File

@ -25,7 +25,7 @@
#include "common/timer.h"
#include "engines/engine.h"
#include "sci/include/sfx_timer.h"
#include "sci/sfx/sfx_timer.h"
namespace Sci {