torgue->torque
authorvortex <vortex@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 16 Dec 2010 18:14:21 +0000 (18:14 +0000)
committervortex <vortex@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 16 Dec 2010 18:14:21 +0000 (18:14 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10668 d7cf8633-e32d-0410-b094-e92efae38249

clvm_cmds.c
dpdefs/dpextensions.qc
progs.h
prvm_cmds.c
prvm_cmds.h
svvm_cmds.c
world.c

index a30ce3c..9c1247c 100644 (file)
@@ -4546,7 +4546,7 @@ NULL,                                                     // #538
 NULL,                                                  // #539
 VM_physics_enable,                             // #540 void(entity e, float physics_enabled) physics_enable = #540; (DP_PHYSICS_ODE)
 VM_physics_addforce,                   // #541 void(entity e, vector force, vector relative_ofs) physics_addforce = #541; (DP_PHYSICS_ODE)
-VM_physics_addtorgue,                  // #542 void(entity e, vector torgue) physics_addtorgue = #542; (DP_PHYSICS_ODE)
+VM_physics_addtorque,                  // #542 void(entity e, vector torque) physics_addtorque = #542; (DP_PHYSICS_ODE)
 NULL,                                                  // #543
 NULL,                                                  // #544
 NULL,                                                  // #545
index 06361ae..af459ee 100644 (file)
@@ -1598,7 +1598,7 @@ const float JOINTTYPE_FIXED = -1;
 //builtin definitions:
 void(entity e, float physics_enabled) physics_enable = #540; // enable or disable physics on object
 void(entity e, vector force, vector force_pos) physics_addforce = #541; // apply a force from certain origin, length of force vector is power of force
-void(entity e, vector torgue) physics_addtorgue = #542; // add relative torgue
+void(entity e, vector torque) physics_addtorque = #542; // add relative torque
 //description: provides Open Dynamics Engine support, requires extenal dll to be present or engine compiled with statical link option
 //be sure to checkextension for it to know if library i loaded and ready, also to enable physics set "physice_ode" cvar to 1
 //note: this extension is highly experimental and may be unstable
diff --git a/progs.h b/progs.h
index b7208e5..3021914 100644 (file)
--- a/progs.h
+++ b/progs.h
@@ -35,7 +35,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define ODEFUNC_ENABLE                 1
 #define ODEFUNC_DISABLE                        2
 #define ODEFUNC_RELFORCEATPOS  3
-#define ODEFUNC_RELTORGUE              4
+#define ODEFUNC_RELTORQUE              4
 
 typedef struct edict_odefunc_s
 {
index 5755ef7..f2c0e54 100644 (file)
@@ -6952,27 +6952,27 @@ void VM_physics_addforce(void)
        VM_physics_ApplyCmd(ed, &f);
 }
 
-// void(entity e, vector torgue) physics_addtorgue = #;
-void VM_physics_addtorgue(void)
+// void(entity e, vector torque) physics_addtorque = #;
+void VM_physics_addtorque(void)
 {
        prvm_edict_t *ed;
        edict_odefunc_t f;
        
-       VM_SAFEPARMCOUNT(2, VM_physics_addtorgue);
+       VM_SAFEPARMCOUNT(2, VM_physics_addtorque);
        ed = PRVM_G_EDICT(OFS_PARM0);
        if (!ed)
        {
                if (developer.integer > 0)
-                       VM_Warning("VM_physics_addtorgue: null entity!\n");
+                       VM_Warning("VM_physics_addtorque: null entity!\n");
                return;
        }
        // entity should have MOVETYPE_PHYSICS already set, this can damage memory (making leaked allocation) so warn about this even if non-developer
        if (ed->fields.server->movetype != MOVETYPE_PHYSICS)
        {
-               VM_Warning("VM_physics_addtorgue: entity is not MOVETYPE_PHYSICS!\n");
+               VM_Warning("VM_physics_addtorque: entity is not MOVETYPE_PHYSICS!\n");
                return;
        }
-       f.type = ODEFUNC_RELTORGUE;
+       f.type = ODEFUNC_RELTORQUE;
        VectorCopy(PRVM_G_VECTOR(OFS_PARM1), f.v1);
        VM_physics_ApplyCmd(ed, &f);
 }
index 6ca09b1..e8ed3cb 100644 (file)
@@ -477,4 +477,4 @@ void VM_getsurfacetriangle(void);
 // physics builtins
 void VM_physics_enable(void);
 void VM_physics_addforce(void);
-void VM_physics_addtorgue(void);
+void VM_physics_addtorque(void);
index d9bc0ae..fc35514 100644 (file)
@@ -3682,7 +3682,7 @@ NULL,                                                     // #538
 NULL,                                                  // #539
 VM_physics_enable,                             // #540 void(entity e, float physics_enabled) physics_enable = #540; (DP_PHYSICS_ODE)
 VM_physics_addforce,                   // #541 void(entity e, vector force, vector relative_ofs) physics_addforce = #541; (DP_PHYSICS_ODE)
-VM_physics_addtorgue,                  // #542 void(entity e, vector torgue) physics_addtorgue = #542; (DP_PHYSICS_ODE)
+VM_physics_addtorque,                  // #542 void(entity e, vector torque) physics_addtorque = #542; (DP_PHYSICS_ODE)
 NULL,                                                  // #543
 NULL,                                                  // #544
 NULL,                                                  // #545
diff --git a/world.c b/world.c
index 9028195..b5b1def 100644 (file)
--- a/world.c
+++ b/world.c
@@ -1725,7 +1725,7 @@ void World_Physics_ApplyCmd(prvm_edict_t *ed, edict_odefunc_t *f)
                dBodyEnable(body);
                dBodyAddForceAtRelPos(body, f->v1[0], f->v1[1], f->v1[2], f->v2[0], f->v2[1], f->v2[2]);
                break;
-       case ODEFUNC_RELTORGUE:
+       case ODEFUNC_RELTORQUE:
                dBodyEnable(body);
                dBodyAddRelTorque(body, f->v1[0], f->v1[1], f->v1[2]);
                break;