Changeset 5076 in orxonox.OLD for trunk

Timestamp:

Aug 19, 2005, 3:52:54 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: minor

Location:

trunk/src

Files:

• defs/debug.h (modified) (2 diffs)
• lib/graphics/text_engine.cc (modified) (2 diffs)
• lib/util/list.h (modified) (2 diffs)
• util/shell.cc (modified) (3 diffs)

trunk/src/defs/debug.h

@@ -99 +99 @@
 
 //#ifdef
-//#define PRINTF(x)        PRINT(x)
+#define PRINTF(x)        PRINT(x)
 #define PRINT_EXEC       Shell::addBufferLineStatic
 
+#ifndef PRINTF
 #ifdef DEBUG
 
@@ -154 +155 @@
 #define PRINTF0 \
     printf("%s:%d::", __FILE__, __LINE__) && PRINT_EXEC
-
+#endif
 
 ///////////////////////////////////////////////////

trunk/src/lib/graphics/text_engine.cc

@@ -72 +72 @@
 Text::~Text()
 {
+  ResourceManager::getInstance()->unload(this->font);
+
+//  if (this->text)
+    //delete []this->text;
   TextEngine::getInstance()->deleteText(this);
 }
@@ -846 +850 @@
 void TextEngine::deleteText(Text* text)
 {
-  ResourceManager::getInstance()->unload(text->font);
   textList->remove(text);
 }

trunk/src/lib/util/list.h

@@ -138 +138 @@
   T* lastElement();
   bool isEmpty();
-  int getSize();
+  unsigned int getSize();
   bool inList(T* entity);
   tIterator<T>* getIterator();
@@ -359 +359 @@
 */
 template<class T>
-inline int tList<T>::getSize()
+inline unsigned int tList<T>::getSize()
 {
   return this->size;

trunk/src/util/shell.cc

@@ -78 +78 @@
     Text* newText = TextEngine::getInstance()->createText("fonts/earth.ttf", 10, TEXT_DYNAMIC, 0, 255, 0);
     newText->setAlignment(TEXT_ALIGN_LEFT);
-    newText->setPosition2D(5, 5);
+    newText->setPosition2D(5, 500);
     newText->setText("");
     this->bufferText->add(newText);
@@ -137 +137 @@
 void Shell::addBufferLine(const char* line, va_list arguments)
 {
-  vsprintf(this->bufferArray, line, arguments);
-
-  char* newLine = new char[strlen(this->bufferArray)+1];
-  strcpy(newLine, this->bufferArray);
+//  vsprintf(this->bufferArray, line, arguments);
+
+//  char* newLine = new char[strlen(this->bufferArray)+1];
+//  strcpy(newLine, this->bufferArray);
 
 //  this->buffer->add(newLine);
@@ -150 +150 @@
 //    }
 
-  this->bufferText->firstElement()->setText(newLine);
+//  this->bufferText->firstElement()->setText(newLine);
 }