[Quake2world-dev] r406 - in quake2world/branches/menu/src/menu: . node

[mattn at jdolan.dyndns.org]

Author: mattn
Date: 2009-04-19 21:06:19 +0000 (Sun, 19 Apr 2009)
New Revision: 406

Modified:
   quake2world/branches/menu/src/menu/m_render.c
   quake2world/branches/menu/src/menu/node/m_node_image.c
Log:
* fixed segfault
* fixed image path

Modified: quake2world/branches/menu/src/menu/m_render.c
===================================================================
--- quake2world/branches/menu/src/menu/m_render.c	2009-04-19 21:03:17 UTC (rev 405)
+++ quake2world/branches/menu/src/menu/m_render.c	2009-04-19 21:06:19 UTC (rev 406)
@@ -42,7 +42,7 @@
  */
 const struct image_s *MN_LoadImage (const char *name)
 {
-	const struct image_s *image = R_LoadImage(va("pics/%s", name), it_pic);
+	const struct image_s *image = R_LoadImage(name, it_pic);
 	if (image == r_notexture)
 		return NULL;
 	return image;

Modified: quake2world/branches/menu/src/menu/node/m_node_image.c
===================================================================
--- quake2world/branches/menu/src/menu/node/m_node_image.c	2009-04-19 21:03:17 UTC (rev 405)
+++ quake2world/branches/menu/src/menu/node/m_node_image.c	2009-04-19 21:06:19 UTC (rev 406)
@@ -72,6 +72,8 @@
 		return;
 
 	image = MN_LoadImage(imageName);
+	if (!image)
+		return;
 
 	MN_GetNodeAbsPos(node, nodepos);
 	if (node->size[0] && !node->size[1]) {