Commit Graph

398 Commits

Author SHA1 Message Date
Paul Gilbert
00061bc5dd CGE: Added support for GMM save/load and launcher loading 2011-07-16 21:12:19 +10:00
Paul Gilbert
ce070cdd3c CGE: Implemented basic savegame support
I've slightly modified the behaviour of the original - rather than prompting each time the user starts for a name, it now only prompts the first time, and uses the entered name as a save description for a slot 0 savegame
2011-07-16 18:33:20 +10:00
Paul Gilbert
10627dccfa CGE: Fix the selection of menu items to call appropriate dispatch method 2011-07-16 16:23:34 +10:00
Paul Gilbert
50d313a547 CGE: Implement monochrome view mode button 2011-07-16 15:44:17 +10:00
Paul Gilbert
b957eda759 CGE: Map keypad Enter to be handled like the main Enter key 2011-07-16 15:30:06 +10:00
Paul Gilbert
c3f3120194 CGE: Cleaned up room preview handling code and fixed memory leak 2011-07-16 15:17:18 +10:00
Paul Gilbert
453fbb7454 CGE: Bugfixes for loading the room preview shapes list 2011-07-15 22:56:49 +10:00
Paul Gilbert
4dd65c5e57 CGE: Removed some commented out code from previous bugfix 2011-07-15 22:14:33 +10:00
Paul Gilbert
8c7130fdfa CGE: Fix display of in-game hotspot description 2011-07-15 22:12:56 +10:00
Paul Gilbert
b74e1b6af0 CGE: Pathfinder now works 2011-07-15 21:25:03 +10:00
Paul Gilbert
11fa6b941c CGE: Fix some errors in the pathfinder setup 2011-07-15 20:43:29 +10:00
Paul Gilbert
c3bed46ba0 CGE: Fix for all the game objects being draggable 2011-07-15 19:38:58 +10:00
Paul Gilbert
f0d10b62b3 CGE: In progress work on pathfinder 2011-07-14 22:36:18 +10:00
Paul Gilbert
324ccb1760 CGE: Split pathfinding related code into walk.cpp 2011-07-13 21:04:44 +10:00
Paul Gilbert
c3c8032c42 CGE: Implemented Bitmap::xShow method 2011-07-13 20:42:30 +10:00
Paul Gilbert
9dc2cb87d9 CGE: Fix array size in Spike class constructor 2011-07-13 19:21:34 +10:00
Paul Gilbert
6c97190092 CGE: Fixed initialising of _shadow that was crashing the intro sequence 2011-07-13 19:18:23 +10:00
Strangerke
4d0f83babb CGE: Rename some constants 2011-07-13 08:44:58 +02:00
Strangerke
5148f80fa5 CGE: add a new SNPOST to fix the function pointer issue 2011-07-13 00:29:10 +02:00
Paul Gilbert
4d96ec7034 CGE: Fixed a previously commented adding of mouse object to show queue 2011-07-12 22:44:04 +10:00
Paul Gilbert
700dbe021e CGE: Fix ProgName method to handle extensions without a leading period 2011-07-12 22:43:24 +10:00
Paul Gilbert
11c9e64885 CGE: More bugfixes for memory leaks 2011-07-12 22:02:00 +10:00
Paul Gilbert
e2b19ad9b0 CGE: Fixed several memory leaks of main objects 2011-07-12 21:53:07 +10:00
Paul Gilbert
891032053a CGE: Removed redundant disable/enable calls 2011-07-12 21:43:53 +10:00
Paul Gilbert
b6be90326d CGE: Fixed a memory leak with Sprite::setSeq 2011-07-12 21:41:11 +10:00
Paul Gilbert
daae033e01 CGE: Converted SprExt::_Seq to use dynamically allocated data 2011-07-12 21:16:23 +10:00
Strangerke
a524adcaee CGE: Suppress isVga() and memType() 2011-07-12 08:02:18 +02:00
Strangerke
dab96401ad CGE: Implement snGhost by splitting _m field in two. Some cleanup. 2011-07-12 07:24:20 +02:00
Paul Gilbert
9ba5e2b304 CGE: Reverted last commit due to extra memory leaks 2011-07-11 20:56:32 +10:00
Paul Gilbert
18077762d7 CGE: Standardised Sprite::seq on always allocating/freeing data 2011-07-11 20:37:37 +10:00
Paul Gilbert
10ca53a00c CGE: Fix cursor to show on-screen once the game starts 2011-07-10 21:07:57 +10:00
Paul Gilbert
c3a4ba8b05 CGE: More fixes for free/delete[] mismatches 2011-07-10 20:28:22 +10:00
Paul Gilbert
9b5b88274e CGE: Bugfix for correctly flagging key release 2011-07-10 20:13:11 +10:00
Paul Gilbert
f33ac85e79 CGE: Bugfixes for some crashes 2011-07-10 20:07:45 +10:00
Paul Gilbert
9efefdbced CGE: Fixed the display of text in the name entry dialog
Whilst the 'melting' effect of entered text was very amusing, it did need to be fixed.
2011-07-10 20:02:17 +10:00
Paul Gilbert
a693ff2ecf CGE: A few more fixes for memory leaks identified by Valgrind 2011-07-10 19:23:14 +10:00
Paul Gilbert
66c7777dfe CGE: Fix Valgrind identified errors 2011-07-10 18:17:40 +10:00
Paul Gilbert
32c8962d62 CGE: Removed some accidentally added debugging statements 2011-07-10 17:58:39 +10:00
Paul Gilbert
88c7b25e5b CGE: Fixed more free/delete[] mismatches identified by Valgrind 2011-07-10 17:56:29 +10:00
Paul Gilbert
1870f09d31 CGE: Fix several allocation mismatches and Valgrind issues 2011-07-10 14:51:22 +10:00
Paul Gilbert
ef83c248d3 CGE: Added extra event processing call to fix non-responsiveness when running under Valgrind 2011-07-10 11:45:17 +10:00
Paul Gilbert
8628b154a7 CGE: Fixed compiler warning 2011-07-10 11:40:06 +10:00
Paul Gilbert
6039e8a245 CGE: Removed the definition of the now unused SavTab structure 2011-07-10 10:12:46 +10:00
Paul Gilbert
319ff2ca49 CGE: Changed Sprite::contract to always destroy the sprite array 2011-07-10 10:11:50 +10:00
Paul Gilbert
0bbefbef90 CGE: Created PocLight class to encapsulate the LI sprite array 2011-07-10 10:10:51 +10:00
Paul Gilbert
47b17cd1ce CGE: Create Spike class to encapsulate the SP spite array 2011-07-10 10:07:35 +10:00
Paul Gilbert
622dc2d503 CGE: Created a CavLight class to encapsulate the PR sprite array 2011-07-10 10:04:41 +10:00
Paul Gilbert
9d40a1ba9d CGE: Mouse MC sprite array into the Mouse class 2011-07-10 10:00:57 +10:00
Paul Gilbert
817a52ed56 CGE: Created a HorizLine stub class to hold the HL sprite array 2011-07-10 09:57:19 +10:00
Paul Gilbert
1e83e27925 CGE: Moved MB sprite array into Square class 2011-07-10 09:51:18 +10:00
Paul Gilbert
989e071bb9 CGE: Implemented code for saving games, removing the need for the SavTab array 2011-07-10 09:44:46 +10:00
Strangerke
cf1a45f8a8 CGE: replace the 2 memcpy previously used by a memmove
(thanks eriktorbjorn for pointing that out)
2011-07-09 09:39:02 +02:00
Strangerke
6ed9dd0d04 CGE: Cleanup: rename a couple of forgotten class members 2011-07-09 00:41:47 +02:00
Strangerke
0b27de942b CGE: replace some 'tricky replicate lines' memcpy by two, in order to avoid overlapping 2011-07-09 00:25:09 +02:00
Strangerke
080d7cf7f0 CGE: Rename Mouse class 2011-07-08 08:22:25 +02:00
eriktorbjorn
dd77866709 CGE: Remove unused variable 2011-07-07 20:51:31 +02:00
Strangerke
fe2e1bb2fd CGE: Remove "bitmaps" files 2011-07-07 20:43:09 +02:00
Strangerke
affaa1f4d6 CGE: Some cleanup: Move some static functions to CGEEngine, remove parameters to GetText, rename members of SavTab 2011-07-07 09:24:08 +02:00
Strangerke
c86c62b288 CGE: Cleanup and renaming. Also move some static and global functions to CGEEngine. 2011-07-07 09:23:09 +02:00
Paul Gilbert
2997db0040 CGE: Minor bugfixes for game loading 2011-07-05 22:06:26 +10:00
Paul Gilbert
c676f88da0 CGE: Rearrange engine setup so sprite arrays are setup before they're needed 2011-07-05 21:39:14 +10:00
Paul Gilbert
24fa551a71 CGE: Fix synchronising Sprite::_seqPtr to be a signed int16 2011-07-05 21:11:59 +10:00
Paul Gilbert
44490c378d CGE: _hero isn't meant to be instantiated during the engine setup 2011-07-05 21:07:14 +10:00
Paul Gilbert
41c7482a52 CGE: Implement random number source 2011-07-05 20:51:29 +10:00
Paul Gilbert
a1f177317c CGE: Bugfix for ProgName method 2011-07-05 20:40:24 +10:00
Paul Gilbert
fe0ff3b2e9 CGE: Converted loadGame to use the ScummVM serialiser 2011-07-05 20:26:34 +10:00
Paul Gilbert
dbf9e4679c CGE: Started work on endifying savegame loading 2011-07-05 20:22:51 +10:00
Strangerke
fae1d7efd8 CGE: This ends the first renaming pass. Also move some functions to CGEEngine 2011-07-04 08:15:56 +02:00
Strangerke
c313d2cce8 CGE: Even more renaming (WIP) 2011-07-03 16:22:26 +02:00
Paul Gilbert
665b12ff8d CGE: Compilation fix after merge 2011-07-03 20:23:19 +10:00
Paul Gilbert
d1ef4021bc CGE: Bugfix for keyboard entry 2011-07-03 20:21:40 +10:00
Paul Gilbert
ecad39e246 CGE: Implemented code for game tick 2011-07-03 20:21:37 +10:00
Strangerke
4116189395 CGE: Some more renaming (WIP) 2011-07-03 11:28:22 +02:00
Paul Gilbert
dff8bd5474 CGE: Fix some memory leaks 2011-07-03 17:14:47 +10:00
Paul Gilbert
d53142d95e CGE: Fixed code using memory overruns to do duplication 2011-07-03 15:41:07 +10:00
Paul Gilbert
900e8cbf5b CGE: Fixed GCC compiler warnings 2011-07-03 15:32:27 +10:00
Paul Gilbert
156c2d020f CGE: Fix GCC compiler warnings 2011-07-03 14:55:49 +10:00
Paul Gilbert
334de9626a CGE: Removed C standard library includes 2011-07-03 12:30:27 +10:00
Paul Gilbert
bf6a5256fe CGE: Removed code for boot sector based copy protection check 2011-07-03 12:05:58 +10:00
Paul Gilbert
ac0caf7579 CGE: Implemented BITMAP::Hide method 2011-07-03 11:43:59 +10:00
eriktorbjorn
5f64f3ff47 CGE: Removed unused NumStr() function.
It was used, until my previous commit. :-)
2011-07-02 20:28:11 +02:00
eriktorbjorn
ada4556b9a CGE: Simplify error() calls
This also silences a few GCC warnings.
2011-07-02 20:25:39 +02:00
Strangerke
bdc213846e CGE: Some more renaming (WIP) 2011-07-02 18:20:41 +02:00
Paul Gilbert
f150126a0b CGE: Bugfix for wrapping event queue when it reaches the 256th event 2011-07-02 22:26:40 +10:00
Paul Gilbert
d510d2505b CGE: Fix for crash in BITMAP::solidAt when negative co-ordinates passed 2011-07-02 22:15:23 +10:00
Paul Gilbert
e782b53eab CGE: Added code for Mouse::On and Mouse::Off 2011-07-02 21:45:29 +10:00
Paul Gilbert
1e3c0725e4 CGE: Hooked up mouse event handler 2011-07-02 21:34:40 +10:00
Paul Gilbert
adb2701629 CGE: Graceful exit rather than an error 2011-07-02 20:38:27 +10:00
Paul Gilbert
72ae475c97 CGE: Fix naming of touch() virtual methods, and fixed keyboard handling 2011-07-02 20:04:30 +10:00
Paul Gilbert
bb3d61b137 CGE: Created an EventManager class and hooked it up to the Keyboard class 2011-07-02 18:38:25 +10:00
Paul Gilbert
d55401c2e1 CGE: Changed MOUSE class from using static fields to an instantiated class 2011-07-02 16:46:31 +10:00
Paul Gilbert
6833daab84 CGE: Added engine prefix to header file #defines 2011-07-02 16:23:32 +10:00
Paul Gilbert
ec28ef04c4 CGE: Merged mouse.* and keybd.* files to centralise event handling 2011-07-02 16:19:36 +10:00
Paul Gilbert
1ab67c2124 CGE: Fix problem with calculating box sizes for text strings 2011-07-02 16:04:47 +10:00
Paul Gilbert
3469d1fb04 CGE: Bugfix to correctly reset wait timeouts when done 2011-07-02 14:23:38 +10:00
Strangerke
8e531d0da3 CGE: Some more renaming (WIP) 2011-07-02 01:02:14 +02:00
Paul Gilbert
601bfbd609 CGE: Reimplemented game timer from using thread to using getMillis() 2011-07-01 18:18:44 +10:00
Paul Gilbert
c982298cbd CGE: Fix initialisation of the MOUSE class 2011-07-01 18:17:58 +10:00
Paul Gilbert
ac86efcd61 CGE: Palette fixes so that first screen shows correctly 2011-07-01 18:04:21 +10:00
Strangerke
0000a3139a CGE: Some more renaming (wip) 2011-07-01 08:37:40 +02:00
Strangerke
f59c910b8f CGE: Some more renaming (wip) 2011-06-30 08:30:23 +02:00
Strangerke
f2f3124246 CGE: Some more renaming (wip) 2011-06-29 16:13:17 +02:00
Strangerke
91dc5f424a CGE: Misc cleanup (provided by Digitall) 2011-06-29 14:29:49 +02:00
Paul Gilbert
e1b6bc0427 CGE: Removed Mouse from VGA::ShowQ to prevent crashes in the movie player 2011-06-29 21:17:07 +10:00
Strangerke
290305ad43 CGE: Cleanup : Start renaming. Add BMPLoad() function 2011-06-29 00:35:21 +02:00
Paul Gilbert
e25f9c71f5 CGE: Fix SVG0FILE define to point to INI_FILE class 2011-06-28 22:58:51 +10:00
Paul Gilbert
04a123a4ef CGE: Fix for displaying non full-screen bitmaps 2011-06-28 22:36:43 +10:00
Paul Gilbert
a89ce394bc CGE: Fix initialisation of the TALK class 2011-06-28 22:18:21 +10:00
Paul Gilbert
d4b11df58b Merge branch 'soltys_wip2' of github.com:Strangerke/scummvm into cge 2011-06-28 21:58:26 +10:00
Paul Gilbert
2fe6061d91 CGE: Bitmap now shows correctly 2011-06-28 21:58:03 +10:00
eriktorbjorn
315bbd348d CGE: Fix some GCC compile errors and warnings. 2011-06-27 19:25:24 +02:00
Paul Gilbert
571c3fc666 CGE: Getting closer to properly showing bitmap images 2011-06-27 21:29:18 +10:00
Paul Gilbert
af00b91111 Merge branch 'soltys_wip2' of github.com:Strangerke/scummvm into cge
Conflicts:
	engines/cge/cge_main.cpp
	engines/cge/general.cpp
	engines/cge/snail.cpp
	engines/cge/vga13h.cpp
2011-06-27 19:03:50 +10:00
Paul Gilbert
e13317baea CGE: Beginnings of work on graphics support 2011-06-27 18:57:58 +10:00
Strangerke
083d6ff612 CGE: remove some if(n)def DEMO by using a new flag. Added CGEEngine in several classes in order to do so. 2011-06-27 01:03:47 +02:00
Strangerke
e0673c1135 CGE: get rid of memicmp 2011-06-26 12:52:07 +02:00
Strangerke
a06a75b9a4 CGE: Implement ForceExt and RCrypt. Little style cleanup. 2011-06-26 12:07:42 +02:00
Paul Gilbert
d5fdd09429 CGE: Bugfix for scanning archive index in BTFILE class 2011-06-26 18:51:12 +10:00
Paul Gilbert
fe9dc10964 CGE: Implemented basic file access functionality 2011-06-26 17:53:55 +10:00
Strangerke
a307d405b6 CGE: suppress a couple of static, add ProgName and MergeExt 2011-06-22 08:11:18 +02:00
Strangerke
b5ad69d13c CGE: ScummVM no longer crashes instantly 2011-06-21 19:38:16 +02:00
Strangerke
6dc29e4a04 CGE: Remove some statics 2011-06-20 23:40:22 +02:00
Strangerke
77d4dcade2 CGE: Remove static parts of HEART 2011-06-20 00:55:47 +02:00
Strangerke
40f95669ae CGE: As there's only one instance of VGA, suppress all the static keywords from it 2011-06-20 00:13:41 +02:00
eriktorbjorn
0fa5425aa8 Merge branch 'soltys_wip2' of github.com:Strangerke/scummvm into soltys_wip2 2011-06-19 11:19:18 +02:00
eriktorbjorn
78e3f2a57b CGE: Get rid of some static initializing
ScummVM itself (not the engine; I haven't tried that) now starts
without crashing. It exits immediately, but as far as I can tell
it does not crash. It still produces lots of Valgrind warnings,
though...
2011-06-19 11:17:54 +02:00
Strangerke
ac3d66d3dd CGE: (Eriktorbjorn) Fix compilation for GCC 2011-06-19 10:13:54 +02:00
eriktorbjorn
3871c71f0e CGE: Fix compilation under GCC
Unfortunately, I had to stub a few things but this all looks like
code that will have to be rewritten later anyway.
2011-06-19 07:59:37 +02:00
Strangerke
77d5c25472 CGE: Suppress some defines, fix semi-columns in template definitions 2011-06-18 08:54:22 +02:00
Strangerke
1ebe182ba1 CGE: Fix the remaining link errors. It now crashes instantly, most likely because of the VGA class 2011-06-14 23:54:59 +02:00
Strangerke
44cf1872e2 CGE: Fix one linker error 2011-06-13 18:23:48 +02:00
Strangerke
9918344cdc CGE: Fix several issues reported by CPPCHECK 2011-06-13 13:44:52 +02:00
Strangerke
aa1d8986a6 CGE: Cleanup: also remove trailing tabs 2011-06-13 13:13:39 +02:00
Strangerke
64f2ccca9b CGE: Cleanup: remove trailing spaces 2011-06-13 13:07:45 +02:00
Strangerke
ffc2aa4e4f CGE: Format code 2011-06-13 11:57:24 +02:00
Strangerke
ccd934e4bf CGE: Add a couple of STUB warnings 2011-06-13 00:40:19 +02:00
Strangerke
b1df7ca734 CGE: Add missing file, and STUB some missing functions in general.cpp 2011-06-12 22:06:44 +02:00
Strangerke
3bef49c003 CGE: Suppress VGA::Exit, some cleanup, add one missing source 2011-06-12 01:13:44 +02:00
Strangerke
92076d4641 CGE: Remove DROP() macro 2011-06-11 23:27:27 +02:00
Strangerke
11264a60a7 CGE: Stubbing and cleanup made by SylvainTV 2011-06-11 22:35:21 +02:00
Strangerke
15d98b2a54 CGE: Add a couple of missing files 2011-06-11 09:33:17 +02:00
Strangerke
29065d302a CGE: Add namespaces 2011-06-10 22:57:09 +02:00
Strangerke
7d88b9e4cd CGE: Suppress typedef for byte, word and dword. 2011-06-10 19:02:13 +02:00
Strangerke
68f7ff1115 CGE: Replace Boolean, TRUE and FALSE by bool, true, false 2011-06-10 13:06:03 +02:00
Strangerke
a5c569eff2 CGE: Remove far and near keywords 2011-06-10 09:14:43 +02:00
Strangerke
03c540abff CGE: Add default header, fix some includes 2011-06-10 07:45:18 +02:00
Strangerke
01a7e7ad60 CGE: Add several sources based on headers 2011-06-09 08:20:53 +02:00
Strangerke
c545ebd0d5 CGE: Add minimal engine and detection 2011-09-10 17:50:47 +02:00