[Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.83,1.84 boxes.cpp,1.33,1.34 newgui.cpp,1.8,1.9
Max Horn
fingolfin at users.sourceforge.net
Sun Jul 7 18:05:02 CEST 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gui dialog.cpp,1.8,1.9 dialog.h,1.4,1.5 widget.cpp,1.7,1.8 widget.h,1.4,1.5
- Next message: [Scummvm-cvs-logs] CVS: scummvm Makefile.mingw,1.25,1.26
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv2862
Modified Files:
actor.cpp boxes.cpp newgui.cpp
Log Message:
added some typecasts that might help QNX; updated NewGui TODO list
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- actor.cpp 7 Jul 2002 20:21:42 -0000 1.83
+++ actor.cpp 8 Jul 2002 01:04:29 -0000 1.84
@@ -106,7 +106,7 @@
int Scumm::getAngleFromPos(int x, int y)
{
if (_gameId == GID_DIG) {
- double temp = atan2(x, -y);
+ double temp = atan2((double)x, (double)-y);
return Scumm::normalizeAngle((int)(temp * 180 / 3.1415926535));
} else {
if (abs(y) * 2 < abs(x)) {
Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/boxes.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- boxes.cpp 7 Jul 2002 20:25:22 -0000 1.33
+++ boxes.cpp 8 Jul 2002 01:04:29 -0000 1.34
@@ -23,6 +23,7 @@
#include "stdafx.h"
#include "scumm.h"
#include "actor.h"
+
#include <math.h>
byte Scumm::getMaskFromBox(int box)
@@ -967,9 +968,9 @@
Box2 = (Closest2 > 3);
Box3 = (Closest3 > 3);
- Dist1 = (int)sqrt(Dist1);
- Dist2 = (int)sqrt(Dist2);
- Dist3 = (int)sqrt(Dist3);
+ Dist1 = (int)sqrt((double)Dist1);
+ Dist2 = (int)sqrt((double)Dist2);
+ Dist3 = (int)sqrt((double)Dist3);
if (Box1 == Box2 && abs(Dist1 - Dist2) < 4) {
SetGate(Closest1, Closest2, polyx, polyy);
Index: newgui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/newgui.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- newgui.cpp 8 Jul 2002 00:29:47 -0000 1.8
+++ newgui.cpp 8 Jul 2002 01:04:29 -0000 1.9
@@ -30,10 +30,12 @@
/*
* TODO list
+ * - implement the missing / incomplete dialogs
* - add more widgets
+ * - add support for right/center aligned text
+ * - allow multi line (l/c/r aligned) text via StaticTextWidget ?
* - add "close" widget to all dialogs (with a flag to turn it off) ?
* - make dialogs "moveable" ?
- * - implement the missing / incomplete dialogs
* - come up with a new look&feel / theme for the GUI
* - ...
*/
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gui dialog.cpp,1.8,1.9 dialog.h,1.4,1.5 widget.cpp,1.7,1.8 widget.h,1.4,1.5
- Next message: [Scummvm-cvs-logs] CVS: scummvm Makefile.mingw,1.25,1.26
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list