thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added some typecasts that might help QNX; updated NewGui TODO list

Browse source 
svn-id: r4489
This commit is contained in:
Max Horn 2002-07-08 01:04:29 +00:00
parent 28852f1497
commit b00225b9dc
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
actor.cpp
View file

@ -106,7 +106,7 @@ void Actor::setActorWalkSpeed(uint newSpeedX, uint newSpeedY)
int Scumm::getAngleFromPos(int x, int y) int Scumm::getAngleFromPos(int x, int y)
{ {
if (_gameId == GID_DIG) { if (_gameId == GID_DIG) {
double temp = atan2(x, -y); double temp = atan2((double)x, (double)-y);
return Scumm::normalizeAngle((int)(temp * 180 / 3.1415926535)); return Scumm::normalizeAngle((int)(temp * 180 / 3.1415926535));
} else { } else {
if (abs(y) * 2 < abs(x)) { if (abs(y) * 2 < abs(x)) {

7
boxes.cpp
View file

@ -23,6 +23,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "scumm.h" #include "scumm.h"
#include "actor.h" #include "actor.h"
#include <math.h> #include <math.h>
byte Scumm::getMaskFromBox(int box) byte Scumm::getMaskFromBox(int box)
@ -967,9 +968,9 @@ void Scumm::GetGates(int trap1, int trap2)
Box2 = (Closest2 > 3); Box2 = (Closest2 > 3);
Box3 = (Closest3 > 3); Box3 = (Closest3 > 3);
Dist1 = (int)sqrt(Dist1); Dist1 = (int)sqrt((double)Dist1);
Dist2 = (int)sqrt(Dist2); Dist2 = (int)sqrt((double)Dist2);
Dist3 = (int)sqrt(Dist3); Dist3 = (int)sqrt((double)Dist3);
if (Box1 == Box2 && abs(Dist1 - Dist2) < 4) { if (Box1 == Box2 && abs(Dist1 - Dist2) < 4) {
SetGate(Closest1, Closest2, polyx, polyy); SetGate(Closest1, Closest2, polyx, polyy);

4
newgui.cpp
View file

@ -30,10 +30,12 @@
/* /*
* TODO list * TODO list
* - implement the missing / incomplete dialogs
* - add more widgets * - 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) ? * - add "close" widget to all dialogs (with a flag to turn it off) ?
* - make dialogs "moveable" ? * - make dialogs "moveable" ?
* - implement the missing / incomplete dialogs
* - come up with a new look&feel / theme for the GUI * - come up with a new look&feel / theme for the GUI
* - ... * - ...
*/ */