diff OSWindow.cpp @ 2225:080fd5a5433d

Merge
author Grumpy7
date Wed, 19 Feb 2014 22:30:39 +0100
parents 17bc3a1eb037
children aff7a7b072b7
line wrap: on
line diff
--- a/OSWindow.cpp	Wed Feb 19 22:26:10 2014 +0100
+++ b/OSWindow.cpp	Wed Feb 19 22:30:39 2014 +0100
@@ -18,6 +18,7 @@
 #include "Bink_Smacker.h"
 #include "ErrorHandling.h"
 #include "Log.h"
+#include "LOD.h"
 
 
 bool OSWindow::OnMouseLeftClick(int x, int y)
@@ -255,8 +256,8 @@
       {
         pArcomageGame->GameOver = 1;
         pArcomageGame->field_F4 = 1;
-        pArcomageGame->uGameResult = 2;
-        pArcomageGame->field_B0 = -2;
+        pArcomageGame->uGameWinner = 2;
+        pArcomageGame->Victory_type = -2;
         return false;
       }
       if ( wparam != 114 )
@@ -473,13 +474,23 @@
   GetCursorPos(&cursor_pos);
 
   if (!strcmp(cursor_name, "MICON1") )
-    SetClassLongPtrW(api_handle, GCLP_HCURSOR, (LONG)LoadCursorW(GetModuleHandleW(nullptr), IDC_ARROW));
+    //SetClassLongPtrW(api_handle, GCLP_HCURSOR, (LONG)LoadCursorW(GetModuleHandleW(nullptr), IDC_ARROW));
+    SetClassLongPtrW(api_handle, GCLP_HCURSOR, (LONG)LoadCursorW(NULL, IDC_ARROW));
   else if (!strcmp(cursor_name, "MICON2") )
-    SetClassLongPtrW(api_handle, GCLP_HCURSOR, (LONG)LoadCursorW(GetModuleHandleW(nullptr), L"Target"));
+  {
+    //HCURSOR hCurs1; // дескриптор курсора 
+ 
+    // Создаем курсор в виде мишени. 
+ 
+    //pMouse->uCursorTextureID = pIcons_LOD->LoadTexture(cursor_name, TEXTURE_16BIT_PALETTE);//есть альфа маска
+    //hCurs1 = LoadCursor(NULL, L"Target");//неверно, наверно нужно загрузить/создать курсор
+    SetClassLongPtrW(api_handle, GCLP_HCURSOR, (LONG)LoadCursorW(NULL, IDC_CROSS));
+
+  }
   else if (!strcmp(cursor_name, "MICON3") )
-    SetClassLongPtrW(api_handle, GCLP_HCURSOR, (LONG)LoadCursorW(GetModuleHandleW(nullptr), IDC_WAIT));
+    SetClassLongPtrW(api_handle, GCLP_HCURSOR, (LONG)LoadCursorW(NULL, IDC_WAIT));
 
-  //ClientToScreen(api_handle, &cursor_pos);
+  //ClientToScreen(api_handle, &cursor_pos); //кидает курсор в другую часть экрана
   SetCursorPos(cursor_pos.x, cursor_pos.y);
 }