Skip to content

Commit fa3f19d

Browse files
Chris7Chris7
committed
Merge branch 'master' into exportFix
2 parents c14f803 + 188bdb1 commit fa3f19d

24 files changed

+501
-2395
lines changed

‎src/TArea.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,12 @@ QList<int> TArea::getCollisionNodes()
158158

159159
void TArea::fast_ausgaengeBestimmen( int id )
160160
{
161+
qDebug()<<"trace#0";
161162
TRoom * pR = mpRoomDB->getRoom(id);
162163
if( ! pR ) return;
164+
qDebug()<<"trace#1";
163165
exits.remove(id);
166+
qDebug()<<"trace#1";
164167
if( pR->getNorth() > 0 && rooms.indexOf( pR->getNorth() ) < 0 )
165168
{
166169
QPair<int, int> p = QPair<int,int>(id, NORTH);
@@ -221,22 +224,31 @@ void TArea::fast_ausgaengeBestimmen( int id )
221224
QPair<int, int> p = QPair<int,int>(id, OUT);
222225
exits.insertMulti( id, p );
223226
}
227+
qDebug()<<"trace#2";
224228
const QMap<int, QString> otherMap = pR->getOtherMap();
229+
qDebug()<<"trace#3";
225230
QMapIterator<int,QString> it( otherMap );
231+
qDebug()<<"trace#4";
226232
while( it.hasNext() )
227233
{
234+
qDebug()<<"trace#5";
228235
it.next();
236+
qDebug()<<"trace#6";
229237
int _exit = it.key();
230238
TRoom * pO = mpRoomDB->getRoom(_exit);
239+
qDebug()<<"trace#7 pO="<<pO;
231240
if( pO )
232241
{
242+
qDebug()<<"trace#8";
233243
if( pO->getArea() != getAreaID() )
234244
{
245+
qDebug()<<"trace#9";
235246
QPair<int, int> p = QPair<int,int>(pO->getId(), OTHER);
236247
exits.insertMulti( pO->getId(), p );
237248
}
238249
}
239250
}
251+
qDebug()<<"trace#10-OKexit";
240252
}
241253

242254
void TArea::ausgaengeBestimmen()

‎src/TArea.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ class TArea
7575
int zoneAreaRef;
7676
TRoomDB * mpRoomDB;
7777

78+
private:
79+
TArea(){qFatal("FATAL: illegal default constructor use of TArea()");};
7880
//QMap<int, TMapLabel> labelMap;
7981

8082
};

‎src/TBuffer.cpp

Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ TChar::TChar( const TChar & copy )
127127

128128
TBuffer::TBuffer( Host * pH )
129129
: mLinkID ( 0 )
130-
, mLinesLimit ( 10000 )
131-
, mBatchDeleteSize ( 1000 )
130+
, mLinesLimit ( 1000 )
131+
, mBatchDeleteSize ( 100 )
132132
, mUntriggered ( 0 )
133133
, mWrapAt ( 99999999 )
134134
, mWrapIndent ( 0 )
@@ -1993,6 +1993,7 @@ void TBuffer::append( QString & text,
19931993
{
19941994
if( text.at(i) == '\n' )
19951995
{
1996+
log(size()-1, size()-1);
19961997
std::deque<TChar> newLine;
19971998
buffer.push_back( newLine );
19981999
lineBuffer.push_back( QString() );
@@ -2869,6 +2870,7 @@ inline int TBuffer::wrap( int startLine )
28692870
dirty.push_back( true );
28702871
}
28712872

2873+
log(startLine, startLine+tempList.size());
28722874
//qDebug()<<"lB="<<lineBuffer.size()<<" pB="<<promptBuffer.size()<<" tB="<<timeBuffer.size()<<" pB="<<promptBuffer.size()<<" dB="<<dirty.size();
28732875
//Q_ASSERT(!(lineBuffer.size() == promptBuffer.size() == timeBuffer.size() == dirty.size() ));
28742876
return insertedLines > 0 ? insertedLines : 0;
@@ -2993,6 +2995,48 @@ int TBuffer::wrap( int startLine, int screenWidth, int indentSize, TChar & forma
29932995
return insertedLines > 0 ? insertedLines : 0;
29942996
}
29952997

2998+
void TBuffer::log( int from, int to )
2999+
{
3000+
3001+
TBuffer * pB = &mpHost->mpConsole->buffer;
3002+
if( pB == this )
3003+
{
3004+
if( mpHost->mpConsole->mLogToLogFile )
3005+
{
3006+
if( from >= size() || from < 0 )
3007+
{
3008+
return;
3009+
}
3010+
if( to >= size() )
3011+
{
3012+
to = size()-1;
3013+
}
3014+
if( to < 0 )
3015+
{
3016+
return;
3017+
}
3018+
for( int i=from; i<=to; i++ )
3019+
{
3020+
3021+
QString toLog;
3022+
if( mpHost->mRawStreamDump )
3023+
{
3024+
QPoint P1 = QPoint(0,i);
3025+
QPoint P2 = QPoint( buffer[i].size(), i);
3026+
toLog = bufferToHtml(P1, P2);
3027+
}
3028+
else
3029+
{
3030+
toLog = lineBuffer[i];
3031+
toLog.append("\n");
3032+
}
3033+
mpHost->mpConsole->mLogStream << toLog;
3034+
}
3035+
mpHost->mpConsole->mLogStream.flush();
3036+
}
3037+
}
3038+
}
3039+
29963040
// returns how many new lines have been inserted by the wrapping action
29973041
int TBuffer::wrapLine( int startLine, int screenWidth, int indentSize, TChar & format )
29983042
{
@@ -3091,6 +3135,7 @@ int TBuffer::wrapLine( int startLine, int screenWidth, int indentSize, TChar & f
30913135

30923136
if( lineCount < 1 )
30933137
{
3138+
log( startLine, startLine );
30943139
return 0;
30953140
}
30963141

@@ -3118,6 +3163,7 @@ int TBuffer::wrapLine( int startLine, int screenWidth, int indentSize, TChar & f
31183163
promptBuffer.insert( startLine+i, isPrompt );
31193164
dirty.insert( startLine+i, true );
31203165
}
3166+
log( startLine, startLine+tempList.size()-1 );
31213167
//Q_ASSERT(!((lineBuffer.size()==promptBuffer.size()) && (lineBuffer.size()==timeBuffer.size()) && (lineBuffer.size() == dirty.size()) ));
31223168
//qDebug()<<"lB="<<lineBuffer.size()<<" pB="<<promptBuffer.size()<<" tB="<<timeBuffer.size()<<" pB="<<promptBuffer.size()<<" dB="<<dirty.size();
31233169
return insertedLines > 0 ? insertedLines : 0;

‎src/TBuffer.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ class TBuffer
8282
void expandLine( int y, int count, TChar & );
8383
int wrap( int startLine, int screenWidth, int indentSize, TChar & format );
8484
int wrapLine( int startLine, int screenWidth, int indentSize, TChar & format );
85+
void log( int, int );
8586
int skipSpacesAtBeginOfLine( int i, int i2 );
8687
void addLink( bool, QString & text, QStringList & command, QStringList & hint, TChar format );
8788
// void appendLink( QString & text,

‎src/TConsole.cpp

Lines changed: 39 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,36 +1106,44 @@ void TConsole::printOnDisplay( std::string & incomingSocketData )
11061106
mTriggerEngineMode = true;
11071107
buffer.translateToPlainText( incomingSocketData );
11081108
mTriggerEngineMode = false;
1109-
if( mLogToLogFile )
1110-
{
1111-
if( ! mIsDebugConsole )
1112-
{
1113-
if( mpHost->mRawStreamDump )
1114-
{
1115-
if( buffer.size() > mLastBufferLogLine + 1 )
1116-
{
1117-
if( buffer.size() < mLastBufferLogLine)
1118-
{
1119-
mLastBufferLogLine -= buffer.mBatchDeleteSize;
1120-
if( mLastBufferLogLine < 0 )
1121-
{
1122-
mLastBufferLogLine = 0;
1123-
}
1124-
}
1125-
for( int i=mLastBufferLogLine+1; i<buffer.size(); i++ )
1126-
{
1127-
QPoint P1 = QPoint(0,i);
1128-
QPoint P2 = QPoint( buffer.buffer[i].size(), i);
1129-
QString toLog = buffer.bufferToHtml(P1, P2);
1130-
mLastBufferLogLine++;
1131-
mLogStream << toLog;
1132-
}
1133-
mLastBufferLogLine--;
1134-
}
1135-
mLogStream.flush();
1136-
}
1137-
}
1138-
}
1109+
// if( mLogToLogFile )
1110+
// {
1111+
// if( ! mIsDebugConsole )
1112+
// {
1113+
// if( buffer.size() < mLastBufferLogLine )
1114+
// {
1115+
// mLastBufferLogLine -= buffer.mBatchDeleteSize;
1116+
// qDebug()<<"---> RESETTING mLastBufferLogLine";
1117+
// if( mLastBufferLogLine < 0 )
1118+
// {
1119+
// mLastBufferLogLine = 0;
1120+
// }
1121+
// }
1122+
// if( buffer.size() > mLastBufferLogLine + 1 )
1123+
// {
1124+
// for( int i=mLastBufferLogLine+1; i<buffer.size(); i++ )
1125+
// {
1126+
// QString toLog;
1127+
// if( mpHost->mRawStreamDump )
1128+
// {
1129+
// QPoint P1 = QPoint(0,i);
1130+
// QPoint P2 = QPoint( buffer.buffer[i].size(), i);
1131+
// toLog = buffer.bufferToHtml(P1, P2);
1132+
// }
1133+
// else
1134+
// {
1135+
// toLog = buffer.lineBuffer[i];
1136+
// toLog.append("\n");
1137+
// }
1138+
// mLogStream << toLog;
1139+
// qDebug()<<"LOG:"<<i<<" lastLogLine="<<mLastBufferLogLine<<" size="<<buffer.size()<<" toLog<"<<toLog<<">";
1140+
// mLastBufferLogLine++;
1141+
// }
1142+
// mLastBufferLogLine--;
1143+
// }
1144+
// mLogStream.flush();
1145+
// }
1146+
// }
11391147
double processT = mProcessingTime.elapsed();
11401148
if( mpHost->mTelnet.mGA_Driver )
11411149
{
@@ -1158,17 +1166,7 @@ void TConsole::runTriggers( int line )
11581166
mCurrentLine = buffer.line( line );
11591167
mpHost->getLuaInterpreter()->set_lua_string( cmLuaLineVariable, mCurrentLine );
11601168
mCurrentLine.append('\n');
1161-
if( mLogToLogFile )
1162-
{
1163-
if( ! mIsDebugConsole )
1164-
{
1165-
if( ! mpHost->mRawStreamDump )
1166-
{
1167-
mCurrentLine.replace(QChar(255), '\n');
1168-
mLogStream << mCurrentLine;
1169-
}
1170-
}
1171-
}
1169+
11721170
if( mudlet::debugMode )
11731171
{
11741172
TDebug(QColor(Qt::darkGreen),QColor(Qt::black)) << "new line arrived:">>0; TDebug(QColor(Qt::lightGray),QColor(Qt::black)) << mCurrentLine<<"\n">>0;

0 commit comments

Comments
 (0)