diff Player.h @ 1002:3ee391de04d5

Слияние
author Ritor1
date Tue, 14 May 2013 19:05:08 +0600
parents c5d8ea1e6ccb
children e865f349aa41
line wrap: on
line diff
--- a/Player.h	Tue May 14 19:04:48 2013 +0600
+++ b/Player.h	Tue May 14 19:05:08 2013 +0600
@@ -138,10 +138,10 @@
 /*  339 */
 enum CHARACTER_RACE
 {
-  CHARACTER_RACE_HUMAN = 0x0,
-  CHARACTER_RACE_ELF = 0x1,
-  CHARACTER_RACE_GOBLIN = 0x2,
-  CHARACTER_RACE_DWARF = 0x3,
+  CHARACTER_RACE_HUMAN = 0,
+  CHARACTER_RACE_ELF = 1,
+  CHARACTER_RACE_GOBLIN = 2,
+  CHARACTER_RACE_DWARF = 3,
 };
 enum CHARACTER_ATTRIBUTE
 {