Mercurial > mm7
comparison Player.cpp @ 1207:96a81634669e
arrays to std::arrays phase 3 - finishing global arrays
undone changes in render.h, because framerate dropped by half
author | Grumpy7 |
---|---|
date | Sun, 09 Jun 2013 01:30:36 +0200 |
parents | 8c02e6f74b29 |
children | 8192b25d356c |
comparison
equal
deleted
inserted
replaced
1206:ab6560001f5b | 1207:96a81634669e |
---|---|
107 unsigned char pAgeingSpeedMultiplier[4] = {100, 100, 40, 10}; | 107 unsigned char pAgeingSpeedMultiplier[4] = {100, 100, 40, 10}; |
108 unsigned char pAgeingLuckMultiplier[4] = {100, 100, 100, 100}; | 108 unsigned char pAgeingLuckMultiplier[4] = {100, 100, 100, 100}; |
109 | 109 |
110 signed int pAgeingTable[4] = {50, 100, 150, 0xFFFF}; | 110 signed int pAgeingTable[4] = {50, 100, 150, 0xFFFF}; |
111 | 111 |
112 unsigned int pConditionImportancyTable[18] = {16, 15, 14, 17, 13, 2, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 1, 0}; | 112 std::array<unsigned int, 18> pConditionImportancyTable = {{16, 15, 14, 17, 13, 2, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 1, 0}}; |
113 | 113 |
114 short param_to_bonus_table[29] = {500, 400, 350, 300, 275, 250, 225, 200, 175, | 114 short param_to_bonus_table[29] = {500, 400, 350, 300, 275, 250, 225, 200, 175, |
115 150, 125, 100, 75, 50, 40, 35, 30, 25, 21, | 115 150, 125, 100, 75, 50, 40, 35, 30, 25, 21, |
116 19, 17, 15, 13, 11, 9, 7, 5, 3, 0}; | 116 19, 17, 15, 13, 11, 9, 7, 5, 3, 0}; |
117 signed int parameter_to_bonus_value[29] = {30, 25, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, -1, -2, -3, -4, -5, -6}; | 117 signed int parameter_to_bonus_value[29] = {30, 25, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, -1, -2, -3, -4, -5, -6}; |