Attachment #446994 for bug #594468

View | Details | Raw Unified | Return to bug 594468
Collapse All | Expand All

Lines 37-43 Link Here

(-)crystalspace-src-2.0/include/csutil/redblacktree.h.old (-2 / +2 lines)
37	* @{ */	37	* @{ */
38		38
39	template <typename K, typename Allocator,	39	template <typename K, typename Allocator,
40	template<typename K, typename K2> class Ordering>	40	template<typename K1, typename K2> class Ordering>
41	class csRedBlackTree;	41	class csRedBlackTree;
42		42
43	template <typename K, typename T>	43	template <typename K, typename T>
Lines 237-243 Link Here
237	template <typename K,	237	template <typename K,
238	typename Allocator =	238	typename Allocator =
239	CS::Container::DefaultRedBlackTreeAllocator<K>,	239	CS::Container::DefaultRedBlackTreeAllocator<K>,
240	template<typename K, typename K2> class Ordering =	240	template<typename K1, typename K2> class Ordering =
241	CS::Container::RedBlackTreeOrderingTotal>	241	CS::Container::RedBlackTreeOrderingTotal>
242	class csRedBlackTree	242	class csRedBlackTree
243	{	243	{

Lines 1159-1165 Link Here

(-)crystalspace-src-2.0/plugins/terraformer/pagingformer/pagingformer.cpp.old (-1 / +1 lines)
1159	else	1159	else
1160	{	1160	{
1161	// Something we can't return was requested	1161	// Something we can't return was requested
1162	return false;	1162	return NULL;
1163	}	1163	}
1164	}	1164	}
1165		1165

Lines 46-65 Link Here

(-)crystalspace-src-2.0/plugins/documentsystem/xmlread/characters.cpp.old (-10 / +10 lines)
46	// 0 1 2 3 4 5 6 7 8 9 A B C D E F	46	// 0 1 2 3 4 5 6 7 8 9 A B C D E F
47	CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // 00-0f	47	CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // 00-0f
48	CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // 10-1f	48	CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // 10-1f
49	CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,S,S,0), // 20-2f	49	CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,(uint32)S,(uint32)S,0), // 20-2f
50	CHAR_ROW(S,S,S,S,S,S,S,S,S,S,F,0,0,0,0,0), // 30-3f	50	CHAR_ROW((uint32)S,(uint32)S,(uint32)S,(uint32)S,(uint32)S,(uint32)S,(uint32)S,(uint32)S,(uint32)S,(uint32)S,(uint32)F,0,0,0,0,0), // 30-3f
51	CHAR_ROW(0,F,F,F,F,F,F,F,F,F,F,F,F,F,F,F), // 40-4f	51	CHAR_ROW(0,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F), // 40-4f
52	CHAR_ROW(F,F,F,F,F,F,F,F,F,F,F,0,0,0,0,F), // 50-5f	52	CHAR_ROW((uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,0,0,0,0,(uint32)F), // 50-5f
53	CHAR_ROW(0,F,F,F,F,F,F,F,F,F,F,F,F,F,F,F), // 60-6f	53	CHAR_ROW(0,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F), // 60-6f
54	CHAR_ROW(F,F,F,F,F,F,F,F,F,F,F,0,0,0,0,0), // 70-7f	54	CHAR_ROW((uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,0,0,0,0,0), // 70-7f
55	CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // 80-8f	55	CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // 80-8f
56	CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // 90-9f	56	CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // 90-9f
57	CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // a0-af	57	CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // a0-af
58	CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // b0-bf	58	CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // b0-bf
59	CHAR_ROW(F,F,F,F,F,F,F,F,F,F,F,F,F,F,F,F), // c0-cf	59	CHAR_ROW((uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F), // c0-cf
60	CHAR_ROW(F,F,F,F,F,F,F,0,F,F,F,F,F,F,F,F), // d0-df	60	CHAR_ROW((uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,0,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F), // d0-df
61	CHAR_ROW(F,F,F,F,F,F,F,F,F,F,F,F,F,F,F,F), // e0-ef	61	CHAR_ROW((uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F), // e0-ef
62	CHAR_ROW(F,F,F,F,F,F,F,0,F,F,F,F,F,F,F,F), // f0-ff	62	CHAR_ROW((uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,0,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F), // f0-ff
63	};	63	};
64		64
65	#undef CHAR_ROW	65	#undef CHAR_ROW

Lines 141-147 Link Here

(-)crystalspace-src-2.0/plugins/mesh/protomesh/object/protomesh.cpp.old (-1 / +1 lines)
141	{	141	{
142	n = 0;	142	n = 0;
143		143
144	if (vis_cb) if (!vis_cb->BeforeDrawing (this, rview)) return false;	144	if (vis_cb) if (!vis_cb->BeforeDrawing (this, rview)) return NULL;
145		145
146	SetupObject ();	146	SetupObject ();
147		147

Lines 1012-1018 Link Here

(-)crystalspace-src-2.0/plugins/terraformer/simpleformer/simpleformer.cpp.old (-1 / +1 lines)
1012	else	1012	else
1013	{	1013	{
1014	// Something we can't return was requested	1014	// Something we can't return was requested
1015	return false;	1015	return NULL;
1016	}	1016	}
1017	}	1017	}
1018		1018




          {
            csVector3 v;
            if (!SyntaxService->ParseVector (vector_node, v))
              return NULL;
            bone->GetTransform ().SetOrigin (v);
          }


          {
            csMatrix3 m;
            if (!SyntaxService->ParseMatrix (matrix_node, m))
              return NULL;
            bone->GetTransform ().SetO2T (m);
          }
        }

            {
              csVector3 v;
              if (!SyntaxService->ParseVector (vector_node, v))
              return NULL;
              socket_transform.SetOrigin (v);
            }
    

            {
              csMatrix3 m;
              if (!SyntaxService->ParseMatrix (matrix_node, m))
              return NULL;
              socket_transform.SetO2T (m);
            }
            socket->SetTransform(socket_transform);

          {
          csVector3 v;
          if (!SyntaxService->ParseVector (vector_node, v))
            return NULL;
          key_transform.SetOrigin (v);
          }


          {
          csMatrix3 m;
          if (!SyntaxService->ParseMatrix (matrix_node, m))
            return NULL;
          key_transform.SetO2T (m);
          }
        }

Lines 516-522 Link Here

(-)crystalspace-src-2.0/plugins/mesh/animesh/persist/skeleton2/skeleton2ldr.cpp.old (-2 / +2 lines)
516	if (!name)	516	if (!name)
517	{	517	{
518	synldr->ReportError (msgid, node, "No name set for animation");	518	synldr->ReportError (msgid, node, "No name set for animation");
519	return false;	519	return NULL;
520	}	520	}
521		521
522	CS::Animation::iSkeletonAnimation* fact = packet->CreateAnimation (name);	522	CS::Animation::iSkeletonAnimation* fact = packet->CreateAnimation (name);
Lines 524-530 Link Here
524	{	524	{
525	synldr->ReportError (msgid, node,	525	synldr->ReportError (msgid, node,
526	"Could not create animation, another animation with same name already exist");	526	"Could not create animation, another animation with same name already exist");
527	return false;	527	return NULL;
528	}	528	}
529		529
530	if (node->GetAttributeValueAsBool ("bindspace", false))	530	if (node->GetAttributeValueAsBool ("bindspace", false))

Lines 363-369 Link Here

(-)crystalspace-src-2.0/plugins/mesh/watermesh/object/watermesh.cpp.old (-1 / +1 lines)
363	{	363	{
364	n = 0;	364	n = 0;
365		365
366	if (vis_cb) if (!vis_cb->BeforeDrawing (this, rview)) return false;	366	if (vis_cb) if (!vis_cb->BeforeDrawing (this, rview)) return NULL;
367		367
368	iCamera* camera = rview->GetCamera ();	368	iCamera* camera = rview->GetCamera ();
369		369




        break;
      case XMLTOKEN_KEY:
        if (!ParseKey (child, &Keys))
          return NULL;
        break;
      case XMLTOKEN_HALO:
        {

          {
            csMatrix3 m;
            if (!SyntaxService->ParseMatrix (matrix_node, m))
              return NULL;
            light_transf.SetO2T (m);
          }
          csRef<iDocumentNode> vector_node = child->GetNode ("v");

          {
            csVector3 v;
            if (!SyntaxService->ParseVector (vector_node, v))
              return NULL;
            use_light_transf_vector = true;
            light_transf.SetO2TTranslation (v);
          }

        {
          bool flag;
          if (!SyntaxService->ParseBool (child, flag, true))
            return NULL;
          lightFlags.SetBool (CS_LIGHT_NOSHADOWS, flag);
        }
        break;

        {
          csColor c;
          if (!SyntaxService->ParseColor (child, c))
            return NULL;
          sector->SetDynamicAmbientLight (c);
        }
        break;

          iRenderLoop* loop = ParseRenderLoop (child, set);
          if (!loop)
          {
            return NULL;
          }
          if (set)
          {

        return 0;
      case XMLTOKEN_KEY:
        if (!ParseKey (child, pNode->QueryObject()))
          return NULL;
        break;
      case XMLTOKEN_POSITION:
        if (!SyntaxService->ParseVector (child, pos))

Return to bug 594468

Lines 157-163 Link Here

(-)crystalspace-src-2.0/plugins/mesh/skeleton/persist/standard/skelldr.cpp.old (-6 / +6 lines)
157	{	157	{
158	csVector3 v;	158	csVector3 v;
159	if (!SyntaxService->ParseVector (vector_node, v))	159	if (!SyntaxService->ParseVector (vector_node, v))
160	return false;	160	return NULL;
161	bone->GetTransform ().SetOrigin (v);	161	bone->GetTransform ().SetOrigin (v);
162	}	162	}
163		163
Lines 166-172 Link Here
166	{	166	{
167	csMatrix3 m;	167	csMatrix3 m;
168	if (!SyntaxService->ParseMatrix (matrix_node, m))	168	if (!SyntaxService->ParseMatrix (matrix_node, m))
169	return false;	169	return NULL;
170	bone->GetTransform ().SetO2T (m);	170	bone->GetTransform ().SetO2T (m);
171	}	171	}
172	}	172	}
Lines 201-207 Link Here
201	{	201	{
202	csVector3 v;	202	csVector3 v;
203	if (!SyntaxService->ParseVector (vector_node, v))	203	if (!SyntaxService->ParseVector (vector_node, v))
204	return false;	204	return NULL;
205	socket_transform.SetOrigin (v);	205	socket_transform.SetOrigin (v);
206	}	206	}
207		207
Lines 210-216 Link Here
210	{	210	{
211	csMatrix3 m;	211	csMatrix3 m;
212	if (!SyntaxService->ParseMatrix (matrix_node, m))	212	if (!SyntaxService->ParseMatrix (matrix_node, m))
213	return false;	213	return NULL;
214	socket_transform.SetO2T (m);	214	socket_transform.SetO2T (m);
215	}	215	}
216	socket->SetTransform(socket_transform);	216	socket->SetTransform(socket_transform);
Lines 550-556 Link Here
550	{	550	{
551	csVector3 v;	551	csVector3 v;
552	if (!SyntaxService->ParseVector (vector_node, v))	552	if (!SyntaxService->ParseVector (vector_node, v))
553	return false;	553	return NULL;
554	key_transform.SetOrigin (v);	554	key_transform.SetOrigin (v);
555	}	555	}
556		556
Lines 559-565 Link Here
559	{	559	{
560	csMatrix3 m;	560	csMatrix3 m;
561	if (!SyntaxService->ParseMatrix (matrix_node, m))	561	if (!SyntaxService->ParseMatrix (matrix_node, m))
562	return false;	562	return NULL;
563	key_transform.SetO2T (m);	563	key_transform.SetO2T (m);
564	}	564	}
565	}	565	}

Lines 571-577 Link Here

(-)crystalspace-src-2.0/plugins/csparser/csparser.cpp.old (-7 / +7 lines)
571	break;	571	break;
572	case XMLTOKEN_KEY:	572	case XMLTOKEN_KEY:
573	if (!ParseKey (child, &Keys))	573	if (!ParseKey (child, &Keys))
574	return false;	574	return NULL;
575	break;	575	break;
576	case XMLTOKEN_HALO:	576	case XMLTOKEN_HALO:
577	{	577	{
Lines 779-785 Link Here
779	{	779	{
780	csMatrix3 m;	780	csMatrix3 m;
781	if (!SyntaxService->ParseMatrix (matrix_node, m))	781	if (!SyntaxService->ParseMatrix (matrix_node, m))
782	return false;	782	return NULL;
783	light_transf.SetO2T (m);	783	light_transf.SetO2T (m);
784	}	784	}
785	csRef<iDocumentNode> vector_node = child->GetNode ("v");	785	csRef<iDocumentNode> vector_node = child->GetNode ("v");
Lines 787-793 Link Here
787	{	787	{
788	csVector3 v;	788	csVector3 v;
789	if (!SyntaxService->ParseVector (vector_node, v))	789	if (!SyntaxService->ParseVector (vector_node, v))
790	return false;	790	return NULL;
791	use_light_transf_vector = true;	791	use_light_transf_vector = true;
792	light_transf.SetO2TTranslation (v);	792	light_transf.SetO2TTranslation (v);
793	}	793	}
Lines 830-836 Link Here
830	{	830	{
831	bool flag;	831	bool flag;
832	if (!SyntaxService->ParseBool (child, flag, true))	832	if (!SyntaxService->ParseBool (child, flag, true))
833	return false;	833	return NULL;
834	lightFlags.SetBool (CS_LIGHT_NOSHADOWS, flag);	834	lightFlags.SetBool (CS_LIGHT_NOSHADOWS, flag);
835	}	835	}
836	break;	836	break;
Lines 1193-1199 Link Here
1193	{	1193	{
1194	csColor c;	1194	csColor c;
1195	if (!SyntaxService->ParseColor (child, c))	1195	if (!SyntaxService->ParseColor (child, c))
1196	return false;	1196	return NULL;
1197	sector->SetDynamicAmbientLight (c);	1197	sector->SetDynamicAmbientLight (c);
1198	}	1198	}
1199	break;	1199	break;
Lines 1387-1393 Link Here
1387	iRenderLoop* loop = ParseRenderLoop (child, set);	1387	iRenderLoop* loop = ParseRenderLoop (child, set);
1388	if (!loop)	1388	if (!loop)
1389	{	1389	{
1390	return false;	1390	return NULL;
1391	}	1391	}
1392	if (set)	1392	if (set)
1393	{	1393	{
Lines 1569-1575 Link Here
1569	return 0;	1569	return 0;
1570	case XMLTOKEN_KEY:	1570	case XMLTOKEN_KEY:
1571	if (!ParseKey (child, pNode->QueryObject()))	1571	if (!ParseKey (child, pNode->QueryObject()))
1572	return false;	1572	return NULL;
1573	break;	1573	break;
1574	case XMLTOKEN_POSITION:	1574	case XMLTOKEN_POSITION:
1575	if (!SyntaxService->ParseVector (child, pos))	1575	if (!SyntaxService->ParseVector (child, pos))