Commit Graph

69 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
Max Horn
2180b2d6b5 COMMON: Split common/stream.h into several headers
svn-id: r54385
2010-11-19 17:03:07 +00:00
Eugene Sandulenko
327d30d719 CINE: eliminate global variables
svn-id: r51937
2010-08-09 11:38:01 +00:00
Max Horn
37b7be4519 CINE: Change Doxygen commands to match our CFC
svn-id: r48764
2010-04-21 21:22:43 +00:00
Max Horn
ac59693be2 A ton of code formatting fixes; also fixed warnings about single line loops like 'while(cond);' by inserting newlines
svn-id: r36127
2009-01-29 05:26:12 +00:00
Eugene Sandulenko
696897b058 Whoa! Removing trailing spaces.
svn-id: r35648
2009-01-01 15:06:43 +00:00
Filippos Karapetis
162634cc95 Started moving Save/Load code to saveload.cpp/.h
svn-id: r35033
2008-11-13 08:59:17 +00:00
Max Horn
a41c681d9d Merging more of the GSoC 2008 RTL branch: CINE
svn-id: r34244
2008-09-01 17:47:36 +00:00
Kari Salminen
d9d77fef03 Designate fix for bug #2057619 as a hack, as that's what it is.
svn-id: r34102
2008-08-22 12:11:51 +00:00
Kari Salminen
d976f8a0fe Fix for bug #2057619: FW: Glitches in title display of demo (regression).
This fix doesn't seem to break other Future Wars versions like r34039 did.
Some versions of TITRE.ANI use 15 for transparency color, others use 0.
Previously only one of the choices was supported, now both are recognized.

svn-id: r34081
2008-08-21 14:14:33 +00:00
Kari Salminen
44c24e922b Fix for bug #2057619: FW: Glitches in title display of demo (regression).
Removed incorrect transparency data used for logo. Now it's shown correctly.

svn-id: r34039
2008-08-19 14:19:28 +00:00
Christopher Page
fcc00f20b9 Merged revisions 33719,33721-33723,33725-33727,33729-33730,33733,33736,33742,33754,33756,33758,33761,33763,33766 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33769
2008-08-10 21:58:18 +00:00
Kari Salminen
983a4f21e5 Converted animDataTable from a plain array to a Common::Array. Should help to catch out of bounds access errors which may cause memory corruption.
svn-id: r33726
2008-08-09 20:55:01 +00:00
Christopher Page
ce3d1e1a7d Merged revisions 33632-33633,33635,33637,33639-33640,33642-33645,33648,33654-33655,33664,33667-33670,33673-33674,33678,33682,33686-33691,33693,33696,33698,33700,33703,33708,33710,33712-33714,33716 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33720
2008-08-09 19:03:29 +00:00
Kari Salminen
f3ecdaa6fe Made rest of resource loading functions used in loadResource return -1 on error.
This fixed a crash in Operation Stealth when walking out of the airport
(Some file couldn't be opened and the game crashed because of that.
Now it doesn't crash but handles the missing file gracefully).

svn-id: r33643
2008-08-05 19:30:16 +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
Kari Salminen
efd4a7a72f Made loadResourcesFromSave internally use the loadResource-function.
Fixes Operation Stealth savegame loading! HURRAH! FINALLY!

svn-id: r33530
2008-08-02 15:59:38 +00:00
Kari Salminen
6307c46604 - Combined loadAbs and loadResource into one function.
- Made resource loading functions (loadSpl, loadMsk etc)
  return the number of the animDataTable entry right after
  the loaded data.
- Made resource loading functions always load multiframe
  data into directly sequential animDataTable entries
  (Hopefully this won't break anything).

svn-id: r33529
2008-08-02 15:47:25 +00:00
Kari Salminen
2a90435e5d Fix for bug #2019355 (FW: broken compatibility with 0.11.1 saves):
- Changed savegame loading related functions to use SeekableReadStream
  rather than InSaveFile so MemoryReadStream can be used transparently.
- Fixed loadResourcesFromSave to load multiframe animations correctly
  and to load 0.11.0/0.11.1 Future Wars savegames which used a slightly
  different format.
- Added a savegame format detector that tries to detect between the old
  Future Wars savegame format, the new one and a broken revision of the
  new one.
- Changed makeLoad to first load the savegame fully into memory and only
  then handle it (If the savegame's packed then it's unpacked first). If
  the packed savegame can't tell its unpacked size (i.e. it's using zlib
  format) then we'll try to load up to 256kB of the savegame data.
Thanks to wjp for his help with nailing this release critical bug.

svn-id: r33192
2008-07-22 10:15:58 +00:00
Christopher Page
30b1a62e81 Removed unnecessary #inlcudes
svn-id: r32984
2008-07-10 05:15:19 +00:00
Christopher Page
e808cdf7a0 Reimplemented pushEvent() and artificialEventQueue to work with Events instead of EventTypes. Reimplemented Queue as a List instead of Array. Updated AGOS, AGI, CINE, GOB, and KYRA to work with the current implementation of the GMM
svn-id: r32971
2008-07-09 02:27:05 +00:00
Christopher Page
41938b7644 CINE works with the new GMM implementation
svn-id: r32954
2008-07-07 23:47:39 +00:00
Christopher Page
f878820bbe Created Global Main Menu Dialog. Made a uniform _quit flag for engines. So far agi, agos, and cine are now using the new _quit flag.
svn-id: r32770
2008-06-24 21:15:30 +00:00
Kari Salminen
5779261c16 Tiny comment update (Echec in French means failure).
svn-id: r32358
2008-05-29 10:15:39 +00:00
Eugene Sandulenko
f2d72d9473 Patch #1969189: "CinE renderer rewrite"
svn-id: r32257
2008-05-24 22:11:41 +00:00
Eugene Sandulenko
51352c71c5 Proper fix for savestates. Thanks to next_ghost
svn-id: r32073
2008-05-12 21:03:26 +00:00
Kari Salminen
9ba0aa01fa Cleanup & typo.
- Use sizeof(_name) instead of magic number 10 with memset
- 'usually' instead of 'ussually'
- 'delete[]' instead of 'delete []'
- Fixed parameter name discrepancy between loadResource's definition and declaration

svn-id: r31701
2008-04-24 20:04:53 +00:00
Eugene Sandulenko
57a9ef3a8f Patch #1941066: "CinE sprite overlay rewrite" courtsey of next_ghost
svn-id: r31651
2008-04-21 20:51:17 +00:00
Johannes Schickel
b586235fb8 Fixed warnings for msvc9.
svn-id: r31460
2008-04-09 15:16:50 +00:00
Eugene Sandulenko
e4ddd5d5f1 Ignore pointers on save
svn-id: r31453
2008-04-08 18:12:32 +00:00
Sven Hesse
9f94a2fa8c Fix compilation on my 64-bit system...
svn-id: r31450
2008-04-08 09:59:41 +00:00
Eugene Sandulenko
732774fd8d Patch #1913862: "CinE Script system"
svn-id: r31444
2008-04-07 20:24:40 +00:00
Filippos Karapetis
1e58257791 Oops
svn-id: r31297
2008-03-28 17:46:18 +00:00
Filippos Karapetis
70e4503274 Fixed 2 off-by-one errors (thanks next_ghost for spotting them)
svn-id: r31296
2008-03-28 17:38:45 +00:00
Filippos Karapetis
50cf084a6b Cleanup
svn-id: r29973
2007-12-24 10:11:41 +00:00
Gregory Montoir
bb30d560b2 renamed several structures, variables and functions
svn-id: r29860
2007-12-14 19:21:19 +00:00
Filippos Karapetis
729c843091 Cleanup
svn-id: r29858
2007-12-14 13:51:41 +00:00
Filippos Karapetis
3240d0636a Fixed a regression from the latest cleanups
svn-id: r29851
2007-12-13 17:47:54 +00:00
Filippos Karapetis
280d634455 Fixed an incorrect copy/paste
svn-id: r29850
2007-12-13 17:03:14 +00:00
Filippos Karapetis
30be440557 Fixed regression introduced by the latest cleanups
svn-id: r29849
2007-12-13 15:10:52 +00:00
Filippos Karapetis
a9e1f39a16 Cleanup and simplification
svn-id: r29842
2007-12-13 10:47:14 +00:00
Filippos Karapetis
99453537f1 Cleanup
svn-id: r29830
2007-12-11 23:16:15 +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
Torbjörn Andersson
8e2fd2ee73 Fixed freeing of invalid pointer, which would cause Operation Stealth to crash.
I don't know if the loadSet() / loadSetAbs() functions are every used in Future
Wars. If so, we should commit this to the branch as well.

svn-id: r27590
2007-06-21 17:24:27 +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
Gregory Montoir
137140b7e9 removed some resource related memory leaks
svn-id: r27007
2007-05-29 21:06:07 +00:00
Gregory Montoir
73210b4aa3 added code for freePartRange, freePartEntry and freeOverlay (also renamed some functions and variables).
svn-id: r27006
2007-05-29 20:22:20 +00:00
Gregory Montoir
b5aa521a75 added basic support for sounds playback in Amiga versions (only tested with the demos)
svn-id: r26837
2007-05-13 16:11:19 +00:00
Eugene Sandulenko
e09eaa074e Fix bug #1599267: "FW: Ungraceful exit from copy protection screen"
svn-id: r24765
2006-11-23 06:43:18 +00:00