[colobot] 95/390: Small fix to 72b4228abe583cd953491575cf42bae17ff5e9d2

[Didier Raboud]

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

odyx pushed a commit to branch upstream/latest
in repository colobot.

commit c001c46cb53b3aedc7cbb0670f1c475679cf3d3d
Author: krzys-h <krzys_h at interia.pl>
Date:   Sun Oct 19 15:27:00 2014 +0200

    Small fix to 72b4228abe583cd953491575cf42bae17ff5e9d2
---
 src/CBot/CBotStack.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/CBot/CBotStack.cpp b/src/CBot/CBotStack.cpp
index 6e5e7d8..42d5617 100644
--- a/src/CBot/CBotStack.cpp
+++ b/src/CBot/CBotStack.cpp
@@ -790,7 +790,6 @@ void CBotStack::GetRunPos(const char* &FunctionName, int &start, int &end)
 
     while (p->m_next != NULL)
     {
-        
         if ( p->m_instr != NULL ) instr = p->m_instr;
         if ( p->m_bFunc == 1 && p->m_instr != NULL ) funct = p->m_instr;
         if ( p->m_next->m_prog != prog ) break ;
@@ -800,7 +799,7 @@ void CBotStack::GetRunPos(const char* &FunctionName, int &start, int &end)
     }
 
     if ( p->m_instr != NULL ) instr = p->m_instr;
-    if ( p->m_bFunc == 1 ) funct = p->m_instr;
+    if ( p->m_bFunc == 1 && p->m_instr != NULL ) funct = p->m_instr;
 
     if ( funct == NULL ) return;
 
@@ -829,16 +828,19 @@ CBotVar* CBotStack::GetStackVars(const char* &FunctionName, int level)
         if (p->m_next2 && p->m_next2->m_state != 0) p = p->m_next2 ;
         else                                        p = p->m_next;
     }
+    // Now p is the highest element on the stack
 
 
     // descends upon the elements of block
     while ( p != NULL && !p->m_bBlock )    p = p->m_prev;
+    // Now p is on the beggining of the top block (with local variables)
 
     while ( p != NULL && level++ < 0 )
     {
         p = p->m_prev;
         while ( p != NULL && !p->m_bBlock )    p = p->m_prev;
     }
+    // Now p is on the block "level"
 
     if ( p == NULL ) return NULL;
 

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