Commit Graph

428 Commits

Author SHA1 Message Date
Filippos Karapetis
6c5d005edc Cleanup
svn-id: r32609
2008-06-08 03:09:21 +00:00
Filippos Karapetis
ee1dfa3f3d Initialize _charMap to avoid crash when drascula.dat doesn't exist
svn-id: r32607
2008-06-08 02:00:34 +00:00
Eugene Sandulenko
8a0566de14 Add stubs for .dat file loading
svn-id: r32605
2008-06-07 21:02:03 +00:00
Eugene Sandulenko
09597d028c WIP of drascula.dat loading.
DISCLAIMER: this is too far from finished. From now drascula.dat is required to
run the game, but in the meantime you have to make it by yourself. Do not 
update DRASCULA_DAT_VER as I want it to be version 1 once all loading will
be implemented, but that may lead to some changes similar to r32602.

svn-id: r32603
2008-06-07 20:47:52 +00:00
Eugene Sandulenko
7a0feca9e2 Add new files to makefile.
svn-id: r32600
2008-06-07 19:44:00 +00:00
Eugene Sandulenko
e14f81391c Shuffled around more code. Now the files look more manageable.
svn-id: r32599
2008-06-07 19:40:43 +00:00
Eugene Sandulenko
681f331895 Another fix, now to German texts.
svn-id: r32597
2008-06-07 18:43:20 +00:00
Eugene Sandulenko
a78c2251ca Ooops. Several missing colons in the texts which lead to wrong messages were spotted and fixed.
svn-id: r32596
2008-06-07 18:38:44 +00:00
Eugene Sandulenko
f6a1a89d04 Patch #1986992: "DRASCULA: correcting errors"
svn-id: r32592
2008-06-07 14:45:01 +00:00
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
Eugene Sandulenko
18aec42f19 Fix apostrophe rendering in conversation texts.
svn-id: r32587
2008-06-06 20:58:32 +00:00
Eugene Sandulenko
3d072b4402 Another English fix from sanguineh
svn-id: r32586
2008-06-06 20:21:06 +00:00
Eugene Sandulenko
58dd060ebc Slighly modified patch #1985341: "DRASCULA: Hopefully my last batch of english updates"
svn-id: r32585
2008-06-06 20:12:51 +00:00
Filippos Karapetis
fbf319dbfb Partially reverted the changes to for loops in my last commit. It's not wise to call strlen() on each loop iteration...
svn-id: r32584
2008-06-06 19:52:09 +00:00
Filippos Karapetis
00dba1cebc - Cleanup
- Removed the unneeded AuxBuffLast buffer (this one is really not necessary :) )
- Simplified some more room actions

svn-id: r32583
2008-06-06 19:37:36 +00:00
Eugene Sandulenko
3b1e4fc15f Move more room code into roomActions[].
svn-id: r32582
2008-06-06 19:29:59 +00:00
Eugene Sandulenko
c6f72c52df Partially reverted r32580. That surface is used by Spanish version.
svn-id: r32581
2008-06-06 19:17:21 +00:00
Filippos Karapetis
31bb8c01c7 Removed the useless textSurface buffer
frame_x -> frameX
candleX, candleY, pianistX and drunkX are used in more than one place

svn-id: r32580
2008-06-06 18:28:50 +00:00
Filippos Karapetis
7a05f382c2 Initialize roomNumber correctly
svn-id: r32579
2008-06-06 17:58:08 +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
fa8981e1e2 Simplified the room preupdaters and updaters
svn-id: r32573
2008-06-06 09:53:33 +00:00
Eugene Sandulenko
a478ef04ae Fix regressions introduced in r32571
svn-id: r32572
2008-06-06 09:18:49 +00:00
Filippos Karapetis
547e25667b Removed the empty specialized parsers for rooms 19, 44, 61 and 63
svn-id: r32571
2008-06-06 07:48:00 +00:00
Filippos Karapetis
bc76980ae6 Added the rest of the rooms to the room parser
svn-id: r32570
2008-06-06 07:42:00 +00:00
Torbjörn Andersson
5d46aa2b7f Removed left-over debugging.
svn-id: r32569
2008-06-06 06:59:44 +00:00
Torbjörn Andersson
fe8ec2ef10 Only try to play a sound file if the file could be found. (Otherwise, it looks
like it will try to use the most recently opened file, which is probably not a
sound at all.)

svn-id: r32568
2008-06-06 06:58:37 +00:00
Eugene Sandulenko
095c1544db Further unification of room code.
svn-id: r32567
2008-06-06 06:35:25 +00:00
Filippos Karapetis
3c7e0f5f8d Fixed regression: rooms 0, 56 and 60 are not called by the default room parser (13 and 21 too, but there are no default actions associated with them)
svn-id: r32562
2008-06-05 21:12:02 +00:00
Eugene Sandulenko
b7ac2f99f6 Optimize a bit roomParse, though ideal would be a binary search, but I am
too lazy for that.

svn-id: r32561
2008-06-05 20:35:45 +00:00
Eugene Sandulenko
35cdc7aae4 Converted most of checkAction() to pseudorooms 200 and 201, putting
them into roomActions.

svn-id: r32560
2008-06-05 20:28:50 +00:00
Eugene Sandulenko
9cbf46a7a4 Merged all roomXXActions into single array. Thus simplified room parsers.
svn-id: r32559
2008-06-05 19:29:30 +00:00
Eugene Sandulenko
a921549370 Pendulum room is room #102
svn-id: r32558
2008-06-05 19:04:58 +00:00
Filippos Karapetis
b9516aa80e escoba -> runCurrentChapter
svn-id: r32557
2008-06-05 15:15:20 +00:00
Filippos Karapetis
5f573fea11 Added enums for all items up to chapter 3 and some of chapter 4
svn-id: r32556
2008-06-05 15:03:48 +00:00
Max Horn
dd4a0efe02 Fix compiler warning (to clear a C-string, do not abuse sprintf like that)
svn-id: r32555
2008-06-05 14:02:49 +00:00
Filippos Karapetis
bfd4fc910e - Rewrote the way room updaters, preupdaters and room parsers are called and added debug output when they're called
- Simplified calls to converse()
- Removed the useless para_codificar buffers
- Renamed checkFlag -> checkAction

svn-id: r32554
2008-06-05 13:23:57 +00:00
Filippos Karapetis
cae527c703 Forgot the separator
svn-id: r32553
2008-06-05 12:41:04 +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
5acc34fb77 Slighlty modified patch #1984858: "DRASCULA: more english grammar/spelling fixes"
svn-id: r32551
2008-06-05 05:59:56 +00:00
Filippos Karapetis
1869141f04 saves -> saveLoadScreen
svn-id: r32546
2008-06-04 19:27:14 +00:00
Filippos Karapetis
f44d39494d Clear "select" when the save/load screen pops up, to avoid having garbage shown in the selected game slot
svn-id: r32545
2008-06-04 19:24:50 +00:00
Filippos Karapetis
8d4cf05ccc Reduced the delays in Drascula's save/load screen to make it more responsive (since delay() waits for double the time internally)
svn-id: r32544
2008-06-04 19:21:17 +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
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
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
Filippos Karapetis
08566b44b8 enterNewRoom -> enterRoom
Added debug output when entering/exiting rooms

svn-id: r32530
2008-06-04 09:08:37 +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
Filippos Karapetis
e3a8074a6d Rewrote some more room logic
svn-id: r32518
2008-06-03 18:17:56 +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
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
Filippos Karapetis
e6d2ed3ca8 Further cleanup of the talk code
svn-id: r32494
2008-06-02 10:58:45 +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
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
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
Filippos Karapetis
ffc64511ca Add MD5's and packed file overrides for original packed files of the Multilingual English/German/French CD of Drascula
svn-id: r32478
2008-06-01 21:30:07 +00:00
Eugene Sandulenko
df35925557 Enable file fallback for drascula. Now old uncompressed games should work.
svn-id: r32477
2008-06-01 21:11:14 +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
Eugene Sandulenko
49dd9376ad More ArjFile usage
svn-id: r32473
2008-06-01 19:07:57 +00:00
Eugene Sandulenko
e5be4847ac WIP for hooking unarj in order to play unmodified files from CD.
Will break your game unless you put packet.001 into game directory.
Not everything has been hooked and files fallback and detection is not
yet implemented

svn-id: r32461
2008-06-01 11:44:45 +00:00
Eugene Sandulenko
7a2d85c07c More endianness fixes
svn-id: r32445
2008-05-31 22:54:09 +00:00
Eugene Sandulenko
4b4ebbd45d Endianness fixes in FLI player
svn-id: r32444
2008-05-31 22:41:31 +00:00
Eugene Sandulenko
968fe6cbd7 Patch #1980689: "DRASCULA: ENGLISH GRAMMAR/SPELLING" thanks to sanguinehearts
svn-id: r32426
2008-05-31 17:44:57 +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
Filippos Karapetis
601b735346 Cleanup
svn-id: r32423
2008-05-31 10:24:45 +00:00
Eugene Sandulenko
7ce59d993b Remove trailing spaces
svn-id: r32422
2008-05-31 10:01:13 +00:00
Filippos Karapetis
9f95b76588 x_pantalla/y_pantalla -> screenX/screenY
y_de_signos -> signY
pos_texto -> textPos

svn-id: r32421
2008-05-31 09:55:11 +00:00
Eugene Sandulenko
e5934e38c5 Fix bug #1979579: "DRASCULA: typo in Spanish verbs"
svn-id: r32420
2008-05-31 09:49:09 +00:00
Filippos Karapetis
6ba824e66e Oops
svn-id: r32419
2008-05-31 09:45:47 +00:00
Filippos Karapetis
c80543cbb8 Cleanup
svn-id: r32418
2008-05-31 09:38:12 +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
b33662e27f rompo_y_salgo -> breakOut
svn-id: r32410
2008-05-31 00:15:01 +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
ab81c9bb90 The game's screensaver should now kick in correctly
svn-id: r32408
2008-05-30 23:53:17 +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
798ce0ace8 Cleanup
svn-id: r32406
2008-05-30 21:09:21 +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
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