Commit Graph

141 Commits

Author SHA1 Message Date
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
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
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
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
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
fa8981e1e2 Simplified the room preupdaters and updaters
svn-id: r32573
2008-06-06 09:53:33 +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
Eugene Sandulenko
095c1544db Further unification of room code.
svn-id: r32567
2008-06-06 06:35:25 +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
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
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
Filippos Karapetis
1869141f04 saves -> saveLoadScreen
svn-id: r32546
2008-06-04 19:27:14 +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
735463de44 Fixed the misuse of ARRAYSIZE
svn-id: r32537
2008-06-04 16:15:08 +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
052d6f6bff releaseGame() -> quitGame()
nivel_osc -> palLevel
Simplified calls to loadPic()

svn-id: r32533
2008-06-04 10:27:10 +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
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
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
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
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
Filippos Karapetis
bbfb4661ee updateData -> updateVisible
num_ejec -> currentChapter

svn-id: r32417
2008-05-31 09:16:26 +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
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