Commit Graph

47 Commits

Author SHA1 Message Date
athrxx
e4e5e68f0d KYRA: implement SJIS features required for EOB II FM-Towns
- low res font drawing for intro and outro texts
- fat print mode for ingame texts
2018-11-14 17:22:20 +01:00
Adrian Frühwirth
3747d852ee JANITORIAL: Fix whitespace 2018-04-15 16:31:31 +02:00
Johannes Schickel
53332e8066 GRAPHICS: Make GPL headers consistent in themselves. 2014-02-18 02:39:34 +01:00
D G Turner
ac4087856f ALL: Remove optimization unstable code on checking for null after new.
These issues were identified by the STACK tool.

By default, the C++ new operator will throw an exception on allocation
failure, rather than returning a null pointer.

The result is that testing the returned pointer for null is redundant
and _may_ be removed by the compiler. This is thus optimization
unstable and may result in incorrect behaviour at runtime.

However, we do not use exceptions as they are not supported by all
compilers and may be disabled.

To make this stable without removing the null check, you could qualify
the new operator call with std::nothrow to indicate that this should
return a null, rather than throwing an exception.

However, using (std::nothrow) was not desirable due to the Symbian
toolchain lacking a <new> header.
A global solution to this was also not easy by redefining "new" as "new
(std::nothrow)" due to custom constructors in NDS toolchain and various
common classes.

Also, this would then need explicit checks for OOM adding to all new
usages as per C malloc which is untidy.

For now to remove this optimisation unstable code is best as it is
likely to not be present anyway, and OOM will cause a system library
exception instead, even without exceptions enabled in the application
code.
2014-01-15 02:36:19 +00:00
Johannes Schickel
b1db5fabee GRAPHICS: Formatting. 2011-08-23 15:25:12 +02:00
Johannes Schickel
243779a7eb GRAPHICS: Display warning in case the SJIS.FNT version does not match. 2011-08-23 15:15:29 +02:00
Christoph Mallon
23a0f5318c JANITORIAL: Remove trailing empty lines. 2011-08-07 13:53:33 +02:00
athrxx
c06c05a769 GRAPHICS: remove char/line spacing handling from sjis code
(as discussed with LordHoto this should rather be handled in the engine)
2011-07-10 00:45:00 +02:00
athrxx
e3dbae886d SCUMM: Make use of graphics/sjis code for LOOM PCE sjis drawing
Also move font rom loader to graphics/sjis and make the necessary changes there.
2011-07-09 20:07:58 +02:00
Johannes Schickel
16ba176b4f GRAPHICS: Fix SJIS PCE font loading. 2011-07-01 06:13:11 +02:00
Johannes Schickel
685e32dbd7 GRAPHICS: Offer support for PCE font data of SJIS.FNT. 2011-07-01 05:42:54 +02:00
Johannes Schickel
c047f871d6 GRAPHICS: Cleanup SJIS font code a bit. 2011-07-01 05:42:54 +02:00
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
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +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
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
Johannes Schickel
3fd919060c GRPAHICS: Do not access Surface::bytesPerPixel anymore. 2011-04-17 20:58:08 +02:00
Max Horn
0ce2ca4e00 COMMON: Replace MKID_BE by MKTAG
MKID_BE relied on unspecified behavior of the C++ compiler,
and as such was always a bit unsafe. The new MKTAG macro
is slightly less elegant, but does no longer depend on the
behavior of the compiler.
Inspired by FFmpeg, which has an almost identical macro.
2011-04-12 16:53:15 +02:00
Willem Jan Palenstijn
6a28d05676 BUILD: Include scummsys.h to force rebuild after reconfigure (thanks LordHoto)
svn-id: r55156
2011-01-08 03:27:13 +00:00
Max Horn
a0df86955f ALL: Push down deps on stream.h from .h to .cpp files
svn-id: r54358
2010-11-19 01:37:04 +00:00
Florian Kagerer
e4da5e3af4 GRAPHICS/SJIS: cleanup
svn-id: r54099
2010-11-05 20:36:13 +00:00
Florian Kagerer
4457d10f84 GRAPHICS/SJIS: fix out of bounds shadow mode text drawing
svn-id: r54080
2010-11-05 01:11:05 +00:00
Florian Kagerer
206971d16b SCUMM/FM-TOWNS JAPANESE: fix out of bounds text drawing
(could cause invalid memory access in MI1)

svn-id: r54079
2010-11-05 00:36:23 +00:00
Florian Kagerer
1d87f434a2 SCUMM/FM-TOWNS JAPANESE: implement flipped text
(used in the MI1 circus scene after Guybrush gets shot out of the cannon)

svn-id: r53616
2010-10-19 16:58:27 +00:00
Florian Kagerer
c841c3fb7c SCUMM/FM-TOWNS: more improvements to japanese font drawing
- made use of LordHotos graphics/sjis code to reduce code duplication
- japanese mode for version 3 and 5 works fine now with few exceptions (some line spacing glitches in MI1 intro etc.)

svn-id: r53554
2010-10-17 13:08:00 +00:00
Johannes Schickel
aed02365ec Strip trailing spaces/tabs.
svn-id: r47541
2010-01-25 01:39:44 +00:00
Johannes Schickel
746f391b8a Cleanup.
svn-id: r45993
2009-11-19 22:22:08 +00:00
Johannes Schickel
67c6e92efb Add support for 8x16 chars in the FM-Towns font ROM code.
svn-id: r44910
2009-10-11 12:00:56 +00:00
Max Horn
f242266f6d Change a couple places from 'end of namespace' to 'End of namespace', for consistency
svn-id: r44634
2009-10-04 21:26:33 +00:00
Johannes Schickel
03a26923c9 Implemented support for drawing 8x16 chars from our custom SJIS font.
svn-id: r44486
2009-09-30 14:53:07 +00:00
Johannes Schickel
1b94303b78 Update SJIS code to read SJIS.FNT version 2 data (no support for drawing ASCII and half-width katakana glyphs yet).
svn-id: r44483
2009-09-30 13:07:12 +00:00
Johannes Schickel
2597814af3 Add another range check in our SJIS font code to avoid out of bounds access.
svn-id: r43532
2009-08-19 08:37:20 +00:00
Johannes Schickel
d1fed5cee1 Instead of only printing a warning, when no SJIS char data is present, just return to the caller.
svn-id: r42823
2009-07-26 14:40:03 +00:00
Johannes Schickel
4b27c43b0a Reflect code to test the magic bytes in the sjis.fnt header.
svn-id: r42821
2009-07-26 14:19:02 +00:00
Johannes Schickel
ec67b583b0 Add way to overwrite default SJIS font.
svn-id: r42819
2009-07-26 14:18:34 +00:00
Johannes Schickel
15662b3cfb Print warning, when client code does try to draw an unsupported SJIS char.
svn-id: r42817
2009-07-26 14:18:06 +00:00
Johannes Schickel
ebc74a7c9b Add a factory method, which tries to open different SJIS fonts/ROMs and returns a font for the first present data.
svn-id: r42816
2009-07-26 14:17:54 +00:00
Johannes Schickel
cb960ad976 Change the way the font data for SJIS fonts is load.
svn-id: r42815
2009-07-26 14:17:40 +00:00
Johannes Schickel
0a612f40eb Add support for our custom SJIS font.
svn-id: r42813
2009-07-26 14:17:06 +00:00
Johannes Schickel
712e0c80ea Create base class FontSJIS16x16 for our own SJIS font.
svn-id: r42812
2009-07-26 14:16:51 +00:00
Filippos Karapetis
a0a675e42d Reverted commit #42257, as the original issue was with the compilation process of MSVC and the ENABLE_* checks work correctly
svn-id: r42289
2009-07-09 15:15:49 +00:00
Filippos Karapetis
570d157ff3 The ENABLE_* flags are only checked for *.cpp files in MSVC, so move the ENABLE_* checks to sjis.cpp to fix compilation under MSVC
svn-id: r42257
2009-07-08 07:13:56 +00:00
Johannes Schickel
832540f64f Simply compile guard of SJIS code and fix comment.
svn-id: r42234
2009-07-07 19:18:32 +00:00
Johannes Schickel
2a117d9a90 Add guards to only include SJIS font code, when KYRA or SCI is enabled.
svn-id: r42233
2009-07-07 19:00:51 +00:00
Johannes Schickel
8c65d4d4a9 - Rename FontSJIS::enableShadow to enableOutline.
- Initialize outline to false by default in FontTowns.

svn-id: r42231
2009-07-07 18:17:30 +00:00
Johannes Schickel
62eebc3e17 - Added support for outlined FM-Towns ROM drawing
- Adapted KYRA to use that

svn-id: r42230
2009-07-07 18:10:35 +00:00
Johannes Schickel
8623081666 Add generic functionallity to draw FM-Towns ROM. (To be used by KYRA and SCI)
svn-id: r42221
2009-07-07 14:22:23 +00:00