222 Commits

Author SHA1 Message Date
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
Max Horn
4158ff64ed Fix warnings
svn-id: r32403
2008-05-30 16:39:49 +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
0e92f8ffa9 Rewrote some more room logic
svn-id: r32400
2008-05-30 14:58:09 +00:00
Filippos Karapetis
1da231a34e - x_alakeva/y_alakeva -> destX/destY
- confirma_salir -> confirmExit
- Used CLIP instead of if's

svn-id: r32399
2008-05-30 14:44:08 +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
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
d0b396f062 Moved SSN frame definitions into their own enum and removed unused definitions for the escape and F1-F10 keys
svn-id: r32391
2008-05-30 10:21:29 +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
Filippos Karapetis
64def1b562 Big simplification and cleanup to the animation code
svn-id: r32387
2008-05-30 09:45:00 +00:00
Eugene Sandulenko
4eed36f88c Fix compilation
svn-id: r32386
2008-05-30 09:28:52 +00:00
Eugene Sandulenko
0516f550c3 Wrap up talk_taber2()
svn-id: r32385
2008-05-30 08:56:07 +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
Eugene Sandulenko
4ae97b90cb Remove obsolete comment
svn-id: r32382
2008-05-30 08:30:40 +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
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
8d16e9330a Untangling spaghetti code: removed several goto statements
svn-id: r32379
2008-05-30 08:00:42 +00:00
Filippos Karapetis
1ca29c1796 Some cleanup, translated an error message
svn-id: r32378
2008-05-30 07:26:55 +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
54e631a903 rompo -> doBreak
Removed unused variable rompo2

svn-id: r32376
2008-05-30 07:19:09 +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
Eugene Sandulenko
3c827020a6 Fix regression introduced by last cleanup
svn-id: r32373
2008-05-30 05:35:47 +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
5396cd5ded Cleanup
svn-id: r32370
2008-05-29 20:35:15 +00:00
Filippos Karapetis
3a43916e20 ancho -> width
alto -> height
nuevo_ancho -> newWidth
nuevo_alto -> newHeight
suma_x -> totalX
suma_y -> totalY
Removed unneeded variables diferencia_x/diferencia_y

svn-id: r32368
2008-05-29 18:18:38 +00:00
Filippos Karapetis
8363f1294a More talk related simplifications
svn-id: r32367
2008-05-29 18:09:12 +00:00
Filippos Karapetis
13c8e6d94b Numbers are mapped in a different order in the game's fonts
svn-id: r32365
2008-05-29 16:53:28 +00:00
Filippos Karapetis
eb964d2844 Fixed regression
svn-id: r32364
2008-05-29 16:41:49 +00:00
Filippos Karapetis
c2c21ffffb MirarRaton -> updateEvents
espera_soltar -> updateEvents
Some cleanup

svn-id: r32363
2008-05-29 14:14:31 +00:00
Filippos Karapetis
beafc62b0d puertas_cerradas -> updateDoor
saca_objeto -> removeObject

svn-id: r32362
2008-05-29 14:04:47 +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
2675cd38a6 Fixed the two animation FIXMEs
svn-id: r32325
2008-05-27 16:02:07 +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
314ecc5d7d Cleanup of the X_OBJ and Y_OBJ defines
svn-id: r32313
2008-05-27 07:04:56 +00:00
Filippos Karapetis
8e290114d2 palJuego -> gamePalette
x_raton -> mouseX
y_raton -> mouseY

Some slight cleanup

svn-id: r32312
2008-05-27 06:35:00 +00:00
Kari Salminen
a43d1e6be0 Changed floating point immediates to single precision (Silences MSVC warning C4305: '+=' : truncation from 'double' to 'float').
svn-id: r32307
2008-05-26 22:01:29 +00:00
Eugene Sandulenko
32eee43bbc Implement built-in screensaver
svn-id: r32306
2008-05-26 21:48:59 +00:00