abelgar.patch

abelgar, 09/20/2010 10:12 am

Download (6 kB)

b/code/nel/include/nel/ligo/primitive_utils.h Mon Sep 20 10:01:35 2010 +0200
162 162
	{
163 163
		while (!_IndexStack.empty())
164 164
		{
165
			if (_IndexStack.back() == ~0)
165
			// uint cast is to prevent warn with gcc but use of complement with uint is weird
166
			if (_IndexStack.back() == (uint) ~0)
166 167
			{
167 168
				_IndexStack.back() = 0;
168 169
				// we need to check the current node.
b/code/ryzom/tools/pd_parser/main.cpp Mon Sep 20 10:01:35 2010 +0200
32 32
	uint	arg;
33 33
	for (arg=1; (sint)arg<argc; ++arg)
34 34
	{
35
		if (argv[arg] == "-hauto")
35
		string str_arg = argv[arg];
36

  
37
		if (str_arg == "-hauto")
36 38
			GenerateHAuto = true;
37
		else if (argv[arg] == "-dbgmsg")
39
		else if (str_arg == "-dbgmsg")
38 40
		{
39 41
			VerboseMode = true;
40 42
			GenerateDebugMessages = true;
41 43
		}
42
		else if (argv[arg] == "-onlylogs")
44
		else if (str_arg == "-onlylogs")
43 45
		{
44 46
			GenerateOnlyLogs = true;
45 47
		}
......
129 131

  
130 132
	return 0;
131 133
*/
132
}
134
}
b/code/ryzom/tools/pd_parser/parse_node.h Mon Sep 20 10:01:35 2010 +0200
745 745
	std::string		XmlNode;
746 746
	std::vector<CColumn>	ColumnList;
747 747

  
748
	uint			Id;
749

  
750 748
	sint			Column;
751 749
	sint			Columns;
752 750

  
751
	uint			Id;
752

  
753 753
	CClassNode*		ClassNode;
754 754
	CClassNode*		getParentClass()	{ return dynamic_cast<CClassNode*>(Parent); }
755 755

  
b/code/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp Mon Sep 20 10:01:35 2010 +0200
188 188
			// the same zones were found -> now check their dates against the island one
189 189
			uint32 packedIslandDate = CFile::getFileModificationDate(islandPath);
190 190
			mustRebuild = false;
191
			for(uint k = 0; k < presentZonePathes.size(); ++k)
191

  
192
			for(uint l = 0; l < presentZonePathes.size(); ++l)
192 193
			{				
193 194
				if (CFile::getFileModificationDate(presentZonePathes[l]) > packedIslandDate)
194 195
				{
b/code/ryzom/tools/translation_tools/extract_bot_names.cpp Mon Sep 20 10:01:35 2010 +0200
272 272
	//-------------------------------------------------------------------
273 273
	// init the sheets
274 274
	CSheetId::init(false);
275
	char *PACKED_SHEETS_NAME = "bin/translation_tools_creature.packed_sheets";
275
	string PACKED_SHEETS_NAME = "bin/translation_tools_creature.packed_sheets";
276 276
	loadForm("creature", PACKED_SHEETS_NAME, Creatures, false, false);
277
	
277 278
	if (Creatures.empty())
278 279
	{
279 280
		for (uint i=0;i<georgesPaths.size();++i)
......
750 751
	CI18N::writeTextFile(workTitleFile.asString(), s, false);
751 752

  
752 753
	return 0;
753
}
754
}
b/code/ryzom/tools/translation_tools/extract_new_sheet_names.cpp Mon Sep 20 10:01:35 2010 +0200
198 198
		return;
199 199
	}
200 200
	// get the key column index
201
	uint	keyColIndex;
201
	uint	keyColIndex = 0;
202
	
202 203
	if(!workSheet.findCol(columnId, keyColIndex))
203 204
	{
204 205
		nlwarning("Error: Don't find the column '%s'. '%s' Aborted", columnId.c_str(), workSheetFileName.c_str());
b/code/ryzom/tools/translation_tools/main.cpp Mon Sep 20 10:01:35 2010 +0200
313 313
		LOG("Error : the file languages.txt is empty !\n");
314 314
		return 1;
315 315
	}
316
	LOG("Found %u language code\n", Languages.size());
316

  
317
	LOG("Found %u language code\n", (uint) Languages.size());
317 318

  
318 319
	return 0;
319 320
}
......
1378 1379
			return false;
1379 1380
		makeHashCode(diff, false);
1380 1381

  
1381
		uint cmdCol;
1382
		uint cmdCol = 0;
1382 1383
		if (!diff.findCol(ucstring("DIFF_CMD"), cmdCol))
1383 1384
		{
1384 1385
			LOG("Can't find DIFF_CMD column in %s ! Invalid diff file.\n", CFile::getFilename(fileList[i]).c_str());
......
1490 1491
		TWorksheet::TRow row(context.Reference.ColCount+1);
1491 1492
		for (uint j=0; j<context.Addition.ColCount; ++j)
1492 1493
		{
1493
			uint colIndex;
1494
			uint colIndex = 0;
1494 1495
			if (context.Reference.findCol(context.Addition.Data[0][j], colIndex))
1495 1496
			{
1496 1497
				row[colIndex+1] = context.Addition.Data[addIndex][j];
......
1508 1509
		TWorksheet::TRow row(context.Reference.ColCount+1);
1509 1510
		for (uint j=0; j<context.Reference.ColCount; ++j)
1510 1511
		{
1511
			uint colIndex;
1512
			uint colIndex = 0;
1512 1513
			if (context.Reference.findCol(context.Reference.Data[0][j], colIndex))
1513 1514
			{
1514 1515
				row[colIndex+1] = context.Reference.Data[refIndex][j];
......
1527 1528
		// copy the old content (this fill data in column that don't exist in addition worksheet)
1528 1529
		row = context.Reference.Data[refIndex];
1529 1530
		row.insert(row.begin(), ucstring());
1531

  
1530 1532
		// changed element
1531 1533
		for (uint j=0; j<context.Addition.ColCount; ++j)
1532 1534
		{
1533
			uint colIndex;
1535
			uint colIndex = 0;
1534 1536
			if (context.Reference.findCol(context.Addition.Data[0][j], colIndex))
1535 1537
			{
1536 1538
				row[colIndex+1] = context.Addition.Data[addIndex][j];
1537 1539
			}
1538 1540
		}
1541

  
1539 1542
		char temp[1024];
1540 1543
		sprintf(temp, "DIFF CHANGED %u ", addIndex);
1541 1544
		row[0] = temp;
......
3144 3147
	
3145 3148
	// create the diff version.
3146 3149
	char temp[1024];
3147
	sprintf(temp, "%8.8X", ::time(NULL));
3150
	sprintf(temp, "%8.8X", (uint) ::time(NULL));
3148 3151
	diffVersion = temp;
3149 3152

  
3150 3153
	if (strcmp(argv[1], "make_work") == 0)