Core: Remove a few silly warnings here and there (and adjust a comment to allow System.cpp to show properly in the nano-editor)

This commit is contained in:
click
2012-06-13 18:38:21 +02:00
parent 5daa540d3a
commit 50bd43661c
3 changed files with 8 additions and 8 deletions
+1 -1
View File
@@ -54,7 +54,7 @@ class GameObjectAI
virtual void SetData(uint32 /*id*/, uint32 /*value*/) {} virtual void SetData(uint32 /*id*/, uint32 /*value*/) {}
virtual void OnGameEvent(bool /*start*/, uint16 /*eventId*/) {} virtual void OnGameEvent(bool /*start*/, uint16 /*eventId*/) {}
virtual void OnStateChanged(uint32 /*state*/, Unit* /*unit*/) {} virtual void OnStateChanged(uint32 /*state*/, Unit* /*unit*/) {}
virtual void EventInform(uint32 eventId) {} virtual void EventInform(uint32 /*eventId*/) {}
}; };
class NullGameObjectAI : public GameObjectAI class NullGameObjectAI : public GameObjectAI
+1 -1
View File
@@ -2691,7 +2691,7 @@ public:
{ {
PrepareSpellScript(spell_gen_touch_the_nightmare_SpellScript); PrepareSpellScript(spell_gen_touch_the_nightmare_SpellScript);
void HandleDamageCalc(SpellEffIndex effIndex) void HandleDamageCalc(SpellEffIndex /*effIndex*/)
{ {
uint32 bp = GetCaster()->GetMaxHealth() * 0.3f; uint32 bp = GetCaster()->GetMaxHealth() * 0.3f;
SetHitDamage(bp); SetHitDamage(bp);
+6 -6
View File
@@ -48,9 +48,9 @@ char output_path[128] = ".";
char input_path[128] = "."; char input_path[128] = ".";
uint32 maxAreaId = 0; uint32 maxAreaId = 0;
//************************************************** // **************************************************
// Extractor options // Extractor options
//************************************************** // **************************************************
enum Extract enum Extract
{ {
EXTRACT_MAP = 1, EXTRACT_MAP = 1,
@@ -221,7 +221,7 @@ uint32 ReadMapDBC()
map_ids[x].id = dbc.getRecord(x).getUInt(0); map_ids[x].id = dbc.getRecord(x).getUInt(0);
strcpy(map_ids[x].name, dbc.getRecord(x).getString(1)); strcpy(map_ids[x].name, dbc.getRecord(x).getString(1));
} }
printf("Done! (%u maps loaded)\n", map_count); printf("Done! (%zu maps loaded)\n", map_count);
return map_count; return map_count;
} }
@@ -246,7 +246,7 @@ void ReadAreaTableDBC()
maxAreaId = dbc.getMaxId(); maxAreaId = dbc.getMaxId();
printf("Done! (%u areas loaded)\n", area_count); printf("Done! (%zu areas loaded)\n", area_count);
} }
void ReadLiquidTypeTableDBC() void ReadLiquidTypeTableDBC()
@@ -267,7 +267,7 @@ void ReadLiquidTypeTableDBC()
for(uint32 x = 0; x < liqTypeCount; ++x) for(uint32 x = 0; x < liqTypeCount; ++x)
LiqType[dbc.getRecord(x).getUInt(0)] = dbc.getRecord(x).getUInt(3); LiqType[dbc.getRecord(x).getUInt(0)] = dbc.getRecord(x).getUInt(3);
printf("Done! (%u LiqTypes loaded)\n", liqTypeCount); printf("Done! (%zu LiqTypes loaded)\n", liqTypeCount);
} }
// //
@@ -572,7 +572,7 @@ bool ConvertADT(char *filename, char *filename2, int /*cell_y*/, int /*cell_x*/,
// Try store as packed in uint16 or uint8 values // Try store as packed in uint16 or uint8 values
if (!(heightHeader.flags & MAP_HEIGHT_NO_HEIGHT)) if (!(heightHeader.flags & MAP_HEIGHT_NO_HEIGHT))
{ {
float step; float step = 0;
// Try Store as uint values // Try Store as uint values
if (CONF_allow_float_to_int) if (CONF_allow_float_to_int)
{ {