pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-01 11:36:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More compiler warning fixes.

Browse Source
This commit is contained in:
Derision
2013-03-10 18:55:18 +00:00
parent 0ad1044b2e
commit e53ae5f6d5
7 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/AA.cpp
+5 -5
View File
@@ -443,7 +443,6 @@ void Client::HandleAAAction(aaID activate) {
}
break;
// seveian 2008-09-23
case aaActionProjectIllusion:
EnableAAEffect(aaEffectProjectIllusion, 3600);
Message(10, "The power of your next illusion spell will flow to your grouped target in your place.");
@@ -453,8 +452,9 @@ void Client::HandleAAAction(aaID activate) {
case aaActionEscape:
Escape();
break;
case aaBeastialAlignment:
// Don't think this code is used any longer for Bestial Alignment as the AA has a spell_id and no nonspell_action.
case aaActionBeastialAlignment:
switch(GetBaseRace()) {
case BARBARIAN:
spell_id = AA_Choose3(activate_val, 4521, 4522, 4523);
@@ -1038,7 +1038,7 @@ void Client::BuyAA(AA_Action* action)
m_pp.aapoints -= real_cost;
Save();
if ((RuleB(AA, Stacking) && (GetClientVersionBit() >= 4) && (aa2->hotkey_sid == 4294967295))
if ((RuleB(AA, Stacking) && (GetClientVersionBit() >= 4) && (aa2->hotkey_sid == 4294967295u))
&& ((aa2->max_level == (cur_level+1)) && aa2->sof_next_id)){
SendAA(aa2->id);
SendAA(aa2->sof_next_id);
@@ -1240,7 +1240,7 @@ void Client::SendAA(uint32 id, int seq) {
3) When you zone/buy your player profile will be checked and determine what AA can be displayed base on what you have already.
*/
if (RuleB(AA, Stacking) && (GetClientVersionBit() >= 4) && (saa2->hotkey_sid == 4294967295))
if (RuleB(AA, Stacking) && (GetClientVersionBit() >= 4) && (saa2->hotkey_sid == 4294967295u))
aa_stack = true;
if (aa_stack){
zone/client_packet.cpp
+8 -8
View File
@@ -9393,7 +9393,7 @@ void Client::CompleteConnect()
gender = 0;
else if (gender == 0)
gender = 1;
SendIllusionPacket(GetRace(), gender, 0xFFFF, 0xFFFF);
SendIllusionPacket(GetRace(), gender, 0xFF, 0xFF);
}
else if (spell.base[x1] == -2)
{
@@ -9406,7 +9406,7 @@ void Client::CompleteConnect()
}
else
{
SendIllusionPacket(spell.base[x1], 0xFF, 0xFFFF, 0xFFFF);
SendIllusionPacket(spell.base[x1], 0xFF, 0xFF, 0xFF);
}
switch(spell.base[x1]){
case OGRE:
@@ -13406,7 +13406,7 @@ void Client::Handle_OP_ItemPreview(const EQApplicationPacket *app)
for (spacer = 0; spacer < 77; spacer++) { //More Item stats, but some seem to be off based on packet check
outapp->WriteUInt8(0);
}
outapp->WriteUInt32(4294967295); //Unknown but always seen as FF FF FF FF
outapp->WriteUInt32(0xFFFFFFFF); //Unknown but always seen as FF FF FF FF
outapp->WriteUInt32(0); //Unknown
for (spacer = 0; spacer < 5; spacer++) { //Augment stuff
outapp->WriteUInt32(item->AugSlotType[spacer]);
@@ -13423,7 +13423,7 @@ void Client::Handle_OP_ItemPreview(const EQApplicationPacket *app)
for (spacer = 0; spacer < 11; spacer++) { //unknowns
outapp->WriteUInt8(0);
}
outapp->WriteUInt32(4294967295); //Unknown but always seen as FF FF FF FF
outapp->WriteUInt32(0xFFFFFFFF); //Unknown but always seen as FF FF FF FF
outapp->WriteUInt16(0); //Unknown
outapp->WriteUInt32(item->Favor); // Tribute
for (spacer = 0; spacer < 17; spacer++) { //unknowns
@@ -13431,7 +13431,7 @@ void Client::Handle_OP_ItemPreview(const EQApplicationPacket *app)
}
outapp->WriteUInt32(item->GuildFavor); // Tribute
outapp->WriteUInt32(0); //Unknown
outapp->WriteUInt32(4294967295); //Unknown but always seen as FF FF FF FF
outapp->WriteUInt32(0xFFFFFFFF); //Unknown but always seen as FF FF FF FF
for (spacer = 0; spacer < 11; spacer++) { //unknowns
outapp->WriteUInt8(0);
}
@@ -13446,13 +13446,13 @@ void Client::Handle_OP_ItemPreview(const EQApplicationPacket *app)
outapp->WriteUInt32(0); //unknown
outapp->WriteUInt32(1); // Always seen as 1
outapp->WriteUInt32(0); //unknown
outapp->WriteUInt32(3452750909); //0x3DCCCCCD/3452750909
outapp->WriteUInt32(0xCDCCCC3D); //0x3DCCCCCD/3452750909
outapp->WriteUInt32(0);
outapp->WriteUInt16(8256); //0x4020/8256
outapp->WriteUInt16(0);
outapp->WriteUInt32(4294967295); //Unknown but always seen as FF FF FF FF
outapp->WriteUInt32(0xFFFFFFFF); //Unknown but always seen as FF FF FF FF
outapp->WriteUInt16(0);
outapp->WriteUInt32(4294967295); //Unknown but always seen as FF FF FF FF
outapp->WriteUInt32(0xFFFFFFFF); //Unknown but always seen as FF FF FF FF
outapp->WriteUInt32(0); //unknown
outapp->WriteUInt32(0); //unknown
outapp->WriteUInt16(0); //unknown
zone/doors.cpp
+2 -2
View File
@@ -110,7 +110,7 @@ Doors::Doors(const char *dmodel, float dx, float dy, float dz, float dheading, u
dest_heading = 0;
is_ldon_door = 0;
client_version_mask = 4294967295;
client_version_mask = 4294967295u;
}
@@ -788,4 +788,4 @@ void Doors::CreateDatabaseEntry()
return;
}
database.InsertDoor(GetDoorDBID(), GetDoorID(), GetDoorName(), GetX(), GetY(), GetZ(), GetHeading(), GetOpenType(), GetGuildID(), GetLockpick(), GetKeyItem(), GetDoorParam(), GetInvertState(), GetIncline(), GetSize());
}
}
zone/entity.cpp
+1 -1
View File
@@ -5124,7 +5124,7 @@ NPC* EntityList::GetClosestBanker(Mob* sender, uint32 &distance)
if(!sender)
return NULL;
distance = 4294967295;
distance = 4294967295u;
NPC* nc = NULL;
LinkedListIterator<NPC*> iterator(npc_list);
zone/perlpacket.cpp
-6
View File
@@ -37,9 +37,6 @@ PerlPacket::~PerlPacket() {
}
bool PerlPacket::SetOpcode(const char *opcode) {
#ifndef WIN32
#warning Rewrite this!
#endif
op = OP_Unknown;
// op = ZoneOpcodeManager->NameSearch(opcode);
return(op != OP_Unknown);
@@ -69,9 +66,6 @@ void PerlPacket::SendTo(Client *who) {
if(len > 0)
memcpy(outapp->pBuffer, packet, len);
#ifndef WIN32
#warning Rewrite this!
#endif
// printf("Created this packet with PerlPacket: OP: %s\n", ZoneOpcodeManager->EmuToName(op));
DumpPacket(outapp);