Skip to content

Commit 21e50a0

Browse files
xezonxezon
committed
[GEN][ZH] Remove trailing CR LF from WWDEBUG_SAY strings with script (#1232)
1 parent 856333c commit 21e50a0

File tree

87 files changed

+392
-392
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+392
-392
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ AggregateDefClass::Create (void)
213213
pmodel->Set_Sub_Objects_Match_LOD ((m_MiscInfo.Flags & W3D_AGGREGATE_FORCE_SUB_OBJ_LOD) == W3D_AGGREGATE_FORCE_SUB_OBJ_LOD);
214214

215215
} else {
216-
WWDEBUG_SAY (("Unable to load aggregate %s.\r\n", m_Info.BaseModelName));
216+
WWDEBUG_SAY (("Unable to load aggregate %s.", m_Info.BaseModelName));
217217
}
218218

219219
// Return a pointer to the new aggregate
@@ -296,13 +296,13 @@ AggregateDefClass::Attach_Subobjects (RenderObjClass &base_model)
296296

297297
// Attach this object to the requested bone
298298
if (base_model.Add_Sub_Object_To_Bone (prender_obj, psubobj_info->BoneName) == false) {
299-
WWDEBUG_SAY (("Unable to attach %s to %s.\r\n", psubobj_info->SubobjectName, psubobj_info->BoneName));
299+
WWDEBUG_SAY (("Unable to attach %s to %s.", psubobj_info->SubobjectName, psubobj_info->BoneName));
300300
}
301301

302302
// Release our hold on this pointer
303303
prender_obj->Release_Ref ();
304304
} else {
305-
WWDEBUG_SAY (("Unable to load aggregate subobject %s.\r\n", psubobj_info->SubobjectName));
305+
WWDEBUG_SAY (("Unable to load aggregate subobject %s.", psubobj_info->SubobjectName));
306306
}
307307
}
308308
}
@@ -559,7 +559,7 @@ AggregateDefClass::Load_W3D (ChunkLoadClass &chunk_load)
559559
case W3D_CHUNK_TEXTURE_REPLACER_INFO:
560560
if (chunk_load.Read (&header, sizeof (header)) == sizeof (header)) {
561561
if (header.ReplacedTexturesCount > 0) {
562-
WWDEBUG_SAY(("Obsolete texture replacement chunk encountered in aggregate: %s\r\n",m_pName));
562+
WWDEBUG_SAY(("Obsolete texture replacement chunk encountered in aggregate: %s",m_pName));
563563
}
564564
}
565565
break;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ AnimatedSoundMgrClass::Initialize (const char *ini_filename)
388388
AnimSoundLists.Add (sound_list);
389389

390390
} else {
391-
//WWDEBUG_SAY (("AnimatedSoundMgrClass::Initialize -- No sounds added for %d!\n", animation_name.Peek_Buffer ()));
391+
//WWDEBUG_SAY (("AnimatedSoundMgrClass::Initialize -- No sounds added for %d!", animation_name.Peek_Buffer ()));
392392
delete sound_list;
393393
}
394394
}
@@ -544,7 +544,7 @@ AnimatedSoundMgrClass::Trigger_Sound
544544
}
545545
}
546546

547-
//WWDEBUG_SAY (("Triggering Sound %d %s\n", GetTickCount (), sound_list->List[index]->SoundName));
547+
//WWDEBUG_SAY (("Triggering Sound %d %s", GetTickCount (), sound_list->List[index]->SoundName));
548548

549549
retval = frame;
550550

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ RenderObjClass * DistLODPrototypeClass::Create(void)
116116
}
117117
dist->Release_Ref();
118118

119-
WWDEBUG_SAY(("OBSOLETE Dist-LOD model found! Please re-export %s!\r\n",name));
119+
WWDEBUG_SAY(("OBSOLETE Dist-LOD model found! Please re-export %s!",name));
120120
HLodClass * hlod = NEW_REF(HLodClass , (name,robj,count));
121121

122122
// Now, release the temporary refs and memory for the name

‎Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class DX8PolygonRendererClass : public MultiListObjectClass
104104

105105
inline void DX8PolygonRendererClass::Set_Vertex_Index_Range(unsigned min_vertex_index_,unsigned vertex_index_range_)
106106
{
107-
// WWDEBUG_SAY(("Set_Vertex_Index_Range - min: %d, range: %d\n",min_vertex_index_,vertex_index_range_));
107+
// WWDEBUG_SAY(("Set_Vertex_Index_Range - min: %d, range: %d",min_vertex_index_,vertex_index_range_));
108108
// if (vertex_index_range_>30000) {
109109
// int a=0;
110110
// a++;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ void DX8WebBrowser::Render(int backbufferindex)
189189
// ******************************************************************************************
190190
void DX8WebBrowser::CreateBrowser(const char* browsername, const char* url, int x, int y, int w, int h, int updateticks, LONG options, LPDISPATCH gamedispatch)
191191
{
192-
WWDEBUG_SAY(("DX8WebBrowser::CreateBrowser - Creating browser with the name %s, url = %s, (x, y, w, h) = (%d, %d, %d, %d), update ticks = %d\n", browsername, url, x, y, h, w, updateticks));
192+
WWDEBUG_SAY(("DX8WebBrowser::CreateBrowser - Creating browser with the name %s, url = %s, (x, y, w, h) = (%d, %d, %d, %d), update ticks = %d", browsername, url, x, y, h, w, updateticks));
193193
if(pBrowser)
194194
{
195195
_bstr_t brsname(browsername);
@@ -212,7 +212,7 @@ void DX8WebBrowser::CreateBrowser(const char* browsername, const char* url, int
212212
// ******************************************************************************************
213213
void DX8WebBrowser::DestroyBrowser(const char* browsername)
214214
{
215-
WWDEBUG_SAY(("DX8WebBrowser::DestroyBrowser - destroying browser %s\n", browsername));
215+
WWDEBUG_SAY(("DX8WebBrowser::DestroyBrowser - destroying browser %s", browsername));
216216
if(pBrowser)
217217
pBrowser->DestroyBrowser(_bstr_t(browsername));
218218
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ SurfaceClass *Font3DDataClass::Minimize_Font_Image( SurfaceClass *surface )
142142
// we assert because we have already modified tables for some of the chars
143143
if (new_y + height > new_height) {
144144
new_y -= height;
145-
WWDEBUG_SAY(( "Font doesn't fit texture 2 on char %c\n", char_index ));
145+
WWDEBUG_SAY(( "Font doesn't fit texture 2 on char %c", char_index ));
146146
}
147147
}
148148

@@ -288,7 +288,7 @@ bool Font3DDataClass::Load_Font_Image( const char *filename )
288288
int end = column;
289289

290290
if ( end <= start ) {
291-
WWDEBUG_SAY(( "Error Char %d start %d end %d width %d\n", char_index, start, end, width ));
291+
WWDEBUG_SAY(( "Error Char %d start %d end %d width %d", char_index, start, end, width ));
292292
}
293293

294294
// WWASSERT( end > start );

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ int HCompressedAnimClass::Load_W3D(ChunkLoadClass & cload)
318318
// gonna trash memory. Boy will we trash memory.
319319
// GTH 09-25-2000: print a warning and survive this error
320320
delete tc_chan;
321-
WWDEBUG_SAY(("ERROR! animation %s indexes a bone not present in the model. Please re-export!\r\n",Name));
321+
WWDEBUG_SAY(("ERROR! animation %s indexes a bone not present in the model. Please re-export!",Name));
322322
}
323323

324324
break;
@@ -335,7 +335,7 @@ int HCompressedAnimClass::Load_W3D(ChunkLoadClass & cload)
335335
// gonna trash memory. Boy will we trash memory.
336336
// GTH 09-25-2000: print a warning and survive this error
337337
delete ad_chan;
338-
WWDEBUG_SAY(("ERROR! animation %s indexes a bone not present in the model. Please re-export!\r\n",Name));
338+
WWDEBUG_SAY(("ERROR! animation %s indexes a bone not present in the model. Please re-export!",Name));
339339
}
340340
break;
341341
}
@@ -353,7 +353,7 @@ int HCompressedAnimClass::Load_W3D(ChunkLoadClass & cload)
353353
// gonna trash memory. Boy will we trash memory.
354354
// GTH 09-25-2000: print a warning and survive this error
355355
delete newbitchan;
356-
WWDEBUG_SAY(("ERROR! animation %s indexes a bone not present in the model. Please re-export!\r\n",Name));
356+
WWDEBUG_SAY(("ERROR! animation %s indexes a bone not present in the model. Please re-export!",Name));
357357
}
358358

359359
break;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ void IntersectionClass::Append_Object_Array(
166166
CurrentCount++;
167167
return;
168168
}
169-
WWDEBUG_SAY(("IntersectionClass::Append_Object_Array - Too many objects\n"));
169+
WWDEBUG_SAY(("IntersectionClass::Append_Object_Array - Too many objects"));
170170
}
171171

172172
// determines if specified plane-intersection point (co-planar with polygon) is within the the passed polygon.

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,7 +1234,7 @@ PersistClass * RenderObjPersistFactoryClass::Load(ChunkLoadClass & cload) const
12341234
break;
12351235

12361236
default:
1237-
WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d\r\n",__FILE__,__LINE__));
1237+
WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d",__FILE__,__LINE__));
12381238
break;
12391239
};
12401240
cload.Close_Chunk();
@@ -1244,8 +1244,8 @@ PersistClass * RenderObjPersistFactoryClass::Load(ChunkLoadClass & cload) const
12441244
if (strlen(name) == 0) {
12451245
static int count = 0;
12461246
if ( ++count < 10 ) {
1247-
WWDEBUG_SAY(("RenderObjPersistFactory attempted to load an un-named render object!\r\n"));
1248-
WWDEBUG_SAY(("Replacing it with a NULL render object!\r\n"));
1247+
WWDEBUG_SAY(("RenderObjPersistFactory attempted to load an un-named render object!"));
1248+
WWDEBUG_SAY(("Replacing it with a NULL render object!"));
12491249
}
12501250
strcpy(name,"NULL");
12511251
}
@@ -1255,9 +1255,9 @@ PersistClass * RenderObjPersistFactoryClass::Load(ChunkLoadClass & cload) const
12551255
if (new_obj == NULL) {
12561256
static int count = 0;
12571257
if ( ++count < 10 ) {
1258-
WWDEBUG_SAY(("RenderObjPersistFactory failed to create object: %s!!\r\n",name));
1259-
WWDEBUG_SAY(("Either the asset for this object is gone or you tried to save a procedural object.\r\n"));
1260-
WWDEBUG_SAY(("Replacing it with a NULL render object!\r\n"));
1258+
WWDEBUG_SAY(("RenderObjPersistFactory failed to create object: %s!!",name));
1259+
WWDEBUG_SAY(("Either the asset for this object is gone or you tried to save a procedural object."));
1260+
WWDEBUG_SAY(("Replacing it with a NULL render object!"));
12611261
}
12621262
strcpy(name,"NULL");
12631263
new_obj = WW3DAssetManager::Get_Instance()->Create_Render_Obj(name);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ void SegLineRendererClass::Set_Texture_Tile_Factor(float factor)
191191
///@todo: I raised this number and didn't see much difference on our min-spec. -MW
192192
const static float MAX_LINE_TILING_FACTOR = 50.0f;
193193
if (factor > MAX_LINE_TILING_FACTOR) {
194-
WWDEBUG_SAY(("Texture (%s) Tile Factor (%.2f) too large in SegLineRendererClass!\r\n", Get_Texture()->Get_Texture_Name().str(), TextureTileFactor));
194+
WWDEBUG_SAY(("Texture (%s) Tile Factor (%.2f) too large in SegLineRendererClass!", Get_Texture()->Get_Texture_Name().str(), TextureTileFactor));
195195
factor = MAX_LINE_TILING_FACTOR;
196196
} else {
197197
factor = MAX(factor, 0.0f);

0 commit comments

Comments
 (0)