--- a/QTfrontend/gamecfgwidget.cpp Thu Aug 26 23:59:18 2010 +0200
+++ b/QTfrontend/gamecfgwidget.cpp Wed Oct 27 14:02:20 2010 +0200
@@ -101,46 +101,54 @@
quint32 result = 0;
if (schemeData(1).toBool())
- result |= 0x01;
+ result |= 0x00001000;
if (schemeData(2).toBool())
- result |= 0x10;
+ result |= 0x00000010;
if (schemeData(3).toBool())
- result |= 0x04;
+ result |= 0x00000004;
if (schemeData(4).toBool())
- result |= 0x08;
+ result |= 0x00000008;
if (schemeData(5).toBool())
- result |= 0x20;
+ result |= 0x00000020;
if (schemeData(6).toBool())
- result |= 0x40;
+ result |= 0x00000040;
if (schemeData(7).toBool())
- result |= 0x80;
+ result |= 0x00000080;
if (schemeData(8).toBool())
- result |= 0x100;
+ result |= 0x00000100;
if (schemeData(9).toBool())
- result |= 0x200;
+ result |= 0x00000200;
if (schemeData(10).toBool())
- result |= 0x400;
+ result |= 0x00000400;
if (schemeData(11).toBool())
- result |= 0x800;
+ result |= 0x00000800;
if (schemeData(12).toBool())
- result |= 0x2000;
+ result |= 0x00002000;
if (schemeData(13).toBool())
- result |= 0x4000;
+ result |= 0x00004000;
if (schemeData(14).toBool())
- result |= 0x8000;
+ result |= 0x00008000;
if (schemeData(15).toBool())
- result |= 0x10000;
+ result |= 0x00010000;
if (schemeData(16).toBool())
- result |= 0x20000;
+ result |= 0x00020000;
if (schemeData(17).toBool())
- result |= 0x80000;
+ result |= 0x00040000;
+ if (schemeData(18).toBool())
+ result |= 0x00080000;
+ if (schemeData(19).toBool())
+ result |= 0x00100000;
+ if (schemeData(20).toBool())
+ result |= 0x00200000;
+ if (schemeData(21).toBool())
+ result |= 0x00400000;
return result;
}
quint32 GameCFGWidget::getInitHealth() const
{
- return schemeData(20).toInt();
+ return schemeData(24).toInt();
}
QStringList GameCFGWidget::getFullConfig() const
@@ -148,14 +156,14 @@
QStringList sl;
sl.append("eseed " + pMapContainer->getCurrentSeed());
sl.append(QString("e$gmflags %1").arg(getGameFlags()));
- sl.append(QString("e$damagepct %1").arg(schemeData(18).toInt()));
- sl.append(QString("e$turntime %1").arg(schemeData(19).toInt() * 1000));
- sl.append(QString("e$minestime %1").arg(schemeData(23).toInt() * 1000));
- sl.append(QString("e$landadds %1").arg(schemeData(24).toInt()));
- sl.append(QString("e$sd_turns %1").arg(schemeData(21).toInt()));
- sl.append(QString("e$casefreq %1").arg(schemeData(22).toInt()));
- sl.append(QString("e$minedudpct %1").arg(schemeData(25).toInt()));
- sl.append(QString("e$explosives %1").arg(schemeData(26).toInt()));
+ sl.append(QString("e$damagepct %1").arg(schemeData(22).toInt()));
+ sl.append(QString("e$turntime %1").arg(schemeData(23).toInt() * 1000));
+ sl.append(QString("e$minestime %1").arg(schemeData(27).toInt() * 1000));
+ sl.append(QString("e$landadds %1").arg(schemeData(28).toInt()));
+ sl.append(QString("e$sd_turns %1").arg(schemeData(25).toInt()));
+ sl.append(QString("e$casefreq %1").arg(schemeData(26).toInt()));
+ sl.append(QString("e$minedudpct %1").arg(schemeData(29).toInt()));
+ sl.append(QString("e$explosives %1").arg(schemeData(30).toInt()));
sl.append(QString("e$template_filter %1").arg(pMapContainer->getTemplateFilter()));
sl.append(QString("e$mapgen %1").arg(pMapContainer->get_mapgen()));
sl.append(QString("e$maze_size %1").arg(pMapContainer->get_maze_size()));
@@ -165,8 +173,7 @@
{
sl.append("emap " + currentMap);
if(pMapContainer->getCurrentIsMission())
- sl.append(QString("escript %1/Maps/%2/map.lua")
- .arg(datadir->absolutePath())
+ sl.append(QString("escript Maps/%1/map.lua")
.arg(currentMap));
}
sl.append("etheme " + pMapContainer->getCurrentTheme());