25971 Commits

Author SHA1 Message Date
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
5bdcec23d8 Preparations for optimal memory allocation on reading.
svn-id: r32606
2008-06-07 21:10:19 +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
9fc94f8cca Make .dat file a bit smaller.
svn-id: r32602
2008-06-07 20:40:59 +00:00
Kari Salminen
6225e8e416 Update Drascula's MSVC project files for r32599.
svn-id: r32601
2008-06-07 20:00:51 +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
3723afc268 create_drascula tool, courtsey of md5. Not yet used by the engine.
svn-id: r32598
2008-06-07 18:59:12 +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
Andre Heider
b17d9f4fb0 -Wno-multichar slipped in twice
svn-id: r32594
2008-06-07 15:39:25 +00:00
Andre Heider
1217f0a42b added support for reset and power buttons
svn-id: r32593
2008-06-07 15:37:17 +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
Christopher Page
0f41f1ccf4 SKY: Fixed a memory leak in SKY engine
svn-id: r32578
2008-06-06 16:40:39 +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
Johannes Schickel
0ee152fbb9 - Fixed a valgrind waring
- Formatting
- Removed an assert

svn-id: r32575
2008-06-06 13:34:34 +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
Christopher Page
a98a350d14 TOUCHE: Fixed a memory leak
svn-id: r32566
2008-06-06 00:34:47 +00:00
Andre Heider
7eae38454a recreated icon.png from scummvm_logo.svg
svn-id: r32565
2008-06-05 21:39:44 +00:00
Andre Heider
c0a75930c7 disable more more compiler warnings
svn-id: r32564
2008-06-05 21:34:45 +00:00
Christopher Page
cae6396ce7 Merged revisions 32507-32513,32516,32518,32520-32521,32523-32524,32526-32548,32550-32562 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r32563
2008-06-05 21:20:35 +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