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
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
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
Strangerke
3b63e28a39
HOPKINS: Refactor searchCharacterAnim()
2013-01-29 23:59:25 +01:00
Strangerke
9ceb6c18cd
HOPKINS: Fix regression introduced in 4ce218ef00
2013-01-29 21:16:46 +01:00
Willem Jan Palenstijn
e37be9f535
SCI: Use correct priority selector in SoundCmd
...
It was using 'pri' instead of 'priority', apparently due to a
selector number->name translation error from 544daa5c31
.
Thanks to waltervn for spotting this.
2013-01-29 20:55:40 +01:00
Strangerke
4fed1f580e
HOPKINS: More renaming in the Global class
2013-01-29 08:35:14 +01:00
Strangerke
fbc19ab3b4
HOPKINS: Various renaming
2013-01-29 08:12:43 +01:00
Strangerke
11a0f00c25
HOPKINS: Add hack to improve the display of text on the computers, for the BeOS and OS/2 versions
2013-01-28 22:36:11 +01:00
Einar Johan Trøan Sømåen
9eff1e514f
WINTERMUTE: Move Resources out of binary and into wintermute.zip
2013-01-28 09:20:14 +01:00
Strangerke
c0ad052c72
HOPKINS: Add a fallback for the sound played in the option menu, for the BeOS and OS/2 versions
2013-01-28 07:45:46 +01:00
Strangerke
623360cf15
HOPKINS: Add fallback alternative for the computer font file, for the BeOS and OS/2 versions
2013-01-28 07:15:06 +01:00
Strangerke
a896975962
HOPKINS: Renaming of another variable in LinesManager
2013-01-27 23:49:20 +01:00
Strangerke
0b78d86335
HOPKINS: set private a couple of members of AnimationManager
2013-01-27 23:48:50 +01:00
Strangerke
e923cdef5b
HOPKINS: Some refactoring in LinesManager
2013-01-27 23:30:40 +01:00
Strangerke
e77198081d
HOPKINS: Move some more LinesManager variables to private, add some functions to access them
2013-01-27 22:53:20 +01:00
Strangerke
0f13ff5cc1
HOPKINS: More private members in LinesManager
2013-01-27 22:28:10 +01:00
Strangerke
b9f9b2c75b
HOPKINS: Move some more members to LinesManager
2013-01-27 20:20:36 +01:00
Torbjörn Andersson
a50c05f7d0
HOPKINS: Work around broken cadavre.mod in OS/2 and BeOS versions
...
A large part of cadavre.mod is broken. No new notes play, and only
the old background sounds remain. It's possible, perhaps even
probable, that the original MOD player didn't have this problem,
but all standalone players I've tried do, so I'm assuming it's the
file that's broken. We work around it by changing the length of
the song after it's been loaded to only include the good parts.
2013-01-27 18:18:04 +01:00
Strangerke
9d1d5a09c4
HOPKINS: Move two more variables to _linesManager, set private some variables
2013-01-27 15:22:57 +01:00
Strangerke
8de1b1b996
HOPKINS: Move some more variables from Globals to LinesManager
2013-01-27 14:58:47 +01:00
Johannes Schickel
1bab59aa06
SCUMM: Update handling of non so resources in Loom Mac.
...
This changes the warning to a debug and also updates the comment a bit.
Thanks to eriktorbjorn for checking Loom Mac in an emulator.
2013-01-27 14:52:07 +01:00
Strangerke
68f5da1375
HOPKINS: Move _maxLineIdx to LinesManager, remove a useless variable
2013-01-27 14:32:05 +01:00
Strangerke
50aa4cbc73
HOPKINS: Move some structures and functions to LinesManager
2013-01-27 12:53:00 +01:00
Strangerke
e1504b28a6
HOPKINS: More renaming in LinesManager
2013-01-27 12:04:24 +01:00
Torbjörn Andersson
2dd0690d26
SCUMM: Work around bug #3602239 ("Mac Loom crashes using opening...")
...
Skip music resources that don't have the "so" (song?) tag. It is
better than asserting, now that it turns out that they do exist.
2013-01-27 09:38:01 +01:00
Strangerke
84f7ce6ea3
HOPKINS: Refactor REPONSE
2013-01-27 01:25:46 +01:00
Johannes Schickel
b4d0a8ba66
JANITORIAL: Enforce "} // End of namespace" with a single space after }.
2013-01-26 19:38:02 +01:00
Einar Johan Trøan Sømåen
980dc4a456
WINTERMUTE: Replace all NULLs with nullptr.
2013-01-26 18:07:07 +01:00
Einar Johan Trøan Sømåen
798b440256
WINTERMUTE: Replace a few NULLs with nullptr.
2013-01-26 17:36:20 +01:00
Einar Johan Trøan Sømåen
8469b866cf
WINTERMUTE: Add override-tags to most of the overriden functions in base/gfx.
2013-01-26 17:29:38 +01:00
Strangerke
e21fed1707
HOPKINS: Simplify calls to PARCOURS2
2013-01-26 16:46:21 +01:00
Strangerke
305c820eef
HOPKINS: Simplify version selection
2013-01-26 15:35:02 +01:00
Strangerke
33431f666c
HOPKINS: Fix bank animation speed for OS2 and BeOS version, add code to replace display_version
2013-01-26 15:30:27 +01:00
Strangerke
4887fd6e6e
HOPKINS: Refactor checkSmoothMove and makeSmoothMove
2013-01-26 14:54:57 +01:00
Johannes Schickel
5673dc1692
QUEEN: Rename override to overrideCmd.
...
This fixes compilation on pre-C++11 compilers.
2013-01-26 14:43:21 +01:00
Johannes Schickel
59dde54519
Merge pull request #301 from lordhoto/c++11-playground
...
RFC: Allow use of override and nullptr. Also allow C++11 compilation.
2013-01-26 05:25:14 -08:00
Einar Johan Trøan Sømåen
3b77a97b40
WINTERMUTE: Don't cast bool to pointer.
2013-01-26 13:44:46 +01:00
Strangerke
9644e865bd
HOPKINS: Fix regression in pathfinding code, some more refactoring
2013-01-26 01:57:06 +01:00
Strangerke
550065b496
HOPKINS: Start refactoring PARC_PERS
2013-01-25 08:24:17 +01:00
Willem Jan Palenstijn
f5e43484a0
SCI: Fix kReadNumber sign/hex behaviour
...
Negative numbers now work, and hex overflow is handled like SSCI.
Thanks to waltervn for testing.
2013-01-25 00:57:50 +01:00
Filippos Karapetis
5691a40380
SCI: Update documentation on bug #3585189 and remove an invalid TODO
...
Thanks wjp for pointing out some extra parameters related to pathfinding in SCI
2013-01-24 23:23:48 +02:00
Willem Jan Palenstijn
498fe75dc5
SCI: Fix shadow warning
2013-01-24 22:12:15 +01:00
Willem Jan Palenstijn
89cd5e7416
SCI: Add GetAngle for SCI1 that matches SSCI
...
Thanks to waltervn for creating a scis test script to verify.
2013-01-24 22:10:20 +01:00
Filippos Karapetis
b0cfe968b0
SCI: Fix bug #3585189 - "SCI: QFG1VGA - game hangs in the tavern"
2013-01-24 22:25:09 +02:00
Strangerke
06b72f3ff0
HOPKINS: More refactoring on PARCOURS2
2013-01-24 20:50:48 +01:00
Einar Johan Trøan Sømåen
454542eba1
WINTERMUTE: Even more formatting fixes.
2013-01-24 20:27:03 +01:00
Einar Johan Trøan Sømåen
c239b868da
WINTERMUTE: More formatting fixes.
2013-01-24 20:17:17 +01:00
Einar Johan Trøan Sømåen
5d4d65d6d9
JANITORIAL: Fix ){ -> ) {
2013-01-24 20:15:13 +01:00
Einar Johan Trøan Sømåen
2507b5db8d
WINTERMUTE: Fix formatting in persistent.h
2013-01-24 18:46:32 +01:00
Einar Johan Trøan Sømåen
487539f102
WINTERMUTE: Remove commented out code.
2013-01-24 18:39:57 +01:00
Einar Johan Trøan Sømåen
1fee32ce45
WINTERMUTE: Return something from repeatLastDisplayOp
2013-01-24 18:24:47 +01:00
Einar Johan Trøan Sømåen
199425562e
WINTERMUTE: Fix a leak in sound-file loading.
2013-01-24 17:49:24 +01:00
Einar Johan Trøan Sømåen
17809d0fb3
WINTERMUTE: Delete the _dirtyRect-field of BaseRenderOSystem in the destructor.
2013-01-24 17:27:50 +01:00
Einar Johan Trøan Sømåen
5453f7f7e6
WINTERMUTE: Delete the renderTickets when deleting BaseRenderOSystem
2013-01-24 17:24:31 +01:00
Einar Johan Trøan Sømåen
9d7bcd4aaa
WINTERMUTE: Initialize debugger-variables in WinterMuteEngine.
2013-01-24 17:18:42 +01:00
Einar Johan Trøan Sømåen
426dda70e1
WINTERMUTE: Don't scale 2Bpp images with code aimed at 4Bpp
2013-01-24 17:14:51 +01:00
Einar Johan Trøan Sømåen
a1a6354687
WINTERMUTE: Don't scroll as fast as the scripts actually ask for.
2013-01-24 16:12:35 +01:00
Einar Johan Trøan Sømåen
e829a57762
WINTERMUTE: Fix scrollspeed (and break character animation the same way WME Lite does)
2013-01-24 15:12:02 +01:00
Einar Johan Trøan Sømåen
2e8e3ae13e
WINTERMUTE: Don't draw tickets instantly.
2013-01-24 15:11:56 +01:00
Einar Johan Trøan Sømåen
519821b53b
WINTERMUTE: Further improve UITiledImage-drawing.
2013-01-24 15:11:28 +01:00
Strangerke
6bd728e9c8
HOPKINS: Start refactoring PARCOURS2
2013-01-24 08:34:35 +01:00
Strangerke
59d46f36a9
HOPKINS: Refactoring in LinesManager. Fix a loop bug in PARCOURS2
2013-01-24 08:04:58 +01:00
Strangerke
e1d85a28b5
HOPKINS: Some more renaming in LinesManager. Fix a bug in last loop condition
2013-01-24 00:24:44 +01:00
Strangerke
380bf2ba1a
HOPKINS: Some renaming and refactoring in ObjectsManager and LinesManager
2013-01-24 00:06:38 +01:00
Torbjörn Andersson
51df9a7f9b
HOPKINS: Change a few spaces to tabs
2013-01-24 00:05:36 +01:00
Torbjörn Andersson
efe910d689
HOPKINS: Fix GCC warnings
2013-01-23 21:44:31 +01:00
Filippos Karapetis
0143a5d938
SCI: Bugfix for commit 0968acc
: only filter out missing messages for the jar
...
This is to properly fix bug #3601090 without removing any functionality.
The additional check ensures that the look and hand icons work with the
jar. Many thanks to lskovlun for debugging this and providing a fix
2013-01-23 21:31:26 +02:00
Einar Johan Trøan Sømåen
5ba950c8a4
WINTERMUTE: Add the possibility of enabling/disabling FPS from Debugger.
2013-01-23 11:32:06 +01:00
Einar Johan Trøan Sømåen
efbe9bdae1
WINTERMUTE: Add in debugger-console, enabled by Ctrl-d
2013-01-23 11:18:44 +01:00
Strangerke
668f2ddad7
HOPKINS: Renaming in globals and ObjectsManager
2013-01-23 08:10:36 +01:00
Filippos Karapetis
0968acccfd
SCI: Fix script bug #3601090 - "SCI: Pepper's Adventures in Time: Game becomes unsolvable"
...
Many thanks to lskovlun for debugging this problem and finding the
offending script code that caused it.
2013-01-23 03:17:10 +02:00
Filippos Karapetis
b1ff5ba247
SCI: Slight cleanup in kMessage()
2013-01-23 03:17:10 +02:00
Strangerke
56ca87b3a5
HOPKINS: Modify misc setVolume functions so they are a bit less precise
2013-01-23 01:42:31 +01:00
Einar Johan Trøan Sømåen
6476ba33d2
WINTERMUTE: Fix double delete of TTFs.
2013-01-23 01:40:13 +01:00
Strangerke
82ecfd537f
HOPKINS: Some renaming and refactoring in globals, TalkManager and FontsManager
2013-01-23 01:38:34 +01:00
Einar Johan Trøan Sømåen
53f0871b07
WINTERMUTE: Store savegame-thumbs in game-specific sizes too.
2013-01-23 01:32:51 +01:00
Einar Johan Trøan Sømåen
57bc6374f4
WINTERMUTE: Use FreeSans from ScummModern.zip if the requested font is unavailable.
...
Right now this is the ONLY replacement in place, but Arial is also the default font for WME, so it should cover most cases.
2013-01-23 00:34:04 +01:00
Einar Johan Trøan Sømåen
2c2fe9e941
WINTERMUTE: Correct a delete/delete[]-mismatch pointed out by valgrind
2013-01-22 23:38:00 +01:00
Filippos Karapetis
338c88e5c2
WINTERMUTE: Fix incorrect reversion of code in BaseRenderOSystem::drawLine()
2013-01-23 00:25:38 +02:00
Filippos Karapetis
03634d0833
WINTERMUTE: Fix invalid reads and crashes in BaseRenderOSystem::drawSurface()
2013-01-23 00:21:32 +02:00
Einar Johan Trøan Sømåen
d52ad7e0eb
WINTERMUTE: Use prefix-operators on iterators.
2013-01-22 23:00:47 +01:00
Einar Johan Trøan Sømåen
ff1e91226d
WINTERMUTE: Allow users to enable the FPS-counter in the GUI, and disable MT32-settings.
2013-01-22 22:05:20 +01:00
Strangerke
0e0337c30e
HOPKINS: Some renaming. Implement proper music volume during speech
2013-01-22 21:24:31 +01:00
Einar Johan Trøan Sømåen
4095b76939
WINTERMUTE: Silence a warning.
2013-01-22 20:58:23 +01:00
Einar Johan Trøan Sømåen
bede97c52c
WINTERMUTE: Store larger thumbnails (Bump Savegame-version to 1.2.0.0)
2013-01-22 20:58:12 +01:00
Einar Johan Trøan Sømåen
c6df5f9994
WINTERMUTE: Mark drawLine as unused with dirty-rects.
2013-01-22 19:53:55 +01:00
Einar Johan Trøan Sømåen
d322592037
WINTERMUTE: Guard ConfMan a bit better.
2013-01-22 19:18:29 +01:00
Strangerke
c056266cdd
HOPKINS: rename one more field, fix glitch in ObjectsManager
2013-01-22 18:59:01 +01:00
Einar Johan Trøan Sømåen
472f722556
WINTERMUTE: Store MasterVolume in % instead of 0-255 to ConfMan.
2013-01-22 16:43:31 +01:00
Einar Johan Trøan Sømåen
4ba603807a
WINTERMUTE: Add a hack to skip a single frame after saving/loading. (Fix Bug: #3592874 )
2013-01-22 16:24:49 +01:00
Einar Johan Trøan Sømåen
6a972052ad
WINTERMUTE: Remove unneccessary include.
2013-01-22 15:52:54 +01:00
Einar Johan Trøan Sømåen
9ec8c509da
WINTERMUTE: Lie to the scripts about the exact master volume-% to avoid round-off-issues.
...
(Fix Bug #3592875 )
2013-01-22 15:42:56 +01:00
Einar Johan Trøan Sømåen
7143eaed89
WINTERMUTE: Properly create WAV-substreams, (fix bug #3592165 )
2013-01-22 15:10:01 +01:00
Strangerke
6a8d6e6eca
HOPKINS: Fix error in loop conditions. Thanks Eriktorbjorn for noticing
2013-01-22 07:59:21 +01:00
Strangerke
1a3fb10d91
HOPKINS: Some renaming
2013-01-22 07:53:59 +01:00
Filippos Karapetis
93763acd32
TOLTECS: Don't change the archive position when loading a resource (bug #3601567 )
2013-01-22 04:23:11 +02:00
Filippos Karapetis
63660cd019
TOLTECS: Whitespace fixes and explanation of some magic values
2013-01-22 04:21:00 +02:00
Filippos Karapetis
cc1bb39956
SCI: Add documentation for underscores in object names and fix a warning
2013-01-22 01:57:34 +02:00
Filippos Karapetis
5d90c6fb3e
SCI: Use underscores as substitute characters for spaces in object names
...
This helps in debugging objects with spaces in their names (e.g. the
"Glass Jar" object in Pepper - bug #3601090 ). Now, this object can be
examined like "vo Glass_Jar"
2013-01-22 01:53:50 +02:00
Filippos Karapetis
dbb50219fb
SCI: Fix uninitialized variable workaround for scene 510 (bug #3575570 )
...
A non-zero value must be used in the uninitialized variable, otherwise
the prize is awarded twice. Fixes bug #3575570 - "SCI: QfG3: Both the
player and Yesufu are declared winners"
2013-01-22 01:01:22 +02:00
Filippos Karapetis
b95695719f
SCI: Fix angle rounding in the SCI1 implementation of kGetAngle (bug #3601479 )
...
Fixes bug #3601479 - "SCI KQ6: Castle walls - stuck in same room".
Many thanks to wjp for his help on the kGetAngle implementation
2013-01-22 00:56:46 +02:00
Strangerke
704a36d1fb
HOPKINS: More renaming in ObjectsManager and globals
2013-01-21 22:25:12 +01:00
Strangerke
2cd0d1f4a1
Hopkins: More renaming
2013-01-21 19:15:37 +01:00
Strangerke
33636f0d63
HOPKINS: More renaming in ObjectsManager
2013-01-21 18:59:17 +01:00
Strangerke
de2fa9a81f
HOPKINS: Rename several structures
2013-01-21 07:50:12 +01:00
Strangerke
daa6c887ef
HOPKINS: Remove useless fields in ObjectsManager, some renaming
2013-01-21 00:06:50 +01:00
Strangerke
7b063288d6
HOPKINS: Fix error in PARADISE (field16 vs field10), rename some fields
2013-01-20 23:36:58 +01:00
Strangerke
f9b4fe09da
HOPKINS: Fix regression introduced in 5678fbd321
: Glitch while speaking. Thanks to eriktorbjorn for noticing and bisecting the problem
2013-01-20 22:46:00 +01:00
Strangerke
2c69135c99
HOPKINS: Get rid of GOTOs in FontManager
2013-01-20 20:49:08 +01:00
Filippos Karapetis
edd6f58457
SCI: Fix bug #3601535 - "SCI: SQ4 CD Limited Audio in ScummVM GUI"
2013-01-20 20:29:11 +02:00
Strangerke
d92f85f0e1
HOPKINS: Some more renaming and refactoring
2013-01-20 19:12:45 +01:00
Strangerke
568e645417
HOPKINS: Refactor playIntro
2013-01-20 17:47:35 +01:00
Strangerke
4c44e797d8
HOPKINS: Fix speech in intro for BeOS and OS/2 versions. Thanks Eriktorbjorn for the help
2013-01-20 13:44:14 +01:00
Strangerke
e5db285cd6
HOPKINS: Add Spanish computer text
2013-01-20 12:43:34 +01:00
Strangerke
db80d0d0df
HOPKINS: Some more renaming
2013-01-20 12:33:59 +01:00
Strangerke
3878138d8f
HOPKINS: Some renaming in GraphicsManager and HopkinsEngine
2013-01-20 11:28:39 +01:00
Strangerke
17d57a367e
HOPKINS: Remove WSOUND_INIT
2013-01-20 01:04:52 +01:00
Strangerke
d88e5ad22f
HOPKINS: Remove a couple of useless functions
2013-01-20 01:01:09 +01:00
Strangerke
523aa82563
HOPKINS: Some renaming
2013-01-20 00:56:19 +01:00
Strangerke
1e2723576a
HOPKINS: Fix regression introduced in 9c58c936c8
2013-01-19 14:12:37 +01:00
Strangerke
ca2f04b70f
HOPKINS: The first speech after a video was skipped if the video was skipped before. This fixes it.
2013-01-18 22:23:58 +01:00
Strangerke
0d92a7e5a3
HOPKINS: Add support for RAW speechs used by the OS/2 version
2013-01-18 21:09:41 +01:00
Strangerke
4fd4a5ce05
HOPKINS: Fix cut&paste error in searchCat. Thanks eriktorbjorn for pointing at it
2013-01-18 19:03:38 +01:00
Strangerke
4fd422692b
HOPKINS: Some renaming and refactoring
2013-01-18 18:52:19 +01:00
Strangerke
55b288e98b
HOPKINS: Add some specific BeOS and OS2 files
2013-01-18 18:51:30 +01:00
Strangerke
9c58c936c8
HOPKINS: Some renaming and refactoring
2013-01-18 08:32:07 +01:00
Strangerke
c8c1c88654
HOPKINS: Remove a lot of useless variables in ObjectsManager
2013-01-17 20:06:00 +01:00
Strangerke
8a41d3c1fc
HOPKINS: (on behalf of fuzzie) Fix zoom bug introduced in 1c5a6f8c74
2013-01-17 19:04:44 +01:00
Strangerke
d90720dee1
HOPKINS: Some simplifications in handleOpcode()
2013-01-17 08:35:24 +01:00
Strangerke
4ce218ef00
HOPKINS: Fix a BE issue
2013-01-17 08:20:19 +01:00
Strangerke
b7abcf2bfb
HOPKINS: Fix loops on zoom in Affiche_perfect. Thanks fuzzie for the help!
2013-01-17 00:18:53 +01:00
Strangerke
ae4d99b165
HOPKINS: Move 4 int to boolean in TalkManager
2013-01-16 23:48:09 +01:00
Strangerke
4d16fb1bbd
HOPKINS: More refactoring in TalkManager
2013-01-16 23:38:03 +01:00
Strangerke
ae93d1f6ee
HOPKINS: Some refactoring in TalkManager
2013-01-16 21:15:30 +01:00
Strangerke
fe60baf1df
HOPKINS: Fix mouse cursor 25 in nextVerbIcon ("use coffin")
2013-01-16 17:17:13 +01:00
Strangerke
58af4bc675
HOPKINS: More refactoring in Hopkins (Thanks fuzzie for the help)
2013-01-16 02:00:29 +01:00
Strangerke
ec59e1496f
HOPKINS: More refactoring in ObjectsManager
2013-01-15 08:39:41 +01:00
Strangerke
4410da443c
HOPKINS: More refactoring in ObjectsManager
2013-01-15 08:22:27 +01:00
Strangerke
c7ee7c7ba8
HOPKINS: Refactor several functions in ObjectsManager
2013-01-15 07:29:02 +01:00