summaryrefslogtreecommitdiffstats
path: root/src/object
diff options
context:
space:
mode:
Diffstat (limited to 'src/object')
-rw-r--r--src/object/auto/autoinfo.cpp4
-rw-r--r--src/object/auto/autojostle.cpp5
-rw-r--r--src/object/auto/autojostle.h4
-rw-r--r--src/object/brain.cpp2
4 files changed, 11 insertions, 4 deletions
diff --git a/src/object/auto/autoinfo.cpp b/src/object/auto/autoinfo.cpp
index 56c21d2..e8f31c8 100644
--- a/src/object/auto/autoinfo.cpp
+++ b/src/object/auto/autoinfo.cpp
@@ -428,7 +428,7 @@ void CAutoInfo::UpdateList()
{
info = m_object->GetInfo(i);
sprintf(text, "%s = %.2f", info.name, info.value);
- pl->SetName(i, text);
+ pl->SetItemName(i, text);
}
}
@@ -466,7 +466,7 @@ void CAutoInfo::UpdateListVirus()
}
text[j] = 0;
- pl->SetName(i, text);
+ pl->SetItemName(i, text);
}
}
diff --git a/src/object/auto/autojostle.cpp b/src/object/auto/autojostle.cpp
index 11952c2..df82ad5 100644
--- a/src/object/auto/autojostle.cpp
+++ b/src/object/auto/autojostle.cpp
@@ -77,6 +77,11 @@ void CAutoJostle::Start(int param, float force)
}
}
+// Should never be called
+void CAutoJostle::Start(int param)
+{
+}
+
// Management of an event.
diff --git a/src/object/auto/autojostle.h b/src/object/auto/autojostle.h
index 7b700ad..3822421 100644
--- a/src/object/auto/autojostle.h
+++ b/src/object/auto/autojostle.h
@@ -37,7 +37,9 @@ public:
bool EventProcess(const Event &event);
Error IsEnded();
-protected:
+private:
+ // Overriden to avoid warning about hiding virtual function
+ virtual void Start(int param) override;
protected:
float m_force;
diff --git a/src/object/brain.cpp b/src/object/brain.cpp
index 56221b1..4fab449 100644
--- a/src/object/brain.cpp
+++ b/src/object/brain.cpp
@@ -2486,7 +2486,7 @@ void CBrain::UpdateScript(Ui::CWindow *pw)
}
}
- pl->SetName(i, name);
+ pl->SetItemName(i, name);
}
if ( !bSoluce )