Commit f1a258f6 authored by Manuel Moos's avatar Manuel Moos
Browse files

Merge from legacy_0.2.8.3

parents f4aab7d1 0c4687db
Pipeline #408517422 passed with stages
in 12 minutes and 52 seconds
......@@ -1074,13 +1074,23 @@ void tConfItemLine::ReadVal(std::istream &s){
void tConfItemLine::WriteVal(std::ostream &s){
tConfItem<tString>::WriteVal(s);
// double trailing backslash so it is read back as a single backslash, not
// a continued line (HACK: this would actually be the job of the calling function)
if ( target->Len() >= 2 &&
target->operator()(target->Len() - 2) == '\\' )
s << "\\";
// slow, but correct: escape special characters on the fly
int len = target->Len();
for(int i = 0; i < len; ++i)
{
char c = (*target)[i];
switch(c)
{
case 0:
continue;
case '\\':
case '\'':
case '"':
case ' ':
s << '\\';
}
s << c;
}
}
tConfItemFunc::tConfItemFunc
......
......@@ -2812,7 +2812,10 @@ bool gCycle::Timestep(REAL currentTime){
{
sn_ConsoleOut( "0xff7777Admin : 0xffff77BUG had to kill a cycle because it lagged behind in the simulation. Probably the invulnerability bug. Investigate!\n" );
st_Breakpoint();
KillAt( pos );
if( Vulnerable() )
KillAt( pos );
else
Kill();
ret = false;
}
#endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment