Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5078 in orxonox.OLD for trunk/src/util


Ignore:
Timestamp:
Aug 19, 2005, 5:02:38 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: Shell is running, but only in orxonox-world, not all-over
I do not know why this behaviour occurs, but maybe it is because of some errors in other pointers…
who knows

Location:
trunk/src/util
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/util/resource_manager.cc

    r4961 r5078  
    559559                    subMatch = true;
    560560                }
    561               else if (enumRes->modelSize =- *(int*)param1)
     561              else if (enumRes->ttfSize == *(int*)param1)
    562562                subMatch = true;
    563563              if(subMatch)
  • trunk/src/util/shell.cc

    r5077 r5078  
    4141  //this->bufferDisplaySize = 0;
    4242  this->setBufferSize(100);
    43   // this->setBufferDisplaySize(1);
    44 
     43  this->setBufferDisplaySize(1);
     44
     45//  this->inputLineText = TextEngine::getInstance()->createText("fonts/earth.ttf", 10, TEXT_DYNAMIC, 0, 255, 0);
     46//  this->inputLineText->setText(NULL);
    4547
    4648  //this->addBufferLineStatic("asjflksjdvklasmv %s", "doom");
     
    8183    newText->setText("");
    8284    this->bufferText->add(newText);
    83     // add the Text here
    8485  }
    8586}
     
    137138void Shell::addBufferLine(const char* line, va_list arguments)
    138139{
    139 //  vsprintf(this->bufferArray, line, arguments);
    140 
    141 //  char* newLine = new char[strlen(this->bufferArray)+1];
    142 //  strcpy(newLine, this->bufferArray);
    143 
    144 //  this->buffer->add(newLine);
    145 
    146 //    if (this->buffer->getSize() > this->bufferSize)
    147 //    {
    148 //      delete this->buffer->firstElement();
    149 //      this->buffer->remove(this->buffer->firstElement());
    150 //    }
    151 
    152 //  this->bufferText->firstElement()->setText(newLine);
     140   vsprintf(this->bufferArray, line, arguments);
     141
     142   char* newLine = new char[strlen(this->bufferArray)+1];
     143   strcpy(newLine, this->bufferArray);
     144
     145//   this->buffer->add(newLine);
     146//
     147//   if (this->buffer->getSize() > this->bufferSize)
     148//   {
     149//     delete this->buffer->firstElement();
     150//     this->buffer->remove(this->buffer->firstElement());
     151//   }
     152
     153  this->bufferText->firstElement()->setText(newLine);
     154//  this->inputLineText->setText(line);
    153155}
    154156
Note: See TracChangeset for help on using the changeset viewer.