Mercurial > mm7
comparison Items.h @ 1202:0dbf6c4dd029
arrays to std::arrays phase 1
author | Grumpy7 |
---|---|
date | Sat, 08 Jun 2013 21:33:22 +0200 |
parents | 39eaa6b00141 |
children | 61010a655c94 |
comparison
equal
deleted
inserted
replaced
1196:44f37efc159c | 1202:0dbf6c4dd029 |
---|---|
1 #pragma once | 1 #pragma once |
2 #include <array> | |
2 | 3 |
3 enum DAMAGE_TYPE:unsigned int | 4 enum DAMAGE_TYPE:unsigned int |
4 { | 5 { |
5 DMGT_FIRE = 0, | 6 DMGT_FIRE = 0, |
6 DMGT_ELECTR = 1, | 7 DMGT_ELECTR = 1, |
327 | 328 |
328 void GenerateStandartShopItems(); | 329 void GenerateStandartShopItems(); |
329 void GenerateSpecialShopItems(); | 330 void GenerateSpecialShopItems(); |
330 void GenerateItemsInChest(); | 331 void GenerateItemsInChest(); |
331 | 332 |
332 extern const char uItemsAmountPerShopType[]; // weak | 333 extern std::array<const char, 5> uItemsAmountPerShopType; // weak |
333 extern ItemGen *ptr_50C9A4; | 334 extern ItemGen *ptr_50C9A4; |
334 | 335 |
335 extern struct ItemsTable *pItemsTable; | 336 extern struct ItemsTable *pItemsTable; |
336 | 337 |
337 /* | 338 /* |