Merge master, fix conflicts

This commit is contained in:
KimLS
2015-02-21 15:30:15 -08:00
22 changed files with 421 additions and 216 deletions
+1 -1
View File
@@ -1918,7 +1918,7 @@ namespace SoD
if (emu->CharCount == 0) {
ALLOC_VAR_ENCODE(structs::CharacterSelect_Struct, sizeof(structs::CharacterSelect_Struct));
eq->CharCount = emu->CharCount;
eq->TotalChars = eq->TotalChars;
eq->TotalChars = emu->TotalChars;
if (eq->TotalChars > consts::CHARACTER_CREATION_LIMIT)
eq->TotalChars = consts::CHARACTER_CREATION_LIMIT;