Commit Graph

69 Commits

Author SHA1 Message Date
Johannes Schickel
56a99b1d37 PARALLACTION: Make GPL headers consistent in themselves. 2014-02-18 02:39:37 +01:00
Johannes Schickel
ccaf4d865c PARALLACTION: Take advantage of Surface::getPixels. 2013-08-03 04:02:51 +02:00
Johannes Schickel
d82741a3c8 PARALLACTION: Prefer getBasePtr over direct Surface::pixels access. 2013-08-03 02:52:33 +02:00
Matthew Hoops
0031c41db8 COMMON: Change kPlatformPC to kPlatformDOS
"PC" was very ambiguous and now it matches what we show in the GUI.

This also corrects sword2's platform to Windows.
2013-05-02 18:43:10 -04:00
Alyssa Milburn
1dc58b0b2a PARALLACTION: Fix BRA amiga inventory item cursors. 2013-04-17 23:20:55 +02:00
Alyssa Milburn
41d337c549 PARALLACTION: Clean up global variables a bit. 2012-09-27 22:41:51 +02:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Johannes Schickel
71bdb86e02 Merge pull request #16 "Add a PixelFormat to Graphics::Surface.".
For further discussion check here:
https://github.com/scummvm/scummvm/pull/16

Conflicts:
	graphics/png.cpp
2011-05-01 16:54:45 +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
Johannes Schickel
9734c7be64 PARALLACTION: Prefer Surface::create taking a PixelFormat over the one taking a byte depth. 2011-04-17 16:30:12 +02:00
Nicola Mettifogo
865f12a643 PARALLACTION: Use CursorMan to control cursor instead of backend functions.
svn-id: r55611
2011-01-29 10:42:56 +00:00
Max Horn
1d4c82885d DEBUGGER: Simplify how our console debugger works / is used
* Remove _isAttached member var and isAttached method
* Engines now always call the onFrame method; whether it does
  something is decided by the debugger class resp. its subclasses
* Make detach() protected instead of private, so that subclasses
  can invoke it
* Remove _detach_now member var (call detach() instead).
* Rename _frame_countdown to _frameCountdown and properly
  document it.
* Add more doxygen comments
* Cleanup

svn-id: r50963
2010-07-17 18:38:42 +00:00
Nicola Mettifogo
d199377388 When closing inventory, do not force input back to game-mode if commands need otherwise.
svn-id: r49623
2010-06-13 07:35:48 +00:00
Eugene Sandulenko
c96e234a0a Fix warning
svn-id: r49192
2010-05-24 16:58:14 +00:00
Nicola Mettifogo
5f2a88e596 Cleanup (removed more Parallaction::getGameType() calls).
svn-id: r49147
2010-05-22 18:00:16 +00:00
Nicola Mettifogo
a8ea833941 Do not make the character walk towards the zone clicked upon by the user if it is marked for self-use. See patch 3003626.
svn-id: r49137
2010-05-22 12:36:52 +00:00
Nicola Mettifogo
bc479f8aef Make sure hitZone always gets absolute game coordinates. Based on the patch 3004658 by fuzzie.
svn-id: r49135
2010-05-22 03:49:22 +00:00
Travis Howell
a55cb7fa10 Fix bug #2979193 - NIPPON: Crash at character introduction (regression). By restoring the kEngineBlockInput engine flag.
svn-id: r48464
2010-04-02 12:51:42 +00:00
Yotam Barnoy
ef330ed9b4 Patch for bug 2943361 by littleboy, adding full kb modifier support to all engines + GUI and proper keypad handling
svn-id: r48101
2010-02-21 04:04:13 +00:00
Nicola Mettifogo
9108871833 Added in-game menu for BRA. Load/save is not supported yet.
svn-id: r40176
2009-04-28 12:25:41 +00:00
Nicola Mettifogo
2223627c75 Merged GetData, HearData, SpeakData, PathData, ExamineData, MergeData into TypeData struct. This simplifies life a bit especially in the parsers.
svn-id: r39645
2009-03-23 20:41:54 +00:00
Nicola Mettifogo
71f42a9549 Fully implemented scrolling.
svn-id: r39622
2009-03-23 00:56:05 +00:00
Nicola Mettifogo
9e792deb3e Added mouse cursor to BRA Amiga. To be perfected.
svn-id: r39434
2009-03-16 00:03:22 +00:00
Travis Howell
e27d2f7144 Set mouse buffers in Amiga version of BRA, so selecting inventory object no longer crashes.
svn-id: r39414
2009-03-15 09:39:16 +00:00
Nicola Mettifogo
82e1d15aef Added missing initializations.
svn-id: r39407
2009-03-15 04:29:26 +00:00
Max Horn
f9ecd95d69 Whitespace cleanup: Convert space followed by tab to just tab
svn-id: r39203
2009-03-07 19:24:31 +00:00
Nicola Mettifogo
88efc8603e Removed null*Ptr dummy objects, using SharedPtr's reset method to null pointers instead.
svn-id: r38897
2009-02-26 10:44:01 +00:00
Nicola Mettifogo
d5d006bb30 Cleanup of CommandExec and ProgramExec, and pushed down dependencies from exec.h.
svn-id: r38892
2009-02-26 06:16:35 +00:00
Nicola Mettifogo
5dff53a2fa Added preliminary code for following walker support in BRA.
svn-id: r38837
2009-02-24 09:18:20 +00:00
Nicola Mettifogo
659c9fb901 Changed interface to walk code, to better handle the differences between games. Moreover:
* merged PathBuilder_BR into PathWalker_BR
* implemented checkTrap routine for BRA

svn-id: r38836
2009-02-24 08:42:46 +00:00
Nicola Mettifogo
e3afa772e2 Cleanup.
svn-id: r38817
2009-02-23 12:17:25 +00:00
Nicola Mettifogo
a53fa36913 Made sure each event is processed only once. This wasn't always the case when _inputMode changed as a result of a game action. This also caused the comment mode to be apparently skipped.
svn-id: r35725
2009-01-04 15:09:28 +00:00
Max Horn
df20d264fd Pushing down some header deps (on common/system.h, mostly)
svn-id: r35542
2008-12-25 20:40:00 +00:00
Nicola Mettifogo
b557c58d3b Missing break statement caused many broken warning messages.
svn-id: r35271
2008-12-07 12:47:14 +00:00
Nicola Mettifogo
4c377e0339 Fixed positioning of overlayed graphics (dialogues, inventory, labels) in all locations. These items are now all handled in screen coordinates which are translated automatically by the renderer.
svn-id: r35255
2008-12-06 06:17:10 +00:00
Nicola Mettifogo
7681461b16 Implemented horizontal scrolling for BRA, by using a back buffer. Dialogues in scrollable locations are a bit messed up for the moment.
svn-id: r35253
2008-12-06 04:51:04 +00:00
Nicola Mettifogo
5581030972 * removed the obsolete _quit flag
* refactored most cleanup code for locations and game

svn-id: r34939
2008-11-08 14:56:45 +00:00
Nicola Mettifogo
4ab5d3fdc4 Merging more of the GSoC 2008 RTL branch: PARALLACTION
svn-id: r34268
2008-09-02 01:58:55 +00:00
Nicola Mettifogo
ccf88578c8 Fixed leak with Input class, introduced in commit 34206.
svn-id: r34224
2008-08-31 10:43:32 +00:00
Nicola Mettifogo
0a387bca12 Moved mouse cursor loading/handling to Input class.
svn-id: r34206
2008-08-30 10:27:20 +00:00
Nicola Mettifogo
47b1a06e3b Removed unused code and structures, and a bit of cleanup.
svn-id: r34080
2008-08-21 12:11:24 +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
Nicola Mettifogo
7baf727790 Enforcing use of nullZonePtr only for nulling out pointers, as it is useless for comparisons.
svn-id: r33384
2008-07-28 23:21:03 +00:00
Nicola Mettifogo
a1557bd776 Pick up/drop/open/close actions are now available in game.
svn-id: r33371
2008-07-28 11:50:36 +00:00
Nicola Mettifogo
d1a6b175f5 * Merged old input management flags into a single mouse status variable.
* Mouse is now displayed when it is needed, and hidden when it is not ;)

svn-id: r33270
2008-07-25 02:37:55 +00:00
Nicola Mettifogo
4936e5f7df * Moved end intro and end game sequences code to gui.
* Rewrote all gui code to be run inside the main loop
* Added code to avoid crashes when a scene with no standard background is drawn

svn-id: r33260
2008-07-24 09:24:32 +00:00
Nicola Mettifogo
627e0c2774 Can't test a SharedPtr for nullity!
svn-id: r33258
2008-07-24 08:04:17 +00:00
Nicola Mettifogo
53615c9128 Removed the historical waitUntilLeftClick function and adapted code to use the more general readInput and waitForButtonEvent.
svn-id: r33226
2008-07-23 07:52:43 +00:00
Nicola Mettifogo
78ccedf898 Removed useless event management code and made readInput() more general.
svn-id: r33225
2008-07-23 07:31:35 +00:00
Nicola Mettifogo
8932619ee2 More decoupling of inventory code.
svn-id: r33224
2008-07-23 02:45:09 +00:00