[74974] users/ryandesign/ports/games/PlasmaClient/files/patch-undo-372.diff
ryandesign at macports.org
ryandesign at macports.org
Mon Jan 10 02:16:15 PST 2011
Revision: 74974
http://trac.macports.org/changeset/74974
Author: ryandesign at macports.org
Date: 2011-01-10 02:16:06 -0800 (Mon, 10 Jan 2011)
Log Message:
-----------
PlasmaClient: remove part of the undo-372 patch that is not the problem (move definition of PCAvatarPhys::setInputState to PCPhysicsHelpers.cpp)
Modified Paths:
--------------
users/ryandesign/ports/games/PlasmaClient/files/patch-undo-372.diff
Modified: users/ryandesign/ports/games/PlasmaClient/files/patch-undo-372.diff
===================================================================
--- users/ryandesign/ports/games/PlasmaClient/files/patch-undo-372.diff 2011-01-10 09:42:47 UTC (rev 74973)
+++ users/ryandesign/ports/games/PlasmaClient/files/patch-undo-372.diff 2011-01-10 10:16:06 UTC (rev 74974)
@@ -142,7 +142,7 @@
#include <cmath>
void updateCiChildren(plCoordinateInterface* ci)
-@@ -109,28 +104,9 @@
+@@ -109,27 +104,13 @@
}
PCAvatarPhys::PCAvatarPhys(btRigidBody* _body)
@@ -151,10 +151,10 @@
{
body = _body;
- brain = new pcAvBrainHuman();
--}
--
--void PCAvatarPhys::setInputState(hsUint16 input_state)
--{
+ }
+
+ void PCAvatarPhys::setInputState(hsUint16 input_state)
+ {
- if (brain) {
- hsUint16 oldAngleState = iState & (kISAngleLeft|kISAngleRight);
- hsUint16 newAngleState = input_state & (kISAngleLeft|kISAngleRight);
@@ -168,11 +168,10 @@
- }
- }
-
-- iState = input_state;
+ iState = input_state;
}
-
-@@ -201,11 +177,23 @@
+@@ -201,11 +182,23 @@
const float c5FRunJump12FHorzSpeed = 12.0f / c5FJumpUDTime;
const float c5FRunJump20FHorzSpeed = 20.0f / c5FJumpUDTime;
@@ -201,7 +200,7 @@
// Just from counting patatoes (not scienced)
const float strafe_speed = 2.f;
-@@ -214,9 +202,11 @@
+@@ -214,9 +207,11 @@
// Standing was measured using fraps video capture, and neroshowtime to determine time, frames count.
// spinning full circle in 4 sec in city using male avatar in 1st person
// So 90 deg/sec.
@@ -215,7 +214,7 @@
{
btVector3 velocity;
btVector3 strafeVelocity;
-@@ -276,56 +266,27 @@
+@@ -276,56 +271,27 @@
float turn_rate;
if(iState & kISForward) {
@@ -289,7 +288,7 @@
}
break;
}
-@@ -356,31 +317,6 @@
+@@ -356,31 +322,6 @@
body->setAngularVelocity(angvelocity);
}
@@ -342,8 +341,7 @@
- };
PCAvatarPhys(btRigidBody* body);
-- void setInputState(hsUint16 input_state);
-+ void setInputState(hsUint16 input_state) { iState = input_state; }
+ void setInputState(hsUint16 input_state);
hsUint16 getInputState() const { return iState; }
- void setMouseState(hsUint16 mouse_state);
- hsUint16 getMouseState() const { return mState; }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110110/1d8f11f1/attachment.html>
More information about the macports-changes
mailing list