Commit Graph

2290 Commits

Author SHA1 Message Date
Paul Gilbert
9ac71ca892 TITANIC: Show busy cursor when SuccUBus sending or receiving 2017-10-13 20:59:23 -04:00
Paul Gilbert
75a736bbc8 TITANIC: Workaround for wrong ambient music on load 2017-10-13 19:54:01 -04:00
Paul Gilbert
c339e3261d TITANIC: Renamed GlobalSound methods to AmbientSound 2017-10-13 18:03:30 -04:00
Paul Gilbert
1d8ccbe1ea TITANIC: Cleanup of auto music player classes and messages 2017-10-13 17:51:49 -04:00
Paul Gilbert
44aaaf43b8 TITANIC: Play Pellerator sound only when moving to a new destination 2017-10-12 21:58:34 -04:00
Paul Gilbert
b2ebaf008e TITANIC: DE: Fix showing accented characters in Chat tab 2017-10-12 21:38:20 -04:00
Paul Gilbert
60eca29f3d TITANIC: DE: Fix saying 'ja' to Deskbot during checkin 2017-10-12 20:05:24 -04:00
Paul Gilbert
0fd4e80cb2 TITANIC: Fix buffer overflow in parser searchAndReplace 2017-10-10 19:50:35 -04:00
Paul Gilbert
567556a5c1 TITANIC: Show SGT furniture in stateroom even after upgrading 2017-10-10 19:26:47 -04:00
Paul Gilbert
3fd2cf29b1 TITANIC: Only allow moving to SGT TV in assigned room 2017-10-10 19:19:46 -04:00
Paul Gilbert
1f5908c9bd TITANIC: Fix talking to the Maitre D 2017-10-10 18:02:10 -04:00
Paul Gilbert
fcf0ac1da2 TITANIC: DE: Fix bomb password 2017-10-09 08:11:57 -04:00
Paul Gilbert
721041bc30 TITANIC: Fix Coverity warnings 2017-10-09 07:57:55 -04:00
Paul Gilbert
e30bf609d7 TITANIC: DE: Fix going to bottom of service elevator 2017-10-08 21:21:36 -04:00
Paul Gilbert
2b8cd341ef TITANIC: Turn off testing for English, turn it on for German 2017-10-08 12:48:21 -04:00
Paul Gilbert
9f2d7a6793 TITANIA: DE: Fixes for Titania's wakeup speech 2017-10-08 11:38:40 -04:00
Paul Gilbert
6dac2f4b95 TITANIC: DE: Syntax fixes 2017-10-08 11:12:53 -04:00
Paul Gilbert
f05690db2a TITANIC: DE: Further tweak code wheel loading 2017-10-08 10:39:13 -04:00
Paul Gilbert
51275ea7a9 TITANIC: DE: Fix default code wheel letters 2017-10-07 22:06:00 -04:00
Paul Gilbert
bca0a3f2da TITANIC: DE: Fixes for bomb code wheels 2017-10-07 21:56:52 -04:00
Paul Gilbert
76e5a0246c TITANIC: DE: Fix Barbot response handling 2017-10-07 16:38:12 -04:00
Colin Snover
432fd522d2 ENGINES: Remove default1x scaler flag
This flag is removed for a few reasons:

* Engines universally set this flag to true for widths > 320,
  which made it redundant everywhere;
* This flag functioned primarily as a "force 1x scaler" flag,
  since its behaviour was almost completely undocumented and users
  would need to figure out that they'd need an explicit non-default
  scaler set to get a scaler to operate at widths > 320;
* (Most importantly) engines should not be in the business of
  deciding how the backend may choose to render its virtual screen.
  The choice of rendering behaviour belongs to the user, and the
  backend, in that order.

A nearby future commit restores the default1x scaler behaviour in
the SDL backend code for the moment, but in the future it is my
hope that there will be a better configuration UI to allow users
to specify how they want scaling to work for high resolutions.
2017-10-07 12:30:29 -05:00
Paul Gilbert
6723bed162 TITANIC: DE: Fixes to vocabs, strings, and font in titanic.dat 2017-10-06 21:07:00 -04:00
Paul Gilbert
9b51c1dbbd TITANIC: DE: Fix recognising words with common suffixes 2017-10-06 20:37:28 -04:00
Paul Gilbert
223867b2f5 TITANIC: DE: Fixes for article handling 2017-10-06 07:16:36 -04:00
Paul Gilbert
1ff9e931dc TITANIC: DE: Fix animations changing seasons in Arboretum 2017-10-04 07:06:08 -04:00
Paul Gilbert
1b136180e7 TITANIC: DE: Translations for music room music 2017-10-04 07:05:32 -04:00
Paul Gilbert
5ef0b3a62a TITANIC: DE: Fix sound for music room pitch sliders 2017-10-03 21:29:48 -04:00
Paul Gilbert
d0c20062ad TITANIC: Fix cursor when in MissiveOMat when Conversations tab active 2017-10-03 21:17:53 -04:00
Paul Gilbert
7bcc6ed56c TITANIC: DE: Fix positioning of PET tab names 2017-10-03 20:31:44 -04:00
Paul Gilbert
f3eea52f52 TITANIC: DE: Fix color of text in PET Translation tab text 2017-10-03 20:04:39 -04:00
Paul Gilbert
1d4212a946 TITANIC: DE: Fix horizontal placement of PET mode buttons 2017-10-03 20:00:42 -04:00
Paul Gilbert
5c54651901 TITANIC: DE: Fix dimensions of text area in PET Translation tab 2017-10-03 19:37:09 -04:00
Paul Gilbert
2c79c257a3 TITANIC: DE: Allow for two lines in PET Rooms tab tooltips 2017-10-02 22:01:24 -04:00
Paul Gilbert
93e18ba7c3 TITANIC: DE: Translation for .avi files directly referred to 2017-10-02 21:40:46 -04:00
Paul Gilbert
9c61afb701 TITANIC: DE: Fix perched parrot animations 2017-10-02 21:32:11 -04:00
Paul Gilbert
8733dc8a61 TITANIC: Work around loading savegame when Marcinta is active
Loading a savegame directly from the launcher or Continue dialog when
Marcinta is active shows her as inactive in the original, but still
allows you to talk to her. To fix the inconsistency, now when this
occurs, it will also reset the active NPC back to none.
2017-10-02 21:00:43 -04:00
Paul Gilbert
9ef2ca7f84 TITANIC: DE: Correctly play back entire 1st class upgrade speech 2017-10-02 20:30:39 -04:00
Paul Gilbert
da6b280922 TITANIC: DE: Fix upgrading to 1st class 2017-10-02 20:20:32 -04:00
Paul Gilbert
4d49c3db3a TITANIC: Fix leaks in CGameState _movieList 2017-09-29 21:16:43 -04:00
Paul Gilbert
b98d44ca0b TITANIC: DE: Changes for DoorbotScript::chooseResponse 2017-09-27 21:24:42 -04:00
Paul Gilbert
4a0a3c121f TITANIC: Fix leak of wave file audio streams 2017-09-27 21:11:32 -04:00
Paul Gilbert
c86e7e4f3f TITANIC: Fix memory leak in CStarView 2017-09-27 07:40:28 -04:00
Paul Gilbert
a65a0c4768 TITANIC: DE: Fix switch in DeskbotScript::doSentenceEntry 2017-09-26 21:08:06 -04:00
Paul Gilbert
bd388fed62 TITANIC: Convert some remaining strings to use their titanic.dat entries 2017-09-26 20:41:35 -04:00
Paul Gilbert
82d69c6075 TITANIC: Fix exit crash freeing wave files whilst still playing 2017-09-26 20:39:02 -04:00
Paul Gilbert
c92e41052f TITANIC: Add missing CSound destructor 2017-09-26 20:32:58 -04:00
Paul Gilbert
4927369987 TITANIC: Fix loop limit in TTsentenceConcept destructor 2017-09-25 21:25:26 -04:00
Paul Gilbert
c188fd9130 TITANIC: Add missing destructor for TTsentenceConcept 2017-09-25 20:45:27 -04:00
Paul Gilbert
90636b367e TITANIC: Free wave files on game exit like original does 2017-09-25 19:41:46 -04:00
Paul Gilbert
f806b95eda TITANIC: DE: Properly implement CArboretumGate changes 2017-09-24 14:33:54 -04:00
Paul Gilbert
65811506f8 TITANIC: Don't launch further bot speeches when exiting game
Previously, notifying bots to the end of a speech fragment was
done in ~TTtalker. Which caused problems when in progress talkers
were freed when exiting the game with a speech was in progress,
since it would try to start the next following speech fragment.
2017-09-24 14:09:24 -04:00
Paul Gilbert
5ab826f135 TITANIC: Add some guards against using the game manager during game exit 2017-09-24 12:46:32 -04:00
Paul Gilbert
a6026fc1fc TITANIC: Fix crash if you exit the game whilst a bot is talking 2017-09-24 12:39:39 -04:00
Paul Gilbert
d9eebaf787 TITANIC: Fix leak of vocab synonyms on exit 2017-09-24 12:26:43 -04:00
Paul Gilbert
47f6c2e9b9 Merge pull request #1010 from dreammaster/debugger_params
GUI: Support double quoted debugger parameters
2017-09-24 12:18:15 -04:00
Paul Gilbert
3333432b4d TITANIC: Fix leak of movie event structures 2017-09-24 12:15:58 -04:00
Paul Gilbert
36ce79edb4 TITANIC: Fix access after free in shutdown 2017-09-24 10:55:50 -04:00
Paul Gilbert
947894ce1f TITANIC: Free any active wave files on exit 2017-09-24 10:48:04 -04:00
Paul Gilbert
b724ea6530 TITANIC: Fix compiler warnings in DeskbotScript 2017-09-24 10:34:13 -04:00
Paul Gilbert
2bc23ba6c3 TITANIC: Fix looking at broken pellerator after the first time 2017-09-24 09:46:27 -04:00
Paul Gilbert
d74e94950b TITANIC: DE: Merged German NPC script subclasses back in
There ended up not being enough custom German code in the scripts
to warrant having sub-classes that reimplemented entire methods
2017-09-23 21:18:25 -04:00
Paul Gilbert
e5cad39a58 TITANIC: DE: Updates for SuccUBusScript 2017-09-23 21:02:44 -04:00
Paul Gilbert
e9034ddffe TITANIC: DE: Added changes to MaitreDScript 2017-09-23 20:39:12 -04:00
Paul Gilbert
6f150abf15 TITANIC: DE: Added changes for LiftbotScript 2017-09-23 19:30:28 -04:00
Paul Gilbert
af71ec809b TITANIC: DE: Adding remaining DoorbotScript changes 2017-09-23 17:19:06 -04:00
Paul Gilbert
048bec6808 TITANIC: DE: Adding changes to DoorbotScript 2017-09-23 16:25:44 -04:00
Paul Gilbert
9e2d78446e TITANIC: DE: More BellbotScript changes 2017-09-22 22:31:42 -04:00
Paul Gilbert
5c6de7d2f2 TITANIC: DE: Adding new BellbotScript logic 2017-09-22 20:13:31 -04:00
Paul Gilbert
cd6927d39c TITANIC: DE: Added translations for BarbotScript::process 2017-09-22 07:41:55 -04:00
Paul Gilbert
8f6649cfb1 TITANIC: DE: Add miscellaneous missed sound translations 2017-09-21 20:27:18 -04:00
Paul Gilbert
9eb3e30fb2 TITANIC: DE: More sound translations 2017-09-21 20:06:35 -04:00
Paul Gilbert
9127f5245f TITANIC: DE: Adding sound translations 2017-09-20 22:33:18 -04:00
Paul Gilbert
32735d59e8 TITANIC: DE: Adding sound translations 2017-09-20 20:53:12 -04:00
Paul Gilbert
a7479b4f5b TITANIC: DE: Add translations for playGlobalSound calls 2017-09-20 06:43:10 -04:00
Paul Gilbert
7a184f0e7f TITANIC: DE: Add translations for loadSound calls 2017-09-20 06:28:34 -04:00
Paul Gilbert
37d0b401cb TITANIC: DE: Adding German translations 2017-09-19 22:50:39 -04:00
Paul Gilbert
00db751e7d TITANIC: DE: Sound changes for Bomb 2017-09-19 22:23:15 -04:00
Paul Gilbert
0a44b54ee2 TITANIC: Fix memory leaks on shutdown 2017-09-19 20:00:32 -04:00
Paul Gilbert
ba45fb2d60 TITANIC: Remove redundant surface ccreation from DirectDrawManager 2017-09-19 19:27:23 -04:00
Paul Gilbert
af99606db8 TITANIC: Fix identified redundant tests & assignments 2017-09-18 22:25:54 -04:00
Paul Gilbert
3d4bc3c59b TITANIC: Add missing return check in BellbotScript::process 2017-09-18 22:22:16 -04:00
Paul Gilbert
fce250372f TITANIC: Fix floor calculation in CChevCode::getChevFloorNum 2017-09-18 22:14:40 -04:00
Paul Gilbert
4cfbe02919 TTITANIC: Guard against TTstring items being self-assigned 2017-09-18 21:29:29 -04:00
Paul Gilbert
0c6b15d8d0 TITANIC: Fix regenerating CGameObject _movieRangeInfoList during saving 2017-09-18 21:26:04 -04:00
Paul Gilbert
1f1a4427f5 TITANIC: Change AVISurface _framePixels from ManagedSurface to bool 2017-09-18 21:19:06 -04:00
Paul Gilbert
0362b70225 TITANIC: Fix memory leak loading star control stars 2017-09-18 21:06:34 -04:00
Paul Gilbert
f6ef3cbc9e TITANIC: Fix memory leak on thumbnails when loading savegames 2017-09-18 21:00:39 -04:00
Paul Gilbert
31c9cca0fd TITANIC: DE: Fix ship announcements 2017-09-18 20:53:49 -04:00
Paul Gilbert
f9a86a6995 TITANIC: DE: Fixes for checking in 2017-09-18 20:17:36 -04:00
Paul Gilbert
5af8ed228d TITANIC: Add VocabMode enum, fix German vocab loading 2017-09-18 18:16:03 -04:00
Paul Gilbert
e6a1c5a9a0 TITANIC: Added German DeskbotScript process additions 2017-09-17 22:15:01 -04:00
Paul Gilbert
d48caed204 TITANIC: Add Deskbot German specific logic 2017-09-17 20:36:07 -04:00
Paul Gilbert
b033d1bbd9 TITANIC: Added German specific TTnpcScript doSentenceEntry code
I'm not entirely happy I had to put this in the base TTnpcScript
rather than somewhere in the new german/ subfolder, but I couldn't
think of any clean way to do it except nasty designs like diamond
multiple inheritance
2017-09-17 18:42:00 -04:00
Paul Gilbert
0a8167be75 TITANIC: Fix case sensitivity in header includes 2017-09-17 16:57:18 -04:00
Paul Gilbert
42b24e328a TITANIC: Add skeleton derived bot script classes for German version 2017-09-17 16:39:51 -04:00
Paul Gilbert
0b258ae16f TITANIC: Add translation.h missing from prior commit 2017-09-17 16:32:09 -04:00
Paul Gilbert
481e18ee1d TITANIC: Create a separate g_language global in it's own file
I was becoming concerned with more and more files having to add the
full engine definition and sub-classes thereof via titanic.h,
just so the TRANSLATE macro could call getLanguage. This way, files
just need to include the lightweight translation.h file instead
2017-09-17 16:24:26 -04:00
Paul Gilbert
6ef5948a06 TITANIC: German sound fixes for rest of prologue 2017-09-17 11:43:44 -04:00
Paul Gilbert
fe83d2b3f6 TITANIC: Fixes for sounds and Doorbot during German prologue 2017-09-17 11:21:37 -04:00
Paul Gilbert
6cac39b646 TITANIC: Add differing response Id range checks for German 2017-09-16 22:03:36 -04:00
Paul Gilbert
cedd15f3f3 TITANIC: Fix incorrect sound effect in German prologue 2017-09-16 20:26:43 -04:00
Paul Gilbert
7a1d359342 TITANIC: Fix music playback in music room 2017-09-16 17:57:37 -04:00
Paul Gilbert
3e5515cc21 TITANIC: Improve audio buffer critial section handling 2017-09-16 15:23:43 -04:00
Paul Gilbert
09931ae0aa TITANIC: Fixed FixedQueue compaction when queue has been emptied 2017-09-16 14:09:28 -04:00
Paul Gilbert
bce9ba0aec TITANIC: Standardize audio rate constants 2017-09-16 09:39:27 -04:00
Paul Gilbert
3ed7ef57ae TITANIC: Moved queue logic within CAUdioBuffer to new FixedQueue class
This is a cleaner implementation, since all the pointer logic and
queue management is now better encapsulated in it's own class.
I felt a new FixedQueue class was necessary because the standard
Queue class uses a Common::List internally, which would be unsuitable
for containing 100,000 elements, since each int value would need it's
own list node. This way uses an array internally, like FixedStack
2017-09-14 22:34:04 -04:00
Paul Gilbert
d5df72998c TITANIC: Fix blocky squares during transitions on SGT level 2017-09-12 20:39:54 -04:00
Paul Gilbert
fc0396f80f TITANIC: Fix freeze panning away from Parrot cage 2017-09-11 21:28:45 -04:00
Paul Gilbert
c8c83145a8 TITANIC: The hasAudioTiming code was just an isActive flag 2017-09-11 19:35:21 -04:00
Paul Gilbert
25ae67b870 TITANIC: Created custom stream reader to fix bad y222.avi header 2017-09-10 19:32:26 -04:00
Paul Gilbert
66150ee064 TITANIC: Remove redundant flag clearing in star control 2017-09-10 16:52:13 -04:00
Paul Gilbert
29465fd116 TITANIC: Disable input during Bellbot intro to prevent moving away 2017-09-09 21:18:16 -04:00
Paul Gilbert
030b1d369d TITANIC: Fix nav helmet glitch from leaving view when it's animating 2017-09-09 20:24:18 -04:00
Paul Gilbert
c9a92c3c16 TITANIC: Fix locking/unlocking starfield markers multiple times 2017-09-09 19:26:54 -04:00
Paul Gilbert
00b4e509a0 TITANIC: Various whitespace fixes in star control classes 2017-09-09 18:46:10 -04:00
Paul Gilbert
04dabb0cd2 Merge pull request #1017 from dafioram/star-control-changes
TITANIC: Star control changes
2017-09-09 18:21:08 -04:00
Paul Gilbert
74c401c926 TITANIC: Cleanup and fixes for clicking on Starfield marker LEDs 2017-09-09 18:18:25 -04:00
David Fioramonti
3b579178d4 TITANIC: Hitting go on captain wheel resets it
In the original once you have hit the go button
on the steering wheel it won't let you use it again
until you have solved the puzzle so that is how
ScummVM does it now.
2017-09-09 14:24:26 -07:00
David Fioramonti
d5fb1170d7 TITANIC: Prevent locking/unlocking sounds in photoview
In scummvm and the original engine if you try to
unlock/lock stars in photoview/skyview then the
stars will not unlock/lock, but the sounds
associated with unlocking and locking were playing.
Giving a false impression that the
locking/unlocking was happening.

The sounds no longer play when in photoview.
2017-09-09 14:24:26 -07:00
David Fioramonti
b2dd72adbd TITANIC: Improved naming for Helmet On/Off flag 2017-09-09 14:24:26 -07:00
Paul Gilbert
1e0a22db5c TITANIC: Fix occassional PET mixup when toggling nav helmet on & off 2017-09-09 17:05:53 -04:00
Paul Gilbert
635f189b9c TITANIC: Fix parrot freezing after multiple chicken drags 2017-09-09 15:58:59 -04:00
Paul Gilbert
8fb2371f6f TITANIC: Fix play/stop operation for 1st Class Restaurant Phonograph 2017-09-09 11:01:45 -04:00
Paul Gilbert
7a1b35212b TITANIC: Keep highlighted inventory items animating when changing room 2017-09-08 21:11:22 -04:00
Paul Gilbert
aceff5852e TITANIC: Fix hiding SGT toilet after turning it on & off 2017-09-07 20:37:02 -04:00
David Fioramonti
93d9ac926c TITANIC: star camera better handler function naming
The functions that dealt with the mover handling only
had handler in the name so I added mover and type to the
name to reflect that it involves the mover handler.
2017-09-07 06:34:03 -07:00
David Fioramonti
d3a0a487be TITANIC: star control, removed todos and improved some comments 2017-09-07 06:33:05 -07:00
David Fioramonti
4bdea384c3 TITANIC: make sure of setOrientations more clear
Made camera automover setOrientations not virtual and reduced
arguments also changed name since to differentiate it from
behavior of derived classes.
2017-09-07 06:31:20 -07:00
David Fioramonti
d69404d5de TITANIC: Make use of CCameraAutoMover::setPath() more clear
There was a setPath() adn setPath2() function took in
different arguments and were doing the same thing, but
not using the different arguments. I made it into
one function that only takes in the arguments it uses.

Also it was marked virtual, but all the derived classes,
CMarkedAutoMover, and CUnmarkedAutoMover were just doing
there own thing and then calling this base class implementation.
Therefore, I made it be not virtual and the derived classes can do
there own thing and then call this, but since they are doing slightly
different things it makes sense to differentiate the names and not have
them all be called setPath. I.e., the derived classes also change
the orientation so that is included in their function names to reflect
that.
2017-09-07 06:25:43 -07:00
David Fioramonti
40684e83d3 TITANIC: Better naming for Viewport function
I differentiated getRelativePosCentering() and
getRelativePosCentering2() since one was using
the raw Pose and one was using the regular Pose.
2017-09-07 06:23:01 -07:00
Paul Gilbert
258015571b TITANIC: Add 'skip' response for Deskbot to skip entire checkin 2017-09-06 19:37:06 -04:00
Paul Gilbert
0a3b6d34d5 TITANIC: Make Parrot speech respect the Parrot volume level 2017-09-06 19:26:58 -04:00
Paul Gilbert
f58156aba0 TITANIC: Fix gfx glitch closing SGT chest of drawers 2017-09-06 19:07:12 -04:00
Paul Gilbert
b5408d7245 TITANIC: Fix specifying end frame in movie debugger command 2017-09-06 07:50:18 -04:00
Paul Gilbert
aa3adfb4b1 TITANIC: Allow GMM loading from the copyright and continue dialog 2017-09-05 23:01:12 -04:00
Paul Gilbert
d5cfa3f2be TITANIC: Fix Bellbot disappearing during checkin cutscene 2017-09-05 22:37:50 -04:00
Paul Gilbert
0c2fc12756 TITANIC: Hook up in-game sound sliders to ScummVM volumes 2017-09-05 21:11:06 -04:00
Paul Gilbert
1ecb27e6cc TITANIC: Simplify sound command now that # character is allowed 2017-09-05 19:38:56 -04:00
Paul Gilbert
128edeebda TITANIC: Implement setup code for sound slider positions 2017-09-04 19:11:01 -04:00
Paul Gilbert
50e7a7eb3f TITANIC: Cleanup and enum for CPetSound 2017-09-04 15:38:38 -04:00
Paul Gilbert
9a0798f387 TITANIC: Fix display of music system stop button when pressed 2017-09-04 12:42:05 -04:00
Paul Gilbert
f9bec828de TITANIC: Support full view specification in debugger room command 2017-09-04 10:15:53 -04:00
Paul Gilbert
f36f3942ea TITANIC: Fix Doorbot disappearing on loading prologue elevator savegame 2017-09-03 23:36:47 -04:00
Paul Gilbert
9fa97cd119 TITANIC: Fix Doorbot disappearing in prologue elevator 2017-09-03 23:18:04 -04:00
Paul Gilbert
a2b05b5c63 TITANIC: Fix Doorbot doubletake in the prologue 2017-09-03 20:09:23 -04:00
Paul Gilbert
ba84efe497 TITANIC: Minor cleanup and warning fixes to star control 2017-09-02 11:20:17 -04:00
David Fioramonti
4e586ba43d TITANIC: Fix star3 locking overshoot, #9961
I fixed this previously for star2, I thought the
overshoot for star3 locking might have also been fixed
since I hadn't observed it in a while.

I applied the same workaround by setting the old position
to be the new position.
2017-09-02 07:41:26 -07:00
David Fioramonti
0d5d031564 TITANIC: Added/Removed comments for new functions in FVector and FPose 2017-09-02 06:41:07 -07:00
David Fioramonti
d6ca9eda93 TITANIC: Move Matrix4Inv out of starcamera and into FPose function 2017-09-02 06:41:07 -07:00