Changeset 5766 in orxonox.OLD for trunk/src/lib

Timestamp:

Nov 24, 2005, 6:03:24 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the GuidedMissiles to the trunk, without the changed aiming_turret

Location:

trunk/src/lib/gui/gtk_gui

Files:

• gui_keys.cc (modified) (1 diff)
• gui_update.cc (modified) (1 diff)

trunk/src/lib/gui/gtk_gui/gui_keys.cc

@@ -119 +119 @@
         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_LEFT, "LEFT"));
         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_RIGHT, "RIGHT"));
-        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_FIRE, "BUTTON_LEFT"));
+        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_FIRE, "MOUSE_LEFT"));
         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_NEXT_WEAPON, "m"));
         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_PREV_WEAPON, "n"));

trunk/src/lib/gui/gtk_gui/gui_update.cc

@@ -29 +29 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include "globals.h"
 
 using namespace std;