use BLI_findstring in more places & remove some warnings, no functional changes.

4 files changed, 9 insertions, 27 deletions

diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
index 8a2aea4567e..d06fc283613 100644
--- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
+++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
@@ -316,22 +316,8 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c
 				exitrequested = KX_EXIT_REQUEST_QUIT_GAME;
 			}
 		}
-		
-		Scene *blscene = NULL;
-		if (!bfd)
-		{
-			blscene = (Scene*) blenderdata->scene.first;
-			for (Scene *sce= (Scene*) blenderdata->scene.first; sce; sce= (Scene*) sce->id.next)
-			{
-				if (startscenename == (sce->id.name+2))
-				{
-					blscene = sce;
-					break;
-				}
-			}
-		} else {
-			blscene = bfd->curscene;
-		}
+
+		Scene *blscene= bfd ? bfd->curscene : (Scene *)BLI_findstring(&blenderdata->scene, startscenename, offsetof(ID, name) + 2);
 
 		if (blscene)
 		{
@@ -457,7 +443,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c
 							* should this really be?
 						*/
 						if (event->type==MOUSEMOVE) {
-							/* Note nice! XXX 2.5 event hack */
+							/* Note, not nice! XXX 2.5 event hack */
 							val = event->x - ar->winrct.xmin;
 							mousedevice->ConvertBlenderEvent(MOUSEX, val);
 							
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index 5852d618886..411ddc58c92 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -208,17 +208,14 @@ Scene *KX_BlenderSceneConverter::GetBlenderSceneForName(const STR_String& name)
 	 * Find the specified scene by name, or the first
 	 * scene if nothing matches (shouldn't happen).
 	 */
-
-	for (sce= (Scene*) m_maggie->scene.first; sce; sce= (Scene*) sce->id.next)
-		if (name == (sce->id.name+2))
-			return sce;
+	if((sce= (Scene *)BLI_findstring(&m_maggie->scene, name.ReadPtr(), offsetof(ID, name) + 2)))
+		return sce;
 
 	for (vector<Main*>::iterator it=m_DynamicMaggie.begin(); !(it==m_DynamicMaggie.end()); it++) {
 		Main *main= *it;
 
-		for (sce= (Scene*) main->scene.first; sce; sce= (Scene*) sce->id.next)
-			if (name == (sce->id.name+2))
-				return sce;
+		if((sce= (Scene *)BLI_findstring(&main->scene, name.ReadPtr(), offsetof(ID, name) + 2)))
+			return sce;
 	}
 
 	return (Scene*)m_maggie->scene.first;
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 562d67bcca2..0275c3e1f7a 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -504,7 +504,6 @@ static PyObject* gPyAddScene(PyObject*, PyObject* args)
 {
 	char* name;
 	int overlay = 1;
-	KX_Scene* scene = NULL;
 	
 	if (!PyArg_ParseTuple(args, "s|i:addScene", &name , &overlay))
 		return NULL;
diff --git a/source/gameengine/Rasterizer/RAS_CameraData.h b/source/gameengine/Rasterizer/RAS_CameraData.h
index addbd2b73b6..01f8d491a35 100644
--- a/source/gameengine/Rasterizer/RAS_CameraData.h
+++ b/source/gameengine/Rasterizer/RAS_CameraData.h
@@ -51,12 +51,12 @@ struct RAS_CameraData
 		m_clipstart(clipstart),
 		m_clipend(clipend),
 		m_perspective(perspective),
-		m_focallength(focallength),
 		m_viewport(viewport),
 		m_viewportleft(viewportleft),
 		m_viewportbottom(viewportbottom),
 		m_viewportright(viewportright),
-		m_viewporttop(viewporttop)
+		m_viewporttop(viewporttop),
+        m_focallength(focallength)
 	{
 	}
 };