ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
86,814 Commits 45 Branches 139 Tags
578a6794de9ba7679966fee9aec02c6b2bdbce94
Commit Graph
125 Commits
Author SHA1 Message Date
Filippos Karapetis e2fe740e35 Fix for original game bug with the wall plug in chapter 5. 
Fixes bug #2059621 - DRASCULA: Plug bug

svn-id: r34160
 2008-08-25 15:58:45 +00:00
Filippos Karapetis 9654ee4fa3 Possible fix for (for the drascula engine) for bug #2001583 - "WINCE: CRUISE and DRASCULA engines can not be compiled" 
svn-id: r32777
 2008-06-25 08:36:07 +00:00
Filippos Karapetis b652c20114 Fixed regression in the pendulum room, preventing the player from selecting John's hands (new version of drascula.dat needed) 
svn-id: r32657
 2008-06-10 22:14:47 +00:00
Filippos Karapetis 985903a071 Use the array sizes loaded from drascula.dat, instead of ARRAYSIZE 
svn-id: r32650
 2008-06-10 21:06:39 +00:00
Filippos Karapetis 930ba6d02d drawSurface1 -> bgSurface 
svn-id: r32644
 2008-06-10 18:54:32 +00:00
Filippos Karapetis a353776f2f - drascula.dat is now read completely 
- Removed the rest of the game static data (staticdata.h)
- Some naming convention fixes (added underscore to some shared variables)
- Renamed objeto -> object

svn-id: r32628
 2008-06-09 10:11:42 +00:00
Filippos Karapetis dcde2f7a96 The pendulumSurface pointer is only used in update_102() 
svn-id: r32614
 2008-06-08 11:26:48 +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
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
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
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
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 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 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 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 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