Of course, there's a problem with perfectly valid C++ code in Visual Studio

at the last minute ...


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3264 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2016-01-25 21:16:04 +00:00
parent 86c7b229f0
commit 5cf32f4b95
2 changed files with 37 additions and 7 deletions

View File

@ -146,3 +146,33 @@ bool TrackBall::setMouseControl(
(xid != -1 || yid != -1);
return true;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const uInt32 TrackBall::ourTrakBallTableTB_H[2][2] = {
{ 0x40, 0x00 }, { 0xc0, 0x80 }
};
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const uInt32 TrackBall::ourTrakBallTableTB_V[2][2] = {
{ 0x00, 0x10 }, { 0x20, 0x30 }
};
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const uInt32 TrackBall::ourTrakBallTableST_H[4] = {
0x00, 0x80, 0xc0, 0x40
};
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const uInt32 TrackBall::ourTrakBallTableST_V[4] = {
0x00, 0x10, 0x30, 0x20
};
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const uInt32 TrackBall::ourTrakBallTableAM_H[4] = {
0x00, 0x10, 0x50, 0x40
};
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const uInt32 TrackBall::ourTrakBallTableAM_V[4] = {
0x00, 0x80, 0xa0, 0x20
};

View File

@ -107,19 +107,19 @@ class TrackBall : public Controller
int myScanCountH, myScanCountV, myCountH, myCountV;
// Whether to use the mouse to emulate this controller
int myMouseEnabled;
int myMouseEnabled;
// CX-22
const uInt32 ourTrakBallTableTB_H[2][2] = {{ 0x40, 0x00 }, { 0xc0, 0x80 }};
const uInt32 ourTrakBallTableTB_V[2][2] = {{ 0x00, 0x10 }, { 0x20, 0x30 }};
static const uInt32 ourTrakBallTableTB_H[2][2];
static const uInt32 ourTrakBallTableTB_V[2][2];
// ST mouse / CX-80
const uInt32 ourTrakBallTableST_H[4] = { 0x00, 0x80, 0xc0, 0x40 };
const uInt32 ourTrakBallTableST_V[4] = { 0x00, 0x10, 0x30, 0x20 };
static const uInt32 ourTrakBallTableST_H[4];
static const uInt32 ourTrakBallTableST_V[4];
// Amiga mouse
const uInt32 ourTrakBallTableAM_H[4] = { 0x00, 0x10, 0x50, 0x40 };
const uInt32 ourTrakBallTableAM_V[4] = { 0x00, 0x80, 0xa0, 0x20 };
static const uInt32 ourTrakBallTableAM_H[4];
static const uInt32 ourTrakBallTableAM_V[4];
private:
// Following constructors and assignment operators not supported