diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-06 10:38:07 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-06 10:38:07 +0100 |
| commit | 7cbdab589491e007adacd7597c769cdb9308a32c (patch) | |
| tree | 0269c37cccbed49a1cb15db9de816f39ef549189 /src/gui/widgets/tab.cpp | |
| parent | 616afb27c23def5661b3466d6fc86fd1c65c0082 (diff) | |
| parent | aa4229cbb9f2b264ca96c3beedc66b1c79ccc1f5 (diff) | |
| download | mana-7cbdab589491e007adacd7597c769cdb9308a32c.tar.gz mana-7cbdab589491e007adacd7597c769cdb9308a32c.tar.bz2 mana-7cbdab589491e007adacd7597c769cdb9308a32c.tar.xz mana-7cbdab589491e007adacd7597c769cdb9308a32c.zip | |
Merge branch 'aethyra/master'
Conflicts:
src/being.cpp
src/being.h
src/floor_item.cpp
src/floor_item.h
src/flooritemmanager.cpp
src/gui/inventorywindow.cpp
src/gui/inventorywindow.h
src/gui/itemcontainer.cpp
src/gui/popupmenu.cpp
src/net/beinghandler.cpp
src/npc.cpp
Diffstat (limited to 'src/gui/widgets/tab.cpp')
| -rw-r--r-- | src/gui/widgets/tab.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp index 21402c89..3a79dd91 100644 --- a/src/gui/widgets/tab.cpp +++ b/src/gui/widgets/tab.cpp @@ -35,7 +35,7 @@ int Tab::mInstances = 0; float Tab::mAlpha = config.getValue("guialpha", 0.8); -enum{ +enum { TAB_STANDARD, // 0 TAB_HIGHLIGHTED, // 1 TAB_SELECTED, // 2 @@ -94,8 +94,10 @@ void Tab::init() { tab[mode] = resman->getImage(data[mode].file); a = 0; - for (y = 0; y < 3; y++) { - for (x = 0; x < 3; x++) { + for (y = 0; y < 3; y++) + { + for (x = 0; x < 3; x++) + { tabImg[mode].grid[a] = tab[mode]->getSubImage( data[x].gridX, data[y].gridY, data[x + 1].gridX - data[x].gridX + 1, |