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
Filippos Karapetis
e6d2ed3ca8
Further cleanup of the talk code
...
svn-id: r32494
2008-06-02 10:58:45 +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
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
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
73b8f5ec00
x_igor/y_igor -> igorX/igorY
...
talk_dr_izq -> talk_drascula
Merged talk_drascula and talk_dr_dch
svn-id: r32425
2008-05-31 13:01:48 +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
Eugene Sandulenko
8fd8c68a05
Eliminated more gotos
...
svn-id: r32416
2008-05-31 08:26:06 +00:00
Eugene Sandulenko
83880b85e9
Fix old regression
...
svn-id: r32415
2008-05-31 08:10:15 +00:00
Eugene Sandulenko
46fce5ff50
Replace evil gotos with proper do-while loops.
...
svn-id: r32414
2008-05-31 08:09:34 +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
798ce0ace8
Cleanup
...
svn-id: r32406
2008-05-30 21:09:21 +00:00
Filippos Karapetis
d0174453ed
LookForFree -> soundIsActive
...
soundIsActive returns a boolean value now
svn-id: r32402
2008-05-30 15:15:49 +00:00
Filippos Karapetis
08eeb40ab4
Cleanup
...
svn-id: r32401
2008-05-30 14:58:38 +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
c153aaeea9
Wrapped up talk_drunk
...
Some cleanup
dir_escritura -> targetSurface
targetScreen -> targetSurface
plt (in decompressPic) -> colorCount
funcion -> function
svn-id: r32394
2008-05-30 10:55:43 +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
d261c93049
More simplification of talk code. Moved talk_dr_grande() from animation.cpp to talk.cpp
...
svn-id: r32390
2008-05-30 10:14:27 +00:00
Filippos Karapetis
ea276dd177
talk_igor_frente -> talk_igor_front
...
svn-id: r32389
2008-05-30 10:04:39 +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
0516f550c3
Wrap up talk_taber2()
...
svn-id: r32385
2008-05-30 08:56:07 +00:00
Filippos Karapetis
54a28afe0c
cara -> face
...
componente -> component
palFondo -> bgPalette
Capitalization
svn-id: r32381
2008-05-30 08:28:54 +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
8363f1294a
More talk related simplifications
...
svn-id: r32367
2008-05-29 18:09:12 +00:00
Filippos Karapetis
7a22a63244
Simplified calls to talk_igor_dch, talk_dr_izq and talk_dr_dch
...
Removed loads of font definitions and simplified some of the internal font mapping
svn-id: r32359
2008-05-29 12:17:40 +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
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
