Commit Graph

217 Commits

Author SHA1 Message Date
Max Horn
88913c0139 ALL: Remove trailing whitespaces
This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
  git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
2011-06-20 00:59:48 +02:00
Johannes Schickel
80b336f796 SDL: Replace some SdlGraphicsManager uses with SurfaceSdlGraphicsManager. 2011-06-19 20:20:13 +02:00
Johannes Schickel
1c21232416 SDL: Rename SdlGraphicsManager to SurfaceSdlGraphicsManager to reflect its purpose.
Hopefully I catched all uses of the old name in our ports...
2011-06-19 20:10:21 +02:00
Johannes Schickel
f9f16ee358 OPENGLSDL: Add FIXME about desktop resolution retrieving. 2011-06-19 19:12:34 +02:00
Johannes Schickel
e0eb86826e OPENGL: Clarify OSD rect color in a comment. 2011-06-19 19:03:10 +02:00
Johannes Schickel
34f8b489d2 SDL: Formatting fixes. 2011-06-19 18:49:02 +02:00
Johannes Schickel
f28e134247 OPENGL: Formatting fixes. 2011-06-19 18:48:30 +02:00
Johannes Schickel
735604c2fd OPENGLSDL: Use String::format instead of sprintf. 2011-06-19 18:31:34 +02:00
Johannes Schickel
d316099f35 OPENGLSDL: Formatting fixes. 2011-06-19 18:27:18 +02:00
CeRiAl
781132aabc WINCE: Some cleanup (public vs. private scopes), fix freelook 2011-06-11 23:29:52 +02:00
David-John Willis
4fcd65d885 OPENPANDORA: Start to cleanup the backend and move controls into remapkey.
* Work in progress.
2011-06-11 17:07:21 +01:00
David-John Willis
7878c1ec49 GP2X: Remove remnants of the old GP2X backend.
The GP2X is now folded into the GPH backend (as the GP2X device).
2011-06-11 17:07:08 +01:00
David-John Willis
64b8587507 GPH: Cleanup and some WIP refactoring. 2011-06-11 17:07:08 +01:00
Thierry Crozat
014145f240 I18N: Make some OSD messages translatable 2011-06-06 23:20:11 +01:00
Thierry Crozat
a605c7fd69 OSYSTEM: displayMessageOnOSD() now accepts non-ASCII strings
It should now accept strings encoded using the current
TranslationManaged charset (e.g. translated text).
2011-06-06 23:20:10 +01:00
Thierry Crozat
592cca5402 GRAPHICS: Get rid of kSODFont (ScummFont)
OSD is now using the kGUIFont instead. The main advantage is that
the kGUIFont can be used for translated text while only ASCII
characters were present in ScummFont.
2011-06-06 23:20:08 +01:00
Max Horn
ce32745d9c BACKENDS: Replace OSystem::disableCursorPalette by setFeatureState calls 2011-06-04 11:55:56 +02:00
Max Horn
91b889e2d3 COMMON: Rename kFeatureCursorHasPalette -> kFeatureCursorPalette 2011-06-04 11:55:56 +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
127a6f920a BUILD: Add SDL_BACKEND=1 to config.mk for all SDL based backends 2011-05-31 00:25:40 +02:00
Willem Jan Palenstijn
725db142bc SAMSUNGTV: Fix build on non-SDL platforms 2011-05-24 20:58:36 +02:00
Pawel Kolodziejski
48b4c6c923 SAMSUNGTV: Update port
This combines the following Samsung TV port updates from master:

944e0be209
dc1d07774f

It also includes the parts touching this backend of:

69b1485a22
2fa63ca015
2011-05-24 20:34:45 +02:00
Pawel Kolodziejski
944e0be209 SAMSUNGTV: update port 2011-05-23 18:11:40 +02:00
CeRiAl
e46f7dc1c0 WINCE: Fix mouse coordinate scaling when ARM scaler support is active 2011-05-18 06:04:24 +08:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Max Horn
d683a228a3 MOTO: Change fprintf calls to debug calls 2011-05-03 23:04:58 +02:00
Max Horn
5efb1e5596 DINGUX: Change fprintf calls to debug calls 2011-05-03 23:04:40 +02:00
Max Horn
73396954c9 GPH: Change fprintf to debug 2011-05-03 14:34:59 +02:00
Max Horn
59e77ed667 ALL: Mark printf and various other symbols as forbidden
Right now, a few places in the frontend code still use printf and
consorts. We mark the affected files with a FIXME for now, and
add a dedicated exception for each. To be fixed!

Also tweak FORBIDDEN_SYMBOL_REPLACEMENT to hopefully really always
enforce a compiler error
2011-05-02 16:31:31 +02:00
Johannes Schickel
71bdb86e02 Merge pull request #16 "Add a PixelFormat to Graphics::Surface.".
For further discussion check here:
https://github.com/scummvm/scummvm/pull/16

Conflicts:
	graphics/png.cpp
2011-05-01 16:54:45 +02:00
Ori Avtalion
46cb9c785b JANITORIAL: Yet another attempt at fixing compilation 2011-04-29 00:45:18 +03:00
Ori Avtalion
4d485fc741 BACKENDS: Fix compilation for various backends
Affects:
* PS2
* GPH
* ELF
* MOTO
* IPHONE
* N64
* DINGUX
* WINCE
* PSP
2011-04-28 23:24:06 +03:00
Ori Avtalion
9414d7a6e2 JANITORIAL: Reduce header dependencies in shared code
Some backends may break as I only compiled SDL
2011-04-28 15:08:58 +03:00
Thierry Crozat
6e94f26208 OPENPANDORA: Remove unneeded translations.h include. 2011-04-22 20:01:53 +01:00
Johannes Schickel
da734a4af0 ALL/GRAPHICS: Remove Surface::bytesPerPixel. 2011-04-17 21:27:34 +02:00
Johannes Schickel
0b14f6aa17 SDL: Properly setup internal Surface formats. 2011-04-17 20:56:16 +02:00
Johannes Schickel
911b7b311f OPENGL: Do not access Surface::bytesPerPixel anymore. 2011-04-17 20:56:16 +02:00
Johannes Schickel
7ac3ae108a BACKEND: Prefer Surface::create taking a PixelFormat over the one taking a byte depth. 2011-04-17 16:24:37 +02:00
David-John Willis
6f1c7cf30a GPH: Change backend to mask backend code to GPH_DEVICE.
* This is mainly to make it easy to drop the old GP2X into the
  same codebase (I really have no desire to manage 2 sets of 99.9%
  identical code ;)).
* Code paths for just one of the supported devices can be runtime
  worked out or just defined for that device.

mount.sh: Fixed some small errors#	../../../../scummvm.gph
2011-04-11 18:22:58 +01:00
David-John Willis
bb6bc31813 GP2X: Mask off the graphics and events code behind a GP2X_OLD define.
* This is a temp thing while I finish up merging the GP2X and GPH code.
  I do not want the GP2X backend code dropped yet until this is complete.
2011-04-11 18:15:14 +01:00
dhewg
d83a83ef50 JANITORIAL: Remove/comment unused vars
Found by GCC 4.6's -Wunused-but-set-variable
2011-03-29 21:57:56 +02:00
David-John Willis
b95013dfe2 OPENPANDORA: Refactor OpenPandora backend and move events and graphics into modular backend style. 2011-03-24 21:24:05 +00:00
David-John Willis
cf8dcf4549 GPH: Cleanup GPH backend and adapt to newer modular backend model. 2011-03-24 21:24:05 +00:00
Johannes Schickel
c064fa5c5b OPENGL: Fix mouse cursor position in Normal mode when AR is enabled. 2011-03-21 00:43:16 +01:00
Johannes Schickel
33cf1f8f59 OPENGL: Get rid of unused switchDisplayMode. 2011-03-20 17:30:23 +01:00
Johannes Schickel
6502e191b9 OPENGL: Handle aspect ratio correction as flag instead of having a special mode for it.
This partly fixes the OpenGL mode mess, but now OpenGL Normal and OpenGL
Conserve will feature the same semantics when aspect ratio correction is
enabled... That is still something to solve.
2011-03-20 17:29:08 +01:00
Johannes Schickel
8ab136dafb OPENGL: Fix screenshots when the display width is not divisible by 4. 2011-03-17 21:20:20 +01:00
Johannes Schickel
83c638ad02 OPENGL: Setup the correct header size for BMP screenshots.
This fixes an color bug in the resulting screenshots.
2011-03-17 21:20:20 +01:00
Johannes Schickel
8d35d91bdf OPENGL: Cleanup switchDisplayMode. 2011-03-17 21:20:20 +01:00
Johannes Schickel
f490e6f361 OPENGLSDL: More refactoring to avoid direct access of OpenGlGraphicsManager's members. 2011-03-17 21:20:20 +01:00