fixes some crashes like #9

Serious-Engine/Sources/Engine/Entities/Entity.h

@@ -689,7 +689,10 @@ inline const CEntityPointer &CEntityPointer::operator=(const CEntityPointer &pen
 }
 inline CEntity* CEntityPointer::operator->(void) const { return ep_pen; }
 inline CEntityPointer::operator CEntity*(void) const { return ep_pen; }
-inline CEntity& CEntityPointer::operator*(void) const { return *ep_pen; }
+inline CEntity& CEntityPointer::operator*(void) const {
+  ASSERT(ep_pen);
+  return *ep_pen;
+}
 
 /////////////////////////////////////////////////////////////////////
 // Reference counting functions

Serious-Engine/Sources/EntitiesMP/AirElemental.es

@@ -273,8 +273,8 @@ functions:
       // triggers
       if (fHealth<=fOldHealth && fHealth>fNewHealth)
       {
-        if (&*penTrigger[i]) {
-          SendToTarget(&*penTrigger[i], EET_TRIGGER, FixupCausedToPlayer(this, m_penEnemy));
+        if (penTrigger[i].ep_pen) {
+          SendToTarget(penTrigger[i].ep_pen, EET_TRIGGER, FixupCausedToPlayer(this, m_penEnemy));
         }
       }
     }

Serious-Engine/Sources/EntitiesMP/BloodSpray.es

@@ -160,8 +160,8 @@ procedures:
     }
 
       if (m_penOwner->GetPhysicsFlags()&EPF_MOVABLE) {
-      m_vGDir = ((CMovableEntity *)&*m_penOwner)->en_vGravityDir;
-      m_fGA = ((CMovableEntity *)&*m_penOwner)->en_fGravityA;
+      m_vGDir = ((CMovableEntity *) m_penOwner.ep_pen)->en_vGravityDir;
+      m_fGA = ((CMovableEntity *) m_penOwner.ep_pen)->en_fGravityA;
     } else {
       FLOATmatrix3D &m = m_penOwner->en_mRotation;
       m_vGDir = FLOAT3D(-m(1,2), -m(2,2), -m(3,2));

Serious-Engine/Sources/EntitiesMP/Camera.es

@@ -162,7 +162,7 @@ functions:
       FLOAT3D vTarget=FLOAT3D(0,0,0);
       if( m_penTarget!=NULL)
       {
-        CCameraMarker *pcm = &(CCameraMarker&)*m_penTarget;
+        CCameraMarker *pcm = (CCameraMarker*) m_penTarget.ep_pen;
         if( pcm->m_penViewTarget!=NULL)
         {
           vTarget=pcm->m_penViewTarget->GetLerpedPlacement().pl_PositionVector+m_vRelTargetOffset;
@@ -240,7 +240,7 @@ functions:
       FLOAT3D vTarget=FLOAT3D(0,0,0);
       if( m_penTarget!=NULL)
       {
-        CCameraMarker *pcm = &(CCameraMarker&)*m_penTarget;
+        CCameraMarker *pcm = (CCameraMarker*) m_penTarget.ep_pen;
         if( pcm->m_penViewTarget!=NULL)
         {
           vTarget=pcm->m_penViewTarget->GetPlacement().pl_PositionVector+m_vRelTargetOffset;
@@ -284,7 +284,7 @@ functions:
         pcmNm1 = pcmNp0;
         pcmNp0 = pcmNp1;
         pcmNp1 = pcmNp2;
-        pcmNp2 = (CCameraMarker*)&*pcmNp2->m_penTarget;
+        pcmNp2 = (CCameraMarker*) pcmNp2->m_penTarget.ep_pen;
 
         // disable lerping
         bLerping = FALSE;
@@ -525,12 +525,12 @@ procedures:
     // check all markers for correct type and numbers
     INDEX ctMarkers=1;
     INDEX ctNonSkipped=0;
-    CCameraMarker *pcm0 = (CCameraMarker*)&*m_penTarget;
-    CCameraMarker *pcm  = (CCameraMarker*)&*pcm0->m_penTarget;
+    CCameraMarker *pcm0 = (CCameraMarker*) m_penTarget.ep_pen;
+    CCameraMarker *pcm  = (CCameraMarker*) pcm0->m_penTarget.ep_pen;
     // loop thru markers
     while( pcm!=NULL && pcm->m_penTarget!=pcm0)
     {
-      pcm = (CCameraMarker*)&*pcm->m_penTarget;
+      pcm = (CCameraMarker*) pcm->m_penTarget.ep_pen;
       if (pcm==NULL) {
         WarningMessage( "Movable camera - broken link!");
         return;
@@ -571,7 +571,7 @@ procedures:
     m_bStopMoving = FALSE;
     m_penLast = pcm; // keep last marker
     ASSERT( pcm->m_penTarget == m_penTarget);
-    pcm  = (CCameraMarker*)&*m_penTarget;
+    pcm  = (CCameraMarker*) m_penTarget.ep_pen;
     m_colFade0 = m_colFade1 = pcm->m_colFade;
 
     // register camera as movable entity

Serious-Engine/Sources/EntitiesMP/Common/Common.cpp

@@ -1432,7 +1432,7 @@ class CWorldSettingsController *GetWSC(CEntity *pen)
   class CBackgroundViewer *penBcgViewer = (CBackgroundViewer *) pen->GetWorld()->GetBackgroundViewer();
   if( penBcgViewer != NULL) {
     // obtain world settings controller 
-    pwsc = (CWorldSettingsController *) &*penBcgViewer->m_penWorldSettingsController;
+    pwsc = (CWorldSettingsController *) penBcgViewer->m_penWorldSettingsController.ep_pen;
   }
   return pwsc;
 }

Serious-Engine/Sources/EntitiesMP/Common/Particles.cpp

@@ -464,11 +464,11 @@ void Particles_ViewerLocal(CEntity *penView)
   if (penBcgViewer != NULL)
   {
     // obtain world settings controller 
-    pwsc = (CWorldSettingsController *)&*penBcgViewer->m_penWorldSettingsController;
+    pwsc = (CWorldSettingsController *) penBcgViewer->m_penWorldSettingsController.ep_pen;
     if (pwsc != NULL)
     {
       // obtain environment particles holder 
-      eph = (CEnvironmentParticlesHolder *)&*pwsc->m_penEnvPartHolder;
+      eph = (CEnvironmentParticlesHolder *) pwsc->m_penEnvPartHolder.ep_pen;
     }
   }
 
@@ -546,7 +546,7 @@ void Particles_ViewerLocal(CEntity *penView)
     }
 
     // next environment particles holder
-    eph = (CEnvironmentParticlesHolder *)&*eph->m_penNextHolder;
+    eph = (CEnvironmentParticlesHolder *) eph->m_penNextHolder.ep_pen;
     if (!(IsOfClass(eph, "EnvironmentParticlesHolder"))) break;
   }
 

Serious-Engine/Sources/EntitiesMP/DebugEntityStatesDisplay.es

@@ -60,7 +60,7 @@ procedures:
       {
         on (EBegin) : {
           if (m_penTarget!=NULL) {
-            HUD_SetEntityForStackDisplay((CRationalEntity *)&*m_penTarget);
+            HUD_SetEntityForStackDisplay((CRationalEntity *) m_penTarget.ep_pen);
           } else {
             HUD_SetEntityForStackDisplay(NULL);
           }

Serious-Engine/Sources/EntitiesMP/DestroyableArchitecture.es

@@ -174,7 +174,7 @@ functions:
     static const CTString strMarkerUnused("Marker not set");
     if (iGradient==1)
     {
-      CGradientMarker *pgm = (CGradientMarker *)&*m_penGradient;
+      CGradientMarker *pgm = (CGradientMarker *) m_penGradient.ep_pen;
       if (pgm != NULL) {
         return pgm->GetGradientName();
       } else {
@@ -186,7 +186,7 @@ functions:
   /* Uncache shadows for given gradient */
   void UncacheShadowsForGradient(class CGradientMarker *penDiscard)
   {
-    CGradientMarker *pgm = (CGradientMarker *)&*m_penGradient;
+    CGradientMarker *pgm = (CGradientMarker *) m_penGradient.ep_pen;
     if(pgm == penDiscard)
     {
       CEntity::UncacheShadowsForGradient(1);
@@ -198,7 +198,7 @@ functions:
   {
     if ( iGradient==1)
     {
-      CGradientMarker *pgm = (CGradientMarker *)&*m_penGradient;
+      CGradientMarker *pgm = (CGradientMarker *) m_penGradient.ep_pen;
       if (pgm != NULL) {
         return pgm->GetGradient(0, fpGradient);
       }

Serious-Engine/Sources/EntitiesMP/EnemyBase.es

@@ -302,7 +302,7 @@ functions:
   class CWatcher *GetWatcher(void)
   {
     ASSERT(m_penWatcher!=NULL);
-    return (CWatcher*)&*m_penWatcher;
+    return (CWatcher*) m_penWatcher.ep_pen;
   }
   export void Copy(CEntity &enOther, ULONG ulFlags)
   {

Serious-Engine/Sources/EntitiesMP/EnemyCounter.es

@@ -41,7 +41,7 @@ functions:
     if (m_penMainMusicHolder==NULL) {
       m_penMainMusicHolder = _pNetwork->GetEntityWithName("MusicHolder", 0);
     }
-    return (CMusicHolder *)&*m_penMainMusicHolder;
+    return (CMusicHolder *) m_penMainMusicHolder.ep_pen;
   }
   void StartCounting(void)
   {

Serious-Engine/Sources/EntitiesMP/ExotechLarva.es

@@ -293,7 +293,7 @@ functions:
     CBackgroundViewer *penBcgViewer = (CBackgroundViewer *) GetWorld()->GetBackgroundViewer();
     if( penBcgViewer != NULL) {
       // obtain world settings controller 
-      pwsc = (CWorldSettingsController *) &*penBcgViewer->m_penWorldSettingsController;
+      pwsc = (CWorldSettingsController *) penBcgViewer->m_penWorldSettingsController.ep_pen;
     }
     return pwsc;
   }

Serious-Engine/Sources/EntitiesMP/ExotechLarvaCharger.es

@@ -122,7 +122,7 @@ functions:
     CEntityPointer *penFirst = &m_penBattery01;
 
     for (INDEX i=0; i<6; i++) {
-      CExotechLarvaBattery *penBattery = (CExotechLarvaBattery *)&(*penFirst[i]);
+      CExotechLarvaBattery *penBattery = (CExotechLarvaBattery *) (penFirst[i].ep_pen);
       // if model pointer is valid
       if (penBattery) {
         if (penBattery->m_bActive) { 
@@ -156,7 +156,7 @@ functions:
       CEntityPointer *penFirst = &m_penBattery01;
 
       for (INDEX i=0; i<6; i++) {
-        CExotechLarvaBattery *penBattery = (CExotechLarvaBattery *)&(*penFirst[i]);
+        CExotechLarvaBattery *penBattery = (CExotechLarvaBattery *) (penFirst[i].ep_pen);
         // if model pointer is valid
         if (penBattery) {
           if (penBattery->m_bActive) { 

Serious-Engine/Sources/EntitiesMP/Lightning.es

@@ -80,7 +80,7 @@ functions:
     // if light entity
     if (IsOfClass(m_penLight, "Light"))
     {
-      CLight *penLight = (CLight*)&*m_penLight;
+      CLight *penLight = (CLight*) m_penLight.ep_pen;
 
       if (slPropertyOffset==offsetof(CLightning, m_iLightAnim))
       {

Serious-Engine/Sources/EntitiesMP/MovingBrush.es

@@ -800,10 +800,10 @@ procedures:
 
     INDEX ctMarkers=0;
     // new moving target
-    CMovingBrushMarker *pmbm = (CMovingBrushMarker *) &*m_penTarget;
+    CMovingBrushMarker *pmbm = (CMovingBrushMarker *) m_penTarget.ep_pen;
     while( pmbm!=NULL && IsOfClass(pmbm->m_penTarget, "Moving Brush Marker") && !pmbm->m_bStopMoving && ctMarkers<50)
     {      
-      pmbm = (CMovingBrushMarker *) &*pmbm->m_penTarget;
+      pmbm = (CMovingBrushMarker *) pmbm->m_penTarget.ep_pen;
       ctMarkers++;
     }
 

Serious-Engine/Sources/EntitiesMP/PyramidSpaceShip.es

@@ -236,16 +236,16 @@ functions:
     m_epssState = PSSS_MOVING;
     // check all markers for correct type and numbers
     INDEX ctMarkers=1;
-    CPyramidSpaceShipMarker *pcm0 = (CPyramidSpaceShipMarker*)&*m_penTarget;
+    CPyramidSpaceShipMarker *pcm0 = (CPyramidSpaceShipMarker*) m_penTarget.ep_pen;
     if( pcm0 == NULL)
     {
       return;
     }
-    CPyramidSpaceShipMarker *pcm  = (CPyramidSpaceShipMarker*)&*pcm0->m_penTarget;
+    CPyramidSpaceShipMarker *pcm  = (CPyramidSpaceShipMarker*) pcm0->m_penTarget.ep_pen;
     // loop thru markers
     while( pcm!=NULL && pcm->m_penTarget!=pcm0)
     {
-      pcm = (CPyramidSpaceShipMarker*)&*pcm->m_penTarget;
+      pcm = (CPyramidSpaceShipMarker*) pcm->m_penTarget.ep_pen;
       if (pcm==NULL) {
         WarningMessage( "Space ship path - broken link!");
         return;
@@ -768,7 +768,7 @@ procedures:
     }
 
     HideBeamMachine();
-    InitializePathMoving( (CPyramidSpaceShipMarker*)&*m_penFlyAwayTarget);
+    InitializePathMoving( (CPyramidSpaceShipMarker*) m_penFlyAwayTarget.ep_pen);
     return EReturn();
   }
 
@@ -950,7 +950,7 @@ procedures:
         {
           SwitchToModel();
         }
-        InitializePathMoving((CPyramidSpaceShipMarker*)&*m_penTarget);
+        InitializePathMoving((CPyramidSpaceShipMarker*) m_penTarget.ep_pen);
         resume;
       }
       on( ETrigger):
@@ -978,7 +978,7 @@ procedures:
         if(m_epssState != PSSS_IDLE)
         {
           m_penTarget = eForcePathMarker.penForcedPathMarker;
-          InitializePathMoving((CPyramidSpaceShipMarker*)&*m_penTarget);
+          InitializePathMoving((CPyramidSpaceShipMarker*) m_penTarget.ep_pen);
         }
         resume;
       }

Serious-Engine/Sources/EntitiesMP/Watcher.es

@@ -53,7 +53,7 @@ functions:
   class CEnemyBase *GetOwner(void)
   {
     ASSERT(m_penOwner!=NULL);
-    return (CEnemyBase*)&*m_penOwner;
+    return (CEnemyBase*) m_penOwner.ep_pen;
   }
 
   // find one player number by random

print-stack.bat

@@ -1,2 +1,3 @@
+cd %~dp0
 adb logcat -c
-adb logcat | ndk-stack -sym app\build\intermediates\cmake\release\obj\armeabi-v7a > stack.txt
+adb logcat | ndk-stack -sym app\build\intermediates\cmake\release\obj\armeabi-v7a > stack.txt