[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.180,1.181 actor.h,1.42,1.43 boxes.cpp,1.64,1.65 boxes.h,1.6,1.7 camera.cpp,2.10,2.11 charset.h,2.19,2.20 dialogs.cpp,1.71,1.72 dialogs.h,1.22,1.23 gfx.cpp,2.214,2.215 gfx.h,1.45,1.46 help.h,1.3,1.4 script_v2.cpp,2.202,2.203 script_v5.cpp,1.193,1.194 scumm.h,1.305,1.306 verbs.cpp,1.78,1.79 verbs.h,1.6,1.7
Max Horn
fingolfin at users.sourceforge.net
Thu Oct 2 10:44:02 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv18298/scumm
Modified Files:
actor.cpp actor.h boxes.cpp boxes.h camera.cpp charset.h
dialogs.cpp dialogs.h gfx.cpp gfx.h help.h script_v2.cpp
script_v5.cpp scumm.h verbs.cpp verbs.h
Log Message:
renamed namespace ScummVM to Common
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -d -r1.180 -r1.181
--- actor.cpp 28 Sep 2003 16:08:23 -0000 1.180
+++ actor.cpp 2 Oct 2003 17:43:02 -0000 1.181
@@ -158,8 +158,8 @@
}
}
-int Actor::calcMovementFactor(ScummVM::Point next) {
- ScummVM::Point actorPos(_pos);
+int Actor::calcMovementFactor(Common::Point next) {
+ Common::Point actorPos(_pos);
int diffX, diffY;
int32 deltaXFactor, deltaYFactor;
@@ -341,7 +341,7 @@
int Actor::actorWalkStep() {
int tmpX, tmpY;
- ScummVM::Point actorPos;
+ Common::Point actorPos;
int distX, distY;
int nextFacing;
@@ -1334,7 +1334,7 @@
void Actor::walkActor() {
int new_dir, next_box;
- ScummVM::Point foundPath;
+ Common::Point foundPath;
if (_vm->_version >= 7) {
// FIXME - this is kind of a hack right now but it fixes the
@@ -1414,7 +1414,7 @@
/*
void Actor::walkActorV12() {
- ScummVM::Point foundPath, tmp;
+ Common::Point foundPath, tmp;
int new_dir, next_box;
if (moving & MF_TURN) {
@@ -1465,7 +1465,7 @@
*/
void Actor::walkActorOld() {
- ScummVM::Point p2, p3; // Gate locations
+ Common::Point p2, p3; // Gate locations
int new_dir, next_box;
if (!moving)
Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- actor.h 14 Sep 2003 18:16:44 -0000 1.42
+++ actor.h 2 Oct 2003 17:43:02 -0000 1.43
@@ -37,13 +37,13 @@
};
struct ActorWalkData {
- ScummVM::Point dest; // Final destination
+ Common::Point dest; // Final destination
byte destbox;
int16 destdir;
- ScummVM::Point cur; // Current position
+ Common::Point cur; // Current position
byte curbox;
- ScummVM::Point next; // Next position on our way to the destination
- ScummVM::Point point3;
+ Common::Point next; // Next position on our way to the destination
+ Common::Point point3;
int32 deltaXFactor, deltaYFactor;
uint16 xfrac, yfrac;
};
@@ -82,7 +82,7 @@
static void initActorClass(Scumm *scumm);
public:
- ScummVM::Point _pos;
+ Common::Point _pos;
int top, bottom;
int elevation;
uint width;
@@ -133,7 +133,7 @@
void putActor(int x, int y, byte room);
void setActorWalkSpeed(uint newSpeedX, uint newSpeedY);
protected:
- int calcMovementFactor(ScummVM::Point next);
+ int calcMovementFactor(Common::Point next);
int actorWalkStep();
int remapDirection(int dir, bool is_walking);
void setupActorScale();
@@ -204,8 +204,8 @@
bool isPlayer();
- bool findPathTowards(byte box, byte box2, byte box3, ScummVM::Point &foundPath);
- void findPathTowardsOld(byte box, byte box2, byte box3, ScummVM::Point &p2, ScummVM::Point &p3);
+ bool findPathTowards(byte box, byte box2, byte box3, Common::Point &foundPath);
+ void findPathTowardsOld(byte box, byte box2, byte box3, Common::Point &p2, Common::Point &p3);
};
#endif
Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- boxes.cpp 14 Sep 2003 18:16:44 -0000 1.64
+++ boxes.cpp 2 Oct 2003 17:43:02 -0000 1.65
@@ -77,7 +77,7 @@
static bool compareSlope(int X1, int Y1, int X2, int Y2, int X3, int Y3);
-static ScummVM::Point closestPtOnLine(int ulx, int uly, int llx, int lly, int x, int y);
+static Common::Point closestPtOnLine(int ulx, int uly, int llx, int lly, int x, int y);
byte Scumm::getMaskFromBox(int box) {
@@ -434,7 +434,7 @@
if (box.ul.x == box.ur.x && box.ul.y == box.ur.y && box.lr.x == box.ll.x && box.lr.y == box.ll.y ||
box.ul.x == box.ll.x && box.ul.y == box.ll.y && box.ur.x == box.lr.x && box.ur.y == box.lr.y) {
- ScummVM::Point pt;
+ Common::Point pt;
pt = closestPtOnLine(box.ul.x, box.ul.y, box.lr.x, box.lr.y, x, y);
if (distanceFromPt(x, y, pt.x, pt.y) <= 4)
return true;
@@ -536,11 +536,11 @@
return (Y2 - Y1) * (X3 - X1) <= (Y3 - Y1) * (X2 - X1);
}
-ScummVM::Point closestPtOnLine(int ulx, int uly, int llx, int lly, int x, int y) {
+Common::Point closestPtOnLine(int ulx, int uly, int llx, int lly, int x, int y) {
int lydiff, lxdiff;
int32 dist, a, b, c;
int x2, y2;
- ScummVM::Point pt;
+ Common::Point pt;
if (llx == ulx) { // Vertical line?
x2 = ulx;
@@ -641,7 +641,7 @@
}
int Scumm::getClosestPtOnBox(int b, int x, int y, int16& outX, int16& outY) {
- ScummVM::Point pt;
+ Common::Point pt;
uint dist;
uint bestdist = 0xFFFFFF;
BoxCoords box;
@@ -769,10 +769,10 @@
* Computes the next point actor a has to walk towards in a straight
* line in order to get from box1 to box3 via box2.
*/
-bool Actor::findPathTowards(byte box1nr, byte box2nr, byte box3nr, ScummVM::Point &foundPath) {
+bool Actor::findPathTowards(byte box1nr, byte box2nr, byte box3nr, Common::Point &foundPath) {
BoxCoords box1;
BoxCoords box2;
- ScummVM::Point tmp;
+ Common::Point tmp;
int i, j;
int flag;
int q, pos;
@@ -1142,10 +1142,10 @@
return result;
}
-void Actor::findPathTowardsOld(byte trap1, byte trap2, byte final_trap, ScummVM::Point &p2, ScummVM::Point &p3) {
- ScummVM::Point pt;
- ScummVM::Point gateA[2];
- ScummVM::Point gateB[2];
+void Actor::findPathTowardsOld(byte trap1, byte trap2, byte final_trap, Common::Point &p2, Common::Point &p3) {
+ Common::Point pt;
+ Common::Point gateA[2];
+ Common::Point gateB[2];
_vm->getGates(trap1, trap2, gateA, gateB);
@@ -1183,15 +1183,15 @@
* This way the lines bound a 'corridor' between the two boxes, through which
* the actor has to walk to get from trap1 to trap2.
*/
-void Scumm::getGates(int trap1, int trap2, ScummVM::Point gateA[2], ScummVM::Point gateB[2]) {
+void Scumm::getGates(int trap1, int trap2, Common::Point gateA[2], Common::Point gateB[2]) {
int i, j;
int dist[8];
int minDist[3];
int closest[3];
int box[3];
BoxCoords coords;
- ScummVM::Point closestPoint[8];
- ScummVM::Point boxCorner[8];
+ Common::Point closestPoint[8];
+ Common::Point boxCorner[8];
int line1, line2;
// For all corner coordinates of the first box, compute the point closest
Index: boxes.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- boxes.h 2 Jul 2003 13:47:03 -0000 1.6
+++ boxes.h 2 Oct 2003 17:43:02 -0000 1.7
@@ -39,10 +39,10 @@
} BoxFlags;
struct BoxCoords { /* Box coordinates */
- ScummVM::Point ul;
- ScummVM::Point ur;
- ScummVM::Point ll;
- ScummVM::Point lr;
+ Common::Point ul;
+ Common::Point ur;
+ Common::Point ll;
+ Common::Point lr;
};
#endif
Index: camera.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/camera.cpp,v
retrieving revision 2.10
retrieving revision 2.11
diff -u -d -r2.10 -r2.11
--- camera.cpp 14 Sep 2003 18:16:44 -0000 2.10
+++ camera.cpp 2 Oct 2003 17:43:02 -0000 2.11
@@ -60,7 +60,7 @@
}
void Scumm_v7::setCameraAt(int pos_x, int pos_y) {
- ScummVM::Point old;
+ Common::Point old;
old = camera._cur;
@@ -133,7 +133,7 @@
}
-void Scumm::clampCameraPos(ScummVM::Point *pt) {
+void Scumm::clampCameraPos(Common::Point *pt) {
if (pt->x < VAR(VAR_CAMERA_MIN_X))
pt->x = (short) VAR(VAR_CAMERA_MIN_X);
@@ -226,7 +226,7 @@
}
void Scumm_v7::moveCamera() {
- ScummVM::Point old = camera._cur;
+ Common::Point old = camera._cur;
Actor *a = NULL;
if (camera._follows) {
Index: charset.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.h,v
retrieving revision 2.19
retrieving revision 2.20
diff -u -d -r2.19 -r2.20
--- charset.h 26 Jun 2003 21:41:53 -0000 2.19
+++ charset.h 2 Oct 2003 17:43:02 -0000 2.20
@@ -30,7 +30,7 @@
class CharsetRenderer {
public:
- ScummVM::Rect _str;
+ Common::Rect _str;
int _nextLeft, _nextTop;
int _top;
Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- dialogs.cpp 8 Sep 2003 17:06:44 -0000 1.71
+++ dialogs.cpp 2 Oct 2003 17:43:02 -0000 1.72
@@ -170,7 +170,7 @@
}
-const ScummVM::String ScummDialog::queryResString(int stringno) {
+const Common::String ScummDialog::queryResString(int stringno) {
byte *result;
if (stringno == 0)
@@ -352,7 +352,7 @@
void SaveLoadDialog::fillList() {
// Get savegame names
- ScummVM::StringList l;
+ Common::StringList l;
char name[32];
uint i = _saveMode ? 1 : 0;
bool avail_saves[81];
@@ -715,7 +715,7 @@
_keyMapping->setFlags(WIDGET_CLEARBG);
// Get actions names
- ScummVM::StringList l;
+ Common::StringList l;
for (int i = 1; i < TOTAL_ACTIONS; i++)
l.push_back(getActionName(i));
Index: dialogs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- dialogs.h 20 Aug 2003 14:01:39 -0000 1.22
+++ dialogs.h 2 Oct 2003 17:43:02 -0000 1.23
@@ -38,7 +38,7 @@
: Dialog(gui, x, y, w, h), _scumm(scumm) {}
protected:
- typedef ScummVM::String String;
+ typedef Common::String String;
Scumm *_scumm;
@@ -88,7 +88,7 @@
virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
protected:
- typedef ScummVM::String String;
+ typedef Common::String String;
PushButtonWidget *_nextButton;
PushButtonWidget *_prevButton;
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.214
retrieving revision 2.215
diff -u -d -r2.214 -r2.215
--- gfx.cpp 27 Sep 2003 20:31:18 -0000 2.214
+++ gfx.cpp 2 Oct 2003 17:43:02 -0000 2.215
@@ -802,7 +802,7 @@
_charset->_nextTop = _string[0].ypos;
}
-void Scumm::restoreBG(ScummVM::Rect rect, byte backColor) {
+void Scumm::restoreBG(Common::Rect rect, byte backColor) {
VirtScreen *vs;
int topline, height, width;
byte *backbuff, *bgbak;
@@ -873,7 +873,7 @@
}
bool Scumm::hasCharsetMask(int left, int top, int right, int bottom) {
- ScummVM::Rect rect(left, top, right, bottom);
+ Common::Rect rect(left, top, right, bottom);
return _charset->_hasMask && rect.intersects(gdi._mask);
}
Index: gfx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- gfx.h 5 Sep 2003 20:18:20 -0000 1.45
+++ gfx.h 2 Oct 2003 17:43:02 -0000 1.46
@@ -34,10 +34,10 @@
};
struct CameraData { /** Camera state data */
- ScummVM::Point _cur;
- ScummVM::Point _dest;
- ScummVM::Point _accel;
- ScummVM::Point _last;
+ Common::Point _cur;
+ Common::Point _dest;
+ Common::Point _accel;
+ Common::Point _last;
int _leftTrigger, _rightTrigger;
byte _follows, _mode;
bool _movingToActor;
@@ -114,7 +114,7 @@
int _numZBuffer;
int _imgBufOffs[8];
int32 _numStrips;
- ScummVM::Rect _mask;
+ Common::Rect _mask;
byte _C64Colors[4];
protected:
Index: help.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/help.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- help.h 15 Jul 2003 00:20:04 -0000 1.3
+++ help.h 2 Oct 2003 17:43:02 -0000 1.4
@@ -26,7 +26,7 @@
class ScummHelp {
protected:
- typedef ScummVM::String String;
+ typedef Common::String String;
public:
static int numPages(byte gameId);
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.202
retrieving revision 2.203
diff -u -d -r2.202 -r2.203
--- script_v2.cpp 24 Sep 2003 06:33:58 -0000 2.202
+++ script_v2.cpp 2 Oct 2003 17:43:02 -0000 2.203
@@ -971,7 +971,7 @@
}
void Scumm_v2::o2_drawSentence() {
- ScummVM::Rect sentenceline;
+ Common::Rect sentenceline;
static char sentence[256];
const byte *temp;
int slot = getVerbSlot(VAR(VAR_SENTENCE_VERB),0);
@@ -1537,7 +1537,7 @@
}
// Hide all verbs and inventory
- ScummVM::Rect rect;
+ Common::Rect rect;
rect.top = virtscr[2].topline;
rect.bottom = virtscr[2].topline + 8*88;
rect.left = 0;
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -d -r1.193 -r1.194
--- script_v5.cpp 30 Sep 2003 23:43:59 -0000 1.193
+++ script_v5.cpp 2 Oct 2003 17:43:02 -0000 1.194
@@ -2861,7 +2861,7 @@
// For now, we force a redraw of the screen background. This
// Makes the Zak end credits work more or less correctly.
VirtScreen *vs = &virtscr[0];
- restoreBG(ScummVM::Rect(0,vs->topline, vs->width, vs->topline + vs->height));
+ restoreBG(Common::Rect(0,vs->topline, vs->width, vs->topline + vs->height));
virtscr[0].setDirtyRange(0, virtscr[0].height);
updateDirtyScreen(0);
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -d -r1.305 -r1.306
--- scumm.h 2 Oct 2003 14:37:40 -0000 1.305
+++ scumm.h 2 Oct 2003 17:43:02 -0000 1.306
@@ -54,7 +54,7 @@
struct BoxCoords;
struct FindObjectInRoom;
-typedef ScummVM::Map<ScummVM::String, int> ObjectIDMap;
+typedef Common::Map<Common::String, int> ObjectIDMap;
// Use g_scumm from error() ONLY
extern Scumm *g_scumm;
@@ -115,7 +115,7 @@
struct BlastText {
int16 xpos, ypos;
- ScummVM::Rect rect;
+ Common::Rect rect;
byte color;
byte charset;
bool center;
@@ -123,7 +123,7 @@
};
struct V2MouseoverBox {
- ScummVM::Rect rect;
+ Common::Rect rect;
byte color;
byte hicolor;
};
@@ -431,8 +431,8 @@
int _keyPressed;
uint16 _lastKeyHit;
- ScummVM::Point _mouse;
- ScummVM::Point _virtualMouse;
+ Common::Point _mouse;
+ Common::Point _virtualMouse;
uint16 _mouseButStat;
byte _leftBtnPressed, _rightBtnPressed;
@@ -720,7 +720,7 @@
int8 v2_mouseover_box;
void initV2MouseOver();
- void checkV2MouseOver(ScummVM::Point pos);
+ void checkV2MouseOver(Common::Point pos);
void checkV2Inventory(int x, int y);
void redrawV2Inventory();
@@ -819,7 +819,7 @@
void drawRoomObject(int i, int arg);
void drawBox(int x, int y, int x2, int y2, int color);
- void restoreBG(ScummVM::Rect rect, byte backColor = 0);
+ void restoreBG(Common::Rect rect, byte backColor = 0);
void redrawBGStrip(int start, int num);
void redrawBGAreas();
@@ -829,7 +829,7 @@
virtual void setCameraFollows(Actor *a);
virtual void moveCamera();
virtual void panCameraTo(int x, int y);
- void clampCameraPos(ScummVM::Point *pt);
+ void clampCameraPos(Common::Point *pt);
void actorFollowCamera(int act);
const byte *getPalettePtr();
@@ -981,7 +981,7 @@
byte getNumBoxes();
byte *getBoxMatrixBaseAddr();
int getPathToDestBox(byte from, byte to);
- void getGates(int trap1, int trap2, ScummVM::Point gateA[2], ScummVM::Point gateB[2]);
+ void getGates(int trap1, int trap2, Common::Point gateA[2], Common::Point gateB[2]);
bool inBoxQuickReject(int box, int x, int y, int threshold);
int getClosestPtOnBox(int box, int x, int y, int16& outX, int16& outY);
int getSpecialBox(int param1, int param2);
Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- verbs.cpp 24 Sep 2003 07:40:19 -0000 1.78
+++ verbs.cpp 2 Oct 2003 17:43:02 -0000 1.79
@@ -99,9 +99,9 @@
v2_mouseover_boxes[kSentenceLine].hicolor = hi_color;
}
-void Scumm::checkV2MouseOver(ScummVM::Point pos) {
+void Scumm::checkV2MouseOver(Common::Point pos) {
VirtScreen *vs = &virtscr[2];
- ScummVM::Rect rect;
+ Common::Rect rect;
byte *ptr, *dst;
int i, x, y, new_box = -1;
@@ -197,7 +197,7 @@
void Scumm::redrawV2Inventory() {
int i;
int max_inv;
- ScummVM::Rect inventoryBox;
+ Common::Rect inventoryBox;
v2_mouseover_box = -1;
Index: verbs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- verbs.h 5 Aug 2003 16:43:33 -0000 1.6
+++ verbs.h 2 Oct 2003 17:43:02 -0000 1.7
@@ -32,7 +32,7 @@
struct VerbSlot {
int16 x, y;
int16 right, bottom;
- ScummVM::Rect old;
+ Common::Rect old;
uint16 verbid;
uint8 color, hicolor, dimcolor, bkcolor, type;
uint8 charset_nr, curmode;
More information about the Scummvm-git-logs
mailing list