Commit Graph

430 Commits

Author SHA1 Message Date
Giovanni Bajo
a6eddd2e99 Add detection for original Italian version. 2012-10-26 12:52:15 +02:00
Strangerke
5023a5764f TONY: Fix music bug - 2 songs played simultaneously eventually 2012-10-15 07:08:24 +02:00
Strangerke
72e32ab35e TONY: Fix German fonts 2012-09-28 10:58:32 +02:00
Strangerke
b1844253d4 TONY: In French version, fix 'ê' in hotspot names by replacing it by 'e', like for other accentuated characters 2012-09-26 23:19:16 +02:00
Johannes Schickel
89abab97e3 JANITORIAL: Remove trailing whitespaces.
Powered by:
git ls-files "*.cpp" "*.h" "*.m" "*.mm" | xargs sed -i -e 's/[ \t]*$//'
2012-09-26 04:17:55 +02:00
Strangerke
c61effaff9 TONY: Use debug channel for fading messages 2012-09-25 22:09:42 +02:00
Alyssa Milburn
050a02c6f8 TONY: Replace abortGame() with nicer error() calls. 2012-09-25 17:33:49 +02:00
Alyssa Milburn
0093c4d13e TONY: Don't error out on invalid ReleaseOwnership calls.
A script triggers this at the end of the scene where you give the
flowers to the bearded woman.
2012-09-25 17:32:34 +02:00
Willem Jan Palenstijn
1277a04e60 TONY: Don't mute all sound when using sound config dialog
Thanks to fuzzie for noticing this.
2012-09-24 22:05:28 +02:00
Alyssa Milburn
4a5333893d TONY: Add German/Czech detection entries. 2012-09-10 13:05:40 +02:00
Alyssa Milburn
60b101f5f6 TONY: Rename yet more variables. 2012-09-08 09:59:56 +02:00
Johannes Schickel
1f22838765 TONY: Constify static data tables in custom.cpp. 2012-09-08 01:27:11 +02:00
Strangerke
17d6d732ea TONY: More renaming, reduce some variable scopes 2012-09-08 01:02:36 +02:00
Alyssa Milburn
05fbc28767 TONY: Wait for events to pulse in 'threads'.
This fixes some missing animations, which weren't getting an
opportunity to start.
2012-09-07 20:51:20 +02:00
Strangerke
80b51481b9 TONY: Some more cleanup 2012-09-07 08:11:33 +02:00
Strangerke
ab719630ba TONY: Move const tables back to .cpp, as suggested by LordHoto 2012-09-07 07:39:58 +02:00
Strangerke
c91a72a9d5 TONY: Some more cleanup 2012-09-06 08:26:08 +02:00
Strangerke
25f4a3fb08 TONY: Misc cleanup 2012-09-06 00:23:59 +02:00
Paul Gilbert
220e945d67 TONY: Bugfix for OFFSETOF macro on 64-bit systems 2012-09-05 22:32:02 +10:00
Paul Gilbert
35a7e79614 TONY: Change to hopefully fix Mingw 64 compilation errors 2012-09-05 20:47:32 +10:00
Strangerke
c737e64298 TONY: Move code from .h to .cpp files 2012-09-02 10:34:11 +02:00
Strangerke
1f41e55731 TONY: Remove adv.h 2012-09-01 02:36:54 +02:00
Strangerke
3ab8ebc4f7 TONY: Move some more code from .h to .cpp files 2012-09-01 02:27:31 +02:00
Strangerke
8c753c96a0 TONY: Move some functions from .h to .cpp files 2012-09-01 01:05:22 +02:00
Strangerke
f2df769aab TONY: More renaming 2012-09-01 00:25:35 +02:00
Strangerke
7fbfbc8e6b TONY: Rename some more variables and structures 2012-08-31 23:08:02 +02:00
Strangerke
56c5961fb4 TONY: Translate some variables in findPath, reduce some variable scopes 2012-08-30 08:06:10 +02:00
Strangerke
825e0896dc TONY: Replace C-style comments by C++-style ones.
Also translate some more Italian comments
2012-08-29 23:25:14 +02:00
Strangerke
766eadeef9 TONY: Translate some remaining Italian comments 2012-08-29 22:47:33 +02:00
Alyssa Milburn
985151fe13 TONY: Limit effect of cursor workaround.
This avoids incorrect hotspot offsets.
2012-08-29 09:13:43 +02:00
Alyssa Milburn
a6673aaf90 TONY: Remove useless/commented music code. 2012-08-29 09:12:53 +02:00
Strangerke
a29f1fb04c TONY: Remove some dead code 2012-08-29 08:14:41 +02:00
Strangerke
92a9820f33 TONY: Translate some remaining italian comments 2012-08-29 08:11:52 +02:00
Strangerke
b12ccad994 TONY: Reduce scope of some variables 2012-08-29 00:30:07 +02:00
Strangerke
d2b33ca4cc TONY: Janitorial - remove trailing spaces 2012-08-28 23:25:50 +02:00
Strangerke
56f4bc0225 TONY: Fix some for and if statements with bad coding style 2012-08-28 23:05:48 +02:00
Willem Jan Palenstijn
cdeecf1521 TONY: Replace overlapping memcpy with memmove 2012-08-28 22:50:32 +02:00
Alyssa Milburn
142ac7600f TONY: Remove most of the remaining global functions. 2012-08-28 22:28:44 +02:00
Alyssa Milburn
3c986af9ce TONY: Remove unnecessary mainloop mutex.
Also, all the related freeze functions/members.
2012-08-28 22:10:12 +02:00
Alyssa Milburn
9ebbeda949 TONY: Implement some forgotten sound/music functions. 2012-08-28 20:25:48 +02:00
Alyssa Milburn
23638a07d3 TONY: Fix crash with TA_PERORATE. 2012-08-28 17:19:00 +02:00
Alyssa Milburn
35fd91793b TONY: Get rid of RMDataStream. 2012-08-28 14:26:00 +02:00
Alyssa Milburn
18b1f6d7c6 TONY: Remove unused data dumping code. 2012-08-28 13:33:24 +02:00
Alyssa Milburn
fbf771ea55 TONY: Fix stringLen for empty strings. 2012-08-28 10:09:13 +02:00
Alyssa Milburn
e6bd426398 TONY: Rename curDialog to g_curDialog. 2012-08-28 09:47:21 +02:00
Alyssa Milburn
3570a0153d TONY: Improve Take/ReleaseOwnership.
This releases all held 'mutexes' when processes die, and keeps
track of the lock count too, just in case.
2012-08-28 09:26:04 +02:00
Alyssa Milburn
28681a32ee TONY: Remove more unused bits. 2012-08-27 23:41:23 +02:00
Willem Jan Palenstijn
6805c2cec2 TONY: Translate some minor Italian comments 2012-08-27 13:07:34 +02:00
Alyssa Milburn
7b4dd0a682 TONY: Remove various bits of unused code. 2012-08-27 12:50:33 +02:00
Alyssa Milburn
037920bf76 TONY: Fix width of flipped dirty rects. 2012-08-27 12:30:02 +02:00
Strangerke
addca5d856 TONY: _rgb buffer is no longer static 2012-08-27 06:51:29 +02:00
Strangerke
72604fa3a6 TONY: USe default fonts (Italian/English) when the language is unhandled instead of erroring out 2012-08-27 00:17:28 +02:00
Strangerke
2ce6576515 TONY: Add English in loadTonyDat 2012-08-26 23:58:06 +02:00
Strangerke
7cb29f1522 TONY: Move font related arrays to a DAT file 2012-08-26 23:33:46 +02:00
Alyssa Milburn
5cc63df513 TONY: Fix exiting from the save menu.
We have to copy _nState before it gets reset in closeState.
2012-08-25 14:46:47 +02:00
Alyssa Milburn
ca82454d74 TONY: Reset _hEndOfBuffer when restarting sounds. 2012-08-25 14:09:02 +02:00
Alyssa Milburn
8b0dca3862 TONY: Fix Take/ReleaseOwnership. 2012-08-25 13:32:08 +02:00
Torbjörn Andersson
659436739f TONY: Make the verb menu sound effects play
At least for now, preloading utility sound effects *is* needed in
ScummVM. And since we now have preloading of both normal and utility
sound effects, I've unstubbed the unloading functions as well.
2012-08-25 12:56:02 +02:00
Alyssa Milburn
a9828c8818 TONY: Replace copyMemory with memcpy. 2012-08-25 10:08:10 +02:00
Alyssa Milburn
b14a616f3f TONY: Get rid of RMString. 2012-08-25 10:08:10 +02:00
Alyssa Milburn
b77306bfcc TONY: Convert more strings to Common::String. 2012-08-25 08:41:22 +02:00
Alyssa Milburn
ff9569572a TONY: Store savegame names with Common::String. 2012-08-25 08:41:22 +02:00
Alyssa Milburn
ba20f1d90d TONY: Remove unused members of RMTextItemName. 2012-08-25 08:41:21 +02:00
Alyssa Milburn
f917a4beab TONY: Use Common::String in writeText.
This uses an array of lines rather than trying to stick nulls into
the string, and so fixes wrapping on hyphens (which overwrote the
character before the hyphen). Thanks to eriktorbjorn for both
finding the bug and working out what was going wrong.
2012-08-25 08:41:21 +02:00
Alyssa Milburn
af134e0244 TONY: Animate mouse cursors.
This restores the forgotten doFrame code for RMPointer, which fixes
the bird mouse cursor. Thanks to eriktorbjorn for noticing it.
2012-08-25 08:41:21 +02:00
Alyssa Milburn
aa603bc208 TONY: Mark screen dirty in RMGfxClearTask.
This fixes the "A LONG TIME AFTER..." screen when talking to the old
woman in the booth. Thanks to eriktorbjorn for noticing it.
2012-08-25 08:41:21 +02:00
Alyssa Milburn
7815c05220 TONY: Use the right dirty rects for drawAA.
This makes it match the relevant non-AA code, and fixes problems
due to the invalid rects. (Perhaps we don't need dirty rects here
at all though, since all the callers seem to call the non-AA code
first with the same parameters?)
2012-08-25 08:41:21 +02:00
Alyssa Milburn
68c6109e76 TONY: Draw the dirty rectangle debugging last.
Otherwise the rects are overwritten by the actual drawing.
2012-08-25 08:41:21 +02:00
Alyssa Milburn
0163bd38e8 TONY: Fix background dirty rect handling.
Reset the scrolling state on load, so that when a new scene is
loaded, the background is redrawn. Also, revert the workaround
in d0d15af9, since this (hopefully) fixes the underlying problem.
2012-08-25 08:41:21 +02:00
Alyssa Milburn
61b11037c3 TONY: Ignore draw attempts with non-positive width/height.
This avoids an invalid dirty rect (width -1) during the
introduction scene inside Halloween Park.
2012-08-25 08:41:21 +02:00
Paul Gilbert
bad6ec8388 TONY: Fixed problem with spoken voices being clipped when timed text mode is on. 2012-08-23 22:05:23 +10:00
Paul Gilbert
93e10b5210 TONY: Removed some debug warnings which aren't needed any longer 2012-08-23 22:05:22 +10:00
Alyssa Milburn
b1486aa5fe TONY: Fix spelling of setStretch. 2012-08-22 21:56:12 +02:00
Alyssa Milburn
93f145773e TONY: Fix saveSoundSettings to use setInt for talkspeed. 2012-08-22 21:52:22 +02:00
Alyssa Milburn
c340739001 TONY: Replace _vm with g_vm. 2012-08-22 21:51:51 +02:00
Paul Gilbert
482c1a71b0 TONY: Removed some TODO warnings that aren't needed any longer 2012-08-22 22:28:08 +10:00
Paul Gilbert
dfb0e4f700 TONY: Fix dirty rect refresh glitch in the introduction sequence 2012-08-12 19:47:48 +10:00
Torbjörn Andersson
846f9644dd TONY: Clip width to avoid crash when drawing flipped sprite
This fixes - or at least work around - a failed assertion when
Pantagruel leaves the office at the beginning of the game.
2012-08-01 22:34:00 +02:00
Torbjörn Andersson
fab814b774 TONY: Remove unused variable.
It wasn't used in the original engine either.
2012-07-31 21:29:25 +02:00
Torbjörn Andersson
3b40d14152 TONY: Whitespace changes. 2012-07-31 20:36:48 +02:00
Torbjörn Andersson
a5bfbeed32 TONY: Don't pass uninitialised rect to addDirtyRect()
Wait until after we have the destination rect. Unfortunately, this
does not fix any of the graphical glitches during the intro.
2012-07-26 20:15:32 +02:00
Torbjörn Andersson
09d9b0d8c9 TONY: Change platform from DOS to Windows
This is cosmetic, just to keep the detector from saying that Tony
Tough is a DOS game.
2012-07-15 20:48:43 +02:00
Torbjörn Andersson
9cc7d6c6c5 TONY: Fix crash when entering "sepia" mode by loading a savegame.
Apparently, in this case the cursor is updated before _precalcTable
has been created. Added safeguard against that.
2012-07-02 20:51:14 +02:00
Torbjörn Andersson
924aac4389 TONY: Fix warning about statement without effect. 2012-07-02 20:48:57 +02:00
Paul Gilbert
58b03ec446 TONY: Refactored the Sepia (B & W) mode so the cursor is converted as well 2012-07-02 20:53:31 +10:00
Torbjörn Andersson
65a8799f96 TONY: Added "sepia mode".
This works by adding a wrapper function for copyRectToScreen(). As
far as the engine is concerned, it still draws everything in color.
The mouse cursors are still in color, but that can be fixed later.
2012-06-24 11:09:08 +02:00
Paul Gilbert
69ce6e35f4 TONY: Bugfix for crash when changing scene whilst music is playing 2012-06-23 16:28:03 +10:00
Paul Gilbert
46d87ef76a TONY: Bugfix for loading ambient music when restoring a savegame 2012-06-23 15:25:03 +10:00
Paul Gilbert
717756749d TONY: Merge of dirty rect functionality 2012-06-23 00:57:21 +10:00
Paul Gilbert
eef6b444df TONY: Created a debugger command 'dirty_rects' to show dirty rect areas on-screen 2012-06-22 23:47:39 +10:00
Torbjörn Andersson
2990482406 TONY: Fix Valgrind warning
The loop uses _ctx->msg, so don't delete it until the loop is done.
2012-06-21 21:30:09 +02:00
Paul Gilbert
17289089e6 TONY: Fix for adding dirty rects for 8-bit RLE images 2012-06-21 22:58:58 +10:00
Strangerke
fdc619191b TONY: Translate two comments 2012-06-21 07:31:38 +02:00
Strangerke
85150232f0 TONY: Some more renaming (thanks Hkz) 2012-06-21 00:20:16 +02:00
Strangerke
2d1d6630d6 TONY: Remove useless CODEC class definition 2012-06-20 22:17:41 +02:00
Alyssa Milburn
1ee68078c1 TONY: Replace the FPStream code.
This just removes the original code and replaces it with a quickly-
written trivial implementation similar to clone2727's sfx code. It
seems to at least sort of work. :-)
2012-06-20 19:36:25 +02:00
Paul Gilbert
aa775b4497 TONY: Some bugfixes and cleanup for the music support code 2012-06-19 22:37:56 +10:00
Paul Gilbert
d2061f29be TONY: Added initialisation of FPSound fields in it's constructor 2012-06-19 22:06:30 +10:00
Paul Gilbert
9d437a26dd TONY: Fix some compiler warnings in the newly added sound code 2012-06-19 21:19:17 +10:00
Paul Gilbert
b8d5e17fef TONY: Added an extra check for shouldQuit into the main event loop 2012-06-19 21:14:56 +10:00
Paul Gilbert
61d460a854 TONY: Implement more of the music related code from the original 2012-06-19 20:50:48 +10:00
Paul Gilbert
0aa3d39cf7 TONY: Remove unused stubs for LZO compression 2012-06-18 19:56:28 +10:00
Paul Gilbert
565bf7383a TONY: Refactored the RMRect topLeft/bottomRight properties into a cleaner implementation 2012-06-18 19:50:29 +10:00
Strangerke
f2e6b46153 TONY: Rename RMFontDialog 2012-06-18 08:28:13 +02:00
Strangerke
e8a6f61f88 TONY: Remove useless void in function declaration 2012-06-18 08:24:33 +02:00
Strangerke
bb55045cc8 TONY: Rename two variables 2012-06-18 08:03:02 +02:00
Strangerke
6a7fa693ef TONY: Fix a typo in utils comments 2012-06-18 07:58:19 +02:00
Strangerke
a46b06a587 TONY: Move functions comment to doxygen format 2012-06-17 19:39:58 +02:00
Strangerke
31c0210f22 TONY: Missed one word in previous commit (thanks clone2727) 2012-06-17 18:38:34 +02:00
Strangerke
b36b666300 TONY: American-ification of English used 2012-06-17 18:36:23 +02:00
Strangerke
e36f36168d TONY: Doxygen-ify comments in sound files 2012-06-17 18:09:52 +02:00
Paul Gilbert
d24fc8b5d8 TONY: Fix memory leak in LocationPollThread 2012-06-17 17:42:29 +10:00
Paul Gilbert
9405f9eb4a TONY: Added code to load and save the ScummVM sound settings 2012-06-17 17:04:10 +10:00
Paul Gilbert
b554063d30 TONY: Moved global initialisations out of TonyEngine and into Globals class 2012-06-17 15:01:13 +10:00
Paul Gilbert
d0c6497212 TONY: Fix crash opening the Options menu in-game 2012-06-17 14:22:53 +10:00
Paul Gilbert
a91553efeb TONY: Cleaned up the @defgroup comments 2012-06-17 09:09:18 +10:00
Paul Gilbert
8335c25cb9 TONY: Fix memory leak in ActionThread if game exists whilst it is active 2012-06-17 08:45:38 +10:00
Strangerke
011b15966c TONY: Translate comments in sound.cpp 2012-06-16 23:48:16 +02:00
Strangerke
ac4567dcb6 TONY: Rename sound variables 2012-06-16 19:04:19 +02:00
Paul Gilbert
25d95bd5e3 TONY: Workaround for original game bug opening the door in the first scene
In the original, after moving to the door, the game scripts have Tony start immediately moving back to the desk. Unfortunately, they didn't realise that the _hEndOfPath event would still be briefly set from finishing the walk to the door, so the game didn't wait until Tony had reached the desk to start the conversation.
2012-06-16 22:06:11 +10:00
Strangerke
ddd1414a56 TONY: Rename sound functions and class names 2012-06-16 11:32:50 +02:00
Strangerke
638b066601 TONY: Translate some Italian terms, rename enums 2012-06-16 11:09:08 +02:00
Paul Gilbert
37f772c2d7 TONY: Bugfix for hanging after giving 'shrimp' to the parrot 2012-06-16 18:33:38 +10:00
Paul Gilbert
cdbc4aa28b TONY: Initial commit of in progress dirty rect handling 2012-06-16 10:57:35 +10:00
Strangerke
71aa08c7f0 TONY: Silent more CppCheck warnings 2012-06-15 08:42:24 +02:00
Strangerke
7c605c5f69 TONY: Silent more CppCheck warnings, remove an unused global 2012-06-15 08:23:06 +02:00
Strangerke
7951881d46 TONY: Fix three warnings reported by CppCheck in inventory (reported by eriktorbjorn) 2012-06-14 18:31:57 +02:00
Paul Gilbert
e55a16271e TONY: Removed unused global static object and associated method 2012-06-14 22:07:36 +10:00
Strangerke
d4e9aa78ab TONY: Silent more CppCheck warnings 2012-06-14 08:08:13 +02:00
Strangerke
42a322d671 TONY: Silent some CppCheck warnings 2012-06-14 00:12:45 +02:00
Paul Gilbert
746dcf33da TONY: Refactor RMPointer class to use the ScummVM CursorMan 2012-06-13 21:06:57 +10:00
Strangerke
5bafab9ad6 TONY: Translate some more Italian 2012-06-13 08:00:37 +02:00
Strangerke
876d47e17d TONY: Translate Italian enums 2012-06-12 21:42:46 +02:00
Matthew Hoops
de440e1a71 TONY: Fix looping some sounds 2012-06-12 11:35:27 -04:00
Strangerke
b828231671 TONY: Translate some more comments into English 2012-06-12 08:03:51 +02:00
Strangerke
985602a72d TONY: Rename some Italian into English 2012-06-12 00:07:50 +02:00
Strangerke
34a7c7be98 TONY: Rename a remaining variable in loc.h 2012-06-11 22:22:46 +02:00
Strangerke
5de8b7aa74 TONY: Rename variables in tonychar.h 2012-06-11 21:43:04 +02:00
Strangerke
94df38bfb4 TONY: Rename variables in game.h and gfxcore.h 2012-06-11 21:30:47 +02:00
Strangerke
02c8ccebcb TONY: Rename variables in utils.h 2012-06-11 20:24:25 +02:00
Paul Gilbert
71329df502 TONY: Removed unused variable 2012-06-11 22:38:03 +10:00
Paul Gilbert
d20fb7480e TONY: Fix crash in the Tunnel Of Love 2012-06-11 19:22:41 +10:00
Paul Gilbert
5b5a812d37 TONY: Implemented process to properly set hEndOfBuffer when sound effects end 2012-06-11 12:20:12 +10:00
Matthew Hoops
2da2981682 TONY: Rewind sounds before playing them
Fixes sounds in the menu
2012-06-10 22:03:52 -04:00
Matthew Hoops
42f4fe359c TONY: Convert FPSFX to our mixer code
Only thing missing is the hEndOfBuffer code, but this is a good start
2012-06-10 21:23:28 -04:00
Strangerke
264721a194 TONY: Rename variables in inventory.h 2012-06-11 00:43:59 +02:00
Strangerke
7ace80b0d0 TONY: Rename variables in font.h 2012-06-11 00:34:45 +02:00
Strangerke
44ee26e6c9 TONY: Rename variables in loc.h and mpal.h 2012-06-10 23:56:37 +02:00
Strangerke
2b02a45ce1 TONY: Rename variables in globals.h 2012-06-10 22:34:08 +02:00
Paul Gilbert
f64700b27f TONY: Fixed display of static animations, and some variable renaming 2012-06-11 00:24:52 +10:00