Changeset 5121 in orxonox.OLD for trunk/src/util/resource_manager.cc
- Timestamp:
- Aug 25, 2005, 1:26:57 AM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/util/resource_manager.cc
r5115 r5121 319 319 else 320 320 tmpResource->ttfSize = FONT_DEFAULT_SIZE; 321 if (param2)322 {323 Vector* tmpVec = (Vector*)param2;324 tmpResource->ttfColorR = (int)tmpVec->x;325 tmpResource->ttfColorG = (int)tmpVec->y;326 tmpResource->ttfColorB = (int)tmpVec->z;327 }328 else329 {330 tmpResource->ttfColorR = FONT_DEFAULT_COLOR_R;331 tmpResource->ttfColorG = FONT_DEFAULT_COLOR_G;332 tmpResource->ttfColorB = FONT_DEFAULT_COLOR_B;333 }334 321 335 322 if(isFile(fullName)) 336 323 tmpResource->pointer = new Font(fullName, 337 tmpResource->ttfSize, 338 tmpResource->ttfColorR, 339 tmpResource->ttfColorG, 340 tmpResource->ttfColorB); 324 tmpResource->ttfSize); 341 325 else 342 326 PRINTF(2)("Sorry, %s does not exist. Not loading Font\n", fullName); … … 560 544 else if (enumRes->ttfSize == *(int*)param1) 561 545 subMatch = true; 562 if(subMatch)563 {564 Vector* tmpVec = (Vector*)param2;565 if (!param2)566 {567 if(enumRes->ttfColorR == FONT_DEFAULT_COLOR_R &&568 enumRes->ttfColorG == FONT_DEFAULT_COLOR_G &&569 enumRes->ttfColorB == FONT_DEFAULT_COLOR_B )570 match = true;571 }572 else if (enumRes->ttfColorR == (int)tmpVec->x &&573 enumRes->ttfColorG == (int)tmpVec->y &&574 enumRes->ttfColorB == (int)tmpVec->z )575 match = true;576 }577 546 break; 578 547 #endif /* NO_TEXT */
Note: See TracChangeset
for help on using the changeset viewer.