Changeset 5307 in orxonox.OLD for trunk

Timestamp:

Oct 7, 2005, 6:47:24 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ResourceManager removed obsolete subMatch. This was a Bug

File:

• trunk/src/util/resource_manager.cc (modified) (8 diffs)

trunk/src/util/resource_manager.cc

@@ -251 +251 @@
     {
       PRINTF(4)("not loading cached resource %s\n", tmpResource->name);
-      printf("adding %s count: %d\n", tmpResource->pointer->getName(),  tmpResource->count);
+//      printf("adding %s count: %d\n", tmpResource->pointer->getName(),  tmpResource->count);
       tmpResource->count++;
       if(tmpResource->prio < prio)
@@ -258 +258 @@
   else
     {
-      char* tmpDir;
       // Setting up the new Resource
       tmpResource = new Resource;
@@ -321 +320 @@
 #ifndef NO_TEXT
         case TTF:
-            if (param1)
+            if (param1 != NULL)
               tmpResource->ttfSize = *(unsigned int*)param1;
             else
@@ -351 +350 @@
           else
             {
+              char* tmpDir;
               tIterator<char>* iterator = imageDirs->getIterator();
               tmpDir = iterator->firstElement();
@@ -421 +421 @@
   if (resource == NULL)
     return false;
-  printf("removing %s count: %d\n", resource->pointer->getName(),  resource->count);
+//  printf("removing %s count: %d\n", resource->pointer->getName(),  resource->count);
   if (resource->count > 0)
     resource->count--;
@@ -521 +521 @@
         {
           bool match = false;
-          bool subMatch = false;
 
           switch (type)
@@ -542 +541 @@
                     match = true;
                 }
-              else if (enumRes->skinFileName!= NULL && !strcmp(enumRes->skinFileName, (const char*) param1))
+              else if (!strcmp(enumRes->skinFileName, (const char*)param1))
                 match = true;
               break;
@@ -548 +547 @@
 #ifndef NO_TEXT
             case TTF:
-              if (!param1)
+              if (param1 == NULL)
                 {
                   if (enumRes->ttfSize == FONT_DEFAULT_SIZE)
-                    subMatch = true;
+                    match = true;
                 }
               else if (enumRes->ttfSize == *(unsigned int*)param1)
-                subMatch = true;
+                match = true;
               break;
 #endif /* NO_TEXT */