Mercurial > mm7

comparison Vis.cpp @ 227:bcd55744c2f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clicking background in MainMenu fix
author Nomad
date Sun, 17 Feb 2013 15:09:31 +0200
parents 8646cad02950
children 640a176c030f
comparison
equal deleted inserted replaced
226:c2f2d2644304 227:bcd55744c2f4
4 #include "Outdoor.h" 4 #include "Outdoor.h"
5 #include "Game.h" 5 #include "Game.h"
6 #include "Actor.h" 6 #include "Actor.h"
7 #include "IndoorCamera.h" 7 #include "IndoorCamera.h"
8 #include "Viewport.h" 8 #include "Viewport.h"
9 #include "Log.h"
9 10
10 #include "mm7_data.h" 11 #include "mm7_data.h"
11 //#include "MM7.h" 12 //#include "MM7.h"
12 13
13 14
1480 default_list.uNumPointers = 0; 1481 default_list.uNumPointers = 0;
1481 CastPickRay(pMouseRay, fMouseX, fMouseY, fDepth); 1482 CastPickRay(pMouseRay, fMouseX, fMouseY, fDepth);
1482 PickBillboards_Mouse(fDepth, fMouseX, fMouseY, &default_list, sprite_filter); 1483 PickBillboards_Mouse(fDepth, fMouseX, fMouseY, &default_list, sprite_filter);
1483 if (uCurrentlyLoadedLevelType == LEVEL_Indoor) 1484 if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
1484 PickIndoorFaces_Mouse(fDepth, pMouseRay, &default_list, face_filter); 1485 PickIndoorFaces_Mouse(fDepth, pMouseRay, &default_list, face_filter);
1486 else if (uCurrentlyLoadedLevelType == LEVEL_Outdoor)
1487 PickOutdoorFaces_Mouse(fDepth, pMouseRay, &default_list, face_filter, false);
1485 else 1488 else
1486 PickOutdoorFaces_Mouse(fDepth, pMouseRay, &default_list, face_filter, false); 1489 {
1490 Log::Warning(L"Picking mouse in undefined level"); // picking in main menu is default (buggy) game behavious. should've returned false in Game::PickMouse
1491 return false;
1492 }
1487 default_list.create_object_pointers(Vis_SelectionList::All); 1493 default_list.create_object_pointers(Vis_SelectionList::All);
1488 sort_object_pointers(default_list.object_pointers, 0, default_list.uNumPointers - 1); 1494 sort_object_pointers(default_list.object_pointers, 0, default_list.uNumPointers - 1);
1489 1495
1490 return true; 1496 return true;
1491 } 1497 }