This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit 6b234a6db865acc2a1986fb3a9cc2d5224e9a322
Author: Xycaleth <a...@acslo.com>
Date:   Sat Jul 1 15:04:43 2017 +0100

    Fix warnings in G2_API.cpp
---
 codemp/rd-dedicated/G2_API.cpp | 106 ++++++++++++++---------------------------
 1 file changed, 37 insertions(+), 69 deletions(-)

diff --git a/codemp/rd-dedicated/G2_API.cpp b/codemp/rd-dedicated/G2_API.cpp
index 68c15d6..4b45ef6 100644
--- a/codemp/rd-dedicated/G2_API.cpp
+++ b/codemp/rd-dedicated/G2_API.cpp
@@ -689,7 +689,7 @@ qboolean G2API_SetSurfaceOnOff(CGhoul2Info_v &ghoul2, const 
char *surfaceName, c
 {
        CGhoul2Info *ghlInfo = NULL;
 
-       if (&ghoul2 && ghoul2.size()>0)
+       if (ghoul2.size()>0)
        {
                ghlInfo = &ghoul2[0];
        }
@@ -1086,7 +1086,7 @@ qboolean G2API_SetBoneAnim(CGhoul2Info_v &ghoul2, const 
int modelIndex, const ch
        {
                setFrame=0.0f;
        }
-       if (&ghoul2 && ghoul2.size()>modelIndex)
+       if (ghoul2.size()>modelIndex)
        {
                CGhoul2Info *ghlInfo = &ghoul2[modelIndex];
                qboolean setPtrs = qfalse;
@@ -1288,7 +1288,7 @@ qboolean G2API_SetBoneAngles(CGhoul2Info_v &ghoul2, const 
int modelIndex, const
                                                         const Eorientations 
up, const Eorientations left, const Eorientations forward,
                                                         qhandle_t *modelList, 
int blendTime, int currentTime )
 {
-       if (&ghoul2 && ghoul2.size()>modelIndex)
+       if (ghoul2.size()>modelIndex)
        {
                CGhoul2Info *ghlInfo = &ghoul2[modelIndex];
                qboolean setPtrs = qfalse;
@@ -1625,7 +1625,7 @@ int G2API_AddBolt(CGhoul2Info_v &ghoul2, const int 
modelIndex, const char *boneN
 {
        assert(ghoul2.size()>modelIndex);
 
-       if (&ghoul2 && ghoul2.size()>modelIndex)
+       if (ghoul2.size()>modelIndex)
        {
                CGhoul2Info *ghlInfo = &ghoul2[modelIndex];
                if (G2_SetupModelPointers(ghlInfo))
@@ -1656,9 +1656,7 @@ qboolean G2API_AttachG2Model(CGhoul2Info_v &ghoul2From, 
int modelFrom, CGhoul2In
        if (G2_SetupModelPointers(ghoul2From)&&G2_SetupModelPointers(ghoul2To))
        {
                // make sure we have a model to attach, a model to attach to, 
and a bolt on that model
-               if (&ghoul2From &&
-                       &ghoul2To &&
-                       (ghoul2From.size() > modelFrom) &&
+               if ((ghoul2From.size() > modelFrom) &&
                        (ghoul2To.size() > toModel) &&
                        ((ghoul2To[toModel].mBltlist[toBoltIndex].boneNumber != 
-1) || (ghoul2To[toModel].mBltlist[toBoltIndex].surfaceNumber != -1)))
                {
@@ -1674,12 +1672,9 @@ qboolean G2API_AttachG2Model(CGhoul2Info_v &ghoul2From, 
int modelFrom, CGhoul2In
 
 void G2API_SetBoltInfo(CGhoul2Info_v &ghoul2, int modelIndex, int boltInfo)
 {
-       if (&ghoul2)
+       if (ghoul2.size() > modelIndex)
        {
-               if (ghoul2.size() > modelIndex)
-               {
-                       ghoul2[modelIndex].mModelBoltLink = boltInfo;
-               }
+               ghoul2[modelIndex].mModelBoltLink = boltInfo;
        }
 }
 
@@ -1721,7 +1716,7 @@ qboolean G2API_GetBoltMatrix_SPMethod(CGhoul2Info_v 
&ghoul2, const int modelInde
 {
        assert(ghoul2.size() > modelIndex);
 
-       if (&ghoul2 && (ghoul2.size() > modelIndex))
+       if ((ghoul2.size() > modelIndex))
        {
                CGhoul2Info *ghlInfo = &ghoul2[modelIndex];
 
@@ -1911,43 +1906,20 @@ void G2API_ListBones(CGhoul2Info *ghlInfo, int frame)
 // decide if we have Ghoul2 models associated with this ghoul list or not
 qboolean G2API_HaveWeGhoul2Models(CGhoul2Info_v &ghoul2)
 {
-       int i;
-       if (&ghoul2)
+       for (int i=0; i<ghoul2.size();i++)
        {
-               for (i=0; i<ghoul2.size();i++)
+               if (ghoul2[i].mModelindex != -1)
                {
-                       if (ghoul2[i].mModelindex != -1)
-                       {
-                               return qtrue;
-                       }
+                       return qtrue;
                }
        }
+
        return qfalse;
 }
 
 // run through the Ghoul2 models and set each of the mModel values to the 
correct one from the cgs.gameModel offset lsit
 void G2API_SetGhoul2ModelIndexes(CGhoul2Info_v &ghoul2, qhandle_t *modelList, 
qhandle_t *skinList)
 {
-       return;
-#if 0
-       int i;
-       if (&ghoul2)
-       {
-               for (i=0; i<ghoul2.size(); i++)
-               {
-                       if (ghoul2[i].mModelindex != -1)
-                       {
-                               // broken into 3 lines for debugging, STL is a 
pain to view...
-                               //
-                               int iModelIndex  = ghoul2[i].mModelindex;
-                               qhandle_t mModel = modelList[iModelIndex];
-                               ghoul2[i].mModel = mModel;
-
-                               ghoul2[i].mSkin = 
skinList[ghoul2[i].mCustomSkin];
-                       }
-               }
-       }
-#endif
 }
 
 
@@ -2281,42 +2253,38 @@ void G2API_CopySpecificG2Model(CGhoul2Info_v 
&ghoul2From, int modelFrom, CGhoul2
           //might have been a bug in the reconstruct checking which has since 
been
           //mangled and probably fixed. -rww
 
-       // have we real ghoul2 models yet?
-       if (&ghoul2From && &ghoul2To)
+       // assume we actually have a model to copy from
+       if (ghoul2From.size() > modelFrom)
        {
-               // assume we actually have a model to copy from
-               if (ghoul2From.size() > modelFrom)
+               // if we don't have enough models on the to side, resize us so 
we do
+               if (ghoul2To.size() <= modelTo)
                {
-                       // if we don't have enough models on the to side, 
resize us so we do
-                       if (ghoul2To.size() <= modelTo)
-                       {
-                               assert (modelTo < 5);
-                               ghoul2To.resize(modelTo + 1);
+                       assert (modelTo < 5);
+                       ghoul2To.resize(modelTo + 1);
 #if 0
-                               forceReconstruct = qtrue;
+                       forceReconstruct = qtrue;
 #endif
-                       }
-                       // do the copy
+               }
+               // do the copy
 
-                       if (ghoul2To.IsValid() && ghoul2To.size() >= modelTo)
-                       { //remove the bonecache before we stomp over this 
instance.
-                               if (ghoul2To[modelTo].mBoneCache)
-                               {
-                                       
RemoveBoneCache(ghoul2To[modelTo].mBoneCache);
-                                       ghoul2To[modelTo].mBoneCache = 0;
-                               }
+               if (ghoul2To.IsValid() && ghoul2To.size() >= modelTo)
+               { //remove the bonecache before we stomp over this instance.
+                       if (ghoul2To[modelTo].mBoneCache)
+                       {
+                               RemoveBoneCache(ghoul2To[modelTo].mBoneCache);
+                               ghoul2To[modelTo].mBoneCache = 0;
                        }
-                       ghoul2To[modelTo] = ghoul2From[modelFrom];
+               }
+               ghoul2To[modelTo] = ghoul2From[modelFrom];
 
 #if 0
-                       if (forceReconstruct)
-                       { //rww - we should really do this shouldn't we? If we 
don't mark a reconstruct after this,
-                         //and we do a GetBoltMatrix in the same frame, it 
doesn't reconstruct the skeleton and returns
-                         //a completely invalid matrix
-                               ghoul2To[0].mSkelFrameNum = 0;
-                       }
-#endif
+               if (forceReconstruct)
+               { //rww - we should really do this shouldn't we? If we don't 
mark a reconstruct after this,
+                 //and we do a GetBoltMatrix in the same frame, it doesn't 
reconstruct the skeleton and returns
+                 //a completely invalid matrix
+                       ghoul2To[0].mSkelFrameNum = 0;
                }
+#endif
        }
 }
 
@@ -2409,7 +2377,7 @@ char *G2API_GetGLAName(CGhoul2Info_v &ghoul2, int 
modelIndex)
 {
        if (G2_SetupModelPointers(ghoul2))
        {
-               if (&ghoul2 && (ghoul2.size() > modelIndex))
+               if (ghoul2.size() > modelIndex)
                {
                        //model_t       *mod = 
R_GetModelByHandle(RE_RegisterModel(ghoul2[modelIndex].mFileName));
                        //return mod->mdxm->animName;
@@ -2425,7 +2393,7 @@ qboolean G2API_SetNewOrigin(CGhoul2Info_v &ghoul2, const 
int boltIndex)
 {
        CGhoul2Info *ghlInfo = NULL;
 
-       if (&ghoul2 && ghoul2.size()>0)
+       if (ghoul2.size()>0)
        {
                ghlInfo = &ghoul2[0];
        }

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.git

_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

Reply via email to