[colobot] 188/390: Removed CBOT_STACK switch

[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 ebf92e98c912f3ee0497c21e0197578a9b37ad96
Author: krzys-h <krzys_h at interia.pl>
Date:   Mon Nov 10 18:22:48 2014 +0100

    Removed CBOT_STACK switch
    
    It was just making it harder to look for cause of #119
---
 src/object/robotmain.cpp | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index 228cd65..a5dd6ca 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -99,7 +99,6 @@ const int MAX_FNAME = 255;
 
 
 
-#define CBOT_STACK  true    // saves the stack of programs CBOT
 const float UNIT = 4.0f;
 
 
@@ -5815,7 +5814,6 @@ bool CRobotMain::IOWriteScene(const char *filename, const char *filecbot, char *
     }
     delete level;
 
-#if CBOT_STACK
     // Writes the file of stacks of execution.
     FILE* file = fOpen(filecbot, "wb");
     if (file == NULL) return false;
@@ -5841,7 +5839,6 @@ bool CRobotMain::IOWriteScene(const char *filename, const char *filecbot, char *
     }
     CBotClass::SaveStaticState(file);
     fClose(file);
-#endif
 
     m_delayWriteMessage = 4;  // displays message in 3 frames
     return true;
@@ -5899,21 +5896,9 @@ CObject* CRobotMain::IOReadObject(CLevelParserLine *line, const char* filename,
 
     obj->Read(line);
 
-#if CBOT_STACK
-#else
-    LoadFileScript(obj, filename, objRank, i);
-#endif
-
     int run = line->GetParam("run")->AsInt(-1);
     if (run != -1)
     {
-#if CBOT_STACK
-#else
-        CBrain* brain = obj->GetBrain();
-        if (brain != nullptr)
-            brain->RunProgram(run-1);  // starts the program
-#endif
-
         CAuto* automat = obj->GetAuto();
         if (automat != nullptr)
             automat->Start(run);  // starts the film
@@ -5989,7 +5974,6 @@ CObject* CRobotMain::IOReadScene(const char *filename, const char *filecbot)
     }
     delete level;
 
-#if CBOT_STACK
     CInstanceManager* iMan = CInstanceManager::GetInstancePointer();
 
     // Compiles scripts.
@@ -6043,7 +6027,6 @@ CObject* CRobotMain::IOReadScene(const char *filename, const char *filecbot)
         CBotClass::RestoreStaticState(file);
         fClose(file);
     }
-#endif
 
     return sel;
 }

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