Whoever called a function parameter m_device is fired without notice.

kahrl · kahrl · commit b850f0f03829 · 2013-07-03T20:33:54.000+02:00
diff --git a/src/tile.cpp b/src/tile.cpp
@@ -239,15 +239,15 @@ class SourceImageCache
 		return NULL;
 	}
 	// Primarily fetches from cache, secondarily tries to read from filesystem
-	video::IImage* getOrLoad(const std::string &name, IrrlichtDevice *m_device)
+	video::IImage* getOrLoad(const std::string &name, IrrlichtDevice *device)
 	{
 		std::map<std::string, video::IImage*>::iterator n;
 		n = m_images.find(name);
 		if(n != m_images.end()){
 			n->second->grab(); // Grab for caller
 			return n->second;
 		}
-		video::IVideoDriver* driver = m_device->getVideoDriver();
+		video::IVideoDriver* driver = device->getVideoDriver();
 		std::string path = getTexturePath(name.c_str());
 		if(path == ""){
 			infostream<<"SourceImageCache::getOrLoad(): No path found for \""

Original file line number	Diff line number	Diff line change
`@@ -239,15 +239,15 @@ class SourceImageCache`
`239`	`239`	`return NULL;`
`240`	`240`	`}`
`241`	`241`	`// Primarily fetches from cache, secondarily tries to read from filesystem`
`242`		`- video::IImage* getOrLoad(const std::string &name, IrrlichtDevice *m_device)`
	`242`	`+ video::IImage* getOrLoad(const std::string &name, IrrlichtDevice *device)`
`243`	`243`	`{`
`244`	`244`	`std::map<std::string, video::IImage*>::iterator n;`
`245`	`245`	`n = m_images.find(name);`
`246`	`246`	`if(n != m_images.end()){`
`247`	`247`	`n->second->grab(); // Grab for caller`
`248`	`248`	`return n->second;`
`249`	`249`	`}`
`250`		`- video::IVideoDriver* driver = m_device->getVideoDriver();`
	`250`	`+ video::IVideoDriver* driver = device->getVideoDriver();`
`251`	`251`	`std::string path = getTexturePath(name.c_str());`
`252`	`252`	`if(path == ""){`
`253`	`253`	`infostream<<"SourceImageCache::getOrLoad(): No path found for \""`