Commit Graph

46305 Commits

Author SHA1 Message Date
D G Turner
4b6c1a0c2b DRACI: Replace snprintf() usage with Common::String::format()
Safer and less portability issues.
2011-06-02 03:27:44 +01:00
D G Turner
9607aae5be TOUCHE: Replace snprintf() usage with Common::String::format()
Safer and less portability issues.
2011-06-02 03:17:34 +01:00
D G Turner
37886ba7bb CRUISE: Replace snprintf() usage with Common::String::format()
Safer and less portability issues.
2011-06-02 03:03:21 +01:00
D G Turner
889f5d119a DRASCULA: Replace snprintf() usage with Common::String::format()
Safer and less portability issues.
2011-06-02 02:53:48 +01:00
D G Turner
8356656575 GOB: Replace snprintf() usage with Common::String::format()
Safer and less portability issues.
2011-06-02 02:20:51 +01:00
Johannes Schickel
092142d880 BUILD: Enable Lands of Lore by default. 2011-06-02 03:03:50 +02:00
Arnaud Boutonne
c720f463e4 TSAGE: Add workaround in order to fix crash in scene 5100 when Quinn forgets the Stasis Box
Also present in the original!
2011-06-02 00:53:19 +02:00
Max Horn
333be9c072 GUI: Replace some s(n)printf uses by Common::String::format 2011-06-02 00:07:18 +02:00
Max Horn
8f36c52e58 DEVTOOLS: Do not use -Wglobal-constructors on create_project.o 2011-06-01 23:57:21 +02:00
Max Horn
70d5da3bc4 DEVTOOLS: Link create_kyradat against libcommon.a, for scumm_stricmp 2011-06-01 23:57:21 +02:00
sylvaintv
3429a14c11 TOON: Fix crash
Bug : "Crashes"
Added clipping to magnifier effect
2011-06-01 23:49:19 +02:00
Julien
9717d5be6f CREATE_PROJECT: Add stubs for Xcode provider 2011-06-01 17:34:32 -04:00
Max Horn
9db33ea544 ALL: Removed last traces of the MPEG2 code 2011-06-01 23:17:43 +02:00
Julien
5eae0e1a5c CREATE_PROJECT: Fix type conversion warning 2011-06-01 16:36:47 -04:00
Julien
4c64cfc213 CREATE_PROJECT: Add Xcode project 2011-06-01 16:35:15 -04:00
Julien
6f5c18c661 GIT: Ignore XCode user data 2011-06-01 16:28:21 -04:00
Johannes Schickel
d2a8e8023e COMMON: Implement two simple workaround wrappers for _vsnprintf and _snprintf for MSVC.
This should assure vsnprintf and snprintf will now also always null
terminate the result even for MSVC.

Currently the functions are placed in scummsys.h, but that causes us
to include two standard C library headers there (for MSVC at least).
This is not particulary nice, so we should think of a better solution
here.
2011-06-01 22:18:28 +02:00
Strangerke
c0d70b6dbb TSAGE: Fix a valgrind warning in SceneObject initialization 2011-06-01 19:04:38 +02:00
Strangerke
a2cad5a3d0 TSAGE: Little modification in order to match the executable in scene 6100 2011-06-01 19:01:48 +02:00
Max Horn
4bfd23783a DC: Clarify comment 2011-06-01 18:17:35 +02:00
Max Horn
b0a460e849 DC: Use 'noserial' for release builds 2011-06-01 18:17:01 +02:00
Johannes Schickel
007a33515f COMMON: Add note about us defining vsnprintf as _vsnprintf for older MSVC versions. 2011-06-01 17:31:33 +02:00
Johannes Schickel
2f8e9b954e COMMON: Add comment about MSVC's _snprintf.
This includes a FIXME, since _snprintf behaves differently to snprintf.
Not only in the return value (which is a minor difference, since we usually
do not use it), but also since it does not always include a terminating null.
2011-06-01 17:28:59 +02:00
Max Horn
29ed72115e ANDROID: Revert stable-only changes from commit cf41ac0f which I accidentally merged 2011-06-01 16:45:18 +02:00
Max Horn
48dac6ab7f DETECTOR: Clarify warning a bit 2011-06-01 16:44:35 +02:00
Max Horn
136ffb5e0a DETECTOR: Get rid of unused kADFlagDontAugmentPreferredTarget
It doesn't seem very useful to keep this around for future uses,
either, at least I couldn't think of a convincing argument.
If we really need something like this one day again, it is trivial
enough to add it back.
2011-06-01 16:44:35 +02:00
clone2727
49a8f7675f Merge pull request from scott-t/t7g-ios
T7G iOS support
2011-06-01 07:04:05 -07:00
Scott Thomas
dfb6822886 GROOVIE: Detect iOS platform based on binary existence
Change to choice of music file encoding means the gu16.m4a may not exist
2011-06-01 23:20:12 +09:30
Max Horn
90f2cde9fa PS2: Do not add RELEASE_BUILD
First merge screw up: I meant to comment these lines out (as they area
now -- in fact, these lines did not exist pre-merge at all, I moved the
-DRELEASE_BUILD additions manually to their own lines, so I could
comment them out, and then promptly forgot. *sigh*)

On the pro side, it was very easy to spot and correct this mistake!
2011-06-01 15:48:44 +02:00
Max Horn
a4610df482 Merge branch 'branch-1-3-0' into master
I manually resolved all conflicts, and inspected every single change.
Many were due to the version string mismatch and thus easily resolved.
The MSVC project files add in the 1-3-0 branch were not merged,
neither where the changes to gui/themes/translations.dat.

Conflicts:
	NEWS
	backends/base-backend.cpp
	backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp
	backends/module.mk
	backends/platform/ds/arm9/makefile
	backends/platform/psp/README.PSP
	backends/platform/samsungtv/main.cpp
	backends/platform/samsungtv/samsungtv.cpp
	backends/saves/posix/posix-saves.cpp
	base/commandLine.cpp
	base/internal_version.h
	base/main.cpp
	common/array.h
	configure
	devtools/create_project/create_project.cpp
	dists/android/AndroidManifest.xml
	dists/android/plugin-manifest.xml
	dists/iphone/Info.plist
	dists/irix/scummvm.spec
	dists/macosx/Info.plist
	dists/redhat/scummvm-tools.spec
	dists/redhat/scummvm.spec
	dists/scummvm.rc
	dists/slackware/scummvm.SlackBuild
	dists/wii/meta.xml
	engines/sci/parser/vocabulary.cpp
	engines/tinsel/handle.cpp
	gui/themes/translations.dat
2011-06-01 15:15:31 +02:00
Max Horn
a4d105c902 COMMON: Move SDL endian check a bit down 2011-06-01 10:43:02 +02:00
Matthew Hoops
5bb4ef13c5 GROOVIE: Rename MusicPlayerMPEG4 to MusicPlayerIOS
More fitting now that other music formats can be used now
2011-05-31 14:25:20 -04:00
Matthew Hoops
aa49b38c5a Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
	engines/groovie/script.cpp
2011-05-31 14:16:29 -04:00
Matthew Hoops
d3ea9ab2a9 GROOVIE: Use openStreamFile() to open iOS audio files
Now MP3, FLAC, Vorbis, and QuickTime/MPEG-4 audio files can be used interchangeably.
2011-05-31 14:06:46 -04:00
Matthew Hoops
bf8cfcb6b7 AUDIO: Plug MPEG-4/QuickTime audio into openStreamFile 2011-05-31 13:58:05 -04:00
Max Horn
c86a6c466f COMMON: Include SDL_endian.h instead of SDL_byteorder.h 2011-05-31 18:08:25 +02:00
Walter van Niftrik
05ac17f7b9 SCI: Fix up start/end points when pathfinding with opt == 0.
Fixes bug : "SCI: Freddy Pharkas - Stuck in the brothel door".
2011-05-31 16:26:38 +02:00
Fabio Battaglia
42fa23ff16 CONFIGURE: move some libs required by n64 port
Some system libs weren't found during link stage, this should fix it
2011-05-31 15:16:25 +02:00
Max Horn
811b257014 COMMON: Simplify OverlayColor definition
This typedef still should be moved somewhere else. Maybe a header file
of its own?
2011-05-31 14:22:19 +02:00
Max Horn
e06ca6560f COMMON: Move scumm_str(n)icmp declaration to str.h 2011-05-31 14:19:25 +02:00
Max Horn
1c198cec1b COMMON: Move some weird WinCE/MSVC snprintf-#define around 2011-05-31 14:06:47 +02:00
Max Horn
8654e846e4 COMMON: Shorten endianess / mem align guessing logic in scummsys.h 2011-05-31 14:05:37 +02:00
Max Horn
2d6be5d077 COMMON: Move more stuff from scummsys.h to portdefs.h 2011-05-31 13:56:28 +02:00
Max Horn
9c3e2e43bd COMMON: Move some code from scummsys.h to relevant portdefs.h files 2011-05-31 13:48:03 +02:00
D G Turner
bea6858953 AUDIO: Fix GCC Compilation Warning in FM-Towns Softsynth. 2011-05-31 12:06:14 +01:00
Max Horn
c30904b48a BUILD: Fix typo which broke WebOS builds 2011-05-31 12:22:26 +02:00
D G Turner
5a2e6e4f3f BUILD: Fix compilation when --enable-plugins is enabled. 2011-05-31 04:44:12 +01:00
D G Turner
1edcbe0b00 BUILD: Fix Linking.
These defines are adding to, not replacing the MODULES list.
2011-05-31 01:18:31 +01:00
Max Horn
9c3a8cd3b5 BUILD: Compile more files only when necessary 2011-05-31 00:35:27 +02:00
Max Horn
127a6f920a BUILD: Add SDL_BACKEND=1 to config.mk for all SDL based backends 2011-05-31 00:25:40 +02:00