Changeset 6578 in orxonox.OLD

Timestamp:

Jan 18, 2006, 3:55:23 PM (18 years ago)

Author:

bensch

Message:

trunk: segfault prevention

Location:

trunk/src

Files:

• lib/event/event_handler.cc (modified) (1 diff)
• world_entities/playable.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/world_entities/playable.cc

@@ -54 +54 @@
   this->weaponMan->addWeapon(weapon, configID, slotID);
 
-  if (this->currentPlayer != NULL)
+  this->weaponConfigChanged();
+}
+
+void Playable::removeWeapon(Weapon* weapon)
+{
+  this->weaponMan->removeWeapon(weapon);
+
     this->weaponConfigChanged();
 }
 
-void Playable::removeWeapon(Weapon* weapon)
-{
-  this->weaponMan->removeWeapon(weapon);
-
-  if (this->currentPlayer != NULL)
+void Playable::nextWeaponConfig()
+{
+  this->weaponMan->nextWeaponConfig();
     this->weaponConfigChanged();
 }
 
-void Playable::nextWeaponConfig()
-{
-  this->weaponMan->nextWeaponConfig();
-  if (this->currentPlayer != NULL)
+void Playable::previousWeaponConfig()
+{
+  this->weaponMan->previousWeaponConfig();
     this->weaponConfigChanged();
 }
 
-void Playable::previousWeaponConfig()
-{
-  this->weaponMan->previousWeaponConfig();
-  if (this->currentPlayer != NULL)
-    this->weaponConfigChanged();
-}
-
 void Playable::weaponConfigChanged()
 {
-  this->currentPlayer->weaponConfigChanged();
+  if (this->currentPlayer != NULL)
+    this->currentPlayer->weaponConfigChanged();
 }