Commit Graph

40 Commits

Author SHA1 Message Date
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Ori Avtalion
9414d7a6e2 JANITORIAL: Reduce header dependencies in shared code
Some backends may break as I only compiled SDL
2011-04-28 15:08:58 +03:00
Torbjörn Andersson
10bd159d0d SWORD2: Add assert()s prompted by code analysis warnings.
See bug #3087857.

svn-id: r53509
2010-10-15 19:08:56 +00:00
Torbjörn Andersson
e5ec399c55 SWORD2: Fix some code analysis warnings (bug #3087857)
svn-id: r53467
2010-10-15 06:12:23 +00:00
Max Horn
df81b68967 Change BS 1 & 2 to I & II (see discussion on -devel)
svn-id: r46951
2010-01-03 21:20:05 +00:00
Max Horn
d083e02215 Rename Common::Stream::readLine_NEW to readLine
svn-id: r46779
2009-12-30 23:00:55 +00:00
Willem Jan Palenstijn
5a8b81119b Fix free/delete/delete[] mismatches. Patch by salty-horse
svn-id: r44512
2009-10-01 11:02:23 +00:00
Max Horn
e9cd07e582 SWORD1 & SWORD2: Replaced ioFailed by err+eos
svn-id: r42912
2009-07-29 21:39:34 +00:00
Torbjörn Andersson
0999534749 The error() and warning() functions add ! and newline automatically. (I didn't
look at debug() and debugC(), since I'm really bored with this now. :-)

svn-id: r41061
2009-05-31 10:02:16 +00:00
Johannes Schickel
b3c6751b9b Strip trailing whitespaces in the whole code base.
svn-id: r40867
2009-05-24 15:17:42 +00:00
Fabio Battaglia
0b2e06e4a4 sword2: add support for BS2 PSX demo
svn-id: r39977
2009-04-18 08:37:22 +00:00
Fabio Battaglia
dc9c538a62 Sword2: PSX version support, and GMM loading/saving
svn-id: r39896
2009-04-07 19:52:46 +00:00
Torbjörn Andersson
1edc1789b1 Changed readLine_OLD() to readLine_NEW(). I guess both this and the previous
readLine() change could be more robust, but at least it should be no worse than
it was before.

svn-id: r35226
2008-12-03 21:52:51 +00:00
Max Horn
3248906156 Engine class changed:
- Moved initCommonGFX() && GUIErrorMessage() out of class Engine
- got rid of the _autosavePeriod member (this prevented users from
  changing the autosave period during runtime)
- Got rid of an evil 'using GUI::Dialog' statement
- Clarified some Doxygen comments

svn-id: r34720
2008-10-02 17:48:01 +00:00
Max Horn
9b160804ab Renamed Engine::quit to Engine::shouldQuit (previously, it was easily confused with Engine::quitGame); also cleaned up engine.h a bit
svn-id: r34700
2008-09-30 12:27:38 +00:00
Max Horn
57e724bfc3 Renamed SeekableReadStream::readLine to SeekableReadStream::readLine_OLD; added a new alternate SeekableReadStream::readLine() instead
svn-id: r34315
2008-09-03 17:53:25 +00:00
Christopher Page
4198ee9623 Merged revisions 33188-33189,33191-33193,33196,33198,33202-33203,33206,33210,33212,33218-33220,33222,33224-33226,33229-33243,33246,33248-33250,33252,33258-33261,33263,33266,33270,33272-33283,33285,33287-33290,33295-33298,33321,33325-33330,33332-33335,33337-33340,33342,33345,33347,33349-33350,33352-33357,33359-33367,33369-33371,33373,33375-33377,33379-33380,33383-33385,33387-33389,33392-33394,33400-33402,33404-33405,33407-33410,33412-33416,33418-33419,33425-33427,33432,33436-33438,33444,33446,33452-33453,33455-33459,33463-33464,33466-33471,33473-33474,33478,33490,33492,33495-33496,33509-33512,33518-33519,33522-33527,33529-33530,33537,33541,33544,33546,33550,33552-33554,33556,33558,33561-33562,33565,33568,33570,33574,33576,33578-33581,33584-33587,33590,33596,33604-33611,33614-33615,33617-33618,33620-33621 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
 

svn-id: r33624
2008-08-04 22:34:07 +00:00
Max Horn
0be985ce83 Changed class File (and derived classes) to only support read-only access; added a new class DumpFile for writing
svn-id: r33412
2008-07-29 16:09:10 +00:00
Christopher Page
796e606971 SWORD2 works with the new GMM implementation
svn-id: r33044
2008-07-13 22:00:39 +00:00
Johannes Schickel
600ab40bca Changed all delete [] usages to delete[].
svn-id: r31927
2008-05-07 14:31:45 +00:00
Jordi Vilalta Prat
d6c34bdc4b Fixed the spaces before tabs.
svn-id: r30667
2008-01-28 00:14:17 +00:00
Nicola Mettifogo
258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
2007-09-19 08:40:12 +00:00
Max Horn
22c0403e0d Re-added Revolution Software copyright to BS2 engine
svn-id: r27030
2007-05-31 20:28:29 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots
svn-id: r27024
2007-05-30 21:56:52 +00:00
Max Horn
c489be38d6 Removed obsolete 'if' (resp. replaced it by an assert)
svn-id: r25918
2007-03-01 17:15:26 +00:00
Max Horn
4203819b39 Got rid of another use of File::incRef/decRef
svn-id: r25917
2007-03-01 17:13:23 +00:00
Max Horn
b777c09ac0 Removed some dead code, updated a warning message
svn-id: r25662
2007-02-17 20:38:27 +00:00
Torbjörn Andersson
0080ae687a Stop movie lead-in/out when restarting the game (as I already claimed in a
comment that I was doing) to *really* fix bug #1645480. This time for sure...

svn-id: r25231
2007-01-27 22:10:50 +00:00
Torbjörn Andersson
d2910fe758 Added separate function for playing cutscene lead-in/out sounds, and made sure
that these are stopped whenever the engine is going to do a mass killing of
game resources, e.g. when restoring or restarting the game. Should fix bug
#1645480. (This was a regression added during the rewrite to support DXA.)

svn-id: r25204
2007-01-26 18:21:41 +00:00
Torbjörn Andersson
5aff1df220 Slightly more verbose debug message.
svn-id: r23428
2006-07-08 15:39:26 +00:00
Torbjörn Andersson
f83f1a77b6 Only check if the files on "CD 0" are present. The others are requested with
"insert CD" messages. (Of course, that isn't supported, or even well tested,
but the idea is sound.) This makes it possible to run the BS2 demo again.

Incidentally, this is how I *meant* for it to work when I added that check - I
even wrote so in the comment above that section of the code - so how on earth
did I manage to screw it up like that?

svn-id: r22594
2006-05-24 04:48:39 +00:00
Torbjörn Andersson
6b90c405e8 Initialise _resList to avoid crash (from freeing an invalid pointer) if the
data files are missing.

svn-id: r22520
2006-05-18 14:28:19 +00:00
Max Horn
8fdcfedf19 Do not call static class methods as if they were instance methods
svn-id: r22172
2006-04-26 08:34:01 +00:00
Torbjörn Andersson
2cbcd49893 If the resource manager fails to initialize itself properly, instead of
printing a fatal error, use the new GUIErrorMessage function and return to
the launcher. Also, verify that all files that should be present on "CD 0"
(i.e. on the hard disk) are present at startup, at least. (Any other missing
CLU file is already requested with an "Insert CD" message.)

svn-id: r22168
2006-04-26 06:12:03 +00:00
Max Horn
453aad9ec3 Do not override the 'directory' param when dumping BS2 resources
svn-id: r21935
2006-04-16 12:23:37 +00:00
Torbjörn Andersson
d6f348638d Guard against too many entries in resource.inf, since there has been a TODO
comment about that (removed in the previous commit) since roughly forever.

svn-id: r21536
2006-04-01 21:55:41 +00:00
Torbjörn Andersson
f59d472155 Simplified the loading of resource.inf
svn-id: r21533
2006-04-01 21:42:11 +00:00
Max Horn
d9a9fac937 Fixed tons of format string warnings for debug/error calls (including several errors where the format string didn't match the number of arguments to the call)
svn-id: r21141
2006-03-08 11:37:25 +00:00
Torbjörn Andersson
002c587965 Removed includes from sword2.h so that (hopefully) there will eventually be
less dependencies.

svn-id: r20741
2006-02-17 15:07:36 +00:00
Max Horn
26ee630756 Moved engines to the new engines/ directory
svn-id: r20582
2006-02-11 22:45:04 +00:00