QTfrontend/ui/widget/selectWeapon.cpp
changeset 15638 1ee7790caa0f
parent 15594 fdca2af677a9
child 15971 cee831693af1
equal deleted inserted replaced
15637:fd1a580a35d6 15638:1ee7790caa0f
   191 
   191 
   192     int j = -1;
   192     int j = -1;
   193     int i = 0, k = 0;
   193     int i = 0, k = 0;
   194     for(; i < m_numItems; ++i)
   194     for(; i < m_numItems; ++i)
   195     {
   195     {
   196         // Hide amSkip (6) and amCreeper (57)
   196         if (k % cAmmoMenuRows == 0)
   197         // TODO: Unhide amCreeper when this weapon is done
   197             ++j;
   198         if (i == 6 || i == 57) continue;
   198         unsigned int ammo = ammoMenuAmmos[i];
   199         if (k % 4 == 0) ++j;
   199         // Hide amSkip (7)
   200         SelWeaponItem * swi = new SelWeaponItem(true, i, readWeaponValue(currentState[i], 9), QImage(":/res/ammopic.png"), QImage(":/res/ammopicgrey.png"), this);
   200         if (ammo == 7)
   201         weaponItems[i].append(swi);
   201             continue;
   202         p1Layout->addWidget(swi, j, k % 4);
   202         // Hide unused amCreeper (58)
   203 
   203         else if (ammo == 58)
   204         SelWeaponItem * pwi = new SelWeaponItem(false, i, readWeaponValue(currentState[numItems + i], 8), QImage(":/res/ammopicbox.png"), QImage(":/res/ammopicboxgrey.png"), this);
   204         {
   205         weaponItems[i].append(pwi);
   205             ++k;
   206         p2Layout->addWidget(pwi, j, k % 4);
   206             continue;
   207 
   207         }
   208         SelWeaponItem * dwi = new SelWeaponItem(false, i, readWeaponValue(currentState[numItems*2 + i], 8), QImage(":/res/ammopicdelay.png"), QImage(":/res/ammopicdelaygrey.png"), this);
   208         int a = ammo-1; // ammo ID for SelWeaponItem
   209         weaponItems[i].append(dwi);
   209         SelWeaponItem * swi = new SelWeaponItem(true, a, readWeaponValue(currentState[a], 9), QImage(":/res/ammopic.png"), QImage(":/res/ammopicgrey.png"), this);
   210         p3Layout->addWidget(dwi, j, k % 4);
   210         weaponItems[a].append(swi);
   211 
   211         p1Layout->addWidget(swi, j, k % cAmmoMenuRows);
   212         SelWeaponItem * awi = new SelWeaponItem(false, i, readWeaponValue(currentState[numItems*3 + i], 8), QImage(":/res/ammopic.png"), QImage(":/res/ammopicgrey.png"), this);
   212 
   213         weaponItems[i].append(awi);
   213         SelWeaponItem * pwi = new SelWeaponItem(false, a, readWeaponValue(currentState[numItems + a], 8), QImage(":/res/ammopicbox.png"), QImage(":/res/ammopicboxgrey.png"), this);
   214         p4Layout->addWidget(awi, j, k % 4);
   214         weaponItems[a].append(pwi);
       
   215         p2Layout->addWidget(pwi, j, k % cAmmoMenuRows);
       
   216 
       
   217         SelWeaponItem * dwi = new SelWeaponItem(false, a, readWeaponValue(currentState[numItems*2 + a], 8), QImage(":/res/ammopicdelay.png"), QImage(":/res/ammopicdelaygrey.png"), this);
       
   218         weaponItems[a].append(dwi);
       
   219         p3Layout->addWidget(dwi, j, k % cAmmoMenuRows);
       
   220 
       
   221         SelWeaponItem * awi = new SelWeaponItem(false, a, readWeaponValue(currentState[numItems*3 + a], 8), QImage(":/res/ammopic.png"), QImage(":/res/ammopicgrey.png"), this);
       
   222         weaponItems[a].append(awi);
       
   223         p4Layout->addWidget(awi, j, k % cAmmoMenuRows);
   215 
   224 
   216         ++k;
   225         ++k;
   217     }
   226     }
   218 
   227 
   219     //pLayout->setRowStretch(5, 100);
   228     //pLayout->setRowStretch(5, 100);