Merge branch 'master' of http://sig.projectdivar.com/sigonasr2/Crawler
This commit is contained in:
commit
68c02adde6
@ -109,7 +109,7 @@ protected:
|
||||
}
|
||||
}
|
||||
}
|
||||
inline MenuComponent*PickUpDraggableItem()override sealed{
|
||||
inline MenuComponent*PickUpDraggableItem()override final{
|
||||
if(valid){
|
||||
MenuItemButton*pickUp=NEW MenuItemButton(parentMenu,rect,invRef,inventoryIndex,onClick);
|
||||
valid=false;
|
||||
@ -119,7 +119,7 @@ protected:
|
||||
}
|
||||
}
|
||||
|
||||
inline bool DropDraggableItem(MenuComponent*draggable)override sealed{
|
||||
inline bool DropDraggableItem(MenuComponent*draggable)override final{
|
||||
//HACK Warning! We're making a bold assumption that every component that is draggable is of the same type! This may change in the future....
|
||||
MenuItemButton*draggedItem=(MenuItemButton*)draggable;
|
||||
ITCategory cat=ITEM_DATA.at(draggedItem->invRef.at(draggedItem->inventoryIndex)).Category();
|
||||
|
@ -1 +1,3 @@
|
||||
wc -l $(find *.cpp *.h -not -name "olc*.h")
|
||||
TOTAL=$(wc -l $(find *.cpp *.h -not -name "olc*.h")|grep "total"|awk '{print $1}')
|
||||
FILECOUNT=$(find *.cpp *.h -not -name "olc*.h"|wc -l)
|
||||
echo "$[TOTAL-FILECOUNT*31] (License lines Excluded)"
|
||||
|
Loading…
x
Reference in New Issue
Block a user