[Scummvm-cvs-logs] CVS: scummvm debug.cpp,1.27,1.28 gameDetector.cpp,1.22,1.23 gui.cpp,1.35,1.36 readme.txt,1.29,1.30 saveload.cpp,1.38,1.39 scumm.h,1.125,1.126 sound.cpp,1.47,1.48

Fri Apr 19 04:13:17 CEST 2002

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv12043

Modified Files:
	debug.cpp gameDetector.cpp gui.cpp readme.txt saveload.cpp 
	scumm.h sound.cpp 
Log Message:
Use relative include paths to easy some ports.

Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/debug.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** debug.cpp	12 Apr 2002 21:26:34 -0000	1.27
--- debug.cpp	19 Apr 2002 11:12:27 -0000	1.28
***************
*** 44,48 ****
  	CMD_DUMPBOX,
  	CMD_VAR,
! 	CMD_WATCH,
  	CMD_EXIT
  };
--- 44,48 ----
  	CMD_DUMPBOX,
  	CMD_VAR,
! 	CMD_WATCH,	
  	CMD_EXIT
  };
***************
*** 153,156 ****
--- 153,157 ----
  		}
  		return true;
+ 
  	case CMD_WATCH:
  		if (!_parameters[0]) {

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** gameDetector.cpp	19 Apr 2002 06:23:49 -0000	1.22
--- gameDetector.cpp	19 Apr 2002 11:12:27 -0000	1.23
***************
*** 24,30 ****
  #include "stdafx.h"
  #include "scumm.h"
! #include "mididrv.h"
  #include "gameDetector.h"
! #include "imuse.h"

--- 24,31 ----
  #include "stdafx.h"
  #include "scumm.h"
! #include "sound/mididrv.h"
! #include "sound/imuse.h"
  #include "gameDetector.h"
! 

Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** gui.cpp	18 Apr 2002 15:02:57 -0000	1.35
--- gui.cpp	19 Apr 2002 11:12:27 -0000	1.36
***************
*** 22,29 ****
  #include "stdafx.h"
  #include "scumm.h"
! #include "mididrv.h"
  #include "gui.h"
  #include "guimaps.h"
- #include "imuse.h"

  #ifdef _WIN32_WCE
--- 22,29 ----
  #include "stdafx.h"
  #include "scumm.h"
! #include "sound/mididrv.h"
! #include "sound/imuse.h"
  #include "gui.h"
  #include "guimaps.h"

  #ifdef _WIN32_WCE

Index: readme.txt
===================================================================
RCS file: /cvsroot/scummvm/scummvm/readme.txt,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** readme.txt	18 Apr 2002 08:24:44 -0000	1.29
--- readme.txt	19 Apr 2002 11:12:27 -0000	1.30
***************
*** 21,25 ****
  this includes Simon The Sorcerer.

! If you enjoy ScummVM feel free to donates using the PayPal button on the
  ScummVM homepage.

--- 21,25 ----
  this includes Simon The Sorcerer.

! If you enjoy ScummVM feel free to donate using the PayPal button on the
  ScummVM homepage.

***************
*** 93,102 ****
         Sam and Max:
                  - Subgames are not fully functional.
-                 - Game may freeze if you look at the Dragon Heart, or trip
-                   an alarm, at Bumpusville
                  - Some overlap may occur in graphics, expecially the intro
!                 - Music does not work in adlib mode, use midi
!                 - The dark-light torch does not work in the Tunnel of Love.
!                   You'll have to guess where to throw :)

         Loom (256 Talkie):
--- 93,98 ----
         Sam and Max:
                  - Subgames are not fully functional.
                  - Some overlap may occur in graphics, expecially the intro
!                 - Music isn't perfect. Some overlap may occur

         Loom (256 Talkie):
***************
*** 142,148 ****
  	Microsoft Visual C++:
  	* Open the workspace, scummwm.dsw
- 	* If you want to compile the GDI version, remove sdl.cpp from the
- 	  project and add windows.cpp. for the SDL version, remove
- 	  windows.cpp from the project and add sdl.cpp.
  	* Enter the path to the SDL include files in Tools|Options|Directories
  	* Now it should compile successfully.
--- 138,141 ----
***************
*** 151,155 ****
          * Open the 'scummvm.proj' file in BeIDE. Compile as normal.

!       
  Running:
  --------
--- 144,157 ----
          * Open the 'scummvm.proj' file in BeIDE. Compile as normal.

!         PocketPC - Windows CE:
!         * Download the SDLAudio library:
!           http://arisme.free.fr/PocketScumm/sources/SDLAudio-1.2.3-src.zip
!         * Open and compile the SDLAudio WCEBuild/WCEBuild workspace in EVC++
!         * Open the ScummVM wince/PocketScumm workspace
!         * Enter the SDLAudio directory to your includes path
!         * Enter the compiled SDLAudio.lib to your link libraries list
!         * Now it should compile successfully
! 
! 
  Running:
  --------
***************
*** 158,182 ****
  directory. The filenames must be in lowercase on *nix systems
  (monkey2.000 and monkey2.001). If you use a game with speech, the file
! monster.sou must reside in the same directory as scummvm.
! 
! You can either place the scummvm executable in directory in your path,
! or place it one dir up from the games install dir.
! Here is a good example installation directory structure.
! 
! <root>/Games/LucasArts/
! |
! +-- scummvm
! |
! +-- momkey/
! |
! +-- samnmax/

! In this installation, <root> is either C: for Windows user, or /usr/
! for *nix systems. To run Monkey Island from this install as a Windows user
! you would make a shortcut with this command:

    C:\Games\LucasArts\scummvm.exe -f -pC:\Games\LucasArts\monkey\ monkey

! Or, if you have, for example, Full Throttle on CD, and you CD drive is D:,
  and you wish to disable subtitles and run in fullscreen:

--- 160,171 ----
  directory. The filenames must be in lowercase on *nix systems
  (monkey2.000 and monkey2.001). If you use a game with speech, the file
! monster.sou must reside in the same directory as the datafiles.

! For example, to run a copy of Monkey Island installed in C:\Games\LucasArts
! under Windows, you would make a shortcut calling this command:

    C:\Games\LucasArts\scummvm.exe -f -pC:\Games\LucasArts\monkey\ monkey

! Or, if you have, for example, Full Throttle on CD, and your CD drive is D:,
  and you wish to disable subtitles and run in fullscreen:

***************
*** 184,189 ****

  The short game name you see at the end of the command line is very
! important. You can get the current list of games and game names at:
! http://scummvm.sourceforge.net/compatibility.php

  For the adventurous, who like to live on the edge... you can download daily
--- 173,179 ----

  The short game name you see at the end of the command line is very
! important. A short list is contained at the top of this file. You can also
! get the current list of games and game names at:
!         http://scummvm.sourceforge.net/compatibility.php

  For the adventurous, who like to live on the edge... you can download daily
***************
*** 210,214 ****
          -n        - Disable subtitles. Use with games that have voice.
          -r        - Enable Roland conversion. Try if music sounds incorrect.
! 

  In game Hot Keys:
--- 200,204 ----
          -n        - Disable subtitles. Use with games that have voice.
          -r        - Enable Roland conversion. Try if music sounds incorrect.
!         -a        - Enable amiga pal conversion, for playing Amiga versions

  In game Hot Keys:

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saveload.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** saveload.cpp	17 Apr 2002 20:19:45 -0000	1.38
--- saveload.cpp	19 Apr 2002 11:12:27 -0000	1.39
***************
*** 23,28 ****
  #include "stdafx.h"
  #include "scumm.h"
! #include "mididrv.h"
! #include "imuse.h"

  #ifdef _WIN32_WCE
--- 23,28 ----
  #include "stdafx.h"
  #include "scumm.h"
! #include "sound/mididrv.h"
! #include "sound/imuse.h"

  #ifdef _WIN32_WCE

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -d -r1.125 -r1.126
*** scumm.h	19 Apr 2002 08:21:56 -0000	1.125
--- scumm.h	19 Apr 2002 11:12:27 -0000	1.126
***************
*** 22,26 ****
  #include "scummsys.h"
  #include "system.h"
! #include "mixer.h"

  #define SCUMMVM_VERSION "0.2.0 devel"
--- 22,26 ----
  #include "scummsys.h"
  #include "system.h"
! #include "sound/mixer.h"

  #define SCUMMVM_VERSION "0.2.0 devel"

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** sound.cpp	17 Apr 2002 20:22:21 -0000	1.47
--- sound.cpp	19 Apr 2002 11:12:27 -0000	1.48
***************
*** 23,28 ****
  #include "stdafx.h"
  #include "scumm.h"
! #include "mididrv.h"
! #include "imuse.h"

  #ifdef _WIN32_WCE
--- 23,28 ----
  #include "stdafx.h"
  #include "scumm.h"
! #include "sound/mididrv.h"
! #include "sound/imuse.h"

  #ifdef _WIN32_WCE