Learn how easy it is to sync an existing GitHub or Google Code repo to a SourceForge project! See Demo

Close

[r9041]: packages / debian / stage / debian / patches / multiline_removal Maximize Restore History

Download this file

multiline_removal    37 lines (34 with data), 1.2 kB

--- a/libstageplugin/p_graphics.cc
+++ b/libstageplugin/p_graphics.cc
@@ -232,8 +232,11 @@
 			PLAYER_GRAPHICS2D_CMD_POINTS, this->addr)
 			|| Message::MatchMessage(hdr, PLAYER_MSGTYPE_CMD,
 					PLAYER_GRAPHICS2D_CMD_POLYLINE, this->addr)
+// Draw Multiline is new in Player 3.1, this ifdef allows Stage to build against older versions of Player
+#if defined PLAYER_GRAPHICS2D_CMD_MULTILINE
 			|| Message::MatchMessage(hdr, PLAYER_MSGTYPE_CMD,
                                         PLAYER_GRAPHICS2D_CMD_MULTILINE, this->addr)
+#endif
 			|| Message::MatchMessage(hdr, PLAYER_MSGTYPE_CMD,
 					PLAYER_GRAPHICS2D_CMD_POLYGON, this->addr)) {
 		Message msg(*hdr, data);
@@ -273,7 +276,8 @@
 		glEnd();
 	}
 		break;
-
+// Draw Multiline is new in Player 3.1, this ifdef allows Stage to build against older versions of Player
+#if defined PLAYER_GRAPHICS2D_CMD_MULTILINE
         case PLAYER_GRAPHICS2D_CMD_MULTILINE: {
                 player_graphics2d_cmd_multiline_t
                                 & data =
@@ -286,10 +290,7 @@
         }
                 break;
 
-
-
-
-
+#endif
 
 	case PLAYER_GRAPHICS2D_CMD_POLYGON: {
 		player_graphics2d_cmd_polygon_t