Commit Graph

55857 Commits

Author SHA1 Message Date
Strangerke
ae80dc481b HOPKINS: More refactoring of playSequence in order to handle shouldQuit() 2013-02-03 23:07:51 +01:00
Strangerke
db60dcb432 HOPKINS: Replace a global variable by a parameter in playSequence() 2013-02-03 22:51:34 +01:00
Strangerke
cec23051b3 HOPKINS: Fix the Esc key behavior in playSequence, remove several GOTOs 2013-02-03 22:28:38 +01:00
Torbjörn Andersson
49afc87b88 HOPKINS: Attempt to fix crash when skipping movie
Before starting an "Swav" sound, check that its sound handle isn't
already used. If it is, stop it. When skipping a movie, it still
(incorrectly?) goes through the motions of playing the remaining
frames, including starting any movie sounds on the way.

This would cause us to lose the handle to the sound that was
currently playing in the "Swav" slot, and I *think* that's what
ended up confusing things. I'm still not entirely sure exactly
what was happening.
2013-02-03 18:33:20 +01:00
Filippos Karapetis
6286779d0a SWORD25: Fix some spacing in LUA 2013-02-03 18:18:43 +02:00
Filippos Karapetis
afdb28b4e9 SWORD25: Replace calls to LUAI_THROW() with error() in LUA
This removes one of the uses of setjmp(), but its use in LUAI_TRY still
remains
2013-02-03 18:17:02 +02:00
Strangerke
bce7139c8c HOPKINS: Refactor selection of action animations 2013-02-03 15:42:49 +01:00
Strangerke
5846c71469 HOPKINS: Remove debug hack left in previous commit, some tiny refactoring 2013-02-03 14:30:03 +01:00
Strangerke
5be9c19ac7 HOPKINS: flatten a leftover serie of IFs 2013-02-03 14:20:39 +01:00
Strangerke
6a477576b9 HOPKINS: Some more refactoring in BTOCEAN code 2013-02-03 14:14:08 +01:00
Strangerke
c4657c71ab HOPKINS: Get rid of 3 more labels 2013-02-03 13:50:29 +01:00
Strangerke
397c0cc238 HOPKINS: Start refactoring BTOCEAN. Get rid of two labels and their associated GOTOs 2013-02-03 13:38:51 +01:00
Strangerke
0f69da1a4f HOPKINS: Skip several useless reads in playAnim2, some more refactoring 2013-02-03 11:22:20 +01:00
Strangerke
29ce3e23f1 HOPKINS: More refactoring in playAnim2. Get rid of the remaining GOTOs 2013-02-03 11:08:37 +01:00
Strangerke
c56efbb203 HOPKINS: More refactoring in playAnim2: Get rid of another label and associated GOTO 2013-02-03 10:27:53 +01:00
Strangerke
3653f2b214 HOPKINS: Remove dead code in playAnim2, get rid of one more GOTO 2013-02-03 10:19:42 +01:00
Strangerke
f90da4dd7e HOPKINS: Get rid of another couple of GOTOs in playAnim2 2013-02-03 10:04:03 +01:00
Strangerke
aa4f39e666 HOPKINS: Remove two GOTOs in playAnim() 2013-02-03 07:59:48 +01:00
Strangerke
6797698af8 HOPKINS: Some more refactoring 2013-02-03 01:25:37 +01:00
Thierry Crozat
ad0fccc0bb I18N: Update translation files from source code 2013-02-03 00:11:40 +00:00
Johannes Schickel
7dc15bc070 GUI: Center Launcher.Version in all themes.
Now that we actually use the textalign field of Launcher.Version the version
would be left aligned by default. This looks odd for the classic theme and
the low resolution version of the modern theme and is contrary to the old
"default" value, so I decided to center the string explicitly again.
2013-02-03 00:46:51 +01:00
Johannes Schickel
1115c2b323 GUI: Fix text alignment for the version in the launcher.
Formerly in LauncherDialog::reflowLayout an incorrect way to query the acutal
text alignment was used for the static text widget used for the ScummVM
version.
2013-02-03 00:43:32 +01:00
Torbjörn Andersson
b889bb69ef HOPKINS: Fix Valgrind warnings in INILINK()
We can't read all the way to the end of the buffer, because the
READ_BE_UINT24() function will, naturally, read a few bytes ahead.
2013-02-02 23:09:29 +01:00
Johannes Schickel
8ae324f50c Merge pull request #308 from hasufell/master
fix build under et_EE locale
2013-02-02 12:31:28 -08:00
Torbjörn Andersson
8f300bdc30 HOPKINS: Fix GCC warnings 2013-02-02 20:26:42 +01:00
Strangerke
690405961f HOPKINS: Some refactoring in GraphicsManager 2013-02-02 19:20:58 +01:00
Torbjörn Andersson
ea4639c65f HOPKINS: Fix Sprite_Vesa() height clipping
This fixes some Valgrind warnings on the city overhead map, and also
seem to get rid of the bird "droppings" previously left behind in the
area beneath the picture. There are things I don't understand about
this function, but I hope I didn't break anything.
2013-02-02 12:41:44 +01:00
Strangerke
9772426c58 HOPKINS: Fix signness issue, get rid of another GOTO 2013-02-02 12:26:21 +01:00
Strangerke
4b0e226340 HOPKINS: Get rid of a goto in the display code. Remove useless casts (with comments about that). Some renaming. 2013-02-02 12:15:41 +01:00
Matthew Hoops
31252e1095 MACOSX: Fix compilation with the 10.2.8 SDK
This is a pretty bad hack of not using the kMusicDeviceProperty_SoundBankFSRef symbol and using its value instead. It felt wrong breaking 10.2.8 support just because of Soundfonts.
2013-02-01 16:48:38 -05:00
Matthew Hoops
412ac740aa MACOSX: Load soundfonts using FSRef instead of FSSpec on 10.5
Fixes bug #3602452
2013-02-01 14:15:10 -05:00
hasufell
b65365e0d3 CONFIGURE: Fix build under et_EE locale
Freetype-config reports a broken include dir
when et_EE locale is used. We set LC_ALL
and LANGUAGE to "C" explicitly like autoconf
does to force consistent behavior.
2013-02-01 19:31:15 +01:00
Strangerke
f10d3c8dcc HOPKINS: Remove 2 more labels in EventsManager 2013-02-01 07:55:49 +01:00
Strangerke
7480957ab0 HOPKINS: Get rid of a couple of LABELS in EventsManager, some renaming 2013-02-01 07:36:13 +01:00
Einar Johan Trøan Sømåen
cef07f30d8 WINTERMUTE: Avoid applying color-keys to ALL images with bpp >= 3. 2013-02-01 02:06:07 +01:00
Einar Johan Trøan Sømåen
d12a0e1423 WINTERMUTE: Apply color-key if no alpha-channel is present
(Instead of using the bpp to detect it).
2013-02-01 01:55:16 +01:00
Einar Johan Trøan Sømåen
0db8a0b3b1 GRAPHICS: Let JPEGs pixelformat state 0 alpha bits. 2013-02-01 01:54:39 +01:00
Einar Johan Trøan Sømåen
6b614f8ff5 WINTERMUTE: Avoid using ldepxf/frexpf 2013-02-01 00:48:47 +01:00
Einar Johan Trøan Sømåen
fcc33c22d8 WINTERMUTE: Force the screen to black after loading/saving. 2013-02-01 00:48:30 +01:00
Strangerke
3cb6af38df HOPKINS: Some refactoring in DialogsManager 2013-02-01 00:33:01 +01:00
Einar Johan Trøan Sømåen
0407906bfa WINTERMUTE: Redo the way floats are saved, break savegame compatibility with WME Lite completely.
(This also breaks compatibility with savegames from ScummVM prior to this commit, AND resets the
Savegame-version, older savegames will have differing MAGIC-numbers in their headers, and will thus
not be recognized).
2013-01-31 23:59:21 +01:00
Strangerke
334968c5ff HOPKINS: More refactoring in AnimationManager and ComputerManager 2013-01-31 23:52:01 +01:00
Strangerke
7d743c9e77 HOPKINS: More refactoring in searchAnim 2013-01-31 08:24:34 +01:00
Strangerke
ab6826e24d HOPKINS: Start refactoring searchAnim 2013-01-31 08:18:01 +01:00
Strangerke
9dd09f6c6e HOPKINS: Remove some more casts to unsigned int 2013-01-31 07:48:44 +01:00
Johannes Schickel
0c5bcc3be8 CONFIGURE: Use -O3 for OpenPandora when optimizations are requested.
Formerly -O3 was only used for release builds.
2013-01-31 01:26:00 +01:00
Strangerke
15de07ff74 HOPKINS: Introduce MKTAG24. Make use of MKTAG16 and MKTAG24 2013-01-30 08:31:32 +01:00
Matthew Hoops
9a40cdc40d PEGASUS: Fix lid sequences missing a frame 2013-01-29 22:25:24 -05:00
Matthew Hoops
b50cac637e PEGASUS: Reset _lastMillis when changing rate in the timer 2013-01-29 21:41:01 -05:00
Strangerke
e68e3c91eb HOPKINS: USe MKTAG where possible 2013-01-30 00:17:08 +01:00