Commit Graph

411 Commits

Author SHA1 Message Date
Strangerke
8491e557ce CGE: Remove duplicated forward declaration 2011-09-17 14:55:31 +02:00
Strangerke
38deee5a88 CGE: some more cleanup 2011-09-17 11:09:32 +02:00
Strangerke
4778ff720c CGE: Move some more globals to CGEEngine 2011-09-17 10:54:50 +02:00
Strangerke
f5eca79658 CGE: Move 4 global to CGEEngine 2011-09-17 10:08:52 +02:00
Strangerke
0668a56f69 CGE: Move _vga to CGEEngine 2011-09-16 23:54:08 +02:00
Strangerke
938c08ae58 CGE: Get rid of some more global functions and static members 2011-09-16 20:31:39 +02:00
Strangerke
cdf1335ea6 CGE: Remove two useles externs, un-static-fy two Vga functions 2011-09-16 08:03:30 +02:00
Strangerke
70c5b695df CGE: move two global functions to Vga 2011-09-16 07:55:50 +02:00
Strangerke
15bf8050b8 CGE: Move two globals functions to CGEEngine 2011-09-16 06:45:53 +02:00
Strangerke
d7ae191b82 CGE: Remove general.cpp 2011-09-15 18:54:02 +02:00
Strangerke
c993108207 CGE: Transform some static and globals into class members 2011-09-15 08:00:54 +02:00
Strangerke
d28ac81a12 CGE: Rename cave into scene 2011-09-14 08:15:30 +02:00
Strangerke
dd0e077bd7 CGE: Remove useless function 2011-09-14 00:21:10 +02:00
Strangerke
dc934a3353 CGE4: Remove useless variable
Thanks DrMcCoy for reporting it
2011-09-14 00:14:12 +02:00
Strangerke
82e0b6fc4b CGE: Rewrite fileIO 2011-09-14 00:10:59 +02:00
Strangerke
dd75ebd96b CGE: Remove dead code reported by clang++
Thanks LordHoto and salty-horse for reporting the problem
2011-09-13 00:48:01 +02:00
Strangerke
c9900b605a CGE: Some more cleanup in fileIo 2011-09-13 00:28:31 +02:00
Strangerke
5d8bbc2f48 CGE: Remove IoBuf and CFile 2011-09-13 00:07:00 +02:00
Strangerke
7624cc3822 CGE: Fix crash when newRandom is called with a range set to 0 2011-09-12 23:06:14 +02:00
Filippos Karapetis
af93130fdd CGE: Readded a line that was removed by mistake in r94db561 2011-09-12 23:33:05 +03:00
Filippos Karapetis
a2dc80fbef CGE: Removed snddrv.h 2011-09-12 23:16:12 +03:00
Filippos Karapetis
94db56189b CGE: Removed a leftover goto statement 2011-09-12 23:05:08 +03:00
Alyssa Milburn
a029bb8656 CGE: Build fixes for WinCE.
Rename 'near' to 'nearList' (and the same for 'take' to be
consistent). Also, replace a silly cast with memset to squish
a warning.
2011-09-12 09:13:19 +02:00
Strangerke
85a19d61ad CGE: Remove debug messages, fix a warning 2011-09-12 07:01:21 +02:00
Strangerke
ae99851639 CGE: Remove VFile class 2011-09-12 00:30:46 +02:00
Strangerke
e073fab211 CGE: Fix formatting of operator overloading 2011-09-11 22:24:40 +02:00
Strangerke
3642fa015b CGE: Remove a useless structure 2011-09-11 22:14:48 +02:00
Strangerke
5c256f9689 CGE: Remove some more VFiles 2011-09-11 22:13:00 +02:00
Strangerke
918d79f104 CGE: Remove some more uses of VFile. Fix a shadowed variable 2011-09-11 22:07:22 +02:00
Strangerke
3b9b89a78b CGE: Talk now uses EncryptedStream. Clean up of EncryptedStream 2011-09-11 15:07:56 +02:00
Strangerke
cdba3ac108 CGE: Remove noisy debug message 2011-09-11 14:21:03 +02:00
Strangerke
08d87130aa CGE: Use EncryptedStream in Text: rewrite caching, remove some methods. 2011-09-11 14:19:46 +02:00
Strangerke
3715d6d444 CGE: Add EncryptedStream class, remove seed parameter from XCrypt() 2011-09-11 14:15:32 +02:00
Strangerke
0784b7e0b4 CGE: Remove Dat class 2011-09-09 20:03:23 +02:00
Strangerke
4848683e56 CGE: Remove some static variables from fileIO 2011-09-09 18:24:11 +02:00
Strangerke
8dc4cb40d9 CGE: Remove a useless function declaration in class BtFile 2011-09-09 17:14:02 +02:00
Strangerke
b23bee8571 CGE: Remove XFile, rename some members 2011-09-09 16:51:47 +02:00
Strangerke
4b9d2c2516 CGE: Rename Han structures to Handler
Thanks to Fingolfin for pointing this out (as previous commit)
2011-09-07 23:00:32 +02:00
Strangerke
45de8747d5 CGE: Clean up and split snBarrier(), remove progName() 2011-09-07 22:37:03 +02:00
Strangerke
3e574cfbf8 CGE: Remove wtom() 2011-09-07 01:02:05 +02:00
Strangerke
52f669c93c CGE: Replace Hxy by Common::Point 2011-09-06 23:14:49 +02:00
Strangerke
39d09d5865 CGE: Cleanup: remove residuals of the demo code
Thanks to fingolfin and LordHoto for pointing it out
2011-09-06 22:59:10 +02:00
Strangerke
85d10fe6c7 CGE: Handle properly looping samples 2011-09-06 21:58:41 +02:00
Strangerke
e46c613e9a CGE: Remove 'count' static variable from snail
Thanks LordHoto for pointing it out
2011-09-06 19:56:47 +02:00
Strangerke
5bad1a7c7f CGE: Take into account some of LordHoto's comments 2011-09-06 00:43:40 +02:00
Strangerke
d7695542cd CGE: Remove various defines and functions from "general"
Those were already present in ScummVM (thanks Fingolfin for point out)
2011-09-06 00:16:07 +02:00
Strangerke
b75a308bcc CGE: Replace Couple by Common::Point (thanks Fingolfin for pointing that out) 2011-09-05 23:50:30 +02:00
Strangerke
27328f2546 CGE: Little cleanup of vmenu 2011-09-05 21:21:42 +02:00
Strangerke
76f410958a CGE: Use F5/F7 to display the save/load dialog box 2011-09-04 14:28:12 +02:00
Strangerke
56e57cf380 CGE: Remove two useless callback types 2011-09-04 11:23:01 +02:00
Strangerke
690d94eb03 CGE: Take fingolfin's remark into account: suppress the two leading underscore in define names 2011-09-01 00:32:20 +02:00
Strangerke
31d4173136 CGE: Fix thumbnails display when a game is loaded. 2011-09-01 00:22:20 +02:00
Strangerke
951dfa2be9 CGE: Fix the language of one of the demos 2011-08-29 23:10:33 +02:00
Strangerke
5e0c546aa9 CGE: Remove code related to demos, and tag demos as unsupported 2011-08-29 22:51:45 +02:00
Strangerke
a8d6b92b5a CGE: Little cleanup of the English data file and update the detection 2011-08-29 00:29:22 +02:00
Strangerke
a14a9bb9a2 CGE: Fix ending animation - Game is now completable 2011-08-28 00:48:53 +02:00
Strangerke
12b6851276 CGE: Fix glitch in previous commit 2011-08-28 00:35:00 +02:00
Strangerke
dc9cca5f46 CGE: Fix level when restoring a game 2011-08-27 23:54:18 +02:00
Strangerke
4cb6c739a4 CGE: Change a couple of static members to non static in Vga class 2011-08-27 19:09:13 +02:00
Strangerke
ad244d464c CGE: Set slot #0 as write protected as it's an automatic savegame 2011-08-27 18:14:50 +02:00
Strangerke
bc0e65baac CGE: remove jbw.h, some clean up 2011-08-27 18:01:06 +02:00
Strangerke
fedd310871 CGE: Remove GetText class, which was used to enter the username 2011-08-27 14:08:39 +02:00
Strangerke
4d059c0e62 CGE: Remove user first name input, used originally for savegame names 2011-08-27 14:05:04 +02:00
Strangerke
a8ad211c36 CGE: Merge talk.cpp and gettext.cpp 2011-08-27 09:39:35 +02:00
Strangerke
7144076030 CGE: Move IO classes to a separated source file 2011-08-27 09:05:32 +02:00
Strangerke
bb2f63d285 CGE: Remove useless function 2011-08-26 23:32:05 +02:00
Alyssa Milburn
8b388b6829 CGE: Fix compilation after thumbnail changes. 2011-08-22 20:17:49 +02:00
Strangerke
c6e89df3d9 CGE: Fix error reported by fuzzie 2011-08-22 19:59:09 +02:00
Strangerke
bb591b5415 CGE: Some clean up in Vga class 2011-08-21 11:15:28 +02:00
Strangerke
e69c7a3ac4 CGE: Remove mixer 2011-08-21 09:51:49 +02:00
Strangerke
8de4d8c402 CGE: Get rid of IOMode since it's always 'read' 2011-08-21 01:41:03 +02:00
Strangerke
62035d06bb CGE: Remove a useless pragma, and any code related to writing data 2011-08-21 01:28:07 +02:00
Strangerke
81ae309d5f CGE: Suppress some debug code present in the original 2011-08-20 01:35:56 +02:00
Alyssa Milburn
e916f9ce8c CGE: Another few formatting tweaks. 2011-08-20 00:40:44 +02:00
Alyssa Milburn
e4a37322a6 CGE: More misc cleanup. 2011-08-20 00:23:45 +02:00
Alyssa Milburn
c1807138fb CGE: Cleanup of snail.cpp. 2011-08-20 00:11:30 +02:00
Strangerke
3917c11691 Merge branch 'soltys_wip2' of github.com:Strangerke/scummvm into soltys_wip2 2011-08-20 00:04:41 +02:00
Strangerke
749cd3b115 CGE: Another fix for the pathfinding 2011-08-20 00:03:44 +02:00
Alyssa Milburn
01b4ac7219 CGE: More cleanup. 2011-08-19 23:54:24 +02:00
Alyssa Milburn
bda1afdbfb Merge branch 'soltys_wip2' of https://github.com/Strangerke/scummvm into soltys_wip2
Conflicts:
	engines/cge/bitmap.cpp
2011-08-19 20:14:40 +02:00
Strangerke
8ff904c6b5 CGE: clean up bitmap class. Suppress useless methods, functions, defines... 2011-08-19 19:48:49 +02:00
Strangerke
df122cec17 CGE: fix some warnings reported by cppcheck 2011-08-19 18:32:46 +02:00
Alyssa Milburn
4e156b2463 CGE: Mass re-style/cleanup. 2011-08-19 16:04:10 +02:00
Alyssa Milburn
f0889d3f54 CGE: Remove unused snSelect function, and broken config.cpp. 2011-08-19 16:02:50 +02:00
Alyssa Milburn
65cd0689c7 CGE: Remove (empty) ems.cpp. 2011-08-19 15:56:03 +02:00
Alyssa Milburn
4e4062806b CGE: Portability fix for syncing sprite flags. 2011-08-19 15:55:27 +02:00
Alyssa Milburn
43a41f5380 CGE: Endian-swap VBM headers on load if needed. 2011-08-19 14:55:44 +02:00
Alyssa Milburn
2178d64cbe CGE: Endian-swap the contents of block descriptions. 2011-08-19 14:54:34 +02:00
Paul Gilbert
2b0cec1cd7 CGE: Fix problem with being able to walk into protected areas 2011-08-19 21:15:59 +10:00
Paul Gilbert
372d488b3b CGE: Revert previous commit of flags synchronisation 2011-08-19 20:36:43 +10:00
Paul Gilbert
0d730b85e3 CGE: Changed the Sprite bit-flags into a union, to fix savegame endian issues 2011-08-19 19:49:05 +10:00
Strangerke
40ea6d788b CGE: Suppress some dead code 2011-08-19 07:25:58 +02:00
Alyssa Milburn
85a0fa03ad CGE: Remove unused _intStackPtr. 2011-08-18 00:33:54 +02:00
Alyssa Milburn
23689cac23 CGE: Remove unused Rgb/Trgb/mkRgb. 2011-08-17 10:55:49 +02:00
Alyssa Milburn
a9f002897e CGE: Preserve const in cast. 2011-08-17 10:50:26 +02:00
Alyssa Milburn
9a94a239b8 CGE: Fix gcc shadowed member warning. 2011-08-17 10:12:37 +02:00
Strangerke
1d3f1830c8 CGE: Remove useless functions related to data file creation (unused) 2011-08-13 10:17:41 +02:00
Paul Gilbert
177da650dd CGE: Fix loading of vol.cat file to be endian safe 2011-08-13 18:06:09 +10:00
Strangerke
b02e34cade CGE: Implement sayTime() 2011-08-13 09:33:39 +02:00
Strangerke
58229750cc CGE: silent valgrind warnings 2011-08-13 09:16:15 +02:00
Paul Gilbert
ef7a17a64a CGE: Fix for HLINE not being available for demo
The HorizLine class is really only used for on-screen debugging information anyway, so it's not a problem.
2011-08-13 16:44:48 +10:00
Paul Gilbert
161a39e9fe CGE: Got rid of stub warnings for things that don't need to be implemented in ScummVM 2011-08-13 11:04:10 +10:00
Strangerke
6af5fffd36 CGE: Cleanup: remove useless classes 2011-08-12 19:11:17 +02:00
Paul Gilbert
91fdecbf68 CGE: Properly implemented MIDI music playback 2011-08-12 23:10:30 +10:00
Paul Gilbert
b76c0af2f4 CGE: Work on implementing MIDI music playback.
Music playback is now sort of working, but it seems like only a beat track of the MIDI is getting played
2011-08-12 21:33:45 +10:00
Paul Gilbert
f1f1d8bde0 CGE: Implemented sound effects 2011-08-12 19:48:51 +10:00
Paul Gilbert
0c33687de2 CGE: Further fixes to savegames. 2011-08-10 20:41:39 +10:00
Paul Gilbert
8cad6821bd CGE: Fixes for saving games 2011-08-10 19:33:08 +10:00
Paul Gilbert
621fa62e8b CGE: Save the game if the game is quit via closing the window 2011-08-10 19:02:13 +10:00
Paul Gilbert
7ae8f8ce69 CGE: Decrease delay amounts to give better precision for frame execution 2011-08-10 18:38:06 +10:00
Strangerke
de40ab5e0a CGE: Remove JBW flag (useless) 2011-08-07 11:36:49 +02:00
Strangerke
cbb828b337 CGE: Fix a couple of warnings reported by cppcheck 2011-08-07 11:34:03 +02:00
Paul Gilbert
04e09e530a CGE: Fix memory leaks in pocket list 2011-08-06 22:14:23 +10:00
Paul Gilbert
1208e7e5af CGE: Removed the _mini data block originally used to hold inventory shapes in high memory 2011-08-06 21:03:24 +10:00
Paul Gilbert
46e1f03585 CGE: Fixed up freeing of caveValues data 2011-08-06 20:03:42 +10:00
Paul Gilbert
db61f65b41 CGE: Fix uninitialised warning on event polling 2011-08-06 19:23:01 +10:00
Paul Gilbert
5aba6b5a0c CGE: Removed redundant _sprite creation in engine setup 2011-08-06 18:23:53 +10:00
Paul Gilbert
1f6c27480d CGE: Fix memory leak with _sprite global sprite 2011-08-06 17:22:04 +10:00
Paul Gilbert
9f8eb5a740 CGE: Re-added an explicit check in Sprite destructor against _sprite variable
The trouble is that the _sprite variable can currently be pointing to any registered sprite, and should only be freed in the destructor if it hasn't already been freed. Currently, this is best done by keeping track of whether the pointed to sprite has been already freed or not.
2011-08-06 16:55:39 +10:00
Paul Gilbert
fc05b8cf1b CGE: Fix memory leak with savegame thumbnails 2011-08-06 16:08:47 +10:00
Paul Gilbert
c961597988 CGE: Fixed non-portability in loading _heroXY array 2011-08-06 15:29:49 +10:00
Paul Gilbert
f5d38d82d0 CGE: Fix mismatched delete in Bitmap::_v 2011-08-06 14:01:00 +10:00
Paul Gilbert
63d49d3e1a CGE: Fix uninitialised value Valgrind warnings when saving sprite data 2011-08-06 13:46:44 +10:00
Paul Gilbert
33c4226486 CGE: Fix another shadowed variable warning 2011-08-06 13:34:33 +10:00
Paul Gilbert
0cb8b15cdf CGE: Fixed warning of shadowed variable 2011-08-06 13:30:36 +10:00
Paul Gilbert
388dadd56f CGE: Changed sprite shape list loading to exceed size specified by _shpCnt
This fixes the problem that was happening with the new English archive, which had a bigger shape list for one of the items in the first scene.
2011-08-06 13:16:18 +10:00
Strangerke
bbc51fa443 Merge branch 'soltys_wip2' of github.com:Strangerke/scummvm into soltys_wip2 2011-08-06 02:42:47 +02:00
Paul Gilbert
c1294b772f CGE: Added an assert to test out of bounds sprite shape access
The English version seems to expect a different number of shapes for some sprites, so it will need further work to determine how best to handle the differences.
2011-08-05 22:51:32 +10:00
Paul Gilbert
3ce71737b5 CGE: Fix mismatched memory free. 2011-08-05 21:54:21 +10:00
Paul Gilbert
b7a548f3c7 CGE: Fixed compiler warning of shadowed variable 2011-08-05 21:23:41 +10:00
Paul Gilbert
d229c92879 CGE: Built an English version game archive
This combines the base game resources with the files of cge_work\dusa and work\ins\usa. This makes both action descriptions and hotspots appear in English, although the introduction credits still appear in Polish. I don't know if this was the case for the original 'official' English release; but I consider it a minor issue.
2011-08-05 21:09:03 +10:00
Strangerke
7ea1f74759 CGE: Fix display of info text at the beginning of the game 2011-08-03 16:31:32 +02:00
Strangerke
6f92cdd0d0 CGE: Rename some more defines 2011-08-02 21:47:56 +02:00
Strangerke
88f6cc9b23 CGE: Clean eventManager 2011-08-01 09:53:15 +02:00
Strangerke
c053762c63 CGE: Replace magic values by defines, rename some defines 2011-07-31 19:56:14 +02:00
Strangerke
f898da53a4 CGE: Improve keyboard behavior for non-US layouts 2011-07-31 09:38:08 +02:00
Strangerke
55df4d0635 CGE: Rename some class members, various clean up 2011-07-31 00:52:35 +02:00
Strangerke
b53ffa8f2c CGE: Move some conditional defines to variables 2011-07-30 15:43:49 +02:00
Strangerke
8b53899ca7 CGE: Remove Heart 2011-07-30 15:28:57 +02:00
Strangerke
5c7eb9a768 CGE: un-static-fy several variables, clean Heart class 2011-07-30 12:52:04 +02:00
Strangerke
316b73ee00 CGE: Remove Startup class, set _fx and _sound as dynamic 2011-07-29 10:02:32 +02:00
Strangerke
7d5eb1ee63 CGE: Janitorial: remove trailing spaces 2011-07-28 15:35:12 +02:00
Strangerke
df7d771feb CGE: Remove summa variable, formerly used for the protection check 2011-07-28 11:08:56 +02:00
Strangerke
dad302b640 CGE: Remove _core from Startup class 2011-07-25 19:09:12 +02:00
Strangerke
2e5a041046 CGE: Remove EMM and EMS classes 2011-07-25 17:50:58 +02:00
Strangerke
cf61919648 CGE: Replace 'no core' checks by asserts 2011-07-25 16:04:45 +02:00
Strangerke
82adc025ea CGE: Remove DrvInfo, rename some enums 2011-07-24 23:42:03 +02:00
Strangerke
c728a53148 CGE: Rename IOMode and SnCom enums 2011-07-23 14:31:39 +02:00
Strangerke
3ef0558aa9 CGE: Rename some more constants, some cleanup 2011-07-22 11:54:46 +02:00
Strangerke
5d41ab8b5f CGE: Rename some more constants, remove some useless ones 2011-07-21 01:56:40 +02:00