From 804805d35a87c2acc9425d1762ad26b1ba2ec9ac Mon Sep 17 00:00:00 2001 From: Samuel Barney Date: Wed, 29 Jul 2015 09:04:03 -0600 Subject: Silenced and fixed many warning messages across multiple files. --- src/WorldStorage/NBTChunkSerializer.cpp | 150 ++++++++++++++++---------------- 1 file changed, 75 insertions(+), 75 deletions(-) (limited to 'src/WorldStorage/NBTChunkSerializer.cpp') diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp index cfbbcd0b4..f204ec52b 100644 --- a/src/WorldStorage/NBTChunkSerializer.cpp +++ b/src/WorldStorage/NBTChunkSerializer.cpp @@ -92,12 +92,12 @@ void cNBTChunkSerializer::Finish(void) void cNBTChunkSerializer::AddItem(const cItem & a_Item, int a_Slot, const AString & a_CompoundName) { m_Writer.BeginCompound(a_CompoundName); - m_Writer.AddShort("id", (short)(a_Item.m_ItemType)); - m_Writer.AddShort("Damage", a_Item.m_ItemDamage); - m_Writer.AddByte ("Count", a_Item.m_ItemCount); + m_Writer.AddShort("id", static_cast(a_Item.m_ItemType)); + m_Writer.AddShort("Damage", static_cast((a_Item.m_ItemDamage))); + m_Writer.AddByte ("Count", static_cast(a_Item.m_ItemCount)); if (a_Slot >= 0) { - m_Writer.AddByte ("Slot", (unsigned char)a_Slot); + m_Writer.AddByte ("Slot", static_cast(a_Slot)); } // Write the tag compound (for enchantment, firework, custom name and repair cost): @@ -131,7 +131,7 @@ void cNBTChunkSerializer::AddItem(const cItem & a_Item, int a_Slot, const AStrin if ((a_Item.m_ItemType == E_ITEM_FIREWORK_ROCKET) || (a_Item.m_ItemType == E_ITEM_FIREWORK_STAR)) { - cFireworkItem::WriteToNBTCompound(a_Item.m_FireworkItem, m_Writer, (ENUM_ITEM_ID)a_Item.m_ItemType); + cFireworkItem::WriteToNBTCompound(a_Item.m_FireworkItem, m_Writer, static_cast(a_Item.m_ItemType)); } if (!a_Item.m_Enchantments.IsEmpty()) @@ -184,8 +184,8 @@ void cNBTChunkSerializer::AddBeaconEntity(cBeaconEntity * a_Entity) m_Writer.BeginCompound(""); AddBasicTileEntity(a_Entity, "Beacon"); m_Writer.AddInt("Levels", a_Entity->GetBeaconLevel()); - m_Writer.AddInt("Primary", (int)a_Entity->GetPrimaryEffect()); - m_Writer.AddInt("Secondary", (int)a_Entity->GetSecondaryEffect()); + m_Writer.AddInt("Primary", static_cast(a_Entity->GetPrimaryEffect())); + m_Writer.AddInt("Secondary", static_cast(a_Entity->GetSecondaryEffect())); m_Writer.BeginList("Items", TAG_Compound); AddItemGrid(a_Entity->GetContents()); m_Writer.EndList(); @@ -245,8 +245,8 @@ void cNBTChunkSerializer::AddFurnaceEntity(cFurnaceEntity * a_Furnace) m_Writer.BeginList("Items", TAG_Compound); AddItemGrid(a_Furnace->GetContents()); m_Writer.EndList(); - m_Writer.AddShort("BurnTime", a_Furnace->GetFuelBurnTimeLeft()); - m_Writer.AddShort("CookTime", a_Furnace->GetTimeCooked()); + m_Writer.AddShort("BurnTime", static_cast(a_Furnace->GetFuelBurnTimeLeft())); + m_Writer.AddShort("CookTime", static_cast(a_Furnace->GetTimeCooked())); m_Writer.EndCompound(); } @@ -298,7 +298,7 @@ void cNBTChunkSerializer::AddNoteEntity(cNoteEntity * a_Note) { m_Writer.BeginCompound(""); AddBasicTileEntity(a_Note, "Music"); - m_Writer.AddByte("note", a_Note->GetPitch()); + m_Writer.AddByte("note", static_cast(a_Note->GetPitch())); m_Writer.EndCompound(); } @@ -354,8 +354,8 @@ void cNBTChunkSerializer::AddFlowerPotEntity(cFlowerPotEntity * a_FlowerPot) { m_Writer.BeginCompound(""); AddBasicTileEntity(a_FlowerPot, "FlowerPot"); - m_Writer.AddInt ("Item", (Int32) a_FlowerPot->GetItem().m_ItemType); - m_Writer.AddInt ("Data", (Int32) a_FlowerPot->GetItem().m_ItemDamage); + m_Writer.AddInt ("Item", static_cast(a_FlowerPot->GetItem().m_ItemType)); + m_Writer.AddInt ("Data", static_cast(a_FlowerPot->GetItem().m_ItemDamage)); m_Writer.EndCompound(); } @@ -380,7 +380,7 @@ void cNBTChunkSerializer::AddBasicEntity(cEntity * a_Entity, const AString & a_C m_Writer.AddDouble("", a_Entity->GetYaw()); m_Writer.AddDouble("", a_Entity->GetPitch()); m_Writer.EndList(); - m_Writer.AddShort("Health", a_Entity->GetHealth()); + m_Writer.AddShort("Health", static_cast(a_Entity->GetHealth())); } @@ -435,7 +435,7 @@ void cNBTChunkSerializer::AddMinecartEntity(cMinecart * a_Minecart) { AddBasicEntity(a_Minecart, "MinecartChest"); // Add chest contents into the Items tag: - AddMinecartChestContents((cMinecartWithChest *)a_Minecart); + AddMinecartChestContents(reinterpret_cast(a_Minecart)); break; } case cMinecart::mpFurnace: @@ -521,9 +521,9 @@ void cNBTChunkSerializer::AddMonsterEntity(cMonster * a_Monster) m_Writer.AddFloat("", a_Monster->GetDropChanceLeggings()); m_Writer.AddFloat("", a_Monster->GetDropChanceBoots()); m_Writer.EndList(); - m_Writer.AddByte("CanPickUpLoot", (char)a_Monster->CanPickUpLoot()); + m_Writer.AddByte("CanPickUpLoot", (a_Monster->CanPickUpLoot())? 1 : 0); m_Writer.AddString("CustomName", a_Monster->GetCustomName()); - m_Writer.AddByte("CustomNameVisible", (char)a_Monster->IsCustomNameAlwaysVisible()); + m_Writer.AddByte("CustomNameVisible", static_cast(a_Monster->IsCustomNameAlwaysVisible())); switch (a_Monster->GetMobType()) { case mtBat: @@ -541,22 +541,22 @@ void cNBTChunkSerializer::AddMonsterEntity(cMonster * a_Monster) case mtEnderman: { const cEnderman *Enderman = reinterpret_cast(a_Monster); - m_Writer.AddShort("carried", (Int16) Enderman->GetCarriedBlock()); - m_Writer.AddShort("carriedData", (Int16) Enderman->GetCarriedMeta()); + m_Writer.AddShort("carried", static_cast(Enderman->GetCarriedBlock())); + m_Writer.AddShort("carriedData", static_cast(Enderman->GetCarriedMeta())); break; } case mtHorse: { const cHorse *Horse = reinterpret_cast(a_Monster); - m_Writer.AddByte("ChestedHorse", Horse->IsChested()); - m_Writer.AddByte("EatingHaystack", Horse->IsEating()); - m_Writer.AddByte("Tame", Horse->IsTame()); + m_Writer.AddByte("ChestedHorse", Horse->IsChested()? 1 : 0); + m_Writer.AddByte("EatingHaystack", Horse->IsEating()? 1 : 0); + m_Writer.AddByte("Tame", Horse->IsTame()? 1: 0); m_Writer.AddInt ("Type", Horse->GetHorseType()); m_Writer.AddInt ("Color", Horse->GetHorseColor()); m_Writer.AddInt ("Style", Horse->GetHorseStyle()); m_Writer.AddInt ("ArmorType", Horse->GetHorseArmour()); - m_Writer.AddByte("Saddle", Horse->IsSaddled()); - m_Writer.AddByte("Age", Horse->GetAge()); + m_Writer.AddByte("Saddle", Horse->IsSaddled()? 1 : 0); + m_Writer.AddByte("Age", static_cast(Horse->GetAge())); break; } case mtMagmaCube: @@ -567,9 +567,9 @@ void cNBTChunkSerializer::AddMonsterEntity(cMonster * a_Monster) case mtSheep: { const cSheep *Sheep = reinterpret_cast(a_Monster); - m_Writer.AddByte("Sheared", Sheep->IsSheared()); - m_Writer.AddByte("Color", Sheep->GetFurColor()); - m_Writer.AddByte("Age", Sheep->GetAge()); + m_Writer.AddByte("Sheared", Sheep->IsSheared()? 1 : 0); + m_Writer.AddByte("Color", static_cast(Sheep->GetFurColor())); + m_Writer.AddByte("Age", static_cast(Sheep->GetAge())); break; } case mtSlime: @@ -586,12 +586,12 @@ void cNBTChunkSerializer::AddMonsterEntity(cMonster * a_Monster) { const cVillager *Villager = reinterpret_cast(a_Monster); m_Writer.AddInt("Profession", Villager->GetVilType()); - m_Writer.AddByte("Age", Villager->GetAge()); + m_Writer.AddByte("Age", static_cast(Villager->GetAge())); break; } case mtWither: { - m_Writer.AddInt("Invul", reinterpret_cast(a_Monster)->GetWitherInvulnerableTicks()); + m_Writer.AddInt("Invul", static_cast(reinterpret_cast(a_Monster)->GetWitherInvulnerableTicks())); break; } case mtWolf: @@ -607,8 +607,8 @@ void cNBTChunkSerializer::AddMonsterEntity(cMonster * a_Monster) } m_Writer.AddByte("Sitting", Wolf->IsSitting() ? 1 : 0); m_Writer.AddByte("Angry", Wolf->IsAngry() ? 1 : 0); - m_Writer.AddByte("CollarColor", (unsigned char) Wolf->GetCollarColor()); - m_Writer.AddByte("Age", Wolf->GetAge()); + m_Writer.AddByte("CollarColor", static_cast(Wolf->GetCollarColor())); + m_Writer.AddByte("Age", static_cast(Wolf->GetAge())); break; } case mtZombie: @@ -616,22 +616,22 @@ void cNBTChunkSerializer::AddMonsterEntity(cMonster * a_Monster) const cZombie *Zombie = reinterpret_cast(a_Monster); m_Writer.AddByte("IsVillager", Zombie->IsVillagerZombie() ? 1 : 0); m_Writer.AddByte("IsConverting", Zombie->IsConverting() ? 1 : 0); - m_Writer.AddByte("Age", Zombie->GetAge()); + m_Writer.AddByte("Age", static_cast(Zombie->GetAge())); break; } case mtZombiePigman: { - m_Writer.AddByte("Age", reinterpret_cast(a_Monster)->GetAge()); + m_Writer.AddByte("Age", static_cast(reinterpret_cast(a_Monster)->GetAge())); break; } case mtOcelot: { - m_Writer.AddByte("Age", reinterpret_cast(a_Monster)->GetAge()); + m_Writer.AddByte("Age", static_cast(reinterpret_cast(a_Monster)->GetAge())); break; } case mtPig: { - m_Writer.AddByte("Age", reinterpret_cast(a_Monster)->GetAge()); + m_Writer.AddByte("Age", static_cast(reinterpret_cast(a_Monster)->GetAge())); break; } case mtRabbit: @@ -639,7 +639,7 @@ void cNBTChunkSerializer::AddMonsterEntity(cMonster * a_Monster) const cRabbit *Rabbit = reinterpret_cast(a_Monster); m_Writer.AddInt("RabbitType", Rabbit->GetRabbitTypeAsNumber()); m_Writer.AddInt("MoreCarrotTicks", Rabbit->GetMoreCarrotTicks()); - m_Writer.AddByte("Age", Rabbit->GetAge()); + m_Writer.AddByte("Age", static_cast(Rabbit->GetAge())); break; } case mtInvalidType: @@ -675,7 +675,7 @@ void cNBTChunkSerializer::AddPickupEntity(cPickup * a_Pickup) m_Writer.BeginCompound(""); AddBasicEntity(a_Pickup, "Item"); AddItem(a_Pickup->GetItem(), -1, "Item"); - m_Writer.AddShort("Age", (Int16)a_Pickup->GetAge()); + m_Writer.AddShort("Age", static_cast(a_Pickup->GetAge())); m_Writer.EndCompound(); } @@ -693,21 +693,21 @@ void cNBTChunkSerializer::AddProjectileEntity(cProjectileEntity * a_Projectile) { case cProjectileEntity::pkArrow: { - cArrowEntity * Arrow = (cArrowEntity *)a_Projectile; + cArrowEntity * Arrow = reinterpret_cast(a_Projectile); - m_Writer.AddShort("xTile", (Int16)Arrow->GetBlockHit().x); - m_Writer.AddShort("yTile", (Int16)Arrow->GetBlockHit().y); - m_Writer.AddShort("zTile", (Int16)Arrow->GetBlockHit().z); + m_Writer.AddShort("xTile", static_cast(Arrow->GetBlockHit().x)); + m_Writer.AddShort("yTile", static_cast(Arrow->GetBlockHit().y)); + m_Writer.AddShort("zTile", static_cast(Arrow->GetBlockHit().z)); m_Writer.AddByte("pickup", Arrow->GetPickupState()); m_Writer.AddDouble("damage", Arrow->GetDamageCoeff()); break; } case cProjectileEntity::pkSplashPotion: { - cSplashPotionEntity * Potion = (cSplashPotionEntity *)a_Projectile; + cSplashPotionEntity * Potion = reinterpret_cast(a_Projectile); - m_Writer.AddInt("EffectType", (Int16)Potion->GetEntityEffectType()); - m_Writer.AddInt("EffectDuration", (Int16)Potion->GetEntityEffect().GetDuration()); + m_Writer.AddInt("EffectType", static_cast(Potion->GetEntityEffectType())); + m_Writer.AddInt("EffectDuration", static_cast(Potion->GetEntityEffect().GetDuration())); m_Writer.AddShort("EffectIntensity", Potion->GetEntityEffect().GetIntensity()); m_Writer.AddDouble("EffectDistanceModifier", Potion->GetEntityEffect().GetDistanceModifier()); m_Writer.AddInt("PotionName", Potion->GetPotionColor()); @@ -757,7 +757,7 @@ void cNBTChunkSerializer::AddTNTEntity(cTNTEntity * a_TNT) { m_Writer.BeginCompound(""); AddBasicEntity(a_TNT, "PrimedTnt"); - m_Writer.AddByte("Fuse", (unsigned char)a_TNT->GetFuseTicks()); + m_Writer.AddByte("Fuse", static_cast(a_TNT->GetFuseTicks())); m_Writer.EndCompound(); } @@ -769,8 +769,8 @@ void cNBTChunkSerializer::AddExpOrbEntity(cExpOrb * a_ExpOrb) { m_Writer.BeginCompound(""); AddBasicEntity(a_ExpOrb, "XPOrb"); - m_Writer.AddShort("Age", (Int16)a_ExpOrb->GetAge()); - m_Writer.AddShort("Value", (Int16)a_ExpOrb->GetReward()); + m_Writer.AddShort("Age", static_cast(a_ExpOrb->GetAge())); + m_Writer.AddShort("Value", static_cast(a_ExpOrb->GetReward())); m_Writer.EndCompound(); } @@ -784,7 +784,7 @@ void cNBTChunkSerializer::AddItemFrameEntity(cItemFrame * a_ItemFrame) AddBasicEntity(a_ItemFrame, "ItemFrame"); AddHangingEntity(a_ItemFrame); AddItem(a_ItemFrame->GetItem(), -1, "Item"); - m_Writer.AddByte("ItemRotation", (unsigned char)a_ItemFrame->GetItemRotation()); + m_Writer.AddByte("ItemRotation", static_cast(a_ItemFrame->GetItemRotation())); m_Writer.AddFloat("ItemDropChance", 1.0F); m_Writer.EndCompound(); } @@ -858,7 +858,7 @@ void cNBTChunkSerializer::BiomeData(const cChunkDef::BiomeMap * a_BiomeMap) if ((*a_BiomeMap)[i] < 255) { // Normal MC biome, copy as-is: - m_VanillaBiomes[i] = (unsigned char)((*a_BiomeMap)[i]); + m_VanillaBiomes[i] = static_cast((*a_BiomeMap)[i]); } else { @@ -894,17 +894,17 @@ void cNBTChunkSerializer::Entity(cEntity * a_Entity) switch (a_Entity->GetEntityType()) { - case cEntity::etBoat: AddBoatEntity ((cBoat *) a_Entity); break; - case cEntity::etEnderCrystal: AddEnderCrystalEntity((cEnderCrystal *) a_Entity); break; - case cEntity::etFallingBlock: AddFallingBlockEntity((cFallingBlock *) a_Entity); break; - case cEntity::etMinecart: AddMinecartEntity ((cMinecart *) a_Entity); break; - case cEntity::etMonster: AddMonsterEntity ((cMonster *) a_Entity); break; - case cEntity::etPickup: AddPickupEntity ((cPickup *) a_Entity); break; - case cEntity::etProjectile: AddProjectileEntity ((cProjectileEntity *)a_Entity); break; - case cEntity::etTNT: AddTNTEntity ((cTNTEntity *) a_Entity); break; - case cEntity::etExpOrb: AddExpOrbEntity ((cExpOrb *) a_Entity); break; - case cEntity::etItemFrame: AddItemFrameEntity ((cItemFrame *) a_Entity); break; - case cEntity::etPainting: AddPaintingEntity (reinterpret_cast(a_Entity)); break; + case cEntity::etBoat: AddBoatEntity (reinterpret_cast (a_Entity)); break; + case cEntity::etEnderCrystal: AddEnderCrystalEntity(reinterpret_cast (a_Entity)); break; + case cEntity::etFallingBlock: AddFallingBlockEntity(reinterpret_cast (a_Entity)); break; + case cEntity::etMinecart: AddMinecartEntity (reinterpret_cast (a_Entity)); break; + case cEntity::etMonster: AddMonsterEntity (reinterpret_cast (a_Entity)); break; + case cEntity::etPickup: AddPickupEntity (reinterpret_cast (a_Entity)); break; + case cEntity::etProjectile: AddProjectileEntity (reinterpret_cast(a_Entity)); break; + case cEntity::etTNT: AddTNTEntity (reinterpret_cast (a_Entity)); break; + case cEntity::etExpOrb: AddExpOrbEntity (reinterpret_cast (a_Entity)); break; + case cEntity::etItemFrame: AddItemFrameEntity (reinterpret_cast (a_Entity)); break; + case cEntity::etPainting: AddPaintingEntity (reinterpret_cast (a_Entity)); break; case cEntity::etPlayer: return; // Players aren't saved into the world default: { @@ -937,23 +937,23 @@ void cNBTChunkSerializer::BlockEntity(cBlockEntity * a_Entity) // Add tile-entity into NBT: switch (a_Entity->GetBlockType()) { - case E_BLOCK_BEACON: AddBeaconEntity ((cBeaconEntity *) a_Entity); break; - case E_BLOCK_CHEST: AddChestEntity ((cChestEntity *) a_Entity, a_Entity->GetBlockType()); break; - case E_BLOCK_COMMAND_BLOCK: AddCommandBlockEntity((cCommandBlockEntity *)a_Entity); break; - case E_BLOCK_DISPENSER: AddDispenserEntity ((cDispenserEntity *) a_Entity); break; - case E_BLOCK_DROPPER: AddDropperEntity ((cDropperEntity *) a_Entity); break; + case E_BLOCK_BEACON: AddBeaconEntity (reinterpret_cast (a_Entity)); break; + case E_BLOCK_CHEST: AddChestEntity (reinterpret_cast (a_Entity), a_Entity->GetBlockType()); break; + case E_BLOCK_COMMAND_BLOCK: AddCommandBlockEntity(reinterpret_cast(a_Entity)); break; + case E_BLOCK_DISPENSER: AddDispenserEntity (reinterpret_cast (a_Entity)); break; + case E_BLOCK_DROPPER: AddDropperEntity (reinterpret_cast (a_Entity)); break; case E_BLOCK_ENDER_CHEST: /* No data to be saved */ break; - case E_BLOCK_FLOWER_POT: AddFlowerPotEntity ((cFlowerPotEntity *) a_Entity); break; - case E_BLOCK_FURNACE: AddFurnaceEntity ((cFurnaceEntity *) a_Entity); break; - case E_BLOCK_HEAD: AddMobHeadEntity ((cMobHeadEntity *) a_Entity); break; - case E_BLOCK_HOPPER: AddHopperEntity ((cHopperEntity *) a_Entity); break; - case E_BLOCK_JUKEBOX: AddJukeboxEntity ((cJukeboxEntity *) a_Entity); break; - case E_BLOCK_LIT_FURNACE: AddFurnaceEntity ((cFurnaceEntity *) a_Entity); break; - case E_BLOCK_MOB_SPAWNER: AddMobSpawnerEntity ((cMobSpawnerEntity *) a_Entity); break; - case E_BLOCK_NOTE_BLOCK: AddNoteEntity ((cNoteEntity *) a_Entity); break; - case E_BLOCK_SIGN_POST: AddSignEntity ((cSignEntity *) a_Entity); break; - case E_BLOCK_TRAPPED_CHEST: AddChestEntity ((cChestEntity *) a_Entity, a_Entity->GetBlockType()); break; - case E_BLOCK_WALLSIGN: AddSignEntity ((cSignEntity *) a_Entity); break; + case E_BLOCK_FLOWER_POT: AddFlowerPotEntity (reinterpret_cast (a_Entity)); break; + case E_BLOCK_FURNACE: AddFurnaceEntity (reinterpret_cast (a_Entity)); break; + case E_BLOCK_HEAD: AddMobHeadEntity (reinterpret_cast (a_Entity)); break; + case E_BLOCK_HOPPER: AddHopperEntity (reinterpret_cast (a_Entity)); break; + case E_BLOCK_JUKEBOX: AddJukeboxEntity (reinterpret_cast (a_Entity)); break; + case E_BLOCK_LIT_FURNACE: AddFurnaceEntity (reinterpret_cast (a_Entity)); break; + case E_BLOCK_MOB_SPAWNER: AddMobSpawnerEntity (reinterpret_cast (a_Entity)); break; + case E_BLOCK_NOTE_BLOCK: AddNoteEntity (reinterpret_cast (a_Entity)); break; + case E_BLOCK_SIGN_POST: AddSignEntity (reinterpret_cast (a_Entity)); break; + case E_BLOCK_TRAPPED_CHEST: AddChestEntity (reinterpret_cast (a_Entity), a_Entity->GetBlockType()); break; + case E_BLOCK_WALLSIGN: AddSignEntity (reinterpret_cast (a_Entity)); break; default: { -- cgit v1.2.3