Remove couple unused variables, mark some per-file vars static
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12816 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
parent
75e1c8bc69
commit
c5bb98d1e4
@ -318,7 +318,7 @@ void EventHandler::processGUIAction(const PlayerAction action,
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
EventHandler* event_handler_singleton = NULL;
|
||||
static EventHandler* event_handler_singleton = NULL;
|
||||
|
||||
EventHandler* EventHandler::get()
|
||||
{
|
||||
|
@ -38,8 +38,6 @@
|
||||
#include <IMesh.h>
|
||||
#include <IAnimatedMesh.h>
|
||||
|
||||
ItemManager* item_manager;
|
||||
|
||||
std::vector<scene::IMesh *> ItemManager::m_item_mesh;
|
||||
std::vector<scene::IMesh *> ItemManager::m_item_lowres_mesh;
|
||||
ItemManager * ItemManager::m_item_manager = NULL;
|
||||
|
@ -50,8 +50,6 @@
|
||||
#include <IGUIImage.h>
|
||||
#include <IGUIButton.h>
|
||||
|
||||
InputDevice* player_1_device = NULL;
|
||||
|
||||
using namespace GUIEngine;
|
||||
using irr::core::stringw;
|
||||
|
||||
@ -71,7 +69,7 @@ class PlayerKartWidget;
|
||||
turn moves the selection to the appropriate spinner. "tabbing roots" are
|
||||
used to make navigation back down possible. (FIXME: maybe find a cleaner
|
||||
way?) */
|
||||
int g_root_id;
|
||||
static int g_root_id;
|
||||
|
||||
class FocusDispatcher : public Widget
|
||||
{
|
||||
@ -134,7 +132,7 @@ public:
|
||||
virtual EventPropagation focused(const int playerID);
|
||||
}; // FocusDispatcher
|
||||
|
||||
FocusDispatcher* g_dispatcher = NULL;
|
||||
static FocusDispatcher* g_dispatcher = NULL;
|
||||
|
||||
// ============================================================================
|
||||
|
||||
|
@ -34,7 +34,7 @@
|
||||
|
||||
using namespace GUIEngine;
|
||||
|
||||
StateManager* state_manager_singleton = NULL;
|
||||
static StateManager* state_manager_singleton = NULL;
|
||||
|
||||
StateManager* StateManager::get()
|
||||
{
|
||||
|
@ -59,7 +59,7 @@ const bool REMOVE_BOM = false;
|
||||
/** The list of available languages; this is global so that it is cached (and remains
|
||||
even if the translations object is deleted and re-created) */
|
||||
typedef std::vector<std::string> LanguageList;
|
||||
LanguageList g_language_list;
|
||||
static LanguageList g_language_list;
|
||||
|
||||
// Note : this method is not static because 'g_language_list' is initialized
|
||||
// the first time Translations is constructed (despite being a global)
|
||||
|
Loading…
x
Reference in New Issue
Block a user