From 7f15b3ac5728c44e90a0f0486e17861796f88210 Mon Sep 17 00:00:00 2001 From: Choupom Date: Tue, 19 Apr 2011 16:10:50 +0200 Subject: fixed several stuffs --- src/game/client/components/effects.cpp | 2 +- src/game/client/components/spectator.cpp | 4 ++-- src/game/version.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/game') diff --git a/src/game/client/components/effects.cpp b/src/game/client/components/effects.cpp index 573ac410..8554b7ba 100644 --- a/src/game/client/components/effects.cpp +++ b/src/game/client/components/effects.cpp @@ -86,7 +86,7 @@ void CEffects::SmokeTrail(vec2 Pos, vec2 Vel) p.m_LifeSpan = 0.5f + frandom()*0.5f; p.m_StartSize = 12.0f + frandom()*8; p.m_EndSize = 0; - p.m_Friction = 0.7; + p.m_Friction = 0.7f; p.m_Gravity = frandom()*-500.0f; m_pClient->m_pParticles->Add(CParticles::GROUP_PROJECTILE_TRAIL, &p); } diff --git a/src/game/client/components/spectator.cpp b/src/game/client/components/spectator.cpp index 41c7b48f..542f337a 100644 --- a/src/game/client/components/spectator.cpp +++ b/src/game/client/components/spectator.cpp @@ -64,8 +64,8 @@ void CSpectator::ConSpectateNext(IConsole::IResult *pResult, void *pUserData) if(!pSelf->m_pClient->m_Snap.m_paPlayerInfos[i] || pSelf->m_pClient->m_Snap.m_paPlayerInfos[i]->m_Team == TEAM_SPECTATORS) continue; - NewSpectatorID = i; - GotNewSpectatorID = true; + NewSpectatorID = i; + GotNewSpectatorID = true; break; } } diff --git a/src/game/version.h b/src/game/version.h index 8cf1a7c0..c7f04b75 100644 --- a/src/game/version.h +++ b/src/game/version.h @@ -2,7 +2,7 @@ /* If you are missing that file, acquire a complete release at teeworlds.com. */ #ifndef GAME_VERSION_H #define GAME_VERSION_H -#include "generated/nethash.c" +#include "generated/nethash.cpp" #define GAME_VERSION "0.6 trunk" #define GAME_NETVERSION "0.6 " GAME_NETVERSION_HASH #endif -- cgit 1.4.1