pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	changelog.txt
This commit is contained in:
Paul Coene
2015-02-23 19:11:35 -05:00
parent 221c1f17c7 d601a70546
commit 180c4c3286
8 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/eq_packet_structs.h
+3 -2
View File
@@ -158,6 +158,7 @@ struct CharSelectEquip
Color_Struct Color;
};
// RoF2-based hybrid struct
struct CharacterSelectEntry_Struct
{
char Name[64];
@@ -184,11 +185,11 @@ struct CharacterSelectEntry_Struct
uint8 EyeColor2;
uint8 HairStyle;
uint8 Beard;
uint8 Enabled;
uint8 GoHome; // Seen 0 for new char and 1 for existing
uint8 Tutorial; // Seen 1 for new char or 0 for existing
uint32 DrakkinHeritage;
uint8 Unknown1; // Seen 0
uint8 GoHome; // Seen 0 for new char and 1 for existing
uint8 Enabled; // Originally labeled as 'CharEnabled' - unknown purpose and setting -U
uint32 LastLogin;
uint8 Unknown2; // Seen 0
};
common/patches/rof.cpp
+2 -2
View File
@@ -2982,11 +2982,11 @@ namespace RoF
eq_cse->EyeColor2 = emu_cse->EyeColor2;
eq_cse->HairStyle = emu_cse->HairStyle;
eq_cse->Beard = emu_cse->Beard;
eq_cse->Enabled = emu_cse->Enabled;
eq_cse->GoHome = emu_cse->GoHome;
eq_cse->Tutorial = emu_cse->Tutorial;
eq_cse->DrakkinHeritage = emu_cse->DrakkinHeritage;
eq_cse->Unknown1 = emu_cse->Unknown1;
eq_cse->GoHome = emu_cse->GoHome;
eq_cse->Enabled = emu_cse->Enabled;
eq_cse->LastLogin = emu_cse->LastLogin;
eq_cse->Unknown2 = emu_cse->Unknown2;
common/patches/rof2.cpp
+2 -2
View File
@@ -3066,11 +3066,11 @@ namespace RoF2
eq_cse->EyeColor2 = emu_cse->EyeColor2;
eq_cse->HairStyle = emu_cse->HairStyle;
eq_cse->Beard = emu_cse->Beard;
eq_cse->Enabled = emu_cse->Enabled;
eq_cse->GoHome = emu_cse->GoHome;
eq_cse->Tutorial = emu_cse->Tutorial;
eq_cse->DrakkinHeritage = emu_cse->DrakkinHeritage;
eq_cse->Unknown1 = emu_cse->Unknown1;
eq_cse->GoHome = emu_cse->GoHome;
eq_cse->Enabled = emu_cse->Enabled;
eq_cse->LastLogin = emu_cse->LastLogin;
eq_cse->Unknown2 = emu_cse->Unknown2;
common/patches/rof2_structs.h
+2 -2
View File
@@ -189,11 +189,11 @@ struct CharacterSelectEntry_Struct
/*0000*/ uint8 EyeColor2;
/*0000*/ uint8 HairStyle;
/*0000*/ uint8 Beard;
/*0000*/ uint8 Enabled;
/*0000*/ uint8 GoHome; // Seen 0 for new char and 1 for existing
/*0000*/ uint8 Tutorial; // Seen 1 for new char or 0 for existing
/*0000*/ uint32 DrakkinHeritage;
/*0000*/ uint8 Unknown1; // Seen 0
/*0000*/ uint8 GoHome; // Seen 0 for new char and 1 for existing
/*0000*/ uint8 Enabled; // Swapped position with 'GoHome' 02/23/2015 -U
/*0000*/ uint32 LastLogin;
/*0000*/ uint8 Unknown2; // Seen 0
};
common/patches/rof_structs.h
+2 -2
View File
@@ -189,11 +189,11 @@ struct CharacterSelectEntry_Struct
/*0000*/ uint8 EyeColor2;
/*0000*/ uint8 HairStyle;
/*0000*/ uint8 Beard;
/*0000*/ uint8 Enabled;
/*0000*/ uint8 GoHome; // Seen 0 for new char and 1 for existing
/*0000*/ uint8 Tutorial; // Seen 1 for new char or 0 for existing
/*0000*/ uint32 DrakkinHeritage;
/*0000*/ uint8 Unknown1; // Seen 0
/*0000*/ uint8 GoHome; // Seen 0 for new char and 1 for existing
/*0000*/ uint8 Enabled; // Swapped position with 'GoHome' 02/23/2015 -U
/*0000*/ uint32 LastLogin;
/*0000*/ uint8 Unknown2; // Seen 0
};