Kamil Zbróg
9dc35033f5
Merge remote-tracking branch 'origin/master' into prince
2013-11-04 11:31:09 +00:00
Kamil Zbróg
c56c85265f
PRINCE: small comments here and there
2013-11-04 11:30:46 +00:00
Kamil Zbróg
8c85eff622
PRINCE: code formating fixed
2013-11-04 11:28:10 +00:00
Strangerke
eea62d4b6d
TSAGE: R2R - (incomplete) renaming in scene 1800
2013-11-04 01:42:26 +01:00
Paul Gilbert
4d3b33f656
TSAGE: Renamings for R2R Spill Mountains elevator
2013-11-03 19:08:39 -05:00
Strangerke
26ac044993
TSAGE: R2R - Renaming in scene 1625
2013-11-04 01:01:28 +01:00
Paul Gilbert
940117cd4e
TSAGE: Renaming for R2R spill mountain shaft
2013-11-03 18:58:22 -05:00
Paul Gilbert
25da8bb3e4
TSAGE: Renamings for R2R Elevator shaft bottom
2013-11-03 18:30:14 -05:00
Strangerke
114b3df91e
TSAGE: R2R - Renaming in scene 1580
2013-11-04 00:21:23 +01:00
Martin Kiewitz
31140b7b3e
SCI: little comment cleanup
2013-11-04 00:13:56 +01:00
Martin Kiewitz
de0151a26d
Merge branch 'master' of github.com:scummvm/scummvm
2013-11-03 23:50:33 +01:00
Martin Kiewitz
3fbbdbc2da
SCI: improved script patcher
...
Gabriel Knight + King's Quest 6 patches now also work for Mac versions of those games
added support for selectors instead of using hardcoded values
2013-11-03 23:49:31 +01:00
Paul Gilbert
d99cc1f581
TSAGE: Renaming for R2R Flub Maze
2013-11-03 17:43:37 -05:00
Eugene Sandulenko
6c7c8215e3
FULLPIPE: Started implementing scene 3
2013-11-04 00:30:00 +02:00
Strangerke
7da5c8c514
TSAGE: R2R - Renaming in scene 1530
2013-11-03 23:19:59 +01:00
Torbjörn Andersson
401884fcc4
TSAGE: Renamed and simplified AdLib register offset lookup
2013-11-03 23:18:46 +01:00
Strangerke
cc55afd845
TSAGE: R2R - Rename actors in scene 1500
2013-11-03 22:58:25 +01:00
Strangerke
a6ca886bc5
TSAGE: R2R - Rename a variable in scene 1100
2013-11-03 22:15:56 +01:00
Paul Gilbert
acc8175387
TSAGE: Renamings for R2R balloon action sequence
2013-11-03 14:48:54 -05:00
Paul Gilbert
61f09d5a35
TSAGE: Renamings for R2R guard post
2013-11-03 14:04:00 -05:00
Paul Gilbert
ab47b062a3
TSAGE: Renamings for R2R Inner Forest
2013-11-03 13:41:29 -05:00
Johannes Schickel
b22aeafcc8
AUDIO: Do not add extrapath to SearchMan in MT-32 emu code.
...
At the point where the emulator is created extrapath should already been
added to extrapath. If not, the check in checkDevice already failed and thus
adding it would be too late anyway.
It seems this was added in 805b21181ab7138da6960ade703b25716120fc29. The
comment about it being a HACK has been removed in bbad3f333a9227ccb1de633a0fe92d9e01ad7bb3
but it's not clear to my why... At any rate, this should not be here.
2013-11-03 19:36:04 +01:00
Johannes Schickel
233512fe10
MADE: Create MusicPlayer in run() instead of MadeEngine's constructor.
...
This fixes MT-32 emulator initialization. When the constructor is run the
paths like extrapath etc. are not yet set up. Thus, the MT-32 emulator would
not be able to find the necessary roms in case they are in the extrapath.
2013-11-03 19:17:13 +01:00
Johannes Schickel
919e577ba6
SDL: Fix invalid memory access in getSystemLanguage.
...
A call to setlocale can invalidate the string a previous setlocale call
returned. Instead of saving a pointer we copy the returned string now. This,
for example, fixes invalid memory access on my system.
See de8da01b0e8a309b9ed3f5b0f152ebbcf8f4af37 for the commit introducing the
invalid memory access.
2013-11-03 18:47:03 +01:00
Paul Gilbert
1a440b5ef2
TSAGE: Renaming for R2R Outer Forest
2013-11-03 12:44:35 -05:00
D G Turner
de8da01b0e
SDL: Remove side effect of setlocale() call to get Language.
...
This is to fix bug #3615148 - "ALL: sscanf("%f"), atof() etc. not
portable due to Locale"
The side effect of setlocale("") is to change the active locale
from the default of "C" to the detected system locale, but this
changes the behaviour of sscanf() and several other functions
in a system dependent and non-portable way. This has caused
bugs in the ZVISION engine when running Zork Nemesis.
The solution is to restore the default "C" locale after the call
to get the language.
Thanks to criezy for working out this fix.
2013-11-03 17:10:18 +00:00
Paul Gilbert
c3df6c9c0c
TSAGE: Renaming for R2R Spill Mountains crank room
2013-11-03 11:16:48 -05:00
Paul Gilbert
ad91ca877a
TSAGE: Renamings for R2R Spill Mountains furnace room
2013-11-03 11:07:25 -05:00
Paul Gilbert
6a7c95b616
TSAGE: Renamings for Spill Mountains Large Ledge
2013-11-03 10:59:26 -05:00
Paul Gilbert
d7e65a33a2
TSAGE: Renamings for R2R Spill Mountains bedroom 2
2013-11-03 10:46:53 -05:00
Paul Gilbert
fb08979f8d
TSAGE: Renamings for R2R Spill Mountains bedroom
2013-11-03 10:38:38 -05:00
Paul Gilbert
8b539799d5
TSAGE: Renamings for R2R Pictographs room
2013-11-03 10:11:58 -05:00
Paul Gilbert
6a80b9c2f8
TSAGE: Renamings for R2R Spill Mountains large empty room
2013-11-03 10:08:42 -05:00
Paul Gilbert
0be96cb60d
TSAGE: Renamings for R2R Balloon Launch
2013-11-03 10:00:20 -05:00
Paul Gilbert
20fb12ea80
TSAGE: Renamings for R2R Spill Mountains
2013-11-03 09:27:15 -05:00
Paul Gilbert
0c649197f8
TSAGE: Replace all -999 constants with the LIST_END define
2013-11-03 08:56:36 -05:00
Paul Gilbert
d36b704502
TSAGE: Renamings and bugfixes for R2R desert and forest entrance
2013-11-03 08:54:26 -05:00
Paul Gilbert
e385999700
TSAGE: Renamings for R2R desert scene
2013-11-03 08:28:28 -05:00
Paul Gilbert
5c9d752e1d
TSAGE: Fix to set _endAction when playing voice samples
2013-11-03 08:28:13 -05:00
Paul Gilbert
067ffbcb46
TSAGE: Renamings for R2R Teleporting Outside scene
2013-11-03 08:05:49 -05:00
Strangerke
807197161b
TSAGE: Fix CID 1003720, missing break in switch
2013-11-03 11:40:51 +01:00
Strangerke
f129bc7b3b
TSAGE: Fix sound glitch (CID 1004053)
2013-11-03 11:31:36 +01:00
Eugene Sandulenko
8484b4b148
PARALLACTION: Make sure overridden methods are not used. Fixes compiler warning
2013-11-03 12:20:40 +02:00
Eugene Sandulenko
18b7c5fd9c
PARALLACTION: Pass big value by reference rather than copying. CID 1003923
2013-11-03 12:20:39 +02:00
Strangerke
c24ba381cb
AVALANCHE: Fix CID 1109674
2013-11-03 10:51:15 +01:00
Paul Gilbert
fbd365bb9a
TSAGE: Renaming and unused variable removal from R2R gunpoint cutscene
2013-11-03 00:03:46 -04:00
Paul Gilbert
b7f4da4de6
TSAGE: In progress renaming for R2R Flub Maze
2013-11-02 22:49:47 -04:00
Filippos Karapetis
4b1f426103
NEVERHOOD: Fix Klaymen's idle blinking animation in the teleporter
...
The wrong animation hash was used in stSitIdleTeleporterBlinkSecond()
2013-11-03 04:19:17 +02:00
Filippos Karapetis
bee9e1bfd7
NEVERHOOD: Remove unused method drawShadowSurface()
2013-11-03 04:18:20 +02:00
Paul Gilbert
21a2fc6894
TSAGE: Renamings for R2R Teal confrontation scene
2013-11-02 20:51:35 -04:00
