diff options
| author | Kent Mein <mein@cs.umn.edu> | 2004-07-16 18:45:06 +0400 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2004-07-16 18:45:06 +0400 |
| commit | b07c5f20962420095c2b25f2bbfdc9477ff15f22 (patch) | |
| tree | b06df746c780f398c348039159cad2da53b249d9 /intern | |
| parent | 376468d383791413ebdfaa311a8283d241eb6a1c (diff) | |
Bunch of small fixes for warnings and whatnot....
intern/SoundSystem/intern/SND_AudioDevice.cpp
Initalized a var that could fall through with no value.
source/blender/readblenfile/intern/BLO_readblenfile.c
source/blender/src/space.c
intern/SoundSystem/intern/SND_Scene.cpp
source/gameengine/Converter/BL_MeshDeformer.cpp
removed unused var's
intern/SoundSystem/openal/pthread_cancel.cpp
fixed a nested /*
source/blender/imbuf/IMB_imbuf.h
added static to the type returned for addzbufImBuf
source/blender/imbuf/intern/IMB_bmp.h
had a wrong prototype
source/blender/src/view.c
added newline at end of file.
source/blender/src/sequence.c
removed unused var
added #include <stdlib.h> to avoid:
warning: implicit declaration of function `abs'
initalized a var that could have been used without being set.
Kent
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/SoundSystem/intern/SND_AudioDevice.cpp | 3 | ||||
| -rw-r--r-- | intern/SoundSystem/intern/SND_Scene.cpp | 2 | ||||
| -rw-r--r-- | intern/SoundSystem/openal/pthread_cancel.cpp | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/intern/SoundSystem/intern/SND_AudioDevice.cpp b/intern/SoundSystem/intern/SND_AudioDevice.cpp index 3fd8334d506..9cb2202425c 100644 --- a/intern/SoundSystem/intern/SND_AudioDevice.cpp +++ b/intern/SoundSystem/intern/SND_AudioDevice.cpp @@ -97,14 +97,13 @@ bool SND_AudioDevice::GetNewId(SND_SoundObject* pObject) printf("SND_AudioDevice::GetNewId\n"); #endif - bool result; + bool result = false; // first, get the oldest (the first) idobject SND_IdObject* pIdObject = (SND_IdObject*)m_idObjectList.getHead(); if (pIdObject->isTail()) { - result = false; } else { diff --git a/intern/SoundSystem/intern/SND_Scene.cpp b/intern/SoundSystem/intern/SND_Scene.cpp index 5d26b41469e..ffb1cd44108 100644 --- a/intern/SoundSystem/intern/SND_Scene.cpp +++ b/intern/SoundSystem/intern/SND_Scene.cpp @@ -307,7 +307,6 @@ void SND_Scene::UpdateActiveObects() if (id >= 0) { - bool juststartedplaying = false; #ifdef USE_FMOD // fmod wants these set before playing the sample if (pObject->IsModified()) @@ -323,7 +322,6 @@ void SND_Scene::UpdateActiveObects() pObject->SetPlaystate(SND_PLAYING); pObject->InitRunning(); // printf("start play: %d\n", tijd); - juststartedplaying = true; } #endif if (pObject->Is3D()) diff --git a/intern/SoundSystem/openal/pthread_cancel.cpp b/intern/SoundSystem/openal/pthread_cancel.cpp index c46c1f2c453..7651417db0b 100644 --- a/intern/SoundSystem/openal/pthread_cancel.cpp +++ b/intern/SoundSystem/openal/pthread_cancel.cpp @@ -1,5 +1,5 @@ /* $Id$ -/* + * * ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or |