359 Commits

Author SHA1 Message Date
Willem Jan Palenstijn
92bd22b1d5 WINTERMUTE: Fix regression in ticketing
This caused a crash when pressing 'New Game' in the Black Circle demo.
Regression from 544e4a2f49630cecbf06fe5b1e11bdbab1bdb281.
2013-10-02 00:41:18 +02:00
Filippos Karapetis
db5ff22410 WINTERMUTE: Handle invalid file access in Carol Reed 6: Black Circle 2013-10-02 00:45:29 +03:00
Willem Jan Palenstijn
a979072410 WINTERMUTE: Clean up byte/char casts in loading/parsing 2013-10-01 23:20:43 +02:00
Willem Jan Palenstijn
e0dd19a21c WINTERMUTE: Fix broken uint32/ulong cast 2013-10-01 23:20:42 +02:00
Willem Jan Palenstijn
2ec84600a9 WINTERMUTE: Fix up doxygen comment 2013-10-01 08:11:27 +02:00
Willem Jan Palenstijn
8e58be7a1d Merge branch 'master' into wme_rendering 2013-09-30 22:05:32 +02:00
Willem Jan Palenstijn
057b01951a WINTERMUTE: Add displayTiled function to replace repeatLastDraw
This avoids queueing many tickets for a UITiledImage, replacing
them by a single tiled ticket.
2013-09-30 22:03:48 +02:00
Einar Johan Trøan Sømåen
48ad18d266 Merge branch 'refac'
Conflicts:
	engines/wintermute/graphics/transparent_surface.cpp
	engines/wintermute/graphics/transparent_surface.h
2013-09-30 11:23:57 +02:00
Willem Jan Palenstijn
af8fa194be WINTERMUTE: Remove almost unused _colorMod field
The one actual use of this left-over variable was a bug breaking at
least menu text color in Chivalry when dirty rects were disabled.
2013-09-30 09:38:32 +02:00
Willem Jan Palenstijn
1c3202794a WINTERMUTE: Fix typo in comment 2013-09-29 22:49:07 +02:00
Willem Jan Palenstijn
2242917dda WINTERMUTE: Do antialiased TT font rendering 2013-09-29 22:27:56 +02:00
Willem Jan Palenstijn
265f7e463e WINTERMUTE: Cleanup 2013-09-26 10:49:25 +02:00
Willem Jan Palenstijn
efdf2d3ab7 WINTERMUTE: Remove ticket->_drawNum 2013-09-26 02:17:31 +02:00
Willem Jan Palenstijn
4386889dd5 WINTERMUTE: Remove left-over asserts 2013-09-26 02:17:31 +02:00
Willem Jan Palenstijn
4aa4c427da WINTERMUTE: Remove unnecessary loop 2013-09-26 02:17:28 +02:00
Willem Jan Palenstijn
544e4a2f49 WINTERMUTE: No longer update ticket->_drawNum 2013-09-26 02:17:26 +02:00
Willem Jan Palenstijn
6d1ca9d94e WINTERMUTE: No longer use ticket->_drawNum 2013-09-26 02:17:26 +02:00
Willem Jan Palenstijn
b27ac796d8 WINTERMUTE: Remove unnecessary re-iteration 2013-09-26 02:17:26 +02:00
Willem Jan Palenstijn
dbbf95ca50 WINTERMUTE: Mirror _drawNum with an iterator 2013-09-26 02:17:22 +02:00
Willem Jan Palenstijn
c6220a9cd1 WINTERMUTE: Remove _tempDisableDirtyRects 2013-09-26 02:17:05 +02:00
Willem Jan Palenstijn
aa24cb5e8d WINTERMUTE: Remove ticket batching 2013-09-26 02:17:05 +02:00
Tobia Tesan
d6c21f8c1e WINTERMUTE: Pass blendMode to blit() in RenderTicket. 2013-09-23 19:06:57 +02:00
Tobia Tesan
2e457d96e8 WINTERMUTE: Make some members of UIObject private 2013-09-21 23:22:16 +02:00
Tobia Tesan
b033850e8a WINTERMUTE: Keep attributes in UIWindow private 2013-09-21 23:22:12 +02:00
Tobia Tesan
efc4284b42 WINTERMUTE: Keep _alphaMode private in TransparentSurface 2013-09-21 23:22:06 +02:00
Tobia Tesan
2c4d5ae622 WINTERMUTE: Cast rotate in base_sub_frame 2013-09-18 18:19:19 +02:00
Tobia Tesan
64a3294ec5 WINTERMUTE: Cast zoom inside display(Trans?)Zoom 2013-09-18 18:19:19 +02:00
Eugene Sandulenko
bc1a21f210 Merge pull request #387 from tobiatesan/trim_arguments
WINTERMUTE: Remove useless Rect extra argument from fadeToColor.
2013-09-12 10:54:37 -07:00
Einar Johan Trøan Sømåen
1c091ca1ff WINTERMUTE: Swap dpi and font-height to be the right-way around. 2013-09-08 23:25:23 +02:00
Willem Jan Palenstijn
023914d121 WINTERMUTE: Disambiguate empty and NULL strings when saving
The string stored is now strlen(s)+1, with length 0 indicating NULL.

Increment savegame version for this new format.

Old savegames are fixed by assuming VAL_STRING should never be NULL.
2013-09-05 22:12:49 +02:00
Willem Jan Palenstijn
dd9ab7accb WINTERMUTE: Don't clean up _scripts mid-iteration
Scripts executing from ScEngine::tick() can call
ScEngine::unbreakableTick() via scCallMethod("SaveGame") and
applyEvent("BeforeSave").

This recursive execution could cause finished scripts being removed
from _scripts while ScEngine::tick() is still iterating over that array.
2013-09-05 20:23:42 +02:00
Tobia Tesan
4fec6dd361 WINTERMUTE: Remove useless Rect extra argument from fadeToColor.
It is not used anywhere, and Mnemonic has confirmed that the original
engine does NOT support anything but full screen fades.
2013-08-29 02:01:16 +02:00
Willem Jan Palenstijn
e432d0a83f WINTERMUTE: Remove duplicate code 2013-08-27 00:32:24 +02:00
Willem Jan Palenstijn
e88ce8d963 WINTERMUTE: Simplify string matching 2013-08-27 00:00:37 +02:00
Willem Jan Palenstijn
e5f9cb3cbb WINTERMUTE: Fix and clean up BaseSurfaceOSystem::finishLoad()
This fixes a couple of cases which fell through the cracks of the
previous chain of conditions, including 16bpp images and 32bpp images
without alpha. The latter partially fixes bug #3600667.
2013-08-26 23:25:27 +02:00
Willem Jan Palenstijn
2597c884d3 WINTERMUTE: Fix warning 2013-08-24 12:13:37 +02:00
Einar Johan Trøan Sømåen
ea19c4162d WINTERMUTE: Add binary alpha-blitting.
For now, no RLE, or anything, but the infrastructure for it
is put in place here.
2013-08-20 18:00:17 +02:00
Einar Johan Trøan Sømåen
e824ebaa44 WINTERMUTE: Change pixel-format to RGBA. 2013-08-20 16:52:29 +02:00
Einar Johan Trøan Sømåen
913f03a2ba WINTERMUTE: Avoid doing alpha-blits when image doesn't have alpha.
Also detect images with only binary alpha.
2013-08-20 15:25:01 +02:00
Willem Jan Palenstijn
91c2f8fb09 WINTERMUTE: Don't use a lookup table for alpha
This gives a drawTickets() speed increase of about 10% in the JULIA demo
(on a core i7 920).
2013-08-19 23:14:20 +02:00
Tobia Tesan
21314e2389 WINTERMUTE: Fix computation of _renderRect.
This reverts the changes in 4cf1d671.
Fixes the "notebook bug" - i.e. the notebook being only partially
drawn - in Dirty Split.
2013-08-16 00:42:58 +02:00
Willem Jan Palenstijn
0aa669cc47 WINTERMUTE: Fix (still disabled) modTargetRect logic
Width and height were computed incorrectly.
Also, the shift by _renderRect is not necessary since that was to compensate
for the coordinate translation done by the original SDL_RenderSetViewport,
which we don't perform.
2013-08-16 00:40:28 +02:00
Einar Johan Trøan Sømåen
9ea315747e WINTERMUTE: Be explicit when storing Floats in savegames. 2013-08-13 19:09:08 +02:00
Einar Johan Trøan Sømåen
693c8ca5cc WINTERMUTE: Add atleast some comments to the renderTicket-system. 2013-08-13 18:46:03 +02:00
Einar Johan Trøan Sømåen
7306979f6d WINTERMUTE: Fix uninitialized scalar field (CID1060922) 2013-08-09 18:28:06 +02:00
Johannes Schickel
7f8308e0eb Merge pull request #365 from lordhoto/protected-pixels
Make Graphics::Surface::pixels protected.
2013-08-07 12:24:59 -07:00
Johannes Schickel
1ce54c217a WINTERMUTE: Fix end of namespace comments. 2013-08-04 00:51:09 +02:00
Johannes Schickel
0ee407c44b WINTERMUTE: Take advantage of Surface::getPixels. 2013-08-03 04:02:53 +02:00
Johannes Schickel
19fa89b8f5 WINTERMUTE: Prefer getBasePtr over direct Surface::pixels access. 2013-08-03 04:02:48 +02:00
Einar Johan Trøan Sømåen
9fb15a909c Merge pull request #354 from tobiatesan/wintermute_rotozoom_3
WINTERMUTE: Wintermute rotozoom 3
2013-08-01 02:08:21 -07:00