[Gcblue-commits] gcb_wx/src/graphics tcGameView.cpp,1.11,1.12 tcHookInfo.cpp,1.11,1.12
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2005-06-25 22:10:47
|
Update of /cvsroot/gcblue/gcb_wx/src/graphics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21991/src/graphics Modified Files: tcGameView.cpp tcHookInfo.cpp Log Message: Fixed bug with crashing when too many range circles were displayed Index: tcHookInfo.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcHookInfo.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** tcHookInfo.cpp 1 Jun 2005 00:13:30 -0000 1.11 --- tcHookInfo.cpp 25 Jun 2005 22:10:35 -0000 1.12 *************** *** 386,402 **** /*** damage ***/ ! if (pHookedObj->mfDamageLevel == 0) { strcpy(zBuff,"Damage: none"); } ! else if (pHookedObj->mfDamageLevel >= 0.5f) { color.set(1.0f, 0.4f, 0.4f, 1.0f); ! sprintf(zBuff, "Damage: %2.0f%%", 100.0f*pHookedObj->mfDamageLevel); } else { color.set(1.0f, 1.0f, 0.4f, 1.0f); ! sprintf(zBuff, "Damage: %2.0f%%", 100.0f*pHookedObj->mfDamageLevel); } s = zBuff; --- 386,405 ---- /*** damage ***/ ! float damageLevelPercent = 100.0f * pHookedObj->mfDamageLevel; ! if (damageLevelPercent > 100.0f) damageLevelPercent = 100.0f; ! ! if (damageLevelPercent == 0) { strcpy(zBuff,"Damage: none"); } ! else if (damageLevelPercent >= 50.0f) { color.set(1.0f, 0.4f, 0.4f, 1.0f); ! sprintf(zBuff, "Damage: %2.0f%%", damageLevelPercent); } else { color.set(1.0f, 1.0f, 0.4f, 1.0f); ! sprintf(zBuff, "Damage: %2.0f%%", damageLevelPercent); } s = zBuff; Index: tcGameView.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcGameView.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** tcGameView.cpp 22 Jun 2005 01:22:08 -0000 1.11 --- tcGameView.cpp 25 Jun 2005 22:10:35 -0000 1.12 *************** *** 532,556 **** // display range indication graphics from user selection in mpObjectControl ! if (mpObjectControl != NULL) { ! tsOCSymbolList* pSymbolInfo; ! mpObjectControl->GetSymbols(pSymbolInfo); for(unsigned i=0; ! (i<pSymbolInfo->mnSymbols)&&(i<MAX_OCSYMBOLS)&&(nMapObj<MAXMAPOBJ); i++) { tcMapObj* pMO = &mpMapView->maMapObj[nMapObj++]; //*pMO = mpMapView->maMapObj[0]; pMO->mbFocus = false; pMO->mbExists = true; ! pMO->mfLat = pSymbolInfo->maSymbol[i].mfLat_rad; ! pMO->mfLon = pSymbolInfo->maSymbol[i].mfLon_rad; ! pMO->mfLatExtent = pSymbolInfo->maSymbol[i].mfLatExtent_rad; ! pMO->mfLonExtent = pSymbolInfo->maSymbol[i].mfLonExtent_rad; ! pMO->mfHeading = pSymbolInfo->maSymbol[i].mfArcCenter_deg; // fix this rad/deg double use ! pMO->mfArc_deg = pSymbolInfo->maSymbol[i].mfArcLength_deg; pMO->meSymbol = SYMBOL_PIE; pMO->mnFlags = 0; ! pMO->mnColor = pSymbolInfo->maSymbol[i].mnColor; pMO->mnID = NULL_INDEX; } --- 532,558 ---- // display range indication graphics from user selection in mpObjectControl ! if (mpObjectControl != 0) { ! const std::vector<MapSymbolInfo>& symbolList = mpObjectControl->GetMapSymbols(); ! size_t nMapSymbols = symbolList.size(); ! for(unsigned i=0; ! (i<nMapSymbols)&&(nMapObj<MAXMAPOBJ); i++) { + const MapSymbolInfo& symbol = symbolList[i]; tcMapObj* pMO = &mpMapView->maMapObj[nMapObj++]; //*pMO = mpMapView->maMapObj[0]; pMO->mbFocus = false; pMO->mbExists = true; ! pMO->mfLat = symbol.mfLat_rad; ! pMO->mfLon = symbol.mfLon_rad; ! pMO->mfLatExtent = symbol.mfLatExtent_rad; ! pMO->mfLonExtent = symbol.mfLonExtent_rad; ! pMO->mfHeading = symbol.mfArcCenter_deg; // fix this rad/deg double use ! pMO->mfArc_deg = symbol.mfArcLength_deg; pMO->meSymbol = SYMBOL_PIE; pMO->mnFlags = 0; ! pMO->mnColor = symbol.mnColor; pMO->mnID = NULL_INDEX; } |