1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
|
--- blender/source/gameengine/Expressions/KX_HashedPtr.cpp.x86_64 2004-03-22 17:01:28.000000000 -0500
+++ blender/source/gameengine/Expressions/KX_HashedPtr.cpp 2005-06-05 10:09:48.000000000 -0400
@@ -57,5 +57,5 @@
unsigned int CHashedPtr::hash() const
{
- return KX_Hash((unsigned int) m_valptr);
+ return KX_Hash((unsigned int)((unsigned long) m_valptr & 0x00000000FFFFFFFF));
}
--- blender/source/gameengine/Ketsji/KX_WorldIpoController.cpp.x86_64 2005-03-09 14:45:59.000000000 -0500
+++ blender/source/gameengine/Ketsji/KX_WorldIpoController.cpp 2005-06-05 10:09:48.000000000 -0400
@@ -92,10 +92,10 @@
iporeplica->AddInterpolator(copyipo);
MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
- int orgbase = (int)this;
- int orgloc = (int)scaal;
- int offset = orgloc-orgbase;
- int newaddrbase = (int)iporeplica + offset;
+ long orgbase = (long)this;
+ long orgloc = (long)scaal;
+ long offset = orgloc-orgbase;
+ long newaddrbase = (long)iporeplica + offset;
MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
copyipo->SetNewTarget((MT_Scalar*)blaptr);
}
--- blender/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp.x86_64 2004-03-22 17:01:52.000000000 -0500
+++ blender/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp 2005-06-05 10:09:48.000000000 -0400
@@ -87,10 +87,10 @@
iporeplica->AddInterpolator(copyipo);
MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
- int orgbase = (int)this;
- int orgloc = (int)scaal;
- int offset = orgloc-orgbase;
- int newaddrbase = (int)iporeplica + offset;
+ long orgbase = (long)this;
+ long orgloc = (long)scaal;
+ long offset = orgloc-orgbase;
+ long newaddrbase = (long)iporeplica + offset;
MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
copyipo->SetNewTarget((MT_Scalar*)blaptr);
}
--- blender/source/gameengine/Ketsji/KX_LightIpoSGController.cpp.x86_64 2004-03-22 17:01:52.000000000 -0500
+++ blender/source/gameengine/Ketsji/KX_LightIpoSGController.cpp 2005-06-05 10:09:48.000000000 -0400
@@ -97,10 +97,10 @@
iporeplica->AddInterpolator(copyipo);
MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
- int orgbase = (int)this;
- int orgloc = (int)scaal;
- int offset = orgloc-orgbase;
- int newaddrbase = (int)iporeplica + offset;
+ long orgbase = (long)this;
+ long orgloc = (long)scaal;
+ long offset = orgloc-orgbase;
+ long newaddrbase = (long)iporeplica + offset;
MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
copyipo->SetNewTarget((MT_Scalar*)blaptr);
}
--- blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp.x86_64 2005-03-25 05:33:37.000000000 -0500
+++ blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp 2005-06-05 10:09:48.000000000 -0400
@@ -168,10 +168,10 @@
iporeplica->AddInterpolator(copyipo);
MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
- int orgbase = (int)&m_ipo_xform;
- int orgloc = (int)scaal;
- int offset = orgloc-orgbase;
- int newaddrbase = (int)&iporeplica->m_ipo_xform;
+ long orgbase = (long)&m_ipo_xform;
+ long orgloc = (long)scaal;
+ long offset = orgloc-orgbase;
+ long newaddrbase = (long)&iporeplica->m_ipo_xform;
newaddrbase += offset;
MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
copyipo->SetNewTarget((MT_Scalar*)blaptr);
--- blender/source/gameengine/Ketsji/KX_GameObject.cpp.x86_64 2005-04-18 07:44:21.000000000 -0400
+++ blender/source/gameengine/Ketsji/KX_GameObject.cpp 2005-06-05 10:09:48.000000000 -0400
@@ -1069,10 +1069,10 @@
PyObject* kwds)
{
KX_IPhysicsController* ctrl = GetPhysicsController();
- int physid=0;
+ long physid=0;
if (ctrl)
{
- physid= (int)ctrl->GetUserData();
+ physid= (long)ctrl->GetUserData();
}
return PyInt_FromLong(physid);
}
--- blender/source/gameengine/Ketsji/KX_CameraIpoSGController.cpp.x86_64 2004-07-21 20:26:34.000000000 -0400
+++ blender/source/gameengine/Ketsji/KX_CameraIpoSGController.cpp 2005-06-05 10:09:48.000000000 -0400
@@ -92,10 +92,10 @@
iporeplica->AddInterpolator(copyipo);
MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
- int orgbase = (int)this;
- int orgloc = (int)scaal;
- int offset = orgloc-orgbase;
- int newaddrbase = (int)iporeplica + offset;
+ long orgbase = (long)this;
+ long orgloc = (long)scaal;
+ long offset = orgloc-orgbase;
+ long newaddrbase = (long)iporeplica + offset;
MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
copyipo->SetNewTarget((MT_Scalar*)blaptr);
}
--- blender/source/kernel/gen_system/GEN_HashedPtr.h.x86_64 2002-12-27 08:11:00.000000000 -0500
+++ blender/source/kernel/gen_system/GEN_HashedPtr.h 2005-06-05 10:09:48.000000000 -0400
@@ -40,7 +40,7 @@
void* m_valptr;
public:
GEN_HashedPtr(void* val) : m_valptr(val) {};
- unsigned int hash() const { return GEN_Hash((unsigned int) m_valptr);};
+ unsigned int hash() const { return GEN_Hash((unsigned int)((unsigned long) m_valptr & 0x00000000FFFFFFFF));};
inline friend bool operator ==(const GEN_HashedPtr & rhs, const GEN_HashedPtr & lhs) { return rhs.m_valptr == lhs.m_valptr;};
};
|
GitWeb