Changeset 9713 in orxonox.OLD

Timestamp:

Sep 1, 2006, 11:43:31 AM (18 years ago)

Author:

bensch

Message:

terrain fixed, and <cassert> included

Location:

branches/new_class_id/src

Files:

• lib/lang/new_object_list.h (modified) (1 diff)
• lib/script_engine/script.cc (modified) (3 diffs)
• world_entities/terrain.cc (modified) (2 diffs)

branches/new_class_id/src/lib/lang/new_object_list.h

@@ -9 +9 @@
 
 #include "new_class_id.h"
+#include <cassert>
 #include <map>
 #include <list>

branches/new_class_id/src/lib/script_engine/script.cc

@@ -171 +171 @@
  bool Script::executeFile()
  {
-   PRINT(2)("WARNING: script.executeFile is not implemented yet\n");
+   PRINTF(2)("script.executeFile is not implemented yet\n");
    /*if(currentFile.length() != 0)
    {
@@ -216 +216 @@
     if(error != 0)
     {
-      printf("SCRIPT %s : ERROR: Failed to execute function %s: \n",currentFile.c_str(),currentFunction.c_str());
+      PRINTF(1)("Script '%s' : Failed to execute function '%s': \n",currentFile.c_str(),currentFunction.c_str());
      reportError(error);
      //clean up
@@ -231 +231 @@
    }
    else
-     printf("SCRIPT %s : ERROR: no function selected.\n",currentFile.c_str());
+     PRINTF(1)("SCRIPT '%s' : no function selected.\n",currentFile.c_str());
 
    return false;

branches/new_class_id/src/world_entities/terrain.cc

@@ -89 +89 @@
 Terrain::~Terrain ()
 {
-  if (objectList)
+  if (modelList)
     glDeleteLists(this->modelList, 1);
   if( this->ssp)
@@ -207 +207 @@
   //glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
-  if (this->objectList)
+  if (this->modelList)
     glCallList(this->modelList);
   else if (this->getModel())