libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-17 23:44:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TINSEL: Replace global object s_rectList by a TinselEngine member var

Browse Source 
svn-id: r50834
This commit is contained in:
Max Horn 2010-07-12 23:19:33 +00:00
parent e2c1ee853a
commit 4f914e7a9f
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/tinsel/cliprect.cpp
View File

@ -28,17 +28,15 @@
#include "tinsel/graphics.h" // normal object drawing
#include "tinsel/object.h"
#include "tinsel/palette.h"
#include "tinsel/tinsel.h" // for _vm
namespace Tinsel {
/** list of all clip rectangles */
static RectList s_rectList;
/**
* Resets the clipping rectangle allocator.
*/
void ResetClipRect() {
s_rectList.clear();
_vm->_clipRects.clear();
}
/**
@ -46,11 +44,11 @@ void ResetClipRect() {
* @param pClip clip rectangle dimensions to allocate
*/
void AddClipRect(const Common::Rect &pClip) {
s_rectList.push_back(pClip);
_vm->_clipRects.push_back(pClip);
}
const RectList &GetClipRects() {
return s_rectList;
return _vm->_clipRects;
}
/**
@ -175,6 +173,8 @@ void FindMovingObjects(OBJECT *pObjList, Common::Point *pWin, Common::Rect *pCli
* the total number of clip rectangles.
*/
void MergeClipRect() {
RectList &s_rectList = _vm->_clipRects;
if (s_rectList.size() <= 1)
return;

6
engines/tinsel/tinsel.h
View File

@ -61,6 +61,8 @@ class PCMMusicPlayer;
class Scheduler;
class SoundManager;
typedef Common::List<Common::Rect> RectList;
enum TinselGameID {
GID_DW1 = 0,
GID_DW2 = 1
@ -203,6 +205,10 @@ public:
/** Stack of pending keypresses. */
Common::List<Common::Event> _keypresses;
/** List of all clip rectangles. */
RectList _clipRects;
private:
//MidiMusicPlayer *_midiMusic;
int _musicVolume;