aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actor.cpp2
-rw-r--r--boxes.cpp7
-rw-r--r--newgui.cpp4
3 files changed, 8 insertions, 5 deletions
diff --git a/actor.cpp b/actor.cpp
index c9c9694b18..dfa2f522ba 100644
--- a/actor.cpp
+++ b/actor.cpp
@@ -106,7 +106,7 @@ void Actor::setActorWalkSpeed(uint newSpeedX, uint newSpeedY)
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)) {
diff --git a/boxes.cpp b/boxes.cpp
index 960e24f9a7..d37f1995ac 100644
--- a/boxes.cpp
+++ b/boxes.cpp
@@ -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 @@ void Scumm::GetGates(int trap1, int trap2)
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);
diff --git a/newgui.cpp b/newgui.cpp
index 15cff1d645..378e04f6c6 100644
--- a/newgui.cpp
+++ b/newgui.cpp
@@ -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
* - ...
*/