Commit Graph

25791 Commits

Author SHA1 Message Date
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
f21a15cbbb Removed decompressPic() and fixed the animation of Von Braun and his glass cage
svn-id: r32541
2008-06-04 17:41:40 +00:00
Johannes Schickel
73da6ab51e - Removed -Wconversion from compiler options for g++ 4.3, it's behavior has fundamently changed in g++ 4.3
- Added -Wno-empty-body and -Wno-parentheses as compiler flags for g++ 4.3 for *now* (we should think of removing -Wparentheses though)
- Fixed some warnings for g++ 4.3 (only for the engines I'm using)

svn-id: r32540
2008-06-04 17:20:25 +00:00
Filippos Karapetis
0931f926d4 Fixed typo in the initialization of the _textd1 array, which is now set correctly. Fixes bug #1982111 - "DRASCULA: Crash when buying sickle"
svn-id: r32539
2008-06-04 17:02:25 +00:00
Filippos Karapetis
659d2bb234 Fixed regression from commit #32536
svn-id: r32538
2008-06-04 16:39:56 +00:00
Filippos Karapetis
735463de44 Fixed the misuse of ARRAYSIZE
svn-id: r32537
2008-06-04 16:15:08 +00:00
Filippos Karapetis
bea79f2d31 Rewrote some more room logic. Added a FIXME about the usage of ARRAYSIZE in this case
svn-id: r32536
2008-06-04 14:42:27 +00:00
Filippos Karapetis
518d705c93 lleva_vb -> placeVB
c_mirar -> curExcuseLook
c_poder -> curExcuseAction
sentido -> trackCharacter
mirar_t -> lookExcuses
poder_t -> actionExcuses

svn-id: r32535
2008-06-04 10:48:18 +00:00
Filippos Karapetis
a8d8f23f69 Simplified some more calls to loadPic()
svn-id: r32534
2008-06-04 10:29:28 +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
7e2e283a0e Fixed regression from commit #32507
svn-id: r32532
2008-06-04 09:56:41 +00:00
Nicola Mettifogo
2f92ebde2b oops. Changed stricmp to scumm_stricmp from last commit.
svn-id: r32531
2008-06-04 09:39:38 +00:00
Filippos Karapetis
08566b44b8 enterNewRoom -> enterRoom
Added debug output when entering/exiting rooms

svn-id: r32530
2008-06-04 09:08:37 +00:00
Nicola Mettifogo
73832f2edd * Implemented character change opcodes in BRA
* Fixed loading of dialogue characters in BRA

svn-id: r32529
2008-06-04 09:07:55 +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
c0621fcc4e Merged para_grabar() with saveGame()
sentido_igor -> trackIgor
sentido_bj -> trackBJ

svn-id: r32527
2008-06-04 08:06:04 +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
Nicola Mettifogo
52fbdd51eb Script instructions referencing unexisting animations are now skipped, instead of crashing the engine.
svn-id: r32524
2008-06-04 01:27:55 +00:00
Nicola Mettifogo
fe6ab4227e Return to menu after introduction has played (with glitches).
svn-id: r32523
2008-06-04 01:04:26 +00:00
Filippos Karapetis
4b5ed050f1 Initial WIP and still non-working code for the blinking save reminder icon (bug reports #1981081 and #1971729)
svn-id: r32521
2008-06-03 21:20:55 +00:00
Max Horn
5288daa863 DS: Forgot to commit #include changes in the ds-fs.* files; this allows to get rid of -Isource/fat
svn-id: r32520
2008-06-03 21:04:41 +00:00
Filippos Karapetis
e3a8074a6d Rewrote some more room logic
svn-id: r32518
2008-06-03 18:17:56 +00:00
Johannes Schickel
3be34f071f Added support for compressed kyra3 audio files.
svn-id: r32516
2008-06-03 18:12:21 +00:00
Filippos Karapetis
6673bf512e Reordered and grouped function definitions
svn-id: r32513
2008-06-03 09:23:56 +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
45cce58611 Removed stringSupport.cpp/.h from the MSVC project files of the cruise engine
svn-id: r32511
2008-06-03 07:38:28 +00:00
Filippos Karapetis
2d9a194a55 Removed the now empty files stringSupport.cpp/.h
svn-id: r32510
2008-06-03 07:34:47 +00:00
Nicola Mettifogo
b87c11a4a1 Fixed initialization of parsers, necessary after the latest removal of static arrays.
svn-id: r32509
2008-06-03 00:49:27 +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
5789bbc836 elige_en_barra -> selectVerbFromBar
comprueba -> verify1
x_barra -> verbBarX
conta_vez -> startTime
diff_vez -> timeDiff

Some cleanup

svn-id: r32507
2008-06-02 22:41:58 +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
Filippos Karapetis
b0c7714cfa Added an enum for Igor's possible states
svn-id: r32502
2008-06-02 20:32:36 +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
Eugene Sandulenko
945b92501a Simplified detection table
svn-id: r32500
2008-06-02 18:38:50 +00:00
Eugene Sandulenko
72e3cee9d4 Add detection for original unpacked Spanish and Italian versions.
svn-id: r32499
2008-06-02 18:28:55 +00:00
Eugene Sandulenko
251467a013 - Now it is possible to choose English version from original CD. Thanks to
ADGF_KEEPMATCH
- Fix detection of French version

svn-id: r32498
2008-06-02 18:21:03 +00:00
Eugene Sandulenko
70dd879e2f Implement ADGF_KEEPMATCH
svn-id: r32497
2008-06-02 18:19:58 +00:00
Eugene Sandulenko
12c3798ffb Plug memory leak
svn-id: r32496
2008-06-02 18:19:18 +00:00
Nicola Mettifogo
9630298df6 Sorted static mouse arrow bitmap, so it doesn't have to be 'decoded' on the fly. This saves a headache on re-entry.
svn-id: r32495
2008-06-02 13:12:07 +00:00
Filippos Karapetis
e6d2ed3ca8 Further cleanup of the talk code
svn-id: r32494
2008-06-02 10:58:45 +00:00
Travis Howell
0fc34681c8 Add Macintosh version of Blue's 123 Time Activities.
svn-id: r32492
2008-06-02 08:39:19 +00:00
Filippos Karapetis
841dde61d0 Updated the MSVC project files (added unarj.cpp/.h)
svn-id: r32491
2008-06-02 08:01:26 +00:00
Eugene Sandulenko
cd6d528c42 Better implementation of packet games loading
svn-id: r32490
2008-06-02 06:51:59 +00:00
Eugene Sandulenko
aaf8b5810c Proper detection for packed German and French versions. Removed unneeded code.
svn-id: r32489
2008-06-02 05:56:53 +00:00
Eugene Sandulenko
4352bd1d88 Proper implementation for talk_banterder(82)
svn-id: r32488
2008-06-02 05:38:28 +00:00
Filippos Karapetis
7f36ae8d7c Removed some of the old talk functions
svn-id: r32487
2008-06-02 05:15:34 +00:00
Travis Howell
0f17e60101 GID_WATER is no longer required.
svn-id: r32486
2008-06-02 05:01:40 +00:00
Filippos Karapetis
24156516ab Simplified talk_blind()
svn-id: r32485
2008-06-02 05:00:11 +00:00
Filippos Karapetis
738a62ef6a loadAndDecompressPic -> loadPic
svn-id: r32484
2008-06-02 04:42:19 +00:00
Filippos Karapetis
cb5424810c Show the 3 pictures in carga_escoba after the initial file is loaded (so as not to attempt and reopen the ARJ file)
svn-id: r32483
2008-06-02 04:39:43 +00:00