libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-19 16:18:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
52,210 Commits 5 Branches 5 Tags 1.8 GiB
a2454f6563
Commit Graph

499 Commits

Author SHA1 Message Date
Max Horn
518526ba2f SWORD25: Remove some dead code; cleanup 
svn-id: r53760
 2010-10-24 01:53:32 +00:00
Max Horn
fa0151683c SWORD25: Replace ResourceManager's hash table by a Common::HashMap 
svn-id: r53759
 2010-10-24 01:53:01 +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
Paul Gilbert
66ecd08868 SWORD25: Fix to correctly write game state to savegame files 
svn-id: r53637
 2010-10-20 10:53:50 +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
Max Horn
4caa1d40a8 SWORD25: Simplify log listener code (and get rid of another global constructor) 
svn-id: r53610
 2010-10-19 09:44:48 +00:00
Max Horn
8f5eee67db SWORD25: Destroy singletons upon engine exit (untested, may lead to crash upon exit) 
svn-id: r53609
 2010-10-19 09:44:29 +00:00
Max Horn
d6b7ebab16 SWORD25: Some code cleanup 
svn-id: r53608
 2010-10-19 09:44:13 +00:00
Max Horn
ddf0a3d80c SWORD25: Move BS_ServiceInfo to service_ids.h and turn it into a POD struct 
svn-id: r53607
 2010-10-19 09:43:53 +00:00
Max Horn
88bca8e13d SWORD25: Optimize ReverseArray, move it to only place it is used 
svn-id: r53606
 2010-10-19 09:43:31 +00:00
Max Horn
ebf9911649 SWORD25: Work around for bug in Mac OS X 10.2 SDK 
svn-id: r53604
 2010-10-19 09:42:48 +00:00
Paul Gilbert
3b29bda9a1 SWORD25: Added operator= to Polygon class 
This fixes a corruption where vertice arrays were being copied directly and destroyed prematurely

svn-id: r53603
 2010-10-19 09:23:20 +00:00
Paul Gilbert
355032d4f9 SWORD25: Fix cppcheck warnings in BS_Log::LogPrefix 
The LogPrefix method isn't currently used, but I'm fixing it just in case it's ever used again

svn-id: r53602
 2010-10-19 08:12:04 +00:00
Torbjörn Andersson
c1a3689a5d SWORD25: Fix cppcheck warning 
svn-id: r53600
 2010-10-19 04:59:45 +00:00
Johannes Schickel
70566beb78 SWORD25: Since ssize_t might not be available on all platforms use size_t for the pointer cast now. 
svn-id: r53594
 2010-10-18 22:30:44 +00:00
Johannes Schickel
a821d65efe SWORD25: Fix compilation on 64bit arches by casting a pointer to ssize_t instead of int. 
This should be no permanent solution. I added a small fixme comment near the
cast so it won't be forgotten.

svn-id: r53593
 2010-10-18 22:17:41 +00:00
Johannes Schickel
521751e8d7 SWORD25: Use const_cast to cast away constness. 
This fixes a few warnings/errors in the LUA code. I added some FIXMEs at the
places where the casts happen, since usually this casting indicates bad
design.

svn-id: r53592
 2010-10-18 22:17:18 +00:00
Eugene Sandulenko
c360aa9d14 SWORD25: Fix warning 
svn-id: r53569
 2010-10-18 17:13:03 +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
Ori Avtalion
e6ae9c4d98 SWORD25: Use C-style comments in C files 
svn-id: r53538
 2010-10-16 12:04:22 +00:00
Ori Avtalion
ea9679cf72 SWORD25: Update svn keywords 
svn-id: r53537
 2010-10-16 12:02:59 +00:00
Torbjörn Andersson
9744167adc SWORD25: Fix infinite recursion 
If I understand this, we don't need to call Kernel::GetInstance()
when we are already in the Kernel class. In this particular case,
_RegisterScriptBindings() is called from the Kernel constructor, so
it gets called again and again because _Instance hasn't yet been set.

svn-id: r53512
 2010-10-15 20:01:13 +00:00
Max Horn
4ccce19876 ENGINES: Enhance namespace comments a bit 
svn-id: r53484
 2010-10-15 12:48:19 +00:00
Max Horn
34cc54eaa9 Add doxygen comment for namespaces of several engines. 
This is an empty template which ideally engine maintainers
would update and complete with concrete information...

svn-id: r53481
 2010-10-15 12:28:56 +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
Paul Gilbert
96585f24d9 SWORD25: Fix unloading of movies so the menu animation properly loops 
svn-id: r53474
 2010-10-15 10:52:23 +00:00
Eugene Sandulenko
f67bbc4ecc SWORD25: Attempt to optimize movie rendering 
Current code makes about 5 blits of each frame which is a huge
overhead. This code is an attempt to make that 1. Doesn't work yet
as the rendering pipe keeps blitting invisible pictures.

svn-id: r53459
 2010-10-14 20:44:44 +00:00
Eugene Sandulenko
e0b69a3061 SWORD25: Remove lua.c since it is not needed 
svn-id: r53452
 2010-10-13 22:23:09 +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
Torbjörn Andersson
bbbfdad458 SWORD25: Check if _LogFile has been created before flushing. 
svn-id: r53445
 2010-10-13 19:33:12 +00:00
Matthew Hoops
f9910fd0ee SWORD25: Don't compile lua.c 
lua.c has its own main function which we don't want. Compiling this in for me gives me a Lua console on startup (which probably isn't a good thing).

svn-id: r53442
 2010-10-13 18:13:24 +00:00
Filippos Karapetis
2880ebdeb4 Fixed ifdef. I'm too tired today :/ 
svn-id: r53440
 2010-10-13 17:45:20 +00:00
Filippos Karapetis
96e05a1ff9 SWORD25: Hopefully fix compilation when libtheora is not present 
svn-id: r53439
 2010-10-13 17:42:56 +00:00
Filippos Karapetis
a52f986125 SWORD25: Use $(CXX) -x c to build C files (hopefully this fixes compilation) 
svn-id: r53438
 2010-10-13 17:33:13 +00:00
Filippos Karapetis
737c2dd0ba SWORD25: Partially revert commit #53389 and add the custom rule for C files 
again, so that LUA can be compiled. It's a hack but at least it allows
compilation of C files for now

svn-id: r53437
 2010-10-13 17:05:44 +00:00
Max Horn
9755c63292 SWORD25: Invoke parent's class copy constructor 
svn-id: r53432
 2010-10-13 15:41:55 +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
17f9913a24 SWORD25: Oops, atan2() takes two arguments 
svn-id: r53429
 2010-10-13 15:06:14 +00:00
Max Horn
fa8275f27b SWORD25: Don't even compile theora related code when that lib is not present 
svn-id: r53428
 2010-10-13 15:00:51 +00:00
Filippos Karapetis
a3d3e94a8d SWORD25: Extended Mac OSX compilation fix for sqrtf and atan2f 
svn-id: r53426
 2010-10-13 14:40:32 +00:00
Filippos Karapetis
090540504d SWORD25: Hopefully fixed compilation under Mac OSX, Solaris and mingw32 
Taken from sound/softsynth/mt32/tables.cpp lines 28-41 (thanks LordHoto)

svn-id: r53425
 2010-10-13 14:33:47 +00:00
Filippos Karapetis
de3534fcd3 SWORD25: Include common/scummsys.h in places where USE_THEORADEC is used 
svn-id: r53423
 2010-10-13 14:13:48 +00:00
Filippos Karapetis
d83a70af43 SWORD25: Renamed ENABLE_THEORADEC to USE_THEORADEC (like in configure) 
svn-id: r53418
 2010-10-13 13:32:30 +00:00
Filippos Karapetis
f2d9319d9e SWORD25: Renamed ENABLE_THEORA to ENABLE_THEORADEC (like in configure) 
svn-id: r53417
 2010-10-13 13:27:55 +00:00
Filippos Karapetis
681ec59292 SWORD25: Added a ENABLE_THEORA define inside fmv/theora_decoder.h 
This define can be used to disable building of the Theora decoder, and thus makes
libtheora optional (therefore resolving an item in the Sword25 TODO). Disabling the
Theora decoder will effectively disable the game's videos

Note that running the game with the Theora decoder disabled is still untested

svn-id: r53416
 2010-10-13 13:07:16 +00:00
Sven Hesse
ff0160050a SWORD25: Force cast to uint instead of unsigned long long 
As per Fingolfin's request, because apparently there's no long long
in the C++ standard; and ScummVM's hashmap needs uint.

svn-id: r53413
 2010-10-13 11:42:17 +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
80c7fcede0 SWORD25: Remove the unused LUA compiler 
svn-id: r53411
 2010-10-13 11:24:53 +00:00
Sven Hesse
ab57b38fdf SWORD25: Resolve ambigous write() call on 64 bit systems 
svn-id: r53410
 2010-10-13 11:22:52 +00:00
Sven Hesse
c86c0b6b96 SWORD25: Cast the pointer to unsigned long long 
...Instead of to uint, which fails on my 64 bit system where pointers
are 64 bit, but normal ints 32 bit wide.

svn-id: r53409
 2010-10-13 11:22:19 +00:00
Filippos Karapetis
a876494fe7 SWORD25: Stop using class names as variable names 
svn-id: r53408
 2010-10-13 11:20:49 +00:00
Filippos Karapetis
59c6223d49 SWORD25: Fixed signed/unsigned bug 
svn-id: r53407
 2010-10-13 11:18:34 +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
Eugene Sandulenko
1e15d8efb7 SWORD25: Enforced code naming conventions in sfx/ and reservice.h 
svn-id: r53390
 2010-10-13 00:07:27 +00:00
Eugene Sandulenko
9a5415e6f9 SWORD25: Remove custom .c builiding rules 
svn-id: r53389
 2010-10-13 00:06:53 +00:00
Eugene Sandulenko
bf22def884 SWORD25: Enforce code naming conventions in fmv/* 
svn-id: r53388
 2010-10-13 00:06:37 +00:00
Eugene Sandulenko
7bcfe1f195 SWORD25: Remove standalone SWF rendering tool 
svn-id: r53387
 2010-10-13 00:06:12 +00:00
Eugene Sandulenko
3439819232 SWORD25: Add path to art.h include 
svn-id: r53386
 2010-10-13 00:05:33 +00:00
Eugene Sandulenko
56e05f93a3 SWORD25: Stop polluting global namespace 
svn-id: r53385
 2010-10-13 00:05:09 +00:00
Eugene Sandulenko
0603a58845 SWORD25: Merged all art* code and cleaned it up 
svn-id: r53384
 2010-10-13 00:04:40 +00:00
Eugene Sandulenko
91d1d9eb09 SWORD25: Fix startup 
svn-id: r53383
 2010-10-13 00:04:04 +00:00
Eugene Sandulenko
5790f2a8a1 SWORD25: Add proper copyrights to gfx/image/art* 
svn-id: r53382
 2010-10-13 00:03:47 +00:00
Eugene Sandulenko
1855cee5e3 SWORD25: Loading >200kb file in memory is no more ugly 
svn-id: r53381
 2010-10-13 00:03:10 +00:00
Eugene Sandulenko
8582c1ad57 SWORD25: Enforse code naming conventions in PackageManager and Sword25Engine 
svn-id: r53380
 2010-10-13 00:02:51 +00:00
Eugene Sandulenko
736ae4c07a SWORD25: Return proper path separator 
svn-id: r53379
 2010-10-13 00:01:59 +00:00
Eugene Sandulenko
f85139bbfa SWORD25: Remove redundant code 
svn-id: r53378
 2010-10-13 00:01:40 +00:00
Eugene Sandulenko
2143afde6c SWORD25: Add support for language patch 
svn-id: r53377
 2010-10-13 00:01:04 +00:00
Eugene Sandulenko
d7c6d615bb SWORD25: Fixed vector renderer. Yay! 
svn-id: r53376
 2010-10-13 00:00:41 +00:00
Eugene Sandulenko
7c1b37e150 SWORD25: Fix transparency effects 
svn-id: r53375
 2010-10-13 00:00:20 +00:00
Paul Gilbert
3e84d4fe73 SWORD25: Implemented thumbnail loading for savegame list 
svn-id: r53374
 2010-10-12 23:59:49 +00:00
Paul Gilbert
80521ed5dd SWORD25: Further savegame work, including savegame screenshots 
This handles saving (but not yet re-loaded display) of screenshots into savegame files. It also changes the original engine behaviour of temporarily saving the screenshots in a file 'tmp.png' to keeping the raw PNG file data in a memory block.

svn-id: r53373
 2010-10-12 23:59:23 +00:00
Eugene Sandulenko
1e07d9561f SWORD25: Add standalone SWF renderer 
svn-id: r53372
 2010-10-12 23:58:51 +00:00
Eugene Sandulenko
b2003364ff SWORD25: Fix freeze with sound code. Now game is really playable. 
svn-id: r53371
 2010-10-12 23:57:45 +00:00
Eugene Sandulenko
08ce5575fa SWORD25: Put all sound-related debug output under debug flag. 
svn-id: r53370
 2010-10-12 23:57:26 +00:00
Eugene Sandulenko
017d461b3a SWORD25: Fix bug with script debug flags 
svn-id: r53369
 2010-10-12 23:57:05 +00:00
Eugene Sandulenko
2a918b794a SWORD25: Fix warning 
svn-id: r53368
 2010-10-12 23:56:47 +00:00
Eugene Sandulenko
38d84fd767 SWORD25: Further work on sound. 
Have difficulties with understanding how mainmenu sound is stopped.
Currently it is not. Must be some trickery with object creation.

svn-id: r53367
 2010-10-12 23:56:28 +00:00
Eugene Sandulenko
3e637a8341 SWORD25: Initial work on sound 
svn-id: r53366
 2010-10-12 23:56:07 +00:00
Eugene Sandulenko
951549a298 SWORD25: Fix hangup 
svn-id: r53365
 2010-10-12 23:55:44 +00:00
Eugene Sandulenko
573dafefbb SWORD25: Got rid of FMODExSound class 
svn-id: r53364
 2010-10-12 23:55:24 +00:00
Eugene Sandulenko
56aac421eb SWORD25: Rename GLImage to RenderedImage 
svn-id: r53363
 2010-10-12 23:54:47 +00:00
Eugene Sandulenko
cefa844b51 SWORD25: Rename GLImage to RenderedImage 
svn-id: r53362
 2010-10-12 23:54:30 +00:00
Eugene Sandulenko
e975cc057d SWORD25: Rename GLImage to RenderedImage 
svn-id: r53361
 2010-10-12 23:54:07 +00:00
Eugene Sandulenko
cd453b3d01 SWORD25: Rename glimage.* to renderedimage.* 
svn-id: r53360
 2010-10-12 23:53:41 +00:00
Eugene Sandulenko
97164f058c SWORD25: Adjust the paths accordingly 
svn-id: r53359
 2010-10-12 23:53:07 +00:00
Eugene Sandulenko
2b81beea69 SWORD25: Remove opengl/ directory 
svn-id: r53358
 2010-10-12 23:52:37 +00:00
Eugene Sandulenko
7dfea5ee4d SWORD25: Moved glimage and swimage to image/ 
svn-id: r53357
 2010-10-12 23:52:13 +00:00
Eugene Sandulenko
69cae2e7dd SWORD25: Got rid of OpenGLGfx class 
svn-id: r53356
 2010-10-12 23:51:36 +00:00
Eugene Sandulenko
1aa907e815 SWORD25: Remove unnecessary executable flags 
svn-id: r53355
 2010-10-12 23:51:04 +00:00
Eugene Sandulenko
c59603ddba SWORD25: Get rid of ScummVMInput class 
svn-id: r53354
 2010-10-12 23:50:19 +00:00
Eugene Sandulenko
ccb1644568 SWORD25: Got rid of ScummVMPackageManager 
svn-id: r53353
 2010-10-12 23:49:42 +00:00
Eugene Sandulenko
d5ec19960d SWORD25: Make full transparency check earlier 
svn-id: r53352
 2010-10-12 23:49:12 +00:00
Paul Gilbert
5c228cea0b SWORD25: Fixes to the savegame saving code 
svn-id: r53351
 2010-10-12 23:48:50 +00:00
Paul Gilbert
cf664780cb SWORD25: Bugfix to not draw off-screen images 
svn-id: r53350
 2010-10-12 23:48:32 +00:00
Paul Gilbert
3fe2778970 SWORD25: Fix to array reversal, fixing path-finding 
svn-id: r53349
 2010-10-12 23:48:09 +00:00
Paul Gilbert
3e9610c601 SWORD25: Fix for path-finding 
svn-id: r53348
 2010-10-12 23:47:48 +00:00
Paul Gilbert
21fe28dbef SWORD25: Fix for blitting images with negative offsets 
svn-id: r53347
 2010-10-12 23:47:26 +00:00
Eugene Sandulenko
e0cd481d95 SWORD25: Confirmed correctness of vector images alpha blending 
svn-id: r53346
 2010-10-12 23:47:05 +00:00
Eugene Sandulenko
72104f0f0f SWORD25: Remove unneeded file 
svn-id: r53345
 2010-10-12 23:46:42 +00:00
Eugene Sandulenko
61c7cc13b0 SWORD25: Fixed debug output in GLImage::blit() 
svn-id: r53344
 2010-10-12 23:46:22 +00:00
Eugene Sandulenko
0716b8c1bb SWORD25: Fix vectorimage transparency 
svn-id: r53343
 2010-10-12 23:46:02 +00:00
Eugene Sandulenko
099406e15e SWORD25: Implement original hack with skipping green lines 
svn-id: r53342
 2010-10-12 23:45:41 +00:00
Eugene Sandulenko
a248e0b3f1 SWORD25: Fix bug with some vector frames not showing up. 
svn-id: r53341
 2010-10-12 23:45:20 +00:00
Eugene Sandulenko
2fce44d335 SWORD25: Further fixes for vectorimage rendering 
svn-id: r53340
 2010-10-12 23:44:59 +00:00
Eugene Sandulenko
af1fcbf71d SWORD25: Major bugfix for vector renderer. Only minor glitches are left 
svn-id: r53339
 2010-10-12 23:44:36 +00:00
Eugene Sandulenko
e5ac21dcac SWORD25: Fix some warnings 
svn-id: r53338
 2010-10-12 23:44:14 +00:00
Paul Gilbert
30f199a5a4 SWORD25: Fix memory leak in transparency commit 
At the point where the alpha value was checked, a scaled image surface may have already been created, which needs to be freed.

svn-id: r53337
 2010-10-12 23:43:44 +00:00
Eugene Sandulenko
cbe304c3ae SWORD25: Implement transparent bg color for images 
svn-id: r53336
 2010-10-12 23:43:24 +00:00
Paul Gilbert
1f184fd5a9 SWORD25: Memory leak fixes 
svn-id: r53335
 2010-10-12 23:43:03 +00:00
Paul Gilbert
25bb8b6243 SWORD25: Compilation fix 
svn-id: r53334
 2010-10-12 23:42:39 +00:00
Paul Gilbert
f5a822c340 SWORD25: Added de-allocation of data on image load error 
svn-id: r53333
 2010-10-12 23:42:18 +00:00
Paul Gilbert
d84400d507 SWORD25: Initialise image data block in constructor 
svn-id: r53332
 2010-10-12 23:41:57 +00:00
Paul Gilbert
07a8c87efc SWORD25: Added scaling support 
svn-id: r53331
 2010-10-12 23:41:36 +00:00
Eugene Sandulenko
795a6110cb SWORD25: Fix warnings 
svn-id: r53330
 2010-10-12 23:41:13 +00:00
Eugene Sandulenko
72dc197885 SWORD25: Fix compilation 
svn-id: r53329
 2010-10-12 23:40:51 +00:00
Eugene Sandulenko
94f1a8be03 SWORD25: Added minimal subset of libart inplace 
svn-id: r53328
 2010-10-12 23:40:27 +00:00
Paul Gilbert
49decb9dc5 SWORD25: Another memory leak fix 
svn-id: r53327
 2010-10-12 23:39:15 +00:00
Paul Gilbert
5d7922d052 SWORD25: Fix memory leak 
svn-id: r53326
 2010-10-12 23:38:55 +00:00
Paul Gilbert
3fc518cd0c SWORD25: Replaced some free's with delete[] 
svn-id: r53325
 2010-10-12 23:38:37 +00:00
Paul Gilbert
b922b58f8d SWORD25: Fix for using uninitialised doubles 
svn-id: r53324
 2010-10-12 23:38:16 +00:00
Eugene Sandulenko
7db8be5d4d SWORD25: bugfix for vector images 
svn-id: r53323
 2010-10-12 23:37:56 +00:00
Eugene Sandulenko
7ad20e3337 SWORD25: Further fixes to vector images. Still not finished. 
svn-id: r53322
 2010-10-12 23:37:35 +00:00
Eugene Sandulenko
a773c7a842 SWORD25: Further attempt to fix vector rendering 
svn-id: r53321
 2010-10-12 23:37:13 +00:00
Eugene Sandulenko
5d98d85a09 SWORD25: fix line drawing in vector images 
svn-id: r53320
 2010-10-12 23:36:52 +00:00
Eugene Sandulenko
e844de5141 SWORD25: Started rewriting vector renderer into proper one 
Previous attempt was all wrong, as it completely incorrectly
interpreted SWF shape data.

svn-id: r53319
 2010-10-12 23:36:25 +00:00
Eugene Sandulenko
5f8739209b SWORD25: Fix pen width for vector images 
svn-id: r53318
 2010-10-12 23:35:57 +00:00
Eugene Sandulenko
feefc111dd SWORD25: code formatting 
svn-id: r53317
 2010-10-12 23:35:37 +00:00
Eugene Sandulenko
1041335d34 SWORD25: partial fix for vector image rendering 
svn-id: r53316
 2010-10-12 23:35:14 +00:00
Eugene Sandulenko
bd3c4f2ae5 SWORD25: Fix crashes with vector renderer. Still no gfx. 
svn-id: r53315
 2010-10-12 23:34:47 +00:00
Eugene Sandulenko
7032c209a7 SWORD25: Initial code for vector image rendering. Crashes badly. 
svn-id: r53314
 2010-10-12 23:34:25 +00:00
Eugene Sandulenko
5f83fd1954 SWORD25: Load and parse vector images 
Libart is temporary solution.

svn-id: r53313
 2010-10-12 23:33:51 +00:00
Eugene Sandulenko
dcf70dc6a6 SWORD25: Remove redundant colorspace defines and code. 
svn-id: r53312
 2010-10-12 23:33:23 +00:00
Eugene Sandulenko
99e8337e63 SWORD25: Fix bug in SWF parser 
svn-id: r53311
 2010-10-12 23:32:55 +00:00
Eugene Sandulenko
06bce68860 SWORD25: Comply to the code conventions for several classes 
svn-id: r53310
 2010-10-12 23:32:32 +00:00
Eugene Sandulenko
086f5961b6 SWORD25: unsigned int -> uint 
svn-id: r53309
 2010-10-12 23:30:00 +00:00
Eugene Sandulenko
0cdb2ded85 SWORD25: unsigned char -> byte 
svn-id: r53308
 2010-10-12 23:26:48 +00:00
Eugene Sandulenko
56878b0e62 SWORD25: Got rid of custom typedefs 
svn-id: r53307
 2010-10-12 23:25:54 +00:00
Paul Gilbert
8e5879eac0 SWORD25: Fixed warning 
svn-id: r53306
 2010-10-12 23:25:33 +00:00
Eugene Sandulenko
53ac47b955 SWORD25: update makefile with latest changes. 
svn-id: r53305
 2010-10-12 23:25:13 +00:00
Eugene Sandulenko
a5d895473c SWORD25: Implement image filpping 
svn-id: r53304
 2010-10-12 23:24:52 +00:00
Paul Gilbert
2b2330ce65 SWORD25: Movie playback now works 
svn-id: r53303
 2010-10-12 23:24:31 +00:00
Eugene Sandulenko
77cfc17075 SWORD25: Formatting fixes 
svn-id: r53302
 2010-10-12 23:23:48 +00:00
Eugene Sandulenko
3b80a93782 SWORD25: Put back changes accidentally removed in previous merge. 
svn-id: r53301
 2010-10-12 23:23:29 +00:00
Paul Gilbert
3d3f1db15c SWORD25: Merge of my pending changes to movie playback 
svn-id: r53300
 2010-10-12 23:23:10 +00:00
Eugene Sandulenko
579d872e96 SWORD25: Bugfixes for video playback. 
svn-id: r53299
 2010-10-12 23:22:46 +00:00
Eugene Sandulenko
f06db87a0e SWORD25: Implement playback. Blitting is TODO. 
svn-id: r53298
 2010-10-12 23:22:24 +00:00
Eugene Sandulenko
384468c014 SWORD25: Started to hook TheoraDecoder. Crashes at startup. 
svn-id: r53297
 2010-10-12 23:22:01 +00:00
Eugene Sandulenko
f71295ab6d Revert "SWORD25: Commit of in-progress MoviePlayer code" 
This reverts commit cb95db7cc0.

svn-id: r53296
 2010-10-12 23:21:28 +00:00
Paul Gilbert
cb95db7cc0 SWORD25: Commit of in-progress MoviePlayer code 
Frames aren't being corrected decoded yet; still trying to locate the cause

svn-id: r53295
 2010-10-12 23:20:33 +00:00
Paul Gilbert
ffce890f66 SWORD25: Bugfix to set _backSurface in alternate GLImage constructor 
svn-id: r53294
 2010-10-12 23:19:41 +00:00
Eugene Sandulenko
7a2142b8d6 SWORD25: Fix more warnings 
svn-id: r53293
 2010-10-12 23:19:21 +00:00
Eugene Sandulenko
deb7dcc8bb SWORD25: Fix warnings 
svn-id: r53292
 2010-10-12 23:18:58 +00:00
Paul Gilbert
4024caf768 SWORD25: Bugfix for clipping error causing crash 
The CLIP() macro won't work as desired if the max value is less than the min value. Hence the need for the extra MAX() added into the two lines.

svn-id: r53291
 2010-10-12 23:18:38 +00:00
Paul Gilbert
edfd2e6aca SWORD25: Corrected the definition of infinity constant 
Previous string of ~(-1) was actually evaluating to 0, which was screwing up the path-finding algorithms

svn-id: r53290
 2010-10-12 23:18:16 +00:00
Paul Gilbert
11219f12a6 SWORD25: Bugfix to walk path detection 
svn-id: r53289
 2010-10-12 23:17:58 +00:00
Eugene Sandulenko
1e8b91ef2b SWORD25: Partially unstubbed FindEmbeddedPNG so it is less noisy 
svn-id: r53288
 2010-10-12 23:17:40 +00:00
Eugene Sandulenko
e381bc3c14 SWORD25: char * -> byte * in image-related operations 
svn-id: r53287
 2010-10-12 23:17:19 +00:00
Eugene Sandulenko
a6d909c07f SWORD25: Implement image tinting. 
svn-id: r53286
 2010-10-12 23:16:44 +00:00
Eugene Sandulenko
18e2534b63 SWORD25: Fix color format 
svn-id: r53285
 2010-10-12 23:16:23 +00:00
Eugene Sandulenko
73ae6739a5 SWORD25: Finally fix alpha blending. 
svn-id: r53284
 2010-10-12 23:16:00 +00:00
Paul Gilbert
08237f5d98 SWORD25: Changed save path missing message to an error() call 
svn-id: r53283
 2010-10-12 23:15:39 +00:00
Paul Gilbert
cfc8f84c3e SWORD25: Fixed compiler warnings 
svn-id: r53282
 2010-10-12 23:15:18 +00:00
Paul Gilbert
5bd5790e57 SWORD25: Converted AnimationResource to use SCUMMVM XMLParser. Removed tinyxml library 
svn-id: r53281
 2010-10-12 23:14:56 +00:00
Paul Gilbert
ee753bf031 SWORD25: Bugfix so that EVENT_QUIT quits the game 
svn-id: r53280
 2010-10-12 23:14:23 +00:00
Paul Gilbert
1d6aa4d306 SWORD25: Fixed memory leak 
svn-id: r53279
 2010-10-12 23:14:04 +00:00
Eugene Sandulenko
e7c9014b05 SWORD25: A bit better alpha blending. Still incorrect 
svn-id: r53278
 2010-10-12 23:13:45 +00:00
Paul Gilbert
b294e88f7e SWORD25: Converted FontResource to use ScummVM XML Parser 
svn-id: r53277
 2010-10-12 23:13:24 +00:00
Paul Gilbert
2c62016838 SWORD25: Added GetXmlFile helper function 
The XML files included with the game don't include an XML header line, which is required by the ScummVM XML parser. This helper function encapsulates the GetFile method to return a buffer that includes the required line at the start.

svn-id: r53276
 2010-10-12 23:13:03 +00:00
Eugene Sandulenko
4d11cf941e SWORD25: Another attempt to implement alpha blending. Looks a bit better. 
svn-id: r53275
 2010-10-12 23:12:41 +00:00
Eugene Sandulenko
e9d6fa094e SWORD25: Fix colors 
svn-id: r53274
 2010-10-12 23:12:20 +00:00
Eugene Sandulenko
b9efb23e03 SWORD25: Fix image blitting width. 
svn-id: r53273
 2010-10-12 23:12:03 +00:00
Eugene Sandulenko
fccc44851f SWORD25: Attempt to implement alpha blending. Code disabled. 
svn-id: r53272
 2010-10-12 23:11:41 +00:00
Eugene Sandulenko
de0b8addc4 SWORD25: Fix stupid error in Blit(). Now it shows stuff! 
svn-id: r53271
 2010-10-12 23:11:18 +00:00
Eugene Sandulenko
bab1358e51 SWORD25: More tweaking to image Blit, doesn't assert anymore. 
Though in fact it is all wrong now.

svn-id: r53270
 2010-10-12 23:10:57 +00:00
Eugene Sandulenko
c51f4629cf SWORD25: Implement graphics Fill() method 
svn-id: r53269
 2010-10-12 23:10:36 +00:00
Eugene Sandulenko
f1e7fb28a0 SWORD25: Fix early engine quit. Now it runs, hurray! 
svn-id: r53268
 2010-10-12 23:10:15 +00:00
Eugene Sandulenko
c875856d20 SWORD25: Implemented script tracing 
To turn on traces turn on debugchannel 'script' and then use
debug level as a bitmask:
  1 - show function calls
  2 - show function exits
  3 - show every line

svn-id: r53267
 2010-10-12 23:09:53 +00:00
Eugene Sandulenko
4d678fc3b8 SWORD25: Fix warning 
svn-id: r53266
 2010-10-12 23:09:32 +00:00
Paul Gilbert
1d16dfd281 SWORD25: Refactored engine to remove BS_Rect class 
svn-id: r53265
 2010-10-12 23:09:12 +00:00
Paul Gilbert
0186984671 SWORD25: Fixed return value of AppEnd 
svn-id: r53264
 2010-10-12 23:08:12 +00:00
Paul Gilbert
9efd8bac26 SWORD25: Removed now redundant 'using namespace std' lines 
svn-id: r53263
 2010-10-12 23:07:55 +00:00
Eugene Sandulenko
3fb0e9383b SWORD25: Removed last traces of STL 
svn-id: r53262
 2010-10-12 23:07:29 +00:00
Eugene Sandulenko
b01994a53b SWORD25: removed BS_ prefix from rest of the classes. 
The things which are intentionally left with the prefix:
BS_LOG, BS_ASSERT, BS_Rect, BS_String.

svn-id: r53261
 2010-10-12 22:59:01 +00:00
Eugene Sandulenko
be44216e5c SWORD25: eliminated BS_ prefix in all but kernel/ 
svn-id: r53259
 2010-10-12 22:55:59 +00:00
Eugene Sandulenko
485ff15d23 SWORD25: Mass-eliminating of BS_ prefix in fmv/ and gfx/ 
svn-id: r53258
 2010-10-12 22:53:49 +00:00
Eugene Sandulenko
e71337861f SWORD25: brought CallBackRegisry class to our naming standards 
svn-id: r53257
 2010-10-12 22:51:37 +00:00
Paul Gilbert
596684101e SWORD25: Added implementation of rint method 
Windows doesn't seem to implement this method; even examples for FMOD I saw had WIN32 defines that manually provided the method.

svn-id: r53256
 2010-10-12 22:51:06 +00:00
Eugene Sandulenko
0a7cdd7128 SWORD25: Fix valgrind warning 
svn-id: r53255
 2010-10-12 22:50:47 +00:00
Eugene Sandulenko
a1d22a063b SWORD25: Fix warnings 
svn-id: r53254
 2010-10-12 22:50:28 +00:00
Eugene Sandulenko
b65284078a SWORD25: Debug output for image blitting 
svn-id: r53253
 2010-10-12 22:49:27 +00:00
Eugene Sandulenko
f95da5e3ee SWORD25: Made game run with extracted data 
svn-id: r53252
 2010-10-12 22:49:08 +00:00
Eugene Sandulenko
a21b148a9b SWORD25: Added possibility to run from extracted game. 
Still doesn't start though

svn-id: r53251
 2010-10-12 22:48:45 +00:00
Eugene Sandulenko
a87dbb4c60 SWORD25: Actually blit images to screen. 
svn-id: r53250
 2010-10-12 22:48:22 +00:00
Eugene Sandulenko
24db2ad739 SWORD25: Implement BS_ScummVMPackageManager::doSearch. 
Now all scripts run.

svn-id: r53249
 2010-10-12 22:47:57 +00:00
Eugene Sandulenko
0cdab788ae SWORD25: Changed signature of FS searching method. Cleanup. 
svn-id: r53248
 2010-10-12 22:47:38 +00:00
Eugene Sandulenko
28d81a2a1c SWORD25: package manager. Style fixes. Cleanup 
svn-id: r53247
 2010-10-12 22:47:15 +00:00
Eugene Sandulenko
eb191e3590 SWORD25: Fix loading files with relative paths. 
svn-id: r53246
 2010-10-12 22:46:54 +00:00
Eugene Sandulenko
f4024d7d14 SWORD25: Fix initialization. 
svn-id: r53245
 2010-10-12 22:46:35 +00:00
Eugene Sandulenko
fbdbc089e0 SWORD25: Fix package manager. Now scripts run. 
svn-id: r53244
 2010-10-12 22:46:13 +00:00
Eugene Sandulenko
992c504968 SWORD25: Further fixes for package manager 
svn-id: r53243
 2010-10-12 22:45:53 +00:00
Eugene Sandulenko
06fc35ffe8 SWORD25: Make Lua package registering more robust. 
svn-id: r53242
 2010-10-12 22:45:32 +00:00
Eugene Sandulenko
4b1b3e5034 SWORD25: Better detection entry. 
svn-id: r53241
 2010-10-12 22:45:14 +00:00
Eugene Sandulenko
3f69477b44 SWORD25: Portability fixes. Now compiles and runs under Linux. 
svn-id: r53240
 2010-10-12 22:44:55 +00:00
Eugene Sandulenko
8977f88834 SWORD25: started fixing pakage manager 
svn-id: r53239
 2010-10-12 22:44:29 +00:00
Eugene Sandulenko
c97aee132a SWORD25: Fix log output. 
svn-id: r53238
 2010-10-12 22:44:11 +00:00
Eugene Sandulenko
3a8e1622af SWORD25: Fix conversion bugs in BS_LuaBindhelper::_CreateTable() 
svn-id: r53237
 2010-10-12 22:43:55 +00:00
Eugene Sandulenko
72130c284d SWORD25: Fix couple more warnings 
svn-id: r53236
 2010-10-12 22:43:36 +00:00
Eugene Sandulenko
43959cc6bd SWORD25: Turn on debugging by default 
svn-id: r53235
 2010-10-12 22:43:05 +00:00
Eugene Sandulenko
031a2fc88e SWORD25: Final linking fixes. Now it links! 
svn-id: r53234
 2010-10-12 22:42:44 +00:00
Eugene Sandulenko
5cf67ce36f SWORD25: Stubbed FMODExSound class 
svn-id: r53233
 2010-10-12 22:42:22 +00:00
Eugene Sandulenko
9be75f0acc SWORD25: Added missing file 
svn-id: r53232
 2010-10-12 22:42:01 +00:00
Eugene Sandulenko
2be2f8331b SWORD25: Get rid of glsprites library 
svn-id: r53231
 2010-10-12 22:41:44 +00:00
Eugene Sandulenko
fa224de16f SWORD25: Temporarily added tinyxml code 
To speedup linking, added the code. It has to be replaced with our
XML parser.

svn-id: r53230
 2010-10-12 22:41:04 +00:00
Eugene Sandulenko
23eace8f7d SWORD25: Next step of graphics code conversion. 
Now it does not depend on glsprite library and may even show something

svn-id: r53229
 2010-10-12 22:40:20 +00:00
Eugene Sandulenko
f010c4e2ad SWORD25: Fix linking 
svn-id: r53228
 2010-10-12 22:39:41 +00:00
Eugene Sandulenko
fd40021a72 SWORD25: Started rewriting gfx subsystem 
svn-id: r53227
 2010-10-12 22:39:23 +00:00
Eugene Sandulenko
d50dcb80ad SWORD25: Linking fixes. 
svn-id: r53226
 2010-10-12 22:38:49 +00:00
Eugene Sandulenko
ad5b74c9de SWORD25: Clean compile! 
Under MinGW, with OpenGL and tinyxml.

svn-id: r53225
 2010-10-12 22:38:23 +00:00
Eugene Sandulenko
ab85540a1b SWORD25: More compilation fixes 
Now almost everything compiles fine. Several files were tricked
and there are references to tinyxml.h and of course fmod and agg.

OpenGL gfx renderer removed from the project, we need to create
our own from the scratch.

svn-id: r53224
 2010-10-12 22:37:13 +00:00
Eugene Sandulenko
7257ee345b SWORD25: More compilation fixes 
svn-id: r53223
 2010-10-12 22:36:30 +00:00
Eugene Sandulenko
47904bc7b2 SWORD25: Mass-astyle. 
svn-id: r53222
 2010-10-12 22:35:55 +00:00