BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed critical warnings for Linux build

Browse Source
This commit is contained in:
sippeangelo
2015-09-28 20:40:28 +02:00
parent 2d7703afad
commit edd87ddf58
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Game/LevelSystem.h
-1
View File
@@ -33,7 +33,6 @@
#include "Game/PadSystem.h" #include "Game/PadSystem.h"
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <intrin.h>
namespace dd namespace dd
{ {
src/game/Game/BallSystem.cpp
+1 -1
View File
@@ -13,7 +13,7 @@ void dd::Systems::BallSystem::RegisterComponents(ComponentFactory *cf)
void dd::Systems::BallSystem::Initialize() void dd::Systems::BallSystem::Initialize()
{ {
EVENT_SUBSCRIBE_MEMBER(m_Contact, BallSystem::Contact); EVENT_SUBSCRIBE_MEMBER(m_Contact, &BallSystem::Contact);
} }
void dd::Systems::BallSystem::Update(double dt) void dd::Systems::BallSystem::Update(double dt)
src/game/Game/LevelSystem.cpp
+7 -7
View File
@@ -9,13 +9,13 @@
void dd::Systems::LevelSystem::Initialize() void dd::Systems::LevelSystem::Initialize()
{ {
EVENT_SUBSCRIBE_MEMBER(m_EContact, LevelSystem::OnContact); EVENT_SUBSCRIBE_MEMBER(m_EContact, &LevelSystem::OnContact);
EVENT_SUBSCRIBE_MEMBER(m_ELifeLost, LevelSystem::OnLifeLost); EVENT_SUBSCRIBE_MEMBER(m_ELifeLost, &LevelSystem::OnLifeLost);
EVENT_SUBSCRIBE_MEMBER(m_EScoreEvent, LevelSystem::OnScoreEvent); EVENT_SUBSCRIBE_MEMBER(m_EScoreEvent, &LevelSystem::OnScoreEvent);
EVENT_SUBSCRIBE_MEMBER(m_EMultiBall, LevelSystem::OnMultiBall); EVENT_SUBSCRIBE_MEMBER(m_EMultiBall, &LevelSystem::OnMultiBall);
EVENT_SUBSCRIBE_MEMBER(m_ECreatePowerUp, LevelSystem::OnCreatePowerUp); EVENT_SUBSCRIBE_MEMBER(m_ECreatePowerUp, &LevelSystem::OnCreatePowerUp);
EVENT_SUBSCRIBE_MEMBER(m_EPowerUpTaken, LevelSystem::OnPowerUpTaken); EVENT_SUBSCRIBE_MEMBER(m_EPowerUpTaken, &LevelSystem::OnPowerUpTaken);
EVENT_SUBSCRIBE_MEMBER(m_EStageCleared, LevelSystem::OnStageCleared); EVENT_SUBSCRIBE_MEMBER(m_EStageCleared, &LevelSystem::OnStageCleared);
for (int i = 0; i < Lives(); i++) { for (int i = 0; i < Lives(); i++) {
CreateLife(i); CreateLife(i);
src/game/Physics/PhysicsSystem.cpp
+3 -3
View File
@@ -24,7 +24,7 @@ void dd::Systems::PhysicsSystem::Initialize()
InitializeWater(); InitializeWater();
EVENT_SUBSCRIBE_MEMBER(m_SetImpulse, PhysicsSystem::SetImpulse); EVENT_SUBSCRIBE_MEMBER(m_SetImpulse, &PhysicsSystem::SetImpulse);
} }
void dd::Systems::PhysicsSystem::InitializeWater() void dd::Systems::PhysicsSystem::InitializeWater()
@@ -268,7 +268,7 @@ void dd::Systems::PhysicsSystem::CreateBody(EntityID entity)
if(physicsComponent->Static) { if(physicsComponent->Static) {
body->CreateFixture(&fixtureDef); //Density kanske ska vara 0 på statiska kroppar body->CreateFixture(&fixtureDef); //Density kanske ska vara 0 p� statiska kroppar
} }
else { else {
fixtureDef.shape = pShape; fixtureDef.shape = pShape;
@@ -289,7 +289,7 @@ void dd::Systems::PhysicsSystem::CreateBody(EntityID entity)
void dd::Systems::PhysicsSystem::CreateParticleGroup(EntityID e) void dd::Systems::PhysicsSystem::CreateParticleGroup(EntityID e)
{ {
//TODO: Lägg alla pd i en lista //TODO: L�gg alla pd i en lista
auto transform = m_World->GetComponent<Components::Transform>(e); auto transform = m_World->GetComponent<Components::Transform>(e);
if (!transform) { if (!transform) {
LOG_ERROR("No Transform component in CreateParticleGroup"); LOG_ERROR("No Transform component in CreateParticleGroup");