From: <au...@us...> - 2010-04-08 01:32:06
|
Revision: 5127 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=5127&view=rev Author: auria Date: 2010-04-08 01:32:00 +0000 (Thu, 08 Apr 2010) Log Message: ----------- Removed large bits of old unused code that was jsut confusing Modified Paths: -------------- main/trunk/src/config/device_config.cpp main/trunk/src/input/input.hpp Modified: main/trunk/src/config/device_config.cpp =================================================================== --- main/trunk/src/config/device_config.cpp 2010-04-08 01:25:28 UTC (rev 5126) +++ main/trunk/src/config/device_config.cpp 2010-04-08 01:32:00 UTC (rev 5127) @@ -228,7 +228,6 @@ setBinding(PA_DRIFT, Input::IT_STICKBUTTON, 2); setBinding(PA_RESCUE, Input::IT_STICKBUTTON, 3); setBinding(PA_LOOK_BACK, Input::IT_STICKBUTTON, 4); - //TODO - mappings for clear/enter/leave GA_CLEAR_MAPPING, GA_ENTER, GA_LEAVE? } //------------------------------------------------------------------------------ Modified: main/trunk/src/input/input.hpp =================================================================== --- main/trunk/src/input/input.hpp 2010-04-08 01:25:28 UTC (rev 5126) +++ main/trunk/src/input/input.hpp 2010-04-08 01:32:00 UTC (rev 5127) @@ -120,70 +120,4 @@ std::string("fire"), std::string("lookBack")}; -enum StaticAction -{ - // Below this are synthetic game actions which are never triggered through - // an input device. - GA_NULL, // Nothing dummy entry. - GA_SENSE_CANCEL, // Input sensing canceled. - GA_SENSE_COMPLETE, // Input sensing successfully finished. - - // Below this point are the game actions which can happen while in menu - // mode. - - GA_ENTER, // Enter menu, acknowledge, ... - GA_LEAVE, // Leave a menu. - - GA_CLEAR_MAPPING, // Clear an input mapping. - - GA_INC_SCROLL_SPEED, - GA_INC_SCROLL_SPEED_FAST, - GA_DEC_SCROLL_SPEED, - GA_DEC_SCROLL_SPEED_FAST, - - GA_CURSOR_UP, - GA_CURSOR_DOWN, - GA_CURSOR_LEFT, - GA_CURSOR_RIGHT, - - - GA_TOGGLE_FULLSCREEN, // Switch between windowed/fullscreen mode - GA_LEAVE_RACE, // Switch from race to menu. - - GA_DEBUG_ADD_MISSILE, - GA_DEBUG_ADD_BOWLING, - GA_DEBUG_ADD_HOMING, - GA_DEBUG_TOGGLE_FPS, - GA_DEBUG_TOGGLE_WIREFRAME, - GA_DEBUG_HISTORY - -}; - - - -/* Some constants to make future changes more easier to handle. If you use - * any of the GameAction constants to mark the beginning or end of a range - * or denote a count then something is wrong with your code. ;) - */ - -/** Generally the first GameAction constant. Unlikely to change. */ -const int GA_FIRST = GA_NULL; - -/** A usefull value for array allocations. Should always be to the - * last constant + 1. - */ -const int GA_COUNT = (GA_DEBUG_HISTORY + 1); - -/* The range of GameAction constants that is used while in menu mode. */ -const int GA_FIRST_MENU = GA_ENTER; -const int GA_LAST_MENU = GA_CURSOR_RIGHT; - - -/* The range of GameAction constants which are used ingame but are considered - * fixed and their Inputs should not be used by the players. - */ -const int GA_FIRST_INGAME_FIXED = GA_TOGGLE_FULLSCREEN; -const int GA_LAST_INGAME_FIXED = GA_DEBUG_HISTORY; - - #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |