165 Commits

Author SHA1 Message Date
Torbjörn Andersson
da42014402 SWORD25: Fix main menu button text colour
In the other cases I've found in the code, the colour components are
stored in the order B, G, R and A. Assume that's the case here too. I
hope that is correct. It doesn't seem to break anything obvious.

svn-id: r55255
2011-01-16 08:15:47 +00:00
Max Horn
2180b2d6b5 COMMON: Split common/stream.h into several headers
svn-id: r54385
2010-11-19 17:03:07 +00:00
Max Horn
ee4770ffb6 ENGINES: Change 'colour' to 'color'
Only changed this in engines where 'color' was/is already used
almost exclusively

svn-id: r54288
2010-11-17 12:22:08 +00:00
Max Horn
abe1959d36 COMMON: Simplify DECLARE_SINGLETON macro
This makes it possible to write
  DECLARE_SINGLETON(foo);
instead of
  DECLARE_SINGLETON(foo)
without causing a warning about an extra semicolon.
The extra semicolon helps some editors at parsing the C++ code.

svn-id: r54258
2010-11-16 08:23:13 +00:00
Max Horn
0c018bf392 SWORD25: cleanup
svn-id: r54045
2010-11-03 00:19:28 +00:00
Max Horn
438da9b220 SWORD25: Convert printf to debugN
svn-id: r54040
2010-11-02 09:50:45 +00:00
Max Horn
6fa8772bae SWORD25: Replace art_warn/art_die by warning/error
svn-id: r54002
2010-11-01 16:00:35 +00:00
Max Horn
44393b2dc8 ALL: Add code to help stop people from accidentally using "bad" APIs
A new header file common/forbidden.h is included by scummsys.h and it
re-#defines numerous symbols like fopen(), fread(), system(), etc. with
garbage, in order to provoke compile errors in any code using them.

If a .cpp file really *must* use any of these (e.g. because it is a
backend file), then these redefinitions can be disabled by #defining
FORBIDDEN_SYMBOL_ALLOW_ALL as the first thing in the .cpp file. Whenever
this is done, an explanatory comment should be added.

Note that this system cannot catch all "bad" usages (notably the Lua
code in the sword25 engine), as it can only work if scummsys.h is
included.

svn-id: r53961
2010-10-30 21:27:42 +00:00
Max Horn
b2fa7e58a3 SWORD25: Start to rename read/write methods of *PersistenceBlock classes
All should be renamed to reduce risk of accidental incorrect use.

svn-id: r53899
2010-10-28 00:26:25 +00:00
Max Horn
cf3551525f SWORD25: Get rid of CallbackRegistry
svn-id: r53898
2010-10-28 00:25:33 +00:00
Max Horn
8217efc74a SWORD25: Disable script triggered screenshots
svn-id: r53840
2010-10-25 23:34:36 +00:00
Max Horn
e761f76653 SWORD25: Get rid of most of the 'kernel service/superclass' code
svn-id: r53835
2010-10-25 22:41:25 +00:00
Max Horn
48d15398e5 SWORD25: Get rid of kernel/string.h
svn-id: r53758
2010-10-24 01:52:27 +00:00
Max Horn
2a987c4a31 SWORD25: Simplify & optimize PNG reading code
The interlaced part is untested since I do not know any place
in the game where interlaced data is used.

svn-id: r53757
2010-10-24 01:33:24 +00:00
Max Horn
4d6fb4e768 SWORD25: Get rid of colorFormat parameter in PNGLoader API
Only CF_ARGB32 was supported anyway.

svn-id: r53756
2010-10-24 01:32:52 +00:00
Max Horn
7cc8811a5c SWORD25: Merge classes PNGLoader, ImageLoader and ImageLoaderManager
This looses some flexibility when it comes to supporting other image
formats. But since the game does not use other image formats, this seems
rather irrelevant, compared to how much simpler the code now is.

svn-id: r53755
2010-10-24 01:32:15 +00:00
Max Horn
1e16d576ca SWORD25: Merge B25SLoader into PNGLoader
svn-id: r53754
2010-10-24 01:31:30 +00:00
Max Horn
85e3ddc309 SWORD25: Add ImageLoaderManager, get rid of last globally constructed object
This also gets rid of an evil use of atexit.

svn-id: r53753
2010-10-24 01:30:53 +00:00
Max Horn
2da4469686 SWORD25: Remove outdated comments
svn-id: r53752
2010-10-24 01:29:59 +00:00
Max Horn
360f67636b SWORD25: Register LUA callbacks insider registerScriptBindings() methods
Previously, the constructor of an anonymous global object was used to do
this, for no apparent reason.
However, maybe there was a hidden reason which I missed, so this change
might cause regressions. I.e., please test.

svn-id: r53735
2010-10-23 15:44:33 +00:00
Max Horn
c483a22f2a SWORD25: Get rid of global SharedPtr instances
svn-id: r53734
2010-10-23 15:44:04 +00:00
Paul Gilbert
14e82dbe7f SWORD25: Added description field to savegames
This stores the date and time of when the game was saved, since ScummVM doesn't support getting a file's age like the original engine did.

svn-id: r53638
2010-10-20 11:11:09 +00:00
Eugene Sandulenko
6629efc676 SWORD25: Enforced code formatting rules in rest of the engine
svn-id: r53626
2010-10-19 21:03:33 +00:00
Eugene Sandulenko
ae78107e2a SWORD25: Enforce code naming conventions in gfx/*
svn-id: r53625
2010-10-19 20:54:30 +00:00
Eugene Sandulenko
f3becaddf1 SWORD25: Enforce code naming conventions in gfx/image/imageloader*
svn-id: r53623
2010-10-19 20:52:47 +00:00
Eugene Sandulenko
bbd95da899 SWORD25: Fix engine exit when running without theoradec
svn-id: r53622
2010-10-19 20:52:06 +00:00
Eugene Sandulenko
d94435eebd SWORD25: Enforce code naming conventions in gfx/graphicengine*
svn-id: r53621
2010-10-19 20:51:21 +00:00
Eugene Sandulenko
0d1d481894 SWORD25: Properly implement GraphicEngine::fill()
Now all transitions and dimming out screen at exit dialog is supported.

svn-id: r53620
2010-10-19 20:50:29 +00:00
Paul Gilbert
6a1e874447 SWORD25: Fix for Valgrind identified memory leak
svn-id: r53611
2010-10-19 10:03:38 +00:00
Eugene Sandulenko
3feac393b0 SWORD25: Renamed Lua .c files to .cpp and make it compilable
svn-id: r53568
2010-10-18 17:12:00 +00:00
Paul Gilbert
81f71f48c2 SWORD25: Fix Valgrind reported uninitialised errors
svn-id: r53565
2010-10-18 10:58:22 +00:00
Paul Gilbert
ae63e20661 SWORD25: Fix for Valgrind identified errors
svn-id: r53563
2010-10-18 10:26:27 +00:00
Max Horn
36cd5caf95 COMMON: Add XMLParser::parseIntegerKey variant accepting a Common::String
Almost all places where we used XMLParser::parseIntegerKey were using
it like this:
  XMLParser::parseIntegerKey(str.c_str(), ...)
Since this makes the code harder to read, I overloaded the method to
also accept Commmon::String directly.
Also removed all .c_str() invocations where necessary.

svn-id: r53479
2010-10-15 12:19:13 +00:00
Max Horn
f52b31a05f SWORD25: Typo, cleanup
svn-id: r53478
2010-10-15 12:18:41 +00:00
Max Horn
550073ee04 SWORD25: Do not use Kernel::GetService directly anymore
svn-id: r53477
2010-10-15 12:18:19 +00:00
Max Horn
2b5de8c892 SWORD25: Adapted a few things to our code formatting conventions; translated rest of graphicengine.h to german
svn-id: r53476
2010-10-15 12:17:20 +00:00
Max Horn
f8c15c90ff SWORD25: Fix a few global constructor warnings
svn-id: r53475
2010-10-15 12:16:57 +00:00
Max Horn
9ca0a6147b SWORD25: Get rid of (deprecated) access to libpng io_ptr
Unfortunately I cannot test this, so watch our for regressions.

svn-id: r53451
2010-10-13 22:18:57 +00:00
Max Horn
810f087599 SWORD25: Fix empty loop body & conversion warnings
svn-id: r53450
2010-10-13 22:18:32 +00:00
Torbjörn Andersson
e52b77dc7b SWORD25: Worked around crash in options dialog.
I don't really know if this is correct, but aesthetically it goes well
with how the scale factor is treated.

svn-id: r53447
2010-10-13 20:05:21 +00:00
Johannes Schickel
bc2781fdb3 SWORD25: Semi-colon cleanup.
svn-id: r53446
2010-10-13 20:04:50 +00:00
Max Horn
9b4d41d2d2 SWORD25: Convert object registries to singletons
svn-id: r53431
2010-10-13 15:41:34 +00:00
Max Horn
8f4f0d16fc SWORD25: Renamed getInstance() -> instance()
svn-id: r53430
2010-10-13 15:41:00 +00:00
Filippos Karapetis
c81da6dcb6 SWORD25: Silenced MSVC false positive about a potentially uninitialized variable
svn-id: r53412
2010-10-13 11:32:08 +00:00
Filippos Karapetis
a876494fe7 SWORD25: Stop using class names as variable names
svn-id: r53408
2010-10-13 11:20:49 +00:00
Max Horn
85fa23afbe SWORD25: Get rid of kernel/bs_stdint.h
svn-id: r53405
2010-10-13 10:51:20 +00:00
Max Horn
02322c562c SWORD25: Get rid of Kernel::GetMicroTicks()
svn-id: r53403
2010-10-13 10:41:30 +00:00
Eugene Sandulenko
eb66750137 SWORD25: Enforce code naming conventions in gfx/animation*
svn-id: r53393
2010-10-13 00:10:18 +00:00
Eugene Sandulenko
063cb5d84c SWORD25: Enforced code naming conventions in math/*
svn-id: r53392
2010-10-13 00:09:32 +00:00
Eugene Sandulenko
54ccc8f4c9 SWORD25: Enforced code naming conventions in script/*
svn-id: r53391
2010-10-13 00:08:28 +00:00