Changeset 3530 in orxonox.OLD for orxonox/branches/levelloader/src/lib

Timestamp:

Mar 13, 2005, 10:40:25 PM (19 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: Got the system to compile, the basic backbone now runs. What remains to be done is implementing all necessary functions to load all vital classes into a world

Location:

orxonox/branches/levelloader/src/lib/util

Files:

• substring.cc (modified) (4 diffs)
• substring.h (modified) (3 diffs)

orxonox/branches/levelloader/src/lib/util/substring.cc

@@ -22 +22 @@
 #include "substring.h"
 
-SubString::SubString( char* string)
+SubString::SubString( const char* string)
 {
         n = 0;
@@ -32 +32 @@
         n += 1;
         
-        strings = malloc( sizeof( char*) * n);
+        strings = new char*[n];
         
         int i = 0;
         int l = 0;
         
-        char* offset = string;
+        const char* offset = string;
         char* end = strchr( string, ',');
         while( end != NULL)
         {
                 l = end - offset;
-                strings[i] = malloc( l + 1);
+                strings[i] = new char[l + 1];
                 strncpy( strings[i], offset, l);
                 i++;
@@ -50 +50 @@
         }
         
-        strings[i] = malloc( l + 1);
+        strings[i] = new char[l + 1];
         strncpy( strings[i], offset, l);
         l = strlen( offset);
@@ -62 +62 @@
         for( int i = 0; i < n; i++)
         {
-                free( strings[i]);
+                delete strings[i];
         }
         
-        free( strings);
+        delete strings;
 }
 

orxonox/branches/levelloader/src/lib/util/substring.h

@@ -3 +3 @@
     \brief a small class to get the parts of a string separated by commas
 */
+
+#ifndef _SUBSTRING_H
+#define _SUBSTRING_H
 
 #include "stdincl.h"
@@ -10 +13 @@
         public:
         
-                SubString( char* string);
+                SubString( const char* string);
                 ~SubString();
                 
@@ -20 +23 @@
                 int n;
 };
+
+#endif /* _SUBSTRING_H */