diff --git a/src/blupi.cxx b/src/blupi.cxx index 1fc2ab2..e3f279f 100644 --- a/src/blupi.cxx +++ b/src/blupi.cxx @@ -30,7 +30,6 @@ CDecor *g_pDecor = nullptr; bool g_bFullScreen = false; // false si mode de test Sint32 g_speedRate = 1; Sint32 g_timerInterval = 50; // inverval = 50ms -Sint32 g_mouseType = MOUSETYPEGRA; bool g_bTermInit = false; // initialisation en cours Uint32 g_lastPhase = 999; int g_rendererType = 0; @@ -104,16 +103,6 @@ static bool ReadConfig () g_bFullScreen = 1; } - pText = strstr (buffer, "MouseType="); - if (pText != nullptr) - { - g_mouseType = GetNum (pText + 10); - if (g_mouseType < 1) - g_mouseType = 1; - if (g_mouseType > 9) - g_mouseType = 9; - } - pText = strstr (buffer, "Renderer="); if (pText) { @@ -457,7 +446,7 @@ static bool DoInit (Sint32 argc, char *argv[]) totalDim.x = LXIMAGE; totalDim.y = LYIMAGE; - if (!g_pPixmap->Create (totalDim, g_mouseType)) + if (!g_pPixmap->Create (totalDim)) return InitFail ("Create pixmap", true); OutputDebug ("Image: init\n"); @@ -602,7 +591,6 @@ static bool DoInit (Sint32 argc, char *argv[]) g_pEvent->Create (g_pPixmap, g_pDecor, g_pSound, g_pMovie); g_pEvent->SetFullScreen (g_bFullScreen); - g_pEvent->SetMouseType (g_mouseType); g_pEvent->ChangePhase ( WM_PHASE_INTRO1 ); g_bTermInit = true; // initialisation termin�e diff --git a/src/event.cxx b/src/event.cxx index 4f7abc3..bc28758 100644 --- a/src/event.cxx +++ b/src/event.cxx @@ -1507,7 +1507,6 @@ CEvent::CEvent() m_bFullScreen = true; m_WindowScale = 1; - m_mouseType = MOUSETYPEGRA; m_exercice = 0; m_mission = 0; m_private = 0; @@ -1675,13 +1674,6 @@ Uint8 CEvent::GetWindowScale () return m_WindowScale; } -// Initialise le type de souris. - -void CEvent::SetMouseType (Sint32 mouseType) -{ - m_mouseType = mouseType; -} - // Crée le gestionnaire d'événements. void CEvent::Create (CPixmap *pPixmap, CDecor *pDecor, diff --git a/src/event.h b/src/event.h index bd0e017..0337ed8 100644 --- a/src/event.h +++ b/src/event.h @@ -72,7 +72,6 @@ public: void Create (CPixmap *pPixmap, CDecor *pDecor, CSound *pSound, CMovie *pMovie); void SetFullScreen (bool bFullScreen); - void SetMouseType (Sint32 mouseType); Sint32 GetWorld(); Sint32 GetPhysicalWorld(); Sint32 GetImageWorld(); @@ -174,7 +173,6 @@ protected: bool m_bAccessBuild; bool m_bFullScreen; Uint8 m_WindowScale; - Sint32 m_mouseType; CPixmap *m_pPixmap; CDecor *m_pDecor; CSound *m_pSound; diff --git a/src/pixmap.cxx b/src/pixmap.cxx index 758ad69..122bc09 100644 --- a/src/pixmap.cxx +++ b/src/pixmap.cxx @@ -28,7 +28,6 @@ CPixmap::CPixmap() { Sint32 i; - m_mouseType = MOUSETYPEGRA; m_bDebug = true; m_bPalette = true; @@ -66,9 +65,8 @@ CPixmap::~CPixmap() // Cr�e l'objet DirectDraw principal. // Retourne false en cas d'erreur. -bool CPixmap::Create (POINT dim, Sint32 mouseType) +bool CPixmap::Create (POINT dim) { - m_mouseType = mouseType; m_dim = dim; m_clipRect.left = 0; diff --git a/src/pixmap.h b/src/pixmap.h index 50ecd88..6f0739c 100644 --- a/src/pixmap.h +++ b/src/pixmap.h @@ -29,7 +29,7 @@ public: CPixmap(); ~CPixmap(); - bool Create (POINT dim, Sint32 mouseType); + bool Create (POINT dim); void Fill (RECT rect, COLORREF color); bool ReloadTargetTextures (); @@ -71,7 +71,6 @@ protected: SDL_Rect GetCursorRect (Sint32 sprite); protected: - Sint32 m_mouseType; bool m_bDebug; bool m_bPalette; POINT m_dim; // dimensions totales