diff -r 5eae5da831e1 -r 7440fe992e73 QTfrontend/hwconsts.cpp.in --- a/QTfrontend/hwconsts.cpp.in Mon May 02 18:40:15 2011 +0400 +++ b/QTfrontend/hwconsts.cpp.in Tue May 03 23:16:47 2011 +0200 @@ -34,57 +34,35 @@ bool custom_config = false; bool custom_data = false; -int cMaxTeams = 6; +int cMaxTeams = 8; int cMinServerVersion = 0; -QString * cDefaultAmmoStore = new QString( - "939192942219912103223511100120100000021111010101111991" - "040504054160065554655446477657666666615551010111541111" - "000000000000020550000004000700400000000022000000060000" - "131111031211111112311411111111111111121111110111111111" - ); +QString * cDefaultAmmoStore = new QString( AMMOLINE_DEFAULT_QT AMMOLINE_DEFAULT_PROB + AMMOLINE_DEFAULT_DELAY AMMOLINE_DEFAULT_CRATE ); int cAmmoNumber = cDefaultAmmoStore->size() / 4; QList< QPair > cDefaultAmmos = QList< QPair >() << qMakePair(QString("Default"), *cDefaultAmmoStore) - << qMakePair(QString("Crazy"), QString( - // TODO: Remove Piano's unlimited uses! - "999999999999999999299999999999999929999999990999999229" - "111111011111111111111111111111111111111111110111111111" - "000000000000000000000000000000000000000000000000000000" - "131111031211111112311411111111111111121111010111111111" - )) - << qMakePair(QString("Pro Mode"), QString( - "909000900000000000000900000000000000000000000000000000" - "000000000000000000000000000000000000000000000000000000" - "000000000000020550000004000700400000000020000000000000" - "111111111111111111111111111111111111111110010111111111" - )) - << qMakePair(QString("Shoppa"), QString( - "000000990000000000000000000000000000000000000000000000" - "444441004424440221011212122242200000000200040001001111" - "000000000000000000000000000000000000000000000000000000" - "111111111111111111111111111111111111111110110111111111" - )) - << qMakePair(QString("Clean Slate"),QString( - "101000900001000001100000000000000000000000000000100000" - "040504054160065554655446477657666666615551010111541111" - "000000000000000000000000000000000000000000000000000000" - "131111031211111112311411111111111111121111110111111111" - )) - << qMakePair(QString("Minefield"), QString( - "000000990009000000030000000000000000000000000000000000" - "000000000000000000000000000000000000000000000000000000" - "000000000000020550000004000700400000000020000000060000" - "111111111111111111111111111111111111111111110111111111" - )) + << qMakePair(QString("Crazy"), QString( + AMMOLINE_CRAZY_QT AMMOLINE_CRAZY_PROB + AMMOLINE_CRAZY_DELAY AMMOLINE_CRAZY_CRATE )) + << qMakePair(QString("Pro Mode"), QString( + AMMOLINE_PROMODE_QT AMMOLINE_PROMODE_PROB + AMMOLINE_PROMODE_DELAY AMMOLINE_PROMODE_CRATE )) + << qMakePair(QString("Shoppa"), QString( + AMMOLINE_SHOPPA_QT AMMOLINE_SHOPPA_PROB + AMMOLINE_SHOPPA_DELAY AMMOLINE_SHOPPA_CRATE )) + << qMakePair(QString("Clean Slate"), QString( + AMMOLINE_CLEAN_QT AMMOLINE_CLEAN_PROB + AMMOLINE_CLEAN_DELAY AMMOLINE_CLEAN_CRATE )) + << qMakePair(QString("Minefield"), QString( + AMMOLINE_MINES_QT AMMOLINE_MINES_PROB + AMMOLINE_MINES_DELAY AMMOLINE_MINES_CRATE )) << qMakePair(QString("Thinking with Portals"), QString( - "900000900200000000210000000000000011000009000000000000" - "040504054160065554655446477657666666615551010111541111" - "000000000000020550000004000700400000000020000000060000" - "131111031211111112311411111111111111121111110111111111" - )); + AMMOLINE_PORTALS_QT AMMOLINE_PORTALS_PROB + AMMOLINE_PORTALS_DELAY AMMOLINE_PORTALS_CRATE )) + ; QColor *colors[] = { new QColor(221, 0, 0), // classic red