# HG changeset patch # User nemo # Date 1314816421 14400 # Node ID 6d513913b7a9cff905a3acb94914c9d7a897f034 # Parent 9505a6f3fe054f3bcf24609dac10ee81aca8fd09 Add option for a bottom border. Needs testing. diff -r 9505a6f3fe05 -r 6d513913b7a9 QTfrontend/ammoSchemeModel.cpp --- a/QTfrontend/ammoSchemeModel.cpp Wed Aug 31 11:08:03 2011 -0400 +++ b/QTfrontend/ammoSchemeModel.cpp Wed Aug 31 14:47:01 2011 -0400 @@ -48,21 +48,22 @@ << QVariant(false) // no wind 22 << QVariant(false) // more wind 23 << QVariant(false) // tag team 24 - << QVariant(100) // damage modfier 25 - << QVariant(45) // turn time 26 - << QVariant(100) // init health 27 - << QVariant(15) // sudden death 28 - << QVariant(5) // case prob 29 - << QVariant(3) // mines time 30 - << QVariant(4) // mines number 31 - << QVariant(0) // mine dud pct 32 - << QVariant(2) // explosives 33 - << QVariant(35) // health case pct 34 - << QVariant(25) // health case amt 35 - << QVariant(47) // water rise amt 36 - << QVariant(5) // health dec amt 37 - << QVariant(100) // rope modfier 38 - << QVariant(100) // get away time 39 + << QVariant(false) // bottom border 25 + << QVariant(100) // damage modfier 26 + << QVariant(45) // turn time 27 + << QVariant(100) // init health 28 + << QVariant(15) // sudden death 29 + << QVariant(5) // case prob 30 + << QVariant(3) // mines time 31 + << QVariant(4) // mines number 32 + << QVariant(0) // mine dud pct 33 + << QVariant(2) // explosives 34 + << QVariant(35) // health case pct 35 + << QVariant(25) // health case amt 36 + << QVariant(47) // water rise amt 37 + << QVariant(5) // health dec amt 38 + << QVariant(100) // rope modfier 39 + << QVariant(100) // get away time 40 ; AmmoSchemeModel::AmmoSchemeModel(QObject* parent, const QString & fileName) : @@ -111,21 +112,22 @@ << "disablewind" // 22 << "morewind" // 23 << "tagteam" // 24 - << "damagefactor" // 25 - << "turntime" // 26 - << "health" // 27 - << "suddendeath" // 28 - << "caseprobability" // 29 - << "minestime" // 30 - << "minesnum" // 31 - << "minedudpct" // 32 - << "explosives" // 33 - << "healthprobability" // 34 - << "healthcaseamount" // 35 - << "waterrise" // 36 - << "healthdecrease" // 37 - << "ropepct" // 38 - << "getawaytime" // 39 + << "bottomborder" // 25 + << "damagefactor" // 26 + << "turntime" // 27 + << "health" // 28 + << "suddendeath" // 29 + << "caseprobability" // 30 + << "minestime" // 31 + << "minesnum" // 32 + << "minedudpct" // 33 + << "explosives" // 34 + << "healthprobability" // 35 + << "healthcaseamount" // 36 + << "waterrise" // 37 + << "healthdecrease" // 38 + << "ropepct" // 39 + << "getawaytime" // 40 ; QList proMode; @@ -155,21 +157,22 @@ << QVariant(false) // no wind 22 << QVariant(false) // more wind 23 << QVariant(false) // tag team 24 - << QVariant(100) // damage modfier 25 - << QVariant(15) // turn time 26 - << QVariant(100) // init health 27 - << QVariant(15) // sudden death 28 - << QVariant(0) // case prob 29 - << QVariant(3) // mines time 30 - << QVariant(0) // mines number 31 - << QVariant(0) // mine dud pct 32 - << QVariant(2) // explosives 33 - << QVariant(35) // health case pct 34 - << QVariant(25) // health case amt 35 - << QVariant(47) // water rise amt 36 - << QVariant(5) // health dec amt 37 - << QVariant(100) // rope modfier 38 - << QVariant(100) // get away time 39 + << QVariant(false) // bottom border 25 + << QVariant(100) // damage modfier 26 + << QVariant(15) // turn time 27 + << QVariant(100) // init health 28 + << QVariant(15) // sudden death 29 + << QVariant(0) // case prob 30 + << QVariant(3) // mines time 31 + << QVariant(0) // mines number 32 + << QVariant(0) // mine dud pct 33 + << QVariant(2) // explosives 34 + << QVariant(35) // health case pct 35 + << QVariant(25) // health case amt 36 + << QVariant(47) // water rise amt 37 + << QVariant(5) // health dec amt 38 + << QVariant(100) // rope modfier 39 + << QVariant(100) // get away time 40 ; QList shoppa; @@ -199,21 +202,22 @@ << QVariant(false) // no wind 22 << QVariant(false) // more wind 23 << QVariant(false) // tag team 24 - << QVariant(100) // damage modfier 25 - << QVariant(30) // turn time 26 - << QVariant(100) // init health 27 - << QVariant(50) // sudden death 28 - << QVariant(1) // case prob 29 - << QVariant(3) // mines time 30 - << QVariant(0) // mines number 31 - << QVariant(0) // mine dud pct 32 - << QVariant(0) // explosives 33 - << QVariant(0) // health case pct 34 - << QVariant(25) // health case amt 35 - << QVariant(47) // water rise amt 36 - << QVariant(5) // health dec amt 37 - << QVariant(100) // rope modfier 38 - << QVariant(100) // get away time 39 + << QVariant(false) // bottom border 25 + << QVariant(100) // damage modfier 26 + << QVariant(30) // turn time 27 + << QVariant(100) // init health 28 + << QVariant(50) // sudden death 29 + << QVariant(1) // case prob 30 + << QVariant(3) // mines time 31 + << QVariant(0) // mines number 32 + << QVariant(0) // mine dud pct 33 + << QVariant(0) // explosives 34 + << QVariant(0) // health case pct 35 + << QVariant(25) // health case amt 36 + << QVariant(47) // water rise amt 37 + << QVariant(5) // health dec amt 38 + << QVariant(100) // rope modfier 39 + << QVariant(100) // get away time 40 ; QList cleanslate; @@ -243,21 +247,22 @@ << QVariant(false) // no wind 22 << QVariant(false) // more wind 23 << QVariant(false) // tag team 24 - << QVariant(100) // damage modfier 25 - << QVariant(45) // turn time 26 - << QVariant(100) // init health 27 - << QVariant(15) // sudden death 28 - << QVariant(5) // case prob 29 - << QVariant(3) // mines time 30 - << QVariant(4) // mines number 31 - << QVariant(0) // mine dud pct 32 - << QVariant(2) // explosives 33 - << QVariant(35) // health case pct 34 - << QVariant(25) // health case amt 35 - << QVariant(47) // water rise amt 36 - << QVariant(5) // health dec amt 37 - << QVariant(100) // rope modfier 38 - << QVariant(100) // get away time 39 + << QVariant(false) // bottom border 25 + << QVariant(100) // damage modfier 26 + << QVariant(45) // turn time 27 + << QVariant(100) // init health 28 + << QVariant(15) // sudden death 29 + << QVariant(5) // case prob 30 + << QVariant(3) // mines time 31 + << QVariant(4) // mines number 32 + << QVariant(0) // mine dud pct 33 + << QVariant(2) // explosives 34 + << QVariant(35) // health case pct 35 + << QVariant(25) // health case amt 36 + << QVariant(47) // water rise amt 37 + << QVariant(5) // health dec amt 38 + << QVariant(100) // rope modfier 39 + << QVariant(100) // get away time 40 ; QList minefield; @@ -287,21 +292,22 @@ << QVariant(false) // no wind 22 << QVariant(false) // more wind 23 << QVariant(false) // tag team 24 - << QVariant(100) // damage modfier 25 - << QVariant(30) // turn time 26 - << QVariant(50) // init health 27 - << QVariant(15) // sudden death 28 - << QVariant(0) // case prob 29 - << QVariant(0) // mines time 30 - << QVariant(80) // mines number 31 - << QVariant(0) // mine dud pct 32 - << QVariant(0) // explosives 33 - << QVariant(35) // health case pct 34 - << QVariant(25) // health case amt 35 - << QVariant(47) // water rise amt 36 - << QVariant(5) // health dec amt 37 - << QVariant(100) // rope modfier 38 - << QVariant(100) // get away time 39 + << QVariant(false) // bottom border 25 + << QVariant(100) // damage modfier 26 + << QVariant(30) // turn time 27 + << QVariant(50) // init health 28 + << QVariant(15) // sudden death 29 + << QVariant(0) // case prob 30 + << QVariant(0) // mines time 31 + << QVariant(80) // mines number 32 + << QVariant(0) // mine dud pct 33 + << QVariant(0) // explosives 34 + << QVariant(35) // health case pct 35 + << QVariant(25) // health case amt 36 + << QVariant(47) // water rise amt 37 + << QVariant(5) // health dec amt 38 + << QVariant(100) // rope modfier 39 + << QVariant(100) // get away time 40 ; QList barrelmayhem; @@ -331,21 +337,22 @@ << QVariant(false) // no wind 22 << QVariant(false) // more wind 23 << QVariant(false) // tag team 24 - << QVariant(100) // damage modfier 25 - << QVariant(30) // turn time 26 - << QVariant(100) // init health 27 - << QVariant(15) // sudden death 28 - << QVariant(0) // case prob 29 - << QVariant(0) // mines time 30 - << QVariant(0) // mines number 31 - << QVariant(0) // mine dud pct 32 - << QVariant(80) // explosives 33 - << QVariant(35) // health case pct 34 - << QVariant(25) // health case amt 35 - << QVariant(47) // water rise amt 36 - << QVariant(5) // health dec amt 37 - << QVariant(100) // rope modfier 38 - << QVariant(100) // get away time 39 + << QVariant(false) // bottom border 25 + << QVariant(100) // damage modfier 26 + << QVariant(30) // turn time 27 + << QVariant(100) // init health 28 + << QVariant(15) // sudden death 29 + << QVariant(0) // case prob 30 + << QVariant(0) // mines time 31 + << QVariant(0) // mines number 32 + << QVariant(0) // mine dud pct 33 + << QVariant(80) // explosives 34 + << QVariant(35) // health case pct 35 + << QVariant(25) // health case amt 36 + << QVariant(47) // water rise amt 37 + << QVariant(5) // health dec amt 38 + << QVariant(100) // rope modfier 39 + << QVariant(100) // get away time 40 ; QList tunnelhogs; @@ -375,21 +382,22 @@ << QVariant(false) // no wind 22 << QVariant(false) // more wind 23 << QVariant(false) // tag team 24 - << QVariant(100) // damage modfier 25 - << QVariant(30) // turn time 26 - << QVariant(100) // init health 27 - << QVariant(15) // sudden death 28 - << QVariant(5) // case prob 29 - << QVariant(3) // mines time 30 - << QVariant(10) // mines number 31 - << QVariant(10) // mine dud pct 32 - << QVariant(10) // explosives 33 - << QVariant(35) // health case pct 34 - << QVariant(25) // health case amt 35 - << QVariant(47) // water rise amt 36 - << QVariant(5) // health dec amt 37 - << QVariant(100) // rope modfier 38 - << QVariant(100) // get away time 39 + << QVariant(false) // bottom border 25 + << QVariant(100) // damage modfier 26 + << QVariant(30) // turn time 27 + << QVariant(100) // init health 28 + << QVariant(15) // sudden death 29 + << QVariant(5) // case prob 30 + << QVariant(3) // mines time 31 + << QVariant(10) // mines number 32 + << QVariant(10) // mine dud pct 33 + << QVariant(10) // explosives 34 + << QVariant(35) // health case pct 35 + << QVariant(25) // health case amt 36 + << QVariant(47) // water rise amt 37 + << QVariant(5) // health dec amt 38 + << QVariant(100) // rope modfier 39 + << QVariant(100) // get away time 40 ; QList forts; @@ -419,21 +427,22 @@ << QVariant(false) // no wind 22 << QVariant(false) // more wind 23 << QVariant(false) // tag team 24 - << QVariant(100) // damage modfier 25 - << QVariant(45) // turn time 26 - << QVariant(100) // init health 27 - << QVariant(15) // sudden death 28 - << QVariant(5) // case prob 29 - << QVariant(3) // mines time 30 - << QVariant(0) // mines number 31 - << QVariant(0) // mine dud pct 32 - << QVariant(0) // explosives 33 - << QVariant(35) // health case pct 34 - << QVariant(25) // health case amt 35 - << QVariant(47) // water rise amt 36 - << QVariant(5) // health dec amt 37 - << QVariant(100) // rope modfier 38 - << QVariant(100) // get away time 39 + << QVariant(false) // bottom border 25 + << QVariant(100) // damage modfier 26 + << QVariant(45) // turn time 27 + << QVariant(100) // init health 28 + << QVariant(15) // sudden death 29 + << QVariant(5) // case prob 30 + << QVariant(3) // mines time 31 + << QVariant(0) // mines number 32 + << QVariant(0) // mine dud pct 33 + << QVariant(0) // explosives 34 + << QVariant(35) // health case pct 35 + << QVariant(25) // health case amt 36 + << QVariant(47) // water rise amt 37 + << QVariant(5) // health dec amt 38 + << QVariant(100) // rope modfier 39 + << QVariant(100) // get away time 40 ; QList timeless; @@ -463,21 +472,22 @@ << QVariant(false) // no wind 22 << QVariant(false) // more wind 23 << QVariant(false) // tag team 24 - << QVariant(100) // damage modfier 25 - << QVariant(9999) // turn time 26 - << QVariant(100) // init health 27 - << QVariant(15) // sudden death 28 - << QVariant(5) // case prob 29 - << QVariant(3) // mines time 30 - << QVariant(5) // mines number 31 - << QVariant(10) // mine dud pct 32 - << QVariant(2) // explosives 33 - << QVariant(35) // health case pct 34 - << QVariant(30) // health case amt 35 - << QVariant(0) // water rise amt 36 - << QVariant(0) // health dec amt 37 - << QVariant(100) // rope modfier 38 - << QVariant(100) // get away time 39 + << QVariant(false) // bottom border 25 + << QVariant(100) // damage modfier 26 + << QVariant(9999) // turn time 27 + << QVariant(100) // init health 28 + << QVariant(15) // sudden death 29 + << QVariant(5) // case prob 30 + << QVariant(3) // mines time 31 + << QVariant(5) // mines number 32 + << QVariant(10) // mine dud pct 33 + << QVariant(2) // explosives 34 + << QVariant(35) // health case pct 35 + << QVariant(30) // health case amt 36 + << QVariant(0) // water rise amt 37 + << QVariant(0) // health dec amt 38 + << QVariant(100) // rope modfier 39 + << QVariant(100) // get away time 40 ; QList thinkingportals; @@ -507,21 +517,22 @@ << QVariant(false) // no wind 22 << QVariant(false) // more wind 23 << QVariant(false) // tag team 24 - << QVariant(100) // damage modfier 25 - << QVariant(45) // turn time 26 - << QVariant(100) // init health 27 - << QVariant(15) // sudden death 28 - << QVariant(2) // case prob 29 - << QVariant(3) // mines time 30 - << QVariant(5) // mines number 31 - << QVariant(0) // mine dud pct 32 - << QVariant(5) // explosives 33 - << QVariant(25) // health case pct 34 - << QVariant(25) // health case amt 35 - << QVariant(47) // water rise amt 36 - << QVariant(5) // health dec amt 37 - << QVariant(100) // rope modfier 38 - << QVariant(100) // get away time 39 + << QVariant(false) // bottom border 25 + << QVariant(100) // damage modfier 26 + << QVariant(45) // turn time 27 + << QVariant(100) // init health 28 + << QVariant(15) // sudden death 29 + << QVariant(2) // case prob 30 + << QVariant(3) // mines time 31 + << QVariant(5) // mines number 32 + << QVariant(0) // mine dud pct 33 + << QVariant(5) // explosives 34 + << QVariant(25) // health case pct 35 + << QVariant(25) // health case amt 36 + << QVariant(47) // water rise amt 37 + << QVariant(5) // health dec amt 38 + << QVariant(100) // rope modfier 39 + << QVariant(100) // get away time 40 ; QList kingmode; @@ -551,21 +562,22 @@ << QVariant(false) // no wind 22 << QVariant(false) // more wind 23 << QVariant(false) // tag team 24 - << QVariant(100) // damage modfier 25 - << QVariant(45) // turn time 26 - << QVariant(100) // init health 27 - << QVariant(15) // sudden death 28 - << QVariant(5) // case prob 29 - << QVariant(3) // mines time 30 - << QVariant(4) // mines number 31 - << QVariant(0) // mine dud pct 32 - << QVariant(2) // explosives 33 - << QVariant(35) // health case pct 34 - << QVariant(25) // health case amt 35 - << QVariant(47) // water rise amt 36 - << QVariant(5) // health dec amt 37 - << QVariant(100) // rope modfier 38 - << QVariant(100) // get away time 39 + << QVariant(false) // bottom border 25 + << QVariant(100) // damage modfier 26 + << QVariant(45) // turn time 27 + << QVariant(100) // init health 28 + << QVariant(15) // sudden death 29 + << QVariant(5) // case prob 30 + << QVariant(3) // mines time 31 + << QVariant(4) // mines number 32 + << QVariant(0) // mine dud pct 33 + << QVariant(2) // explosives 34 + << QVariant(35) // health case pct 35 + << QVariant(25) // health case amt 36 + << QVariant(47) // water rise amt 37 + << QVariant(5) // health dec amt 38 + << QVariant(100) // rope modfier 39 + << QVariant(100) // get away time 40 ; @@ -771,4 +783,4 @@ netScheme[i] = QVariant(cfg[i]); reset(); -} +} diff -r 9505a6f3fe05 -r 6d513913b7a9 QTfrontend/gamecfgwidget.cpp --- a/QTfrontend/gamecfgwidget.cpp Wed Aug 31 11:08:03 2011 -0400 +++ b/QTfrontend/gamecfgwidget.cpp Wed Aug 31 14:47:01 2011 -0400 @@ -215,13 +215,15 @@ result |= 0x01000000; // more wind if (schemeData(24).toBool()) result |= 0x02000000; // tag team + if (schemeData(25).toBool()) + result |= 0x04000000; // bottom border return result; } quint32 GameCFGWidget::getInitHealth() const { - return schemeData(27).toInt(); + return schemeData(28).toInt(); } QByteArray GameCFGWidget::getFullConfig() const @@ -245,20 +247,20 @@ bcfg << QString("eseed " + pMapContainer->getCurrentSeed()).toUtf8(); bcfg << QString("e$gmflags %1").arg(getGameFlags()).toUtf8(); - bcfg << QString("e$damagepct %1").arg(schemeData(25).toInt()).toUtf8(); - bcfg << QString("e$turntime %1").arg(schemeData(26).toInt() * 1000).toUtf8(); - bcfg << QString("e$sd_turns %1").arg(schemeData(28).toInt()).toUtf8(); - bcfg << QString("e$casefreq %1").arg(schemeData(29).toInt()).toUtf8(); - bcfg << QString("e$minestime %1").arg(schemeData(30).toInt() * 1000).toUtf8(); - bcfg << QString("e$minesnum %1").arg(schemeData(31).toInt()).toUtf8(); - bcfg << QString("e$minedudpct %1").arg(schemeData(32).toInt()).toUtf8(); - bcfg << QString("e$explosives %1").arg(schemeData(33).toInt()).toUtf8(); - bcfg << QString("e$healthprob %1").arg(schemeData(34).toInt()).toUtf8(); - bcfg << QString("e$hcaseamount %1").arg(schemeData(35).toInt()).toUtf8(); - bcfg << QString("e$waterrise %1").arg(schemeData(36).toInt()).toUtf8(); - bcfg << QString("e$healthdec %1").arg(schemeData(37).toInt()).toUtf8(); - bcfg << QString("e$ropepct %1").arg(schemeData(38).toInt()).toUtf8(); - bcfg << QString("e$getawaytime %1").arg(schemeData(39).toInt()).toUtf8(); + bcfg << QString("e$damagepct %1").arg(schemeData(26).toInt()).toUtf8(); + bcfg << QString("e$turntime %1").arg(schemeData(27).toInt() * 1000).toUtf8(); + bcfg << QString("e$sd_turns %1").arg(schemeData(29).toInt()).toUtf8(); + bcfg << QString("e$casefreq %1").arg(schemeData(30).toInt()).toUtf8(); + bcfg << QString("e$minestime %1").arg(schemeData(31).toInt() * 1000).toUtf8(); + bcfg << QString("e$minesnum %1").arg(schemeData(32).toInt()).toUtf8(); + bcfg << QString("e$minedudpct %1").arg(schemeData(33).toInt()).toUtf8(); + bcfg << QString("e$explosives %1").arg(schemeData(34).toInt()).toUtf8(); + bcfg << QString("e$healthprob %1").arg(schemeData(35).toInt()).toUtf8(); + bcfg << QString("e$hcaseamount %1").arg(schemeData(36).toInt()).toUtf8(); + bcfg << QString("e$waterrise %1").arg(schemeData(37).toInt()).toUtf8(); + bcfg << QString("e$healthdec %1").arg(schemeData(38).toInt()).toUtf8(); + bcfg << QString("e$ropepct %1").arg(schemeData(39).toInt()).toUtf8(); + bcfg << QString("e$getawaytime %1").arg(schemeData(40).toInt()).toUtf8(); bcfg << QString("e$template_filter %1").arg(pMapContainer->getTemplateFilter()).toUtf8(); bcfg << QString("e$mapgen %1").arg(mapgen).toUtf8(); diff -r 9505a6f3fe05 -r 6d513913b7a9 QTfrontend/pagescheme.cpp --- a/QTfrontend/pagescheme.cpp Wed Aug 31 11:08:03 2011 -0400 +++ b/QTfrontend/pagescheme.cpp Wed Aug 31 14:47:01 2011 -0400 @@ -78,7 +78,7 @@ glGMLayout->addWidget(TBW_solid,0,2,1,1); TBW_border = new ToggleButtonWidget(gbGameModes, ":/res/btnBorder.png"); - TBW_border->setToolTip("" + ToggleButtonWidget::tr("Add Border") + ":
" + tr("Add an indestructable border around the terrain")); + TBW_border->setToolTip("" + ToggleButtonWidget::tr("Add Border") + ":
" + tr("Add an indestructible border around the terrain")); glGMLayout->addWidget(TBW_border,0,3,1,1); TBW_lowGravity = new ToggleButtonWidget(gbGameModes, ":/res/btnLowGravity.png"); @@ -161,6 +161,11 @@ TBW_tagteam->setToolTip("" + ToggleButtonWidget::tr("Tag Team") + ":
" + tr("Teams in each clan take successive turns sharing their turn time.")); glGMLayout->addWidget(TBW_tagteam,4,3,1,1); + TBW_bottomborder = new ToggleButtonWidget(gbGameModes, ":/res/btnBorder.png"); + TBW_bottomborder->setToolTip("" + ToggleButtonWidget::tr("Add Bottom Border") + ":
" + tr("Add an indestructible border along the bottom")); + glGMLayout->addWidget(TBW_bottomborder,4,4,1,1); + + // Right QLabel * l; @@ -430,21 +435,22 @@ mapper->addMapping(TBW_nowind, 22); mapper->addMapping(TBW_morewind, 23); mapper->addMapping(TBW_tagteam, 24); - mapper->addMapping(SB_DamageModifier, 25); - mapper->addMapping(SB_TurnTime, 26); - mapper->addMapping(SB_InitHealth, 27); - mapper->addMapping(SB_SuddenDeath, 28); - mapper->addMapping(SB_CaseProb, 29); - mapper->addMapping(SB_MinesTime, 30); - mapper->addMapping(SB_Mines, 31); - mapper->addMapping(SB_MineDuds, 32); - mapper->addMapping(SB_Explosives, 33); - mapper->addMapping(SB_HealthCrates, 34); - mapper->addMapping(SB_CrateHealth, 35); - mapper->addMapping(SB_WaterRise, 36); - mapper->addMapping(SB_HealthDecrease, 37); - mapper->addMapping(SB_RopeModifier, 38); - mapper->addMapping(SB_GetAwayTime, 39); + mapper->addMapping(TBW_bottomborder, 25); + mapper->addMapping(SB_DamageModifier, 26); + mapper->addMapping(SB_TurnTime, 27); + mapper->addMapping(SB_InitHealth, 28); + mapper->addMapping(SB_SuddenDeath, 29); + mapper->addMapping(SB_CaseProb, 30); + mapper->addMapping(SB_MinesTime, 31); + mapper->addMapping(SB_Mines, 32); + mapper->addMapping(SB_MineDuds, 33); + mapper->addMapping(SB_Explosives, 34); + mapper->addMapping(SB_HealthCrates, 35); + mapper->addMapping(SB_CrateHealth, 36); + mapper->addMapping(SB_WaterRise, 37); + mapper->addMapping(SB_HealthDecrease, 38); + mapper->addMapping(SB_RopeModifier, 39); + mapper->addMapping(SB_GetAwayTime, 40); mapper->toFirst(); } diff -r 9505a6f3fe05 -r 6d513913b7a9 QTfrontend/pagescheme.h --- a/QTfrontend/pagescheme.h Wed Aug 31 11:08:03 2011 -0400 +++ b/QTfrontend/pagescheme.h Wed Aug 31 14:47:01 2011 -0400 @@ -71,6 +71,7 @@ ToggleButtonWidget * TBW_nowind; ToggleButtonWidget * TBW_morewind; ToggleButtonWidget * TBW_tagteam; + ToggleButtonWidget * TBW_bottomborder; QSpinBox * SB_DamageModifier; QSpinBox * SB_TurnTime; diff -r 9505a6f3fe05 -r 6d513913b7a9 hedgewars/uConsts.pas --- a/hedgewars/uConsts.pas Wed Aug 31 11:08:03 2011 -0400 +++ b/hedgewars/uConsts.pas Wed Aug 31 14:47:01 2011 -0400 @@ -196,6 +196,7 @@ gfDisableWind = $00800000; gfMoreWind = $01000000; gfTagTeam = $02000000; + gfBottomBorder = $04000000; // NOTE: When adding new game flags, ask yourself // if a "game start notice" would be useful. If so, // add one in uWorld.pas - look for "AddGoal". diff -r 9505a6f3fe05 -r 6d513913b7a9 hedgewars/uLand.pas --- a/hedgewars/uLand.pas Wed Aug 31 11:08:03 2011 -0400 +++ b/hedgewars/uLand.pas Wed Aug 31 14:47:01 2011 -0400 @@ -30,6 +30,7 @@ procedure initModule; procedure freeModule; +procedure DrawBottomBorder; procedure GenMap; function GenPreview: TPreview; @@ -1222,6 +1223,25 @@ LoadMask(mapname); end; +procedure DrawBottomBorder; // broken out from other borders for doing a floor-only map, or possibly updating bottom during SD +var x, y, w, c: Longword; +begin +for w:= 0 to 5 do // width of 3 allowed hogs to be knocked through with grenade + for x:= leftX to rightX do + begin + Land[cWaterLine-1 - w, x]:= lfIndestructible; + if (x + w) mod 32 < 16 then + c:= AMask + else + c:= AMask or RMask or GMask; // FF00FFFF + + if (cReducedQuality and rqBlurryLand) = 0 then + LandPixels[cWaterLine-1 - w, x]:= c + else + LandPixels[(cWaterLine-1 - w) div 2, x div 2]:= c + end; +end; + procedure GenMap; var x, y, w, c: Longword; begin @@ -1272,7 +1292,7 @@ for w:= 0 to 5 do // width of 3 allowed hogs to be knocked through with grenade begin for y:= topY to LAND_HEIGHT - 1 do - begin + begin Land[y, leftX + w]:= lfIndestructible; Land[y, rightX - w]:= lfIndestructible; if (y + w) mod 32 < 16 then @@ -1281,33 +1301,35 @@ c:= AMask or RMask or GMask; // FF00FFFF if (cReducedQuality and rqBlurryLand) = 0 then - begin + begin LandPixels[y, leftX + w]:= c; LandPixels[y, rightX - w]:= c; - end + end else - begin + begin LandPixels[y div 2, (leftX + w) div 2]:= c; LandPixels[y div 2, (rightX - w) div 2]:= c; + end; end; - end; for x:= leftX to rightX do begin - Land[topY + w, x]:= lfIndestructible; - if (x + w) mod 32 < 16 then - c:= AMask - else - c:= AMask or RMask or GMask; // FF00FFFF + Land[topY + w, x]:= lfIndestructible; + if (x + w) mod 32 < 16 then + c:= AMask + else + c:= AMask or RMask or GMask; // FF00FFFF - if (cReducedQuality and rqBlurryLand) = 0 then - LandPixels[topY + w, x]:= c - else - LandPixels[(topY + w) div 2, x div 2]:= c; + if (cReducedQuality and rqBlurryLand) = 0 then + LandPixels[topY + w, x]:= c + else + LandPixels[(topY + w) div 2, x div 2]:= c; end; end; end; +if (GameFlags and gfBottomBorder) <> 0 then DrawBottomBorder; + if (GameFlags and gfDisableGirders) <> 0 then hasGirders:= false; if ((GameFlags and gfForts) = 0) diff -r 9505a6f3fe05 -r 6d513913b7a9 share/hedgewars/Data/Graphics/TARDIS.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Graphics/TARDIS.svg Wed Aug 31 14:47:01 2011 -0400 @@ -0,0 +1,2170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ADVICE & ASSISTANCEOBTAINABLE IMMEDIATELY + POLICE TELEPHONE + FOR THE USE OF + FREE + PUBLIC + PULL TO OPEN + OFFICER & CARSRESPOND TO ALL CALLS + + + + + POLICE + BOX + PUBLICCALL + + + POLICE + BOX + PUBLICCALL + + + + + + + ADVICE & ASSISTANCEOBTAINABLE IMMEDIATELY + POLICE TELEPHONE + FOR THE USE OF + FREE + PUBLIC + PULL TO OPEN + OFFICER & CARSRESPOND TO ALL CALLS + + + +