Mercurial > mm7

comparison Player.h @ 1002:3ee391de04d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 14 May 2013 19:05:08 +0600
parents c5d8ea1e6ccb
children e865f349aa41
comparison
equal deleted inserted replaced
1001:d5796c318653 1002:3ee391de04d5
136 136
137 137
138 /* 339 */ 138 /* 339 */
139 enum CHARACTER_RACE 139 enum CHARACTER_RACE
140 { 140 {
141 CHARACTER_RACE_HUMAN = 0x0, 141 CHARACTER_RACE_HUMAN = 0,
142 CHARACTER_RACE_ELF = 0x1, 142 CHARACTER_RACE_ELF = 1,
143 CHARACTER_RACE_GOBLIN = 0x2, 143 CHARACTER_RACE_GOBLIN = 2,
144 CHARACTER_RACE_DWARF = 0x3, 144 CHARACTER_RACE_DWARF = 3,
145 }; 145 };
146 enum CHARACTER_ATTRIBUTE 146 enum CHARACTER_ATTRIBUTE
147 { 147 {
148 CHARACTER_MIGHT = 0x0, 148 CHARACTER_MIGHT = 0x0,
149 CHARACTER_INTELLIGANCE = 0x1, 149 CHARACTER_INTELLIGANCE = 0x1,