comparison Texture.cpp @ 1463:b330df6a2183

Слияние
author Ritor1
date Sun, 11 Aug 2013 12:09:33 +0600
parents dfc9484ed94c
children 7ef4b64f6329
comparison
equal deleted inserted replaced
1462:f682c853200d 1463:b330df6a2183
28 28
29 29
30 30
31 std::array<Texture *, 2> pTexture_LloydBeacons; 31 std::array<Texture *, 2> pTexture_LloydBeacons;
32 Texture *pTexture_50635C; 32 Texture *pTexture_50635C;
33 Texture *pTexture_506368; 33 Texture *pTex_book_button8_off;
34 Texture *pTexture_50636C; 34 Texture *pTex_book_button8_on;
35 Texture *pTexture_506370; 35 Texture *pTex_book_button7_off;
36 Texture *pTexture_506374; 36 Texture *pTex_book_button7_on;
37 Texture *pTexture_506378; 37 Texture *pTex_book_button6_off;
38 Texture *pTexture_50637C; 38 Texture *pTex_book_button6_on;
39 Texture *pTexture_506380; 39 Texture *pTex_book_button5_off;
40 Texture *pTexture_506384; 40 Texture *pTex_book_button5_on;
41 Texture *pTexture_506388; 41 Texture *pTex_book_button4_off;
42 Texture *pTexture_50638C; 42 Texture *pTex_book_button4_on;
43 Texture *pTexture_506390; 43 Texture *pTex_book_button3_off;
44 Texture *pTexture_506394; 44 Texture *pTex_book_button3_on;
45 Texture *pTex_tab_an_7a__zoot_off; 45 Texture *pTex_book_button2_off;
46 Texture *pTex_tab_an_6a__zoom_off; 46 Texture *pTex_book_button1_off;
47 Texture *pTex_tab_an_7b__zoot_on; 47 Texture *pTex_book_button2_on;
48 Texture *pTex_tab_an_6b__zoom_on; 48 Texture *pTex_book_button1_on;
49 std::array<Texture *, 6> pTexture_TownPortalIcons; // [0]Harmonale, [1]Pierpont, [2]Nighon, [3]Evenmorn Island, [4]Celestia, [5]The Pit 49 std::array<Texture *, 6> pTexture_TownPortalIcons; // [0]Harmonale, [1]Pierpont, [2]Nighon, [3]Evenmorn Island, [4]Celestia, [5]The Pit
50 std::array<Texture *, 12> SBPageCSpellsTextureList; 50 std::array<Texture *, 12> SBPageCSpellsTextureList;
51 std::array<Texture *, 12> SBPageSSpellsTextureList; 51 std::array<Texture *, 12> SBPageSSpellsTextureList;
52 Texture *pSBQuickSpellBtnTextr; 52 Texture *pSBQuickSpellBtnTextr;
53 Texture *pSpellBookClickCloseBtnTextr; 53 Texture *pSpellBookClickCloseBtnTextr;