Commit Graph

25374 Commits

Author SHA1 Message Date
Johannes Schickel
de6e6408b6 Fixed some valgrind warnings.
svn-id: r32065
2008-05-12 17:23:28 +00:00
Filippos Karapetis
e27e54bd1f Updated kyra MSVC project files
svn-id: r32064
2008-05-12 16:36:09 +00:00
Benjamin Haisch
c3b1b9bf82 Fixed timer resolution/conversion; now the vulture in the first scene of RtZ lands on the sign, and the thunder sound is in sync with the flash screen effect in the Infocom logo screen.
svn-id: r32063
2008-05-12 16:10:13 +00:00
Johannes Schickel
289f96d37c More naming consistency fixes (fixes old TODO).
svn-id: r32062
2008-05-12 14:52:18 +00:00
Florian Kagerer
bde4fa1e9b fix for kyra 3 sfx (broken by last commit)
svn-id: r32061
2008-05-12 14:22:27 +00:00
Johannes Schickel
0b9a3f2208 Added assert to snd_playSoundEffect.
svn-id: r32060
2008-05-12 13:50:59 +00:00
Florian Kagerer
771854bdd9 move some kyra 3 static resources to kyra.dat
svn-id: r32058
2008-05-12 13:35:58 +00:00
Johannes Schickel
4db0bd9046 Two more KyraEngine_LoK opcodes renamed.
svn-id: r32057
2008-05-12 13:19:11 +00:00
Johannes Schickel
56d2603d4f - Some more opcodes moved to KyraEngine_v1
- Yet more naming consistency fixes

svn-id: r32056
2008-05-12 13:11:42 +00:00
Johannes Schickel
1a52c5283a - Yet more opcodes moved to KyraEngine_v1
- Renamed some opcodes inside KyraEngine_LoK

svn-id: r32055
2008-05-12 12:57:42 +00:00
Johannes Schickel
279987c181 Oops forgot to commit module.mk
svn-id: r32054
2008-05-12 12:43:52 +00:00
Johannes Schickel
574af78acb - Moved some opcodes to KyraEngine_v1
- Little variable renaming

svn-id: r32053
2008-05-12 12:42:10 +00:00
Filippos Karapetis
e8e4c5dafb Updated the MSVC project files of the kyra engine
svn-id: r32052
2008-05-12 11:43:40 +00:00
Benjamin Haisch
9e39e7d7a2 - Fixed timers, LGOP2 intro should now play correctly
- Some cleanup in LGOP2 opcodes

svn-id: r32051
2008-05-12 09:49:10 +00:00
Filippos Karapetis
27b9887a30 Updated NEWS file for Malcolm's Revenge support
svn-id: r32050
2008-05-12 08:49:55 +00:00
Torbjörn Andersson
65e41486f4 Added do { ... } while (0) to the GUI_V* macros, so that they will work as
expected if, for instance, someone writes "if (...) GUI_V1_MENU_ITEM( ... );"
I don't expect anyone will want to write statements like that, but just to
avoid nasty surprises...

svn-id: r32049
2008-05-12 04:33:30 +00:00
Travis Howell
4c5226002f Update HE version for that English Windows version of Freddi Fish 1.
svn-id: r32048
2008-05-12 04:29:41 +00:00
Torbjörn Andersson
3763c2799d Renamed preprocessor constants to match file names.
svn-id: r32047
2008-05-12 04:17:51 +00:00
Jordi Vilalta Prat
9ba353b9d8 Keep separated arrays for each type of plugin
svn-id: r32046
2008-05-12 01:26:43 +00:00
Jordi Vilalta Prat
2c9968fe80 - Added an engine plugin manager and moved engine specific functionality into it
- base/plugins.* reorganization

svn-id: r32045
2008-05-12 00:26:29 +00:00
Johannes Schickel
bb03596744 - Renamed KyraEngine to KyraEngine_v1
- kyra.* -> kyra_v1.*
- scene.cpp -> scene_v1.cpp

svn-id: r32044
2008-05-11 23:16:50 +00:00
Filippos Karapetis
ea301f9c7b Updated kyra MSVC project files
svn-id: r32043
2008-05-11 22:45:12 +00:00
Johannes Schickel
6e0c569966 Consisteny fixes:
- Renamed classes *_v1 -> *_LoK
 - Renamed files *_v1.* -> *_lok.*
 - Renamed WSAMovieV1 -> WSAMovie_v1
 - Renamed WSAMovieV2 -> WSAMovie_v2

svn-id: r32042
2008-05-11 22:32:37 +00:00
Max Horn
6e3c92e239 Renamed some parallaction member vars to have a leading underscore (besides being part of our code formatting conventions, this fixes various name clash warnings)
svn-id: r32041
2008-05-11 22:08:32 +00:00
Sven Hesse
9390c4021a Implemented saving/loading in Woodruff. Should work, although it tries to save and load sprites (which we ignore currently, doesn't seem to have any impact).
svn-id: r32040
2008-05-11 22:08:18 +00:00
Max Horn
d123c67174 Fix QuickTime MIDI driver compilation
svn-id: r32038
2008-05-11 21:28:51 +00:00
Johannes Schickel
1d018f6046 Formatting.
svn-id: r32037
2008-05-11 21:09:16 +00:00
Paweł Kołodziejski
85abe0be12 more translations
svn-id: r32034
2008-05-11 20:05:09 +00:00
Sven Hesse
c5498a69bf Implemented temp buffer saving/loading ("SAVE.TMP") in Woodruff.
Objects you take from or leave in screens are remembered correctly now.

svn-id: r32030
2008-05-11 18:55:40 +00:00
Johannes Schickel
4b21c2958d Implemented helium mode support for Kyra3.
svn-id: r32028
2008-05-11 17:50:13 +00:00
Johannes Schickel
825e3b5136 - Added support for original kyra3 save files
- Added TalkObject::sceneId in savegames

svn-id: r32027
2008-05-11 17:20:23 +00:00
Johannes Schickel
a6ccfa4f09 Added saving of current album page of kyra3 like the original did.
svn-id: r32025
2008-05-11 16:56:19 +00:00
Johannes Schickel
61a105c9ba Updated pathfinder debug output.
svn-id: r32024
2008-05-11 16:48:54 +00:00
Johannes Schickel
35d01db1aa Implemented page switch animation in kyra3 album.
svn-id: r32023
2008-05-11 15:57:50 +00:00
Johannes Schickel
4932660f13 - Implemented kyra3 album (page switch animation not yet implemented)
- Implemented opcode 25: o3_showAlbum

svn-id: r32022
2008-05-11 15:24:25 +00:00
Filippos Karapetis
57dfdbc6c8 Added a sanity check to getFrame()
svn-id: r32020
2008-05-11 13:11:01 +00:00
Florian Kagerer
5f9c533446 stop music playback when skipping (parts of) the HOF intro
svn-id: r32019
2008-05-11 12:58:54 +00:00
Kari Salminen
47e4cf17bb Update MSVC project files.
svn-id: r32018
2008-05-11 12:56:18 +00:00
Paweł Kołodziejski
583e2573ab Negro -> Black
Destino -> dest
Origen -> src
Alto -> height
Ancho -> width
Buffer -> buffer
contador -> counter
dicho -> said
musica_antes -> previousMusic
musica_room -> roomMusic
cerca -> near
lejos -> far
paso -> step
espuerta -> isDoor

svn-id: r32017
2008-05-11 12:47:26 +00:00
Johannes Schickel
35cc3a3d19 Committed slightly modified patch #1961830 "KYRA: Scroll wheel support for Kyra 2 and 3".
svn-id: r32016
2008-05-11 11:35:12 +00:00
Paweł Kołodziejski
7da27cf28c asigna_rgb -> setRGB
ActualizaPaleta -> updatePalette
elige_objeto -> chooseObject
datos_actuales -> currentData
nombre_obj -> objName
nombre_icono -> iconName
agarra_objeto -> pickObject
abre_puerta -> openDoor
con_voces -> with_voices
carga_pcx -> loadPCX
graba_partida -> saveGame
sin_verbo -> withoutVerb
actualiza_datos -> updateData

svn-id: r32014
2008-05-11 11:20:40 +00:00
Eugene Sandulenko
4cd801e26b - Move remaining texts to texts.cpp
- Specify differences for Spanish version

svn-id: r32013
2008-05-11 11:11:24 +00:00
Paweł Kołodziejski
986f26feae ops
svn-id: r32012
2008-05-11 10:59:08 +00:00
Paweł Kołodziejski
1b25ec5c8e ESPACIO -> SPACE
AZUL_OSCURO -> DARK_BLUE
VERDE_CLARO -> LIGHT_GREEN
VERDE_OSCURO -> DARK_GREEN
AMARILLO -> YELLOW
NARANJA -> ORANGE
ROJO -> RED
MARRON -> MAROON
MORADO -> PURPLE
BLANCO -> WHITE
ROSA -> PINK
ALTO_PERSONAJE -> CHARACTER_HEIGHT
ANCHO_PERSONAJE -> CHARACTER_WIDTH
NO_PUERTA -> NO_DOOR
COMPLETA -> FULL
MEDIA -> HALF

svn-id: r32011
2008-05-11 10:53:59 +00:00
Filippos Karapetis
d6fafb4ad1 Fixed compilation under windows
svn-id: r32010
2008-05-11 10:52:58 +00:00
Torbjörn Andersson
d7fc8fd7be Use less CPU when reading the spell book.
svn-id: r32009
2008-05-11 10:48:22 +00:00
Paweł Kołodziejski
686b7a80de X_PUNTO -> X_DOT
X_PUNTO_OPC -> X_DOT_OPC
X_MAYOR_QUE -> X_GREATER_THAN
X_MENOR_QUE -> X_LESSER_THAN
X_MAYOR_QUE_OPC -> X_GREATER_THAN_OPC
X_MENOR_QUE_OPC -> X_LESSER_THAN_OPC
X_POR_CIENTO -> X_PERCENT
X_POR_CIENTO_OPC -> X_PERCENT_OPC
X_MAS -> X_PLUS
X_MAS_OPC -> X_PLUS_OPC

svn-id: r32008
2008-05-11 10:36:48 +00:00
Paweł Kołodziejski
8e7994ada8 NUM_BANDERAS -> NUM_FLAGS
ANCHOBJ -> OBJWIDTH
ALTOBJ -> OBJHEIGHT
ANCHO_LETRAS -> CHAR_WIDTH
X_GUION -> X_HYPHEN
X_GUION -> X_HYPHEN_OPC
X_ABRE_PARENTESIS -> X_BRACKET_OPEN
X_ABRE_PARENTESIS_OPC -> X_BRACKET_OPEN_OPC
X_CIERRA_PARENTESIS -> X_BRACKET_CLOSE
X_CIERRA_PARENTESIS_OPC -> X_BRACKET_CLOSE_OPC

svn-id: r32007
2008-05-11 10:28:25 +00:00
Paweł Kołodziejski
d176a32f2e salir_al_dos -> releaseGame
stopmusic -> stopMusic
music_status -> musicStatus
playmusic -> playMusic

svn-id: r32006
2008-05-11 10:03:06 +00:00
Eugene Sandulenko
68f45add74 Italian verbs thanks to glorifindel
svn-id: r32005
2008-05-11 10:03:03 +00:00