Commit Graph

89 Commits

Author SHA1 Message Date
Max Horn
4a70a93590 fix convertEndian compilation (thanks erik for giving me some work :-); also removed the #ifdef around it, to prevent such 'incidences' in the future
svn-id: r10356
2003-09-21 18:10:12 +00:00
Torbjörn Andersson
3c7c60196f ScummVM code formatting conventions
svn-id: r10350
2003-09-21 16:11:26 +00:00
Torbjörn Andersson
5628ee7417 cleanup
svn-id: r10308
2003-09-19 06:42:22 +00:00
Max Horn
be9d4066e1 moved engine.* to base; this fixes some linking issues when building a barebone ScummVM (or maybe I just want to increase our CVS stats? <g>)
svn-id: r10287
2003-09-18 02:07:18 +00:00
Max Horn
468275bb94 added a static method setDefaultDirectory to class File; used this to simplify some code; added a global g_sound pointer in bs2, this cuts down on uses of g_sword2 (of course both should be removed on the long run); some other minor tweaks/fixes
svn-id: r10278
2003-09-17 21:06:16 +00:00
Max Horn
c0d1061a2d cleanup
svn-id: r10277
2003-09-17 20:34:20 +00:00
Oliver Kiehl
fd7727e9d2 Fingolfin, now I am really disappointed with you that you didn't see this bug... ;)
svn-id: r10252
2003-09-14 15:07:39 +00:00
Max Horn
30e4785896 simplified code
svn-id: r10245
2003-09-13 21:20:05 +00:00
Oliver Kiehl
52ff6acc1f and another endian fix
svn-id: r10241
2003-09-13 20:42:08 +00:00
Max Horn
5aa69da8ef convert run lists in the res manager
svn-id: r10233
2003-09-13 17:36:31 +00:00
Max Horn
49f84b9c41 cleanup
svn-id: r10222
2003-09-13 13:02:44 +00:00
Max Horn
a81ea7667b improved heuristic, fixes crash when clicking on the fence
svn-id: r10207
2003-09-13 02:28:17 +00:00
Max Horn
c96ce86cab <joostp> *Fingolfin does +5 damage to endian bug.
svn-id: r10199
2003-09-13 01:06:41 +00:00
Max Horn
4d9296d4c4 cleanup
svn-id: r10197
2003-09-12 23:22:45 +00:00
Max Horn
af14b48b4d cleanup / fix WALK_GRID_FILE case in convertEndian
svn-id: r10196
2003-09-12 21:40:44 +00:00
Max Horn
e2b842a85a move convertEndian around
svn-id: r10195
2003-09-12 20:48:28 +00:00
Max Horn
54f284fb3b No need to have convertEndian member of class resMan
svn-id: r10194
2003-09-12 20:46:12 +00:00
Max Horn
2ce7c27f0b properly fixed parallax layers in BE systems
svn-id: r10193
2003-09-12 20:26:54 +00:00
Oliver Kiehl
9dc282f1d5 endian fixes
svn-id: r10192
2003-09-12 18:52:53 +00:00
Torbjörn Andersson
5bf1974a08 Our ServiceWindows() never returns RDERR_APPCLOSED, and we always behave as
if we have the focus, so there's no need to check.

svn-id: r10130
2003-09-09 12:45:33 +00:00
Torbjörn Andersson
bb5f479a8c Added a WaitForFade() function, to replace numerous while-loops scattered
througout the code.

svn-id: r10127
2003-09-09 12:14:08 +00:00
Torbjörn Andersson
5270fa2d5a Re-formatted the code to be a bit more in line with the rest of ScummVM,
and made a few (untested) endian-fixes.

svn-id: r9965
2003-09-02 09:55:11 +00:00
Torbjörn Andersson
178b0d82df Another attempt at fixing the music1.clu / music2.clu thing.
svn-id: r9952
2003-09-01 06:40:07 +00:00
Torbjörn Andersson
54f5caedc5 Untested (because I don't have any savegames on this computer) support for
using music1.clu and music2.clu instead of music.clu

svn-id: r9943
2003-08-31 18:09:21 +00:00
Max Horn
01f020da2b SetPalette conflicts with an OS symbol on OS X
svn-id: r9829
2003-08-23 14:42:37 +00:00
Jonathan Gray
4df7dd406f fix a resman method and make saving work using SaveFileManager
svn-id: r9828
2003-08-23 14:33:57 +00:00
Jonathan Gray
5018d206bc stop bs2 trying to cache clusters
svn-id: r9815
2003-08-22 06:39:18 +00:00
James Brown
ec447fdfbb Remove a bunch of unneeded cruft - but barely the surface of it. This code is depressing and duplicated all over the place... I don't think I can bear to touch this code until it's undergone some MAJOR cleanup :)
svn-id: r9782
2003-08-19 14:57:26 +00:00
Max Horn
0df319e952 #include cleanup (explicityl specify the location for headers from common/, so that we at some point can get rid of -Icommon; exception is made for stdafx.h, since a) we might want to rename it and b) might want to move it to the top level)
svn-id: r9359
2003-08-01 12:21:04 +00:00
Oliver Kiehl
0f85cc3061 rename bs2 to sword2 to have the same name as the original engine.
besides this way all our engines start with an "s" ;)

svn-id: r9301
2003-07-30 19:25:31 +00:00
Jonathan Gray
2b0c2a20b2 match prototype
svn-id: r9238
2003-07-28 10:28:29 +00:00
Jonathan Gray
f22cca2be2 rename _DEBUG define to _BS2_DEBUG to stop it conflicting with VC
svn-id: r9237
2003-07-28 09:49:46 +00:00
Jonathan Gray
98b1a0d7ff replace DWORD usage with uint32
svn-id: r9235
2003-07-28 08:04:03 +00:00
Jonathan Gray
d520390cc5 rename functions with windows specific names
svn-id: r9233
2003-07-28 07:47:21 +00:00
Jonathan Gray
77cf6b7c3e add bs2demo target for broken sword 2 demo
svn-id: r9229
2003-07-28 07:00:15 +00:00
Travis Howell
42ba111063 A few warnings
svn-id: r9224
2003-07-28 03:49:25 +00:00
Travis Howell
ccc40eecc9 Compiles on mingw now
svn-id: r9222
2003-07-28 03:12:49 +00:00
Max Horn
544168e96b fixed yet more warnings
svn-id: r9220
2003-07-28 02:37:47 +00:00
Jonathan Gray
f020d28b5e bs2
svn-id: r9211
2003-07-28 01:44:38 +00:00