Changeset 3238 in orxonox.OLD for orxonox/branches/nico/src/keynames.cc

Timestamp:

Dec 20, 2004, 2:42:54 AM (21 years ago)

Author:

bensch

Message:

orxonox/branches: updated branches: buerli, nico, sound. And moved bezierTrack to old.bezierTrack. Conflicts resolved in a usefull order.
Conflics mostly resolved in favor of trunk
merge.

File:

• orxonox/branches/nico/src/keynames.cc (modified) (4 diffs)

orxonox/branches/nico/src/keynames.cc

@@ -20 +20 @@
 using namespace std;
 
-int buttonname_to_SDLB( char* name)
+int buttonnameToSDLB( char* name)
 {
         if( !strcmp (name, "BUTTON_LEFT")) return SDL_BUTTON_LEFT;
@@ -30 +30 @@
 }
 
-char* SDLB_to_buttonname( int button)
+char* SDLBToButtonname( int button)
 {
         if( button == SDL_BUTTON_LEFT) return "BUTTON_LEFT";
@@ -40 +40 @@
 }
 
-int keyname_to_SDLK( char* name)
+int keynameToSDLK( char* name)
 {
         if( !strcmp (name, "BACKSPACE")) return SDLK_BACKSPACE;
@@ -178 +178 @@
 }
 
-char* SDLK_to_keyname( int key)
+char* SDLKToKeyname( int key)
 {
         if( key == SDLK_BACKSPACE) return "BACKSPACE";