Changeset 6664 in orxonox.OLD for trunk/src

Timestamp:

Jan 24, 2006, 11:23:53 AM (19 years ago)

Author:

bensch

Message:

trunk: small fix in resource/ammos

Location:

trunk/src

Files:

• lib/event/event_handler.cc (modified) (1 diff)
• util/loading/resource_manager.cc (modified) (1 diff)
• world_entities/weapons/ammo_container.cc (modified) (1 diff)

trunk/src/lib/event/event_handler.cc

@@ -262 +262 @@
     SDL_WM_GrabInput(SDL_GRAB_OFF);
   else
-    ;//SDL_WM_GrabInput(SDL_GRAB_ON);
+    SDL_WM_GrabInput(SDL_GRAB_ON);
 }
 

trunk/src/util/loading/resource_manager.cc

@@ -668 +668 @@
         else
         {
-          PRINTF(2)("unable to unload %s because there are still %d references to it\n",
-                    this->resourceList[index]->name, this->resourceList[index]->count);
+          if (round == 3)
+            PRINTF(2)("unable to unload %s because there are still %d references to it\n",
+                      this->resourceList[index]->name, this->resourceList[index]->count);
           removeCount++;
         }

trunk/src/world_entities/weapons/ammo_container.cc

@@ -84 +84 @@
 {
   assert (weapon != NULL);
+  assert (this->weaponValid(weapon));
 
   float fillEnergy = weapon->getEnergyMax();