Skip to content

Commit 344839f

Browse files
xezonxezon
committed
[GEN][ZH] Remove trailing CR LF from WWASSERT_PRINT strings with script (#1232)
1 parent 46e88a5 commit 344839f

File tree

10 files changed

+25
-25
lines changed

10 files changed

+25
-25
lines changed

‎Core/Libraries/Source/WWVegas/WW3D2/shattersystem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ void PolygonClass::Split(const PlaneClass & plane,PolygonClass & front,PolygonCl
592592
back.Verts[(back.NumVerts)++] = Verts[i];
593593
}
594594
} else {
595-
WWASSERT_PRINT(0,"PolygonClass::Split : invalid side\n");
595+
WWASSERT_PRINT(0,"PolygonClass::Split : invalid side");
596596
}
597597

598598
sideprev = side;

‎Core/Libraries/Source/WWVegas/WWMath/aabtreecull.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ void AABTreeCullSystemClass::Update_Bounding_Boxes_Recursive(AABTreeNodeClass *
698698

699699
void AABTreeCullSystemClass::Load(ChunkLoadClass & cload)
700700
{
701-
WWASSERT_PRINT(Object_Count() == 0, "Remove all objects from AAB-Culling system before loading!\n");
701+
WWASSERT_PRINT(Object_Count() == 0, "Remove all objects from AAB-Culling system before loading!");
702702

703703
delete RootNode;
704704
RootNode = new AABTreeNodeClass;

‎Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ void DDSFileClass::Copy_Level_To_Surface
402402

403403
if (!DDSMemory || !Get_Memory_Pointer(level))
404404
{
405-
WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing\n");
405+
WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing");
406406
return;
407407
}
408408

@@ -557,7 +557,7 @@ void DDSFileClass::Copy_CubeMap_Level_To_Surface
557557

558558
if (!DDSMemory || !Get_CubeMap_Memory_Pointer(face,level))
559559
{
560-
WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing\n");
560+
WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing");
561561
return;
562562
}
563563

@@ -727,7 +727,7 @@ void DDSFileClass::Copy_Volume_Level_To_Surface
727727

728728
if (!DDSMemory || !Get_Volume_Memory_Pointer(level))
729729
{
730-
WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing\n");
730+
WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing");
731731
return;
732732
}
733733

‎Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ WW3DErrorType MeshModelClass::read_chunks(ChunkLoadClass & cload,MeshLoadContext
483483
break;
484484

485485
case O_W3D_CHUNK_SURRENDER_TRIANGLES:
486-
WWASSERT_PRINT( 0, "Obsolete Triangle Chunk Encountered!\r\n" );
486+
WWASSERT_PRINT( 0, "Obsolete Triangle Chunk Encountered!" );
487487
break;
488488

489489
case W3D_CHUNK_TRIANGLES:

‎Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ TextureClass::TextureClass
192192
default: break;
193193
}
194194

195-
WWASSERT_PRINT(name && name[0], "TextureClass CTor: NULL or empty texture name\n");
195+
WWASSERT_PRINT(name && name[0], "TextureClass CTor: NULL or empty texture name");
196196
int len=strlen(name);
197197
for (int i=0;i<len;++i)
198198
{
@@ -437,7 +437,7 @@ void TextureClass::Set_Texture_Name(const char * name)
437437
unsigned int TextureClass::Get_Mip_Level_Count(void)
438438
{
439439
if (!D3DTexture) {
440-
WWASSERT_PRINT(0, "Get_Mip_Level_Count: D3DTexture is NULL!\n");
440+
WWASSERT_PRINT(0, "Get_Mip_Level_Count: D3DTexture is NULL!");
441441
return 0;
442442
}
443443

@@ -449,7 +449,7 @@ unsigned int TextureClass::Get_Mip_Level_Count(void)
449449
void TextureClass::Get_Level_Description(SurfaceClass::SurfaceDescription &surface_desc, unsigned int level)
450450
{
451451
if (!D3DTexture) {
452-
WWASSERT_PRINT(0, "Get_Surface_Description: D3DTexture is NULL!\n");
452+
WWASSERT_PRINT(0, "Get_Surface_Description: D3DTexture is NULL!");
453453
}
454454

455455
D3DSURFACE_DESC d3d_surf_desc;
@@ -475,7 +475,7 @@ SurfaceClass *TextureClass::Get_Surface_Level(unsigned int level)
475475
unsigned int TextureClass::Get_Priority(void)
476476
{
477477
if (!D3DTexture) {
478-
WWASSERT_PRINT(0, "Get_Priority: D3DTexture is NULL!\n");
478+
WWASSERT_PRINT(0, "Get_Priority: D3DTexture is NULL!");
479479
return 0;
480480
}
481481

@@ -487,7 +487,7 @@ unsigned int TextureClass::Get_Priority(void)
487487
unsigned int TextureClass::Set_Priority(unsigned int priority)
488488
{
489489
if (!D3DTexture) {
490-
WWASSERT_PRINT(0, "Set_Priority: D3DTexture is NULL!\n");
490+
WWASSERT_PRINT(0, "Set_Priority: D3DTexture is NULL!");
491491
return 0;
492492
}
493493

‎Generals/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ void TextureFilterClass::Set_Mip_Mapping(FilterType mipmap)
157157
{
158158
// if (mipmap != FILTER_TYPE_NONE && Get_Mip_Level_Count() <= 1 && Is_Initialized())
159159
// {
160-
// WWASSERT_PRINT(0, "Trying to enable MipMapping on texture w/o Mip levels!\n");
160+
// WWASSERT_PRINT(0, "Trying to enable MipMapping on texture w/o Mip levels!");
161161
// return;
162162
// }
163163
MipMapFilter=mipmap;

‎GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ void DDSFileClass::Copy_Level_To_Surface
384384

385385
if (!DDSMemory || !Get_Memory_Pointer(level))
386386
{
387-
WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing\n");
387+
WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing");
388388
return;
389389
}
390390

@@ -535,7 +535,7 @@ void DDSFileClass::Copy_CubeMap_Level_To_Surface
535535

536536
if (!DDSMemory || !Get_CubeMap_Memory_Pointer(face,level))
537537
{
538-
WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing\n");
538+
WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing");
539539
return;
540540
}
541541

@@ -705,7 +705,7 @@ void DDSFileClass::Copy_Volume_Level_To_Surface
705705

706706
if (!DDSMemory || !Get_Volume_Memory_Pointer(level))
707707
{
708-
WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing\n");
708+
WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing");
709709
return;
710710
}
711711

‎GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ WW3DErrorType MeshModelClass::read_chunks(ChunkLoadClass & cload,MeshLoadContext
483483
break;
484484

485485
case O_W3D_CHUNK_SURRENDER_TRIANGLES:
486-
WWASSERT_PRINT( 0, "Obsolete Triangle Chunk Encountered!\r\n" );
486+
WWASSERT_PRINT( 0, "Obsolete Triangle Chunk Encountered!" );
487487
break;
488488

489489
case W3D_CHUNK_TRIANGLES:

‎GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ unsigned int TextureBaseClass::Get_Priority(void)
336336
{
337337
if (!D3DTexture)
338338
{
339-
WWASSERT_PRINT(0, "Get_Priority: D3DTexture is NULL!\n");
339+
WWASSERT_PRINT(0, "Get_Priority: D3DTexture is NULL!");
340340
return 0;
341341
}
342342

@@ -356,7 +356,7 @@ unsigned int TextureBaseClass::Set_Priority(unsigned int priority)
356356
{
357357
if (!D3DTexture)
358358
{
359-
WWASSERT_PRINT(0, "Set_Priority: D3DTexture is NULL!\n");
359+
WWASSERT_PRINT(0, "Set_Priority: D3DTexture is NULL!");
360360
return 0;
361361
}
362362

@@ -713,7 +713,7 @@ TextureClass::TextureClass
713713
default: break;
714714
}
715715

716-
WWASSERT_PRINT(name && name[0], "TextureClass CTor: NULL or empty texture name\n");
716+
WWASSERT_PRINT(name && name[0], "TextureClass CTor: NULL or empty texture name");
717717
int len=strlen(name);
718718
for (int i=0;i<len;++i)
719719
{
@@ -987,7 +987,7 @@ SurfaceClass *TextureClass::Get_Surface_Level(unsigned int level)
987987
{
988988
if (!Peek_D3D_Texture())
989989
{
990-
WWASSERT_PRINT(0, "Get_Surface_Level: D3DTexture is NULL!\n");
990+
WWASSERT_PRINT(0, "Get_Surface_Level: D3DTexture is NULL!");
991991
return 0;
992992
}
993993

@@ -1020,7 +1020,7 @@ IDirect3DSurface8 *TextureClass::Get_D3D_Surface_Level(unsigned int level)
10201020
{
10211021
if (!Peek_D3D_Texture())
10221022
{
1023-
WWASSERT_PRINT(0, "Get_D3D_Surface_Level: D3DTexture is NULL!\n");
1023+
WWASSERT_PRINT(0, "Get_D3D_Surface_Level: D3DTexture is NULL!");
10241024
return 0;
10251025
}
10261026

@@ -1312,7 +1312,7 @@ IDirect3DSurface8* ZTextureClass::Get_D3D_Surface_Level(unsigned int level)
13121312
{
13131313
if (!Peek_D3D_Texture())
13141314
{
1315-
WWASSERT_PRINT(0, "Get_D3D_Surface_Level: D3DTexture is NULL!\n");
1315+
WWASSERT_PRINT(0, "Get_D3D_Surface_Level: D3DTexture is NULL!");
13161316
return 0;
13171317
}
13181318

@@ -1458,7 +1458,7 @@ CubeTextureClass::CubeTextureClass
14581458
default: break;
14591459
}
14601460

1461-
WWASSERT_PRINT(name && name[0], "TextureClass CTor: NULL or empty texture name\n");
1461+
WWASSERT_PRINT(name && name[0], "TextureClass CTor: NULL or empty texture name");
14621462
int len=strlen(name);
14631463
for (int i=0;i<len;++i)
14641464
{
@@ -1743,7 +1743,7 @@ VolumeTextureClass::VolumeTextureClass
17431743
default: break;
17441744
}
17451745

1746-
WWASSERT_PRINT(name && name[0], "TextureClass CTor: NULL or empty texture name\n");
1746+
WWASSERT_PRINT(name && name[0], "TextureClass CTor: NULL or empty texture name");
17471747
int len=strlen(name);
17481748
for (int i=0;i<len;++i)
17491749
{

‎GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ void TextureFilterClass::Set_Mip_Mapping(FilterType mipmap)
207207
{
208208
// if (mipmap != FILTER_TYPE_NONE && Get_Mip_Level_Count() <= 1 && Is_Initialized())
209209
// {
210-
// WWASSERT_PRINT(0, "Trying to enable MipMapping on texture w/o Mip levels!\n");
210+
// WWASSERT_PRINT(0, "Trying to enable MipMapping on texture w/o Mip levels!");
211211
// return;
212212
// }
213213
MipMapFilter=mipmap;

0 commit comments

Comments
 (0)