Futile attempts to fix memory corruption bug

This commit is contained in:
2015-10-01 16:12:53 +02:00
parent ff27eafccf
commit c821fbfc25
4 changed files with 10 additions and 23 deletions
+1 -1
View File
@@ -360,7 +360,7 @@ public:
// Swap event queues to get fresh input data in the read queue
//m_EventBroker->Swap();
ResourceManager::Update();
//ResourceManager::Update();
if (m_GameIsRunning) {
m_World->Update(dt);
}
-17
View File
@@ -27,22 +27,6 @@ public:
m_CharacterTextures['8'] = "Textures/GUI/Numbers/N8.png";
m_CharacterTextures['9'] = "Textures/GUI/Numbers/N9.png";
// Create number frame if missing
// for (int i = 0; i < 10; i++) {
// auto frame = new GUI::TextureFrame(this, "NumberFrameDigit");
// frame->SetTexture(m_NumberTextures[0]);
// frame->DisableScissor();
// // Position frame based on alignment
// if (i > 0) {
// frame->SetLeft(m_NumberFrames[0]->Right());
// }
// Width += frame->Width;
// if (Height < frame->Height) {
// Height = frame->Height;
// }
// m_NumberFrames.push_front(frame);
// }
SetNumber(0);
}
@@ -100,7 +84,6 @@ private:
int m_Number = 0;
bool m_LeftAligned = true;
std::string m_NumberTextures[10];
std::unordered_map<char, std::string> m_CharacterTextures;
std::deque<TextureFrame*> m_NumberFrames;
};
+6 -3
View File
@@ -69,9 +69,12 @@ public:
private:
EntityID m_Entity = 0;
glm::vec3 m_Acceleration = glm::vec3(0.f, 0.f, 0.f);
bool m_Left = false, m_Right = false, m_ReplaceBall = false, m_MultiBall = false;
Components::Transform* m_Transform;
Components::Pad* m_Pad;
bool m_Left = false;
bool m_Right = false;
bool m_ReplaceBall = false;
bool m_MultiBall = false;
Components::Transform* m_Transform = nullptr;
Components::Pad* m_Pad = nullptr;
dd::EventRelay<PadSystem, dd::Events::KeyDown> m_EKeyDown;
dd::EventRelay<PadSystem, dd::Events::KeyUp> m_EKeyUp;
+3 -2
View File
@@ -68,9 +68,10 @@ int dd::EventBroker::Process(std::string contextTypeName)
std::shared_ptr<Event> event = pair.second;
auto itpair = relays.equal_range(eventTypeName);
for (auto it2 = itpair.first; it2 != itpair.second; ++it2)
for (auto it2 = itpair.first; it2 != itpair.second; it2++)
{
auto relay = it2->second;
std::string name = it2->first;
BaseEventRelay* relay = it2->second;
relay->Receive(event);
eventsProcessed++;
}