Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/gui/gtk_gui/gui_keys.cc

    r5475 r5766  
    119119        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_LEFT, "LEFT"));
    120120        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_RIGHT, "RIGHT"));
    121         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_FIRE, "BUTTON_LEFT"));
     121        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_FIRE, "MOUSE_LEFT"));
    122122        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_NEXT_WEAPON, "m"));
    123123        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_PREV_WEAPON, "n"));
  • trunk/src/lib/gui/gtk_gui/gui_update.cc

    r5241 r5766  
    2929#include <stdio.h>
    3030#include <stdlib.h>
     31#include "globals.h"
    3132
    3233using namespace std;
Note: See TracChangeset for help on using the changeset viewer.