equal
deleted
inserted
replaced
65 AMMOLINE_PORTALS_QT AMMOLINE_PORTALS_PROB |
65 AMMOLINE_PORTALS_QT AMMOLINE_PORTALS_PROB |
66 AMMOLINE_PORTALS_DELAY AMMOLINE_PORTALS_CRATE )) |
66 AMMOLINE_PORTALS_DELAY AMMOLINE_PORTALS_CRATE )) |
67 << qMakePair(QString("One of Everything"), QString( |
67 << qMakePair(QString("One of Everything"), QString( |
68 AMMOLINE_ONEEVERY_QT AMMOLINE_ONEEVERY_PROB |
68 AMMOLINE_ONEEVERY_QT AMMOLINE_ONEEVERY_PROB |
69 AMMOLINE_ONEEVERY_DELAY AMMOLINE_ONEEVERY_CRATE )) |
69 AMMOLINE_ONEEVERY_DELAY AMMOLINE_ONEEVERY_CRATE )) |
|
70 << qMakePair(QString("Highlander"), QString( |
|
71 AMMOLINE_HIGHLANDER_QT AMMOLINE_HIGHLANDER_PROB |
|
72 AMMOLINE_HIGHLANDER_DELAY AMMOLINE_HIGHLANDER_CRATE )) |
70 ; |
73 ; |
71 |
74 |
72 unsigned int colors[] = HW_TEAMCOLOR_ARRAY; |
75 unsigned int colors[] = HW_TEAMCOLOR_ARRAY; |
73 |
76 |
74 QString * netHost = new QString(); |
77 QString * netHost = new QString(); |