Commit graph

97 commits

Author SHA1 Message Date
Thierry Crozat
d46e0d8ab0 DRASCULA: Add option to pause speech using space or pause key 2018-11-04 21:42:50 +00:00
Eugene Sandulenko
327dcf98ec DRASCULA: Make remaining static texts translatable
drascula.dat file version bumped
2017-11-14 04:07:11 +01:00
Filippos Karapetis
d81869af58 DRASCULA: Simplify the drawing code in BJ's room 2017-11-11 17:14:36 +02:00
Eugene Sandulenko
dead4aa014 JANITORIAL: Remove trailing spaces 2016-10-09 14:59:58 +02:00
Thierry Crozat
eef8371432 DRASCULA: Swap extraSurface and tableSurface use in chapter 6 for Spanish version
This simplifies the code and bring it closer to the original source code.
This should help if we need to debug issues in the future.
2016-04-16 18:59:27 +01:00
Thierry Crozat
e3cb949b95 DRASCULA: Fix wrong background for inventory in chapter 6
This was a regression from commit fa3d3e3 and this fixes part of
bug #7113 DRASCULA: Serious sprite glitches.

The original uses extraSurface to draw text in draw_abc() in the
Spanish version while other languages use tableSurface. But in
ScummVM this was changed to use tableSurface for all languages.
However this caused an issue in chapter 6 when displaying the
inventory has it is also using tableSurface, as it was for all languages
in the original. While using the same surface works for other
languages, in the Spanish version we get the wrong background in
the inventory.

Rather than revert to using extraSurface for drawing text which is
a big change and impact all the chapters, I have opted to simply
swap the usage of the tableSurface and extraSurface in chapter 6
for the Spanish version compared to the original engine. The
changes therefore only impact chapter 6 and only the Spanish
version. I played the chapter in full to check that it indeed works
without causing adverse effects.
2016-04-12 22:19:43 +01:00
Thierry Crozat
5716b288ac DRASCULA: Fix color for Drascula at the end of chapter 5
I checked the original and the code in ScummVM and there is no
call to talk_solo in chapter 4, while we indeed need to use the red
color for all calls to talk_solo in chapter 5.
2016-04-11 01:36:59 +01:00
norbertbajko
bcf2e8204c DRASCULA: comment "talk.cpp"
Explain #5903 DRASCULA-IT bug fix
2015-03-01 17:23:28 +01:00
norbertbajko
0abf6d72b0 DRASCULA: comment "talk.cpp"
Explain #5903 DRASCULA-IT bug fix
2015-03-01 17:16:54 +01:00
Norbert Bajkó
8778603d34 DRASCULA: fix crash/graphic glitch at castle towers
Fix bug #5903 DRASCULA-IT: Crash/graphic glitch at castle towers
2015-03-01 14:48:34 +01:00
Johannes Schickel
cf91cebb9d DRASCULA: Make GPL headers consistent in themselves. 2014-02-18 02:39:34 +01:00
Filippos Karapetis
d531484350 DRASCULA: Some renaming. Also, get rid of some extraneous globals
This removes the superfluous talkHeight, talkWidth and timeDiff
variables. It also changes _loadedDifferentChapter to be a boolean
2013-08-19 03:08:58 +03:00
D G Turner
a0dbe45a45 DRASCULA: Add fix for crash/OOB memory accesses in bug #3440895
This bug is "DRASCULA-IT: Crash/graphic glitch at castle towers".
The crash was due to width and height values being passed to
copyBackground() being invalid due to out of bounds read from
the factor_red array. This adds debugging statements and fixes
the crash by clipping accesses to the maximum index of factor_red.

This doesn't however fix the observed GFX glitch, but stops it being
a segfault.
2011-11-25 06:30:10 +00:00
Johannes Schickel
7600751525 DRASCULA: Allow faster quit when in the mid of a conversation.
This allows quitting ScummVM in only a minimal time when a converstion is
running instead of waiting for it to finish. It is still not instant but much
better.
2011-11-13 20:57:41 +01:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Eugene Sandulenko
e71caf8600 Drascula: Fix bug #2827169.
Bug #2827169: "DRASCULA: gfx glitch in pendulum room" fixed by
rearranging draw sequence.

svn-id: r49719
2010-06-15 10:23:36 +00:00
Eugene Sandulenko
02a76b2e91 Drascula: add even more responsiveness
svn-id: r49718
2010-06-15 10:23:17 +00:00
Eugene Sandulenko
e4d77cf098 Drascula: Add responsiveness while talking.
svn-id: r49716
2010-06-15 10:22:39 +00:00
Max Horn
da81c58af1 DRASCULA: Some cleanup; turn some global C++ objects into members of DrasculaEngine
svn-id: r48215
2010-03-09 23:35:30 +00:00
Torbjörn Andersson
7d238d8779 Make sure that "buf" is properly terminated. Actually, we could probably get
rid of "buf" completely, and replace it with face = syncChar[p] - '0', assuming
that syncChar only contains digits. But for now, let's make a minimal change.
This might fix bug #2826611 ("DRASCULA: Crash when smashing church window").

svn-id: r42776
2009-07-25 17:48:51 +00:00
Max Horn
ac59693be2 A ton of code formatting fixes; also fixed warnings about single line loops like 'while(cond);' by inserting newlines
svn-id: r36127
2009-01-29 05:26:12 +00:00
Eugene Sandulenko
696897b058 Whoa! Removing trailing spaces.
svn-id: r35648
2009-01-01 15:06:43 +00:00
Eugene Sandulenko
294b953843 - Renamed withVoices to _subtitlesDisabled as it reflect the true meaning.
- Allowed to disable subtitles from options dialogs including RTL.

svn-id: r34675
2008-09-28 22:07:16 +00:00
Max Horn
bf76057ec4 Removed tons of unused 'length' variables, to silence compiler warnings
svn-id: r34585
2008-09-16 20:12:25 +00:00
Filippos Karapetis
6a4d96649e - Moved some includes away from drascula.h
- Moved grr() to talk.cpp
- Removed the unnecessary parameter length from isTalkFinished()

svn-id: r34577
2008-09-16 11:49:40 +00:00
Filippos Karapetis
2884da1452 Show the blind man's dialog text at a bit better place
svn-id: r34561
2008-09-15 14:35:11 +00:00
Filippos Karapetis
cbf561a0a0 - Moved more animation data inside drascula.dat
- Merged copyRect and copyRectClip
- Added enums for all the possible character directions and removed duplicate directions
- Extended the talk sequence commands a bit
- Removed unnecessary buffer faceBuffer and the unneeded casts between byte * and char * that were used

svn-id: r34503
2008-09-12 12:54:16 +00:00
Filippos Karapetis
3202ef4dd1 Reduced game memory usage by about 400KB by only loading the current language strings, not all strings
svn-id: r34472
2008-09-10 08:25:12 +00:00
Filippos Karapetis
dbbfaa4c83 talk_dr_grande -> talk_drascula_big
talk_baul -> talk_trunk

svn-id: r34182
2008-08-26 08:35:02 +00:00
Filippos Karapetis
0a2a468d83 Simplified several calls to copyBackground()
svn-id: r34181
2008-08-26 08:21:21 +00:00
Filippos Karapetis
3b0aba1c38 Merged talk_vonBraun and talk_vonBraunpuerta
svn-id: r34180
2008-08-26 08:05:36 +00:00
Max Horn
bd296a45fa Fixed unitialized variables
svn-id: r32865
2008-07-01 10:33:25 +00:00
Filippos Karapetis
930ba6d02d drawSurface1 -> bgSurface
svn-id: r32644
2008-06-10 18:54:32 +00:00
Filippos Karapetis
6c5d005edc Cleanup
svn-id: r32609
2008-06-08 03:09:21 +00:00
Filippos Karapetis
b28b0fe6d7 Cleanup
estanteria -> bookcase

svn-id: r32591
2008-06-07 14:15:56 +00:00
Filippos Karapetis
d3adb312c9 Fixed regression from last commit
svn-id: r32590
2008-06-07 11:43:54 +00:00
Filippos Karapetis
7192c88b19 Used enums for igor talker types
Merged a lot of code of talk_pianist, talk_drunk, talk_werewolf and talk_mus

svn-id: r32589
2008-06-07 11:31:40 +00:00
Filippos Karapetis
67765c6559 Simplified talk_hacker
svn-id: r32588
2008-06-07 10:10:40 +00:00
Filippos Karapetis
7c4e375b39 - Cleaned up the code that makes the in-game screensaver pop up
- Grouped all the frame_* variables
- Removed the unused mouseY_ant variable

Renamed:
x_dr/y_dr -> drasculaX/drasculaY
x_bj/y_bj -> bjX/bjY
vb -> VonBraun
wolf -> werewolf
pos_cabina -> cabinPos
dir_lectura -> pal
plt -> colorCount
palNegra -> blackPalette
cont_sv -> framesWithoutAction

svn-id: r32577
2008-06-06 14:50:19 +00:00
Filippos Karapetis
266cf3b760 Cleanup
svn-id: r32574
2008-06-06 10:01:14 +00:00
Filippos Karapetis
fe2fcbf2d5 - Removed the unused hay_sb variable (originally, it was meant to check if the sound is active or not)
- mesa -> volumeControls
- Cleanup of volumeControls()
- fliplay -> playFLI, and removed openSSN() and EndSSN()
- Some translations:
button_izq -> leftMouseButton
button_dch -> rightMouseButton
animation_rayo -> animation_ray
hueso -> bone
vuela -> fly

svn-id: r32552
2008-06-05 08:25:29 +00:00
Eugene Sandulenko
4ee6f4d01a Fix memory overwrite
svn-id: r32543
2008-06-04 18:27:58 +00:00
Filippos Karapetis
b0eb20b4b8 Fixed the animation where the window is broken by the spear outside the church
svn-id: r32542
2008-06-04 18:08:19 +00:00
Filippos Karapetis
052d6f6bff releaseGame() -> quitGame()
nivel_osc -> palLevel
Simplified calls to loadPic()

svn-id: r32533
2008-06-04 10:27:10 +00:00
Filippos Karapetis
e7f8ef11a9 carga_escoba -> enterNewRoom
talk_sinc -> talk_sync
n_ejec2 -> savedChapter

Removed updatePalette()
Simplified enterNewRoom()
Merged para_cargar() and loadGame()
Slight cleanup to withoutVerb()
Removed set_dac and set_dacSSN

svn-id: r32528
2008-06-04 09:02:23 +00:00
Filippos Karapetis
db0c37d054 Removed junk code from update_1_pre, update_4 and update_6_pre
pon_hare -> moveCharacters
hare_oscuro -> setDarkPalette
hare_claro -> setBrightPalette
funde_hare -> setPaletteBase
conta_blind_vez -> savedTime
paleta_hare -> assignDefaultPalette
paleta_hare_claro -> assignBrightPalette
paleta_hare_oscuro -> assignDarkPalette
distance_x/distance_y -> distanceX/distanceY
palHare -> defaultPalette
palHareClaro -> brightPalette
palHareOscuro -> darkPalette
pos_murci -> batPos
murci_x/murci_y -> batX/batY
blind_x/blind_y -> blindX/blindY

svn-id: r32526
2008-06-04 07:58:34 +00:00
Filippos Karapetis
00e662391d x_talk_izq/x_talk_dch are used in more than 1 place
sentido_dr -> trackDrascula
sentido_hare -> trackProtagonist
sentido_final -> trackFinal
lleva_al_hare -> gotoObject
pon_vb/sentido_vb -> moveVB/trackVB
hay_seleccion -> selectionMade
suelo -> floor
obj_salir -> objIsExit
sitio_x/sitio_y -> roomX/roomY
fundido -> fade
cuanto -> duration (in pause())
pos_hare -> curPos
nom_fich -> fileName
sitiobj_x/sitiobj_y -> roomObjX/roomObjY
sentidobj -> trackObj
cirio -> candle
pianista -> pianist
suma_1_pixel -> talkOffset
sincronia -> syncChar

svn-id: r32512
2008-06-03 08:54:49 +00:00
Filippos Karapetis
220dd330c2 hare_x/hare_y -> curX/curY
ancho_hare -> curWidth
alto_hare -> curHeight
direccion_hare -> curDirection

Some slight cleanup

svn-id: r32508
2008-06-02 23:09:19 +00:00
Filippos Karapetis
6f09c5a928 rayo_x -> rayX
PASO_HARE_X/PASO_HARE_Y -> STEP_X/STEP_Y
PIES_HARE -> FEET_HEIGHT
ALTO_TALK_HARE -> TALK_HEIGHT
ANCHO_TALK_HARE -> TALK_WIDTH
salgo -> roomExit
num_cara -> faceBuffer
pantalla -> curScreen

svn-id: r32503
2008-06-02 20:46:00 +00:00
Torbjörn Andersson
3f745d6813 This should fix a regression in the recent talk_igor() cleanup. I don't
actually have the game, though, so I can't actually verify that there is a
regression, nor that this fixes it.

svn-id: r32501
2008-06-02 18:48:09 +00:00