Commit Graph

46 Commits

Author SHA1 Message Date
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
e3a8074a6d Rewrote some more room logic
svn-id: r32518
2008-06-03 18:17: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
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
b0c7714cfa Added an enum for Igor's possible states
svn-id: r32502
2008-06-02 20:32:36 +00:00
Filippos Karapetis
e6d2ed3ca8 Further cleanup of the talk code
svn-id: r32494
2008-06-02 10:58:45 +00:00
Filippos Karapetis
738a62ef6a loadAndDecompressPic -> loadPic
svn-id: r32484
2008-06-02 04:42:19 +00:00
Filippos Karapetis
704ad4a5fb Removed the now obsolete talk_dr_dch
Merged talk_bartender and talk_taber2
Merged talk_pen and talk_pen2

svn-id: r32481
2008-06-01 22:38:29 +00:00
Eugene Sandulenko
ba5cebfaf8 Now whole game could be run from original packed files.
svn-id: r32475
2008-06-01 20:58:05 +00:00
Filippos Karapetis
8a8c67c9b7 Simplified calls to updateScreen()
svn-id: r32424
2008-05-31 12:40:02 +00:00
Eugene Sandulenko
7ce59d993b Remove trailing spaces
svn-id: r32422
2008-05-31 10:01:13 +00:00
Filippos Karapetis
bbfb4661ee updateData -> updateVisible
num_ejec -> currentChapter

svn-id: r32417
2008-05-31 09:16:26 +00:00
Filippos Karapetis
178e4e805f tabernero -> bartender
anexo -> joined
LimitaVGA -> adjustToVGA
velas -> candles
VelocidadDeFundido -> fadeSpeed
anda_parriba -> walkUp
anda_pabajo -> walkDown

svn-id: r32409
2008-05-31 00:06:05 +00:00
Filippos Karapetis
d711fd9e34 - Simplified font mapping (in print_abc and print_abc_opc)
- Moved checkFlag to rooms.cpp
- x_de_letra/y_de_letra -> letterX/letterY
- Made itemLocations a const
- Removed loads of now unneeded letter descriptions

svn-id: r32407
2008-05-30 23:43:47 +00:00
Filippos Karapetis
64211f3370 - Renamed texts.cpp to staticdata.h and moved all game static data there
- Simplified room_0()
- Some cleanup

svn-id: r32404
2008-05-30 20:42:31 +00:00
Filippos Karapetis
0e92f8ffa9 Rewrote some more room logic
svn-id: r32400
2008-05-30 14:58:09 +00:00
Filippos Karapetis
4837ff8b9b - Merged loadPic and decompressPic
- talk_pianista -> talk_pianist
- Wrapped up talk_pianist, talk_wolf, talk_htel and talk_mus
- Did some cleanup in room logic

svn-id: r32398
2008-05-30 14:25:03 +00:00
Filippos Karapetis
d2c337401e Simplified calls to playSound()
svn-id: r32395
2008-05-30 11:04:40 +00:00
Filippos Karapetis
db0af96fa0 Wrapped up talk_igor_front, talk_igor_door, talk_igor_seated and talk_igor_wig
svn-id: r32392
2008-05-30 10:31:47 +00:00
Filippos Karapetis
792286874a talk_igorpuerta -> talk_igor_door
talk_igor_peluca -> talk_igor_wig
and replaced some unneeded if statements with atoi

svn-id: r32388
2008-05-30 10:02:56 +00:00
Eugene Sandulenko
4eed36f88c Fix compilation
svn-id: r32386
2008-05-30 09:28:52 +00:00
Eugene Sandulenko
9b7e8fb704 Wrap up talk_taber2()
svn-id: r32384
2008-05-30 08:55:47 +00:00
Eugene Sandulenko
8c9205babd Wrap up rest of talk() calls
svn-id: r32383
2008-05-30 08:48:01 +00:00
Filippos Karapetis
6397af21dc diferencia -> difference
pos_pixel -> pixelPos
hare_se_mueve -> characterMoved
pixel_x/pixel_y -> pixelX/pixelY
vez() -> getTime()
menu_sin_volcar() -> showMenu()

Removed unused function codifica()

svn-id: r32380
2008-05-30 08:14:01 +00:00
Filippos Karapetis
4cc64e2b63 anima -> animate
leng -> dataSize, and removed it from the global variables (it's only used in animate())

svn-id: r32377
2008-05-30 07:24:32 +00:00
Filippos Karapetis
eb28418d4b Changed color defines to more meaningful names in an enum
svn-id: r32375
2008-05-30 07:16:17 +00:00
Filippos Karapetis
8aa1b04043 dir_dibujo -> drawSurface
dir_hare_fondo -> backSurface
dir_mesa -> tableSurface
dir_hare_dch -> extraSurface (unsure about this one)
dir_zona_pantalla -> screenSurface
dir_hare_frente -> frontSurface
dir_texto -> textSurface
dir_pendulum -> pendulumSurface

svn-id: r32374
2008-05-30 07:09:36 +00:00
Filippos Karapetis
92bf1817cb Loads of Spanish translations with the help of timofonic (thanks!).
Unified some variable styles

svn-id: r32372
2008-05-29 22:34:03 +00:00
Filippos Karapetis
bf8dfb67e1 More simplifications to the talk functions
svn-id: r32326
2008-05-27 16:13:41 +00:00
Filippos Karapetis
4512958d74 longitud -> length
respuesta -> answer
objetos_que_tengo -> inventoryObjects
boton -> button
cuadrante -> quadrant
distancia -> distance
juego -> game
frase -> phrase
suena -> sound
usado -> used
responde -> response
puesto -> position

svn-id: r32321
2008-05-27 12:22:34 +00:00
Filippos Karapetis
de88eb33b5 objeto_que_lleva -> pickedObject
Removed the verb defines and replaced them with appropriate enums

svn-id: r32320
2008-05-27 12:02:26 +00:00
Filippos Karapetis
7263ec4763 Rewrote some more room logic
svn-id: r32319
2008-05-27 11:49:36 +00:00
Filippos Karapetis
7068ec9b71 Every time strcmp is abused, a baby koala cries...
Changed loads of strcmp's to integer comparisons. There might be two possible regressions (marked with a FIXME) in animation_2_1() and animation_9_6(), which need to be tested

Also, fixed a silly regression I made in commit #32312 in getLine()

svn-id: r32317
2008-05-27 09:03:22 +00:00
Filippos Karapetis
afd44c95d9 Changed roomParse to accept an array directly and rewrote some more room logic
svn-id: r32315
2008-05-27 07:45:13 +00:00
Filippos Karapetis
b1217da63f comienza_sound -> playSound
fin_sound -> stopSound
comienza_sound -> playSound
n_puerta -> doorNum
cierra_puerta -> closeDoor

svn-id: r32314
2008-05-27 07:17:15 +00:00
Filippos Karapetis
3469c4821a More simplification to the talk() calls, fixed a shadowing warning
svn-id: r32298
2008-05-26 18:52:25 +00:00
Filippos Karapetis
e0051aa140 Started rewriting room logic
svn-id: r32294
2008-05-26 17:50:26 +00:00
Paweł Kołodziejski
85abe0be12 more translations
svn-id: r32034
2008-05-11 20:05:09 +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
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
Eugene Sandulenko
e4525090a0 - Move verbs to texts.cpp
- Move yet another hardcoded string to texts.cpp
- Add string numbers to texts.cpp
- Fixed German texts

svn-id: r31998
2008-05-11 08:36:53 +00:00
Eugene Sandulenko
2da2fb7f4d First step to international version support. Moved all texts to arrays
svn-id: r31820
2008-05-02 15:09:20 +00:00
Eugene Sandulenko
6d863377f8 habla[r] -> talk
svn-id: r31814
2008-05-02 13:21:06 +00:00
Jordi Vilalta Prat
ed6678ee05 Translated the action verbs:
MIRAR -> LOOK
COGER -> PICK
ABRIR -> OPEN
CERRAR -> CLOSE
HABLAR -> TALK
MOVER -> MOVE

svn-id: r31813
2008-05-02 13:17:22 +00:00
Eugene Sandulenko
6fb9c2b84f Move rooms_* and update_* to rooms.cpp
svn-id: r31809
2008-05-02 12:00:58 +00:00