Changeset 2866 in orxonox.OLD for orxonox/trunk/src/array.cc

Timestamp:

Nov 16, 2004, 2:07:07 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged importer to src again

File:

• orxonox/trunk/src/array.cc (modified) (3 diffs)

orxonox/trunk/src/array.cc

@@ -69 +69 @@
     printf ("Finalizing array.\n");  
   if ((array = (GLfloat*)malloc( entryCount* sizeof(GLfloat))) == NULL)
+  //  if ((array = new GLfloat [entryCount]) == NULL)
     printf ("could not allocate %i data Blocks\n", entryCount);
   Entry* walker = firstEntry;
@@ -77 +78 @@
     }
   finalized = true;
+
   return;
 }
@@ -91 +93 @@
         printf ("adding new Entry to Array: %f\n", entry);
       
-      entryCount++;
       currentEntry->value = entry;
       currentEntry->next = new Entry;
       currentEntry = currentEntry->next;
       currentEntry->next = NULL;
+      ++entryCount;
     }
   else