Browse Source

Fixes Issue #62

This corrects items 1, 3, and 4 in this issue. Items 2 and 5 are correct as-is.
Peter Robinson 2 years ago
parent
commit
f6af3d68d3

+ 0 - 3
engine/source/game/defaultGame.cc

@@ -592,9 +592,6 @@ void DefaultGame::processTimeEvent(TimeEvent *event)
    {
    {
       elapsedTime = (U32) (elapsedTime * gTimeScale);
       elapsedTime = (U32) (elapsedTime * gTimeScale);
    }
    }
-   {
-       elapsedTime = elapsedTime;
-   }
 
 
    Platform::advanceTime(elapsedTime);
    Platform::advanceTime(elapsedTime);
    bool tickPass;
    bool tickPass;

+ 1 - 1
engine/source/platform/platformFileIO.cc

@@ -345,7 +345,7 @@ StringTableEntry Platform::makeRelativePathName(const char *path, const char *to
       return StringTable->insert(buffer);
       return StringTable->insert(buffer);
    }
    }
 
 
-   if((*pathPtr == 0 && *toPtr == '/') || (*toPtr == '/' && *pathPtr == 0))
+   if(*toPtr == '/' && *pathPtr == 0)
       branch = pathPtr;
       branch = pathPtr;
 
 
    // Figure out parent dirs
    // Figure out parent dirs

+ 2 - 2
engine/source/platformWin32/winDInputDevice.cc

@@ -991,7 +991,7 @@ bool DInputDevice::buildEvent( DWORD offset, S32 newData, S32 oldData )
                }
                }
                if( clearkeys & POV_down)
                if( clearkeys & POV_down)
                {
                {
-                  newEvent.objInst = ( objInst == 0 ) ? SI_DPOV : SI_DPOV;
+                  newEvent.objInst = ( objInst == 0 ) ? SI_DPOV : SI_DPOV2;
                   
                   
                   Game->postEvent(newEvent);
                   Game->postEvent(newEvent);
                }
                }
@@ -1022,7 +1022,7 @@ bool DInputDevice::buildEvent( DWORD offset, S32 newData, S32 oldData )
                }
                }
                if( setkeys & POV_down)
                if( setkeys & POV_down)
                {
                {
-                  newEvent.objInst = ( objInst == 0 ) ? SI_DPOV : SI_DPOV;
+                  newEvent.objInst = ( objInst == 0 ) ? SI_DPOV : SI_DPOV2;
                   
                   
                   Game->postEvent(newEvent);
                   Game->postEvent(newEvent);
                }
                }