# HG changeset patch # User Henek # Date 1289594232 -3600 # Node ID 945f2d10426813b50d59def2e73f1fce3965111b # Parent 37c2d0d3a039dd5f51df7ad01891085fa5bfcbbd fixed breakage of game schemes diff -r 37c2d0d3a039 -r 945f2d104268 QTfrontend/gamecfgwidget.cpp --- a/QTfrontend/gamecfgwidget.cpp Fri Nov 12 21:55:55 2010 +0300 +++ b/QTfrontend/gamecfgwidget.cpp Fri Nov 12 21:37:12 2010 +0100 @@ -157,7 +157,7 @@ quint32 GameCFGWidget::getInitHealth() const { - return schemeData(24).toInt(); + return schemeData(25).toInt(); } QStringList GameCFGWidget::getFullConfig() const @@ -165,18 +165,18 @@ QStringList sl; sl.append("eseed " + pMapContainer->getCurrentSeed()); sl.append(QString("e$gmflags %1").arg(getGameFlags())); - 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())); - sl.append(QString("e$minesnum %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$healthprob %1").arg(schemeData(31).toInt())); - sl.append(QString("e$hcaseamount %1").arg(schemeData(32).toInt())); - sl.append(QString("e$waterrise %1").arg(schemeData(33).toInt())); - sl.append(QString("e$healthdec %1").arg(schemeData(34).toInt())); + sl.append(QString("e$damagepct %1").arg(schemeData(23).toInt())); + sl.append(QString("e$turntime %1").arg(schemeData(24).toInt() * 1000)); + sl.append(QString("e$sd_turns %1").arg(schemeData(26).toInt())); + sl.append(QString("e$casefreq %1").arg(schemeData(27).toInt())); + sl.append(QString("e$minestime %1").arg(schemeData(28).toInt())); + sl.append(QString("e$minesnum %1").arg(schemeData(29).toInt())); + sl.append(QString("e$minedudpct %1").arg(schemeData(30).toInt())); + sl.append(QString("e$explosives %1").arg(schemeData(31).toInt())); + sl.append(QString("e$healthprob %1").arg(schemeData(32).toInt())); + sl.append(QString("e$hcaseamount %1").arg(schemeData(33).toInt())); + sl.append(QString("e$waterrise %1").arg(schemeData(34).toInt())); + sl.append(QString("e$healthdec %1").arg(schemeData(35).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())); diff -r 37c2d0d3a039 -r 945f2d104268 QTfrontend/pages.cpp --- a/QTfrontend/pages.cpp Fri Nov 12 21:55:55 2010 +0300 +++ b/QTfrontend/pages.cpp Fri Nov 12 21:37:12 2010 +0100 @@ -1800,19 +1800,20 @@ mapper->addMapping(TBW_infattack, 19); mapper->addMapping(TBW_resetweps, 20); mapper->addMapping(TBW_perhogammo, 21); - mapper->addMapping(SB_DamageModifier, 22); - mapper->addMapping(SB_TurnTime, 23); - mapper->addMapping(SB_InitHealth, 24); - mapper->addMapping(SB_SuddenDeath, 25); - mapper->addMapping(SB_CaseProb, 26); - mapper->addMapping(SB_MinesTime, 27); - mapper->addMapping(SB_Mines, 28); - mapper->addMapping(SB_MineDuds, 29); - mapper->addMapping(SB_Explosives, 30); - mapper->addMapping(SB_HealthCrates, 31); - mapper->addMapping(SB_CrateHealth, 32); - mapper->addMapping(SB_WaterRise, 33); - mapper->addMapping(SB_HealthDecrease, 34); + mapper->addMapping(TBW_nowind, 22); + mapper->addMapping(SB_DamageModifier, 23); + mapper->addMapping(SB_TurnTime, 24); + mapper->addMapping(SB_InitHealth, 25); + mapper->addMapping(SB_SuddenDeath, 26); + mapper->addMapping(SB_CaseProb, 27); + mapper->addMapping(SB_MinesTime, 28); + mapper->addMapping(SB_Mines, 29); + mapper->addMapping(SB_MineDuds, 30); + mapper->addMapping(SB_Explosives, 31); + mapper->addMapping(SB_HealthCrates, 32); + mapper->addMapping(SB_CrateHealth, 33); + mapper->addMapping(SB_WaterRise, 34); + mapper->addMapping(SB_HealthDecrease, 35); mapper->toFirst(); }