Merge pull request #26 from smlu/develop

v0.3.1

Author: smlu

CHANGELOG.md

@@ -1,3 +1,14 @@
+## v0.3.1
+### General:
+  - Fixed radius of fading plate 3DO models (5d705fb)
+  - Codebase update and cleanup (bf2c4f7)
+  - Fixed bug calculating time delta when path move thing is blocked (f361b65)
+    This fixes the bug where another thing object blocks the path of path moving objects, causing them to continue moving indefinitely as long as the path is blocked.
+    e.g.: pressed button moves out of socket if player blocks its path when the button moves to initial position.
+  - Fixed incorrect usage of enum flags (918bcee)
+  - Added define guard for `STRICT` macro to prevent redefinition warnings (1b0e597)
+  - Fixed incorrect enumerator names enum `SithCollisionType` (f2cbab2)
+
 ## v0.3
 ### General:
   - Fixed various bugs
@@ -13,17 +24,18 @@
   - Added developer COG verbs (33f8f9d)
   - Added error log when popping invalid string from COG stack (34c9e20)
   - Rename debug mode flag `SITHDEBUG_AILOOK_FOR_TARGET_DISABLED` to `SITHDEBUG_AINOTARGET` (53b9091)
-  - Changed argument order of debug print COG functions (a80ed30)
+  - Changed argument order of debug print COG functions (a80ed30)  
     Also changed the log level to debug.
   - Added programs `yacc` & `flex` (d6f5be6 + b669ca8)
   - Fixed yacc initial line number at the start of code parsing. (232f268)  
     This fixes line number in log when error is encountered.
-  - Fixed bug in multiple COG thing functions (`sithCogFunctionThing` module) where a return value was not pushed to the execution stack on error. (e9d4167)  
+  - Fixed bug in multiple COG thing functions (`sithCogFunctionThing` module) where a return value  
+   was not pushed to the execution stack on error. (e9d4167)  
     This fixes corruption of the COG's execution stack when an error occurs.
   - Added new `rdVector` arithmetic functions (c4c8ee5)
   - Fix null pointer dereference && infinitive loop in `sithAnimate_BuildScrollFaceRotate`, `sithAnimate_PushItem`, `sithAnimate_PullItem`, `sithAnimate_UpdatePushItemAnim` and `sithAnimate_UpdatePullItemAnim` (70cf7bf)
   - Fixed handling division by zero in `sithAnimate_StartSpriteSizeAnim` & `sithAnimate_StartThingMoveAnim` (f5dc718)
-  - Altered the AnimateSpriteSize COG function to return -1 when deltaTime is 0. (039a227)  
+  - Altered the `AnimateSpriteSize` COG function to return -1 when deltaTime is 0. (039a227)  
     This change prevents unnecessary animation creation, thereby saving animation slots.  
     The function now returns -1 to the script when the sprite size is set instantly but no animation is created,  
     whereas previously, -1 was returned only on animation creation errors.
@@ -117,7 +129,7 @@
 
 ### Display & Render:
   - Added support for display resolutions higher than 2048-pixel (6f9db7e)
-  - Fixed bug rendering ceiling sky (6f9db7e)
+  - Fixed bug rendering ceiling sky (2a200d5)
   - Fixed thumbnail rendering in save game dialog (c7bb134)
   - Fixed thumbnail rendering in exit dialog (b64fb63)
   - Increased size of game save/load dialogs (ce321bb)

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.15)
 
-project(OpenJones3D VERSION 0.3.0)
+project(OpenJones3D VERSION 0.3.1)
 
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)

Jones3D/Display/jonesConfig.c

@@ -3814,8 +3814,7 @@ UINT_PTR CALLBACK jonesConfig_SaveGameDialogHookProc(HWND hDlg, UINT uMsg, WPARA
                             bValidFile = false;
                         }
 
-                        // TODO: Replace const 17 with macro or with some STD_ARRAYLEN(aLevels)
-                        for ( size_t levelNum = 0; levelNum < 17u; ++levelNum )
+                        for ( size_t levelNum = 0; levelNum < JONESLEVEL_BONUSLEVELNUM; ++levelNum )
                         {
                             const char* pSaveName = sithGetLevelSaveFilename(levelNum);
                             if ( pSaveName )

Libs/j3dcore/j3d.h.in

@@ -30,7 +30,9 @@
 #   ifndef NDEBUG
 #       define J3D_DEBUG 1
 #   endif
-#   define STRICT
+#   ifndef STRICT
+#       define STRICT
+#   endif
 #   define WIN32_LEAN_AND_MEAN
 #   include <Windows.h>
 #   define strcmpi _strcmpi

Libs/sith/Engine/sithAnimate.c

@@ -1867,7 +1867,7 @@ SithSurface* J3DAPI sithAnimate_GetThingFloorSurface(const SithThing* pThing)
             break;
         }
 
-        if ( (pCollision->type & SITHCOLLISION_ADJOINCROSS) != 0 )
+        if ( (pCollision->type & SITHCOLLISION_WORLD) != 0 )
         {
             SithSurface* pSurfaceCollided = pCollision->pSurfaceCollided;
             sithCollision_DecreaseStackLevel();
@@ -1907,7 +1907,7 @@ void J3DAPI sithAnimate_FindAndEnterFloorSurface(const SithThing* pThing, const
             break;
         }
 
-        if ( (pCollision->type & SITHCOLLISION_ADJOINCROSS) != 0 )
+        if ( (pCollision->type & SITHCOLLISION_WORLD) != 0 )
         {
             pSurfaceCollided = pCollision->pSurfaceCollided;
             if ( pSurfaceCollided != pPrevSurf )

Libs/sith/Engine/sithCamera.c

@@ -896,7 +896,6 @@ void J3DAPI sithCamera_Update(SithCamera* pCamera)
     {
         if ( pThing1->moveStatus == SITHPLAYERMOVE_SWIMIDLE && (pThing1->moveInfo.physics.flags & SITH_PF_ONWATERSURFACE) != 0 )
         {
-        LABEL_74:
             memcpy(&pCamera->offset, &sithCamera_vecCameraOffsetClimbDown, sizeof(pCamera->offset));
             goto LABEL_76;
         }

Libs/sith/Engine/sithCollision.c

@@ -352,7 +352,7 @@ SithSector* J3DAPI sithCollision_FindWaterSector(SithSector* pStartSector, rdVec
             break;
         }
 
-        if ( (pCollision->type & (SITHCOLLISION_WORLD | SITHCOLLISION_ADJOINTOUCH)) != 0
+        if ( (pCollision->type & (SITHCOLLISION_ADJOINCROSS | SITHCOLLISION_ADJOINTOUCH)) != 0
             && (pCollision->pSurfaceCollided->flags & SITH_SURFACE_WATER) != 0
             && (pCollision->pSurfaceCollided->pAdjoin->pAdjoinSector->flags & SITH_SECTOR_UNDERWATER) != 0 )
         {
@@ -481,7 +481,7 @@ int J3DAPI sithCollision_HasLOS(const SithThing* pViewer, const SithThing* pTarg
             }
         }
 
-        else if ( (pCollision->type & SITHCOLLISION_ADJOINTOUCH) == 0 || (pCollision->pSurfaceCollided->pAdjoin->flags & SITHCOLLISION_ADJOINCROSS) == 0 )
+        else if ( (pCollision->type & SITHCOLLISION_ADJOINTOUCH) == 0 || (pCollision->pSurfaceCollided->pAdjoin->flags & SITH_ADJOIN_MOVE) == 0 )
         {
             bLos = 0;
             break;
@@ -1069,7 +1069,7 @@ float J3DAPI sithCollision_SearchForCollisions(SithSector* pStartSector, SithThi
     pCollision = sithCollision_aCollisions[stackLevel];
     while ( collNum < sithCollision_aNumStackCollisions[stackLevel] )
     {
-        if ( pCollision->type == SITHCOLLISION_WORLD )
+        if ( pCollision->type == SITHCOLLISION_ADJOINCROSS )
         {
             pAdjoin = pCollision->pSurfaceCollided->pAdjoin;
             SITH_ASSERTREL(pAdjoin);
@@ -1229,7 +1229,7 @@ void J3DAPI sithCollision_SearchForSurfaceCollisions(const SithSector* pSector,
                     {
                         if ( ((colflags & 4) == 0 || (colflags & 1) == 0) && !sithCollision_CheckSectorSearched(pAdjoin->pAdjoinSector) )
                         {
-                            sithCollision_PushSurfaceCollision(pCurSurf, pHitDist, SITHCOLLISION_WORLD, 0);
+                            sithCollision_PushSurfaceCollision(pCurSurf, pHitDist, SITHCOLLISION_ADJOINCROSS, NULL);
                         }
 
                         if ( (colflags & 2) == 0
@@ -1245,10 +1245,10 @@ void J3DAPI sithCollision_SearchForSurfaceCollisions(const SithSector* pSector,
                         {
                             if ( (colflags & 4) != 0 && (colflags & 1) != 0 && !sithCollision_CheckSectorSearched(pAdjoin->pAdjoinSector) )
                             {
-                                sithCollision_PushSurfaceCollision(pCurSurf, pHitDist, SITHCOLLISION_WORLD, 0);
+                                sithCollision_PushSurfaceCollision(pCurSurf, pHitDist, SITHCOLLISION_ADJOINCROSS, NULL);
                             }
 
-                            sithCollision_PushSurfaceCollision(pCurSurf, distance, SITHCOLLISION_ADJOINTOUCH, 0);
+                            sithCollision_PushSurfaceCollision(pCurSurf, distance, SITHCOLLISION_ADJOINTOUCH, NULL);
                         }
                     }
                 }
@@ -1273,7 +1273,7 @@ void J3DAPI sithCollision_SearchForSurfaceCollisions(const SithSector* pSector,
                     {
                         if ( (colflags & 0x400) != 0 || rdVector_Dot3(moveNorm, &hitNorm) < 0.0f )
                         {
-                            sithCollision_PushSurfaceCollision(pCurSurf, pHitDist, (SithCollisionType)(hitType | SITHCOLLISION_ADJOINCROSS), &hitNorm);
+                            sithCollision_PushSurfaceCollision(pCurSurf, pHitDist, (SithCollisionType)(hitType | SITHCOLLISION_WORLD), &hitNorm);
                         }
                     }
                 }
@@ -2460,18 +2460,18 @@ void J3DAPI sithCollision_PushSurfaceCollision(SithSurface* pSurf, float distanc
 {
     SithCollision* pCollision;
 
-    SITH_ASSERTREL(((hitType) & (SITHCOLLISION_WORLD | SITHCOLLISION_ADJOINTOUCH | SITHCOLLISION_ADJOINCROSS)));
+    SITH_ASSERTREL(((hitType) & (SITHCOLLISION_ADJOINCROSS | SITHCOLLISION_ADJOINTOUCH | SITHCOLLISION_WORLD)));
     if ( sithCollision_aNumStackCollisions[stackLevel] == STD_ARRAYLEN(sithCollision_aCollisions[stackLevel]) )
     {
         SITHLOG_ERROR("Found too many collisions in collision system.\n");
         return;
     }
 
     pCollision = &sithCollision_aCollisions[stackLevel][sithCollision_aNumStackCollisions[stackLevel]++];
-    pCollision->pThingCollided = NULL;
-    pCollision->bEnumerated = 0;
-    pCollision->type = hitType;
-    pCollision->distance = distance;
+    pCollision->pThingCollided   = NULL;
+    pCollision->bEnumerated      = 0;
+    pCollision->type             = hitType;
+    pCollision->distance         = distance;
     pCollision->pSurfaceCollided = pSurf;
     if ( pHitNorm )
     {
@@ -2612,7 +2612,7 @@ float J3DAPI sithCollision_CheckDistance(SithThing* pThing, const rdVector3* mov
             break;
         }
 
-        if ( (pCollision->type & SITHCOLLISION_ADJOINCROSS) != 0 )
+        if ( (pCollision->type & SITHCOLLISION_WORLD) != 0 )
         {
             SITH_ASSERTREL(pCollision->pThingCollided == NULL);
             SITH_ASSERTREL(pCollision->pSurfaceCollided != NULL);

Libs/sith/Engine/sithPathMove.c

@@ -561,11 +561,14 @@ void J3DAPI sithPathMove_UpdateMove(SithThing* pThing, float simTime)
         float movedDist = sithCollision_MoveThing(pThing, &pPath->vecDeltaPos, moveDist, 0x44);
         if ( movedDist < moveDist )
         {
-            timeDelta = 0.0f;
             if ( stdMath_ClipNearZero(movedDist) > 0.0f )
             {
                 timeDelta = movedDist / moveDist * timeDelta;
             }
+            else
+            {
+                 timeDelta = 0.0f;
+            }
 
             ++pPath->numBlockedMoves;
         }

Libs/sith/Engine/sithPuppet.c

@@ -1830,7 +1830,7 @@ void J3DAPI sithPuppet_StopForceMove(SithThing* pThing, int bStopTracks)
                 {
                     break;
                 }
-                if ( (pCollision->type & SITHCOLLISION_ADJOINCROSS) != 0 )
+                if ( (pCollision->type & SITHCOLLISION_WORLD) != 0 )
                 {
                     if ( (pCollision->pSurfaceCollided->flags & SITH_SURFACE_LAVA) == 0 )
                     {
@@ -2178,7 +2178,7 @@ void J3DAPI sithPuppet_DefaultCallback(SithThing* pThing, int track, rdKeyMarker
         {
             if ( pThing->renderData.pPuppet->aTracks[track].playSpeed >= 0.5f && pThing->pSoundClass )
             {
-                if ( pThing->pInSector && (pThing->pInSector->flags & SITH_TF_REMOTE) != 0 )
+                if ( pThing->pInSector && (pThing->pInSector->flags & SITH_SECTOR_AETHERIUM) != 0 )
                 {
                     sithSoundClass_PlayModeRandom(pThing, SITHSOUNDCLASS_LSWIMAET);
                 }

Libs/sith/Engine/sithRender.c

@@ -1139,13 +1139,7 @@ int J3DAPI sithRender_RenderThing(SithThing* pThing)
         sithRender_pExtraThingRenderFunc(pThing);
     }
 
-    if ( pThing->type != SITH_THING_EXPLOSION )
-    {
-
-        return drawResult;
-    }
-
-    if ( (pThing->thingInfo.actorInfo.flags & SITH_AF_DROID) == 0 )
+    if ( pThing->type != SITH_THING_EXPLOSION || (pThing->thingInfo.explosionInfo.flags & SITH_EF_BLINDPLAYER) == 0 )
     {
         return drawResult;
     }
@@ -1154,7 +1148,7 @@ int J3DAPI sithRender_RenderThing(SithThing* pThing)
     // In JKDF2 (OpenJKDF2), here is section of code that adds light flashing effect to player view
     stdMath_Dist3D1(pThing->transformedPos.x, pThing->transformedPos.y, pThing->transformedPos.z);
 
-    pThing->thingInfo.actorInfo.flags &= ~SITH_EF_BLINDPLAYER;// 0x100 - SITH_EF_BLINDPLAYER
+    pThing->thingInfo.explosionInfo.flags &= ~SITH_EF_BLINDPLAYER;// 0x100 - SITH_EF_BLINDPLAYER
     return drawResult;
 }