Changeset 5372 in orxonox.OLD for trunk/src/util
- Timestamp:
- Oct 13, 2005, 12:40:04 PM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/util/resource_manager.cc
r5366 r5372 31 31 #ifndef NO_TEXT 32 32 #include "font.h" 33 #include "text.h" //!< @todo this should not be included here. -> make FONT independant of SIZE...34 33 #endif /* NO_TEXT */ 35 34 #ifndef NO_AUDIO … … 365 364 tmpResource->ttfSize = *(unsigned int*)param1; 366 365 else 367 tmpResource->ttfSize = TEXT_DEFAULT_SIZE;366 tmpResource->ttfSize = FONT_DEFAULT_RENDER_SIZE; 368 367 369 368 if(isFile(fullName)) … … 621 620 if (param1 == NULL) 622 621 { 623 if (enumRes->ttfSize == TEXT_DEFAULT_SIZE)622 if (enumRes->ttfSize == FONT_DEFAULT_RENDER_SIZE) 624 623 match = true; 625 624 }
Note: See TracChangeset
for help on using the changeset viewer.