Skip to content

Commit 909a43b

Browse files
committed
Remove further unnecessary return statements.
Missed unnecessary return statements: removed.
1 parent a56aa3f commit 909a43b

File tree

132 files changed

+0
-1172
lines changed

Some content is hidden

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

132 files changed

+0
-1172
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,6 @@ AggregateDefClass::Attach_Subobjects (RenderObjClass &base_model)
304304
}
305305
}
306306
}
307-
308-
return ;
309307
}
310308

311309

@@ -494,8 +492,6 @@ AggregateDefClass::Build_Subobject_List
494492
}
495493
node_list.Delete_All ();
496494
}
497-
498-
return ;
499495
}
500496

501497

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,6 @@ AnimatedSoundMgrClass::Initialize (const char *ini_filename)
393393

394394
delete ini_file;
395395
}
396-
397-
return ;
398396
}
399397

400398

Core/Libraries/Source/WWVegas/WW3D2/htree.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,8 +1068,6 @@ void HTreeClass::Get_Bone_Control(int boneindex, Matrix3D & relative_tm) const
10681068
} else {
10691069
relative_tm.Make_Identity ();
10701070
}
1071-
1072-
return ;
10731071
}
10741072

10751073
HTreeClass * HTreeClass::Alter_Avatar_HTree( const HTreeClass *tree, Vector3 &scale)

Core/Libraries/Source/WWVegas/WW3D2/prim_anim.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,6 @@ PrimitiveAnimationChannelClass<T>::Save (ChunkSaveClass &csave)
284284
}
285285

286286
csave.End_Chunk ();
287-
288-
return ;
289287
}
290288

291289
/////////////////////////////////////////////////////////////////////
@@ -306,8 +304,6 @@ PrimitiveAnimationChannelClass<T>::Load (ChunkLoadClass &cload)
306304

307305
cload.Close_Chunk ();
308306
}
309-
310-
return ;
311307
}
312308

313309
/////////////////////////////////////////////////////////////////////
@@ -333,8 +329,6 @@ PrimitiveAnimationChannelClass<T>::Load_Variables (ChunkLoadClass &cload)
333329

334330
cload.Close_Micro_Chunk ();
335331
}
336-
337-
return ;
338332
}
339333

340334
/////////////////////////////////////////////////////////////////////

Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,6 @@ Render2DSentenceClass::Reset_Polys (void)
117117
for (int index = 0; index < Renderers.Count (); index ++) {
118118
Renderers[index].Renderer->Reset ();
119119
}
120-
121-
return ;
122120
}
123121

124122

@@ -196,8 +194,6 @@ Render2DSentenceClass::Set_Shader (ShaderClass shader)
196194
ShaderClass *curr_shader = Renderers[i].Renderer->Get_Shader ();
197195
(*curr_shader) = Shader;
198196
}
199-
200-
return ;
201197
}
202198

203199

@@ -220,8 +216,6 @@ Render2DSentenceClass::Render (void)
220216
for (int i = 0; i < Renderers.Count (); i ++) {
221217
Renderers[i].Renderer->Render ();
222218
}
223-
224-
return ;
225219
}
226220

227221

@@ -238,8 +232,6 @@ Render2DSentenceClass::Set_Base_Location (const Vector2 &loc)
238232
for (int i = 0; i < Renderers.Count (); i ++) {
239233
Renderers[i].Renderer->Move (dif);
240234
}
241-
242-
return ;
243235
}
244236

245237

@@ -572,8 +564,6 @@ Render2DSentenceClass::Draw_Sentence (uint32 color)
572564
}
573565
}
574566
}
575-
576-
return ;
577567
}
578568

579569

@@ -613,8 +603,6 @@ Render2DSentenceClass::Record_Sentence_Chunk (void)
613603
//
614604
SentenceData.Add (sentence_data);
615605
}
616-
617-
return ;
618606
}
619607

620608

@@ -1330,8 +1318,6 @@ FontCharsClass::Blit_Char (WCHAR ch, uint16 *dest_ptr, int dest_stride, int x, i
13301318
dest_ptr += dest_inc;
13311319
}
13321320
}
1333-
1334-
return ;
13351321
}
13361322

13371323

@@ -1494,8 +1480,6 @@ FontCharsClass::Update_Current_Buffer (int char_width)
14941480
BufferList.Add( new_buffer );
14951481
CurrPixelOffset = 0;
14961482
}
1497-
1498-
return ;
14991483
}
15001484

15011485

@@ -1636,8 +1620,6 @@ FontCharsClass::Free_GDI_Font (void)
16361620
::DeleteDC( MemDC );
16371621
MemDC = NULL;
16381622
}
1639-
1640-
return ;
16411623
}
16421624

16431625

@@ -1781,6 +1763,4 @@ FontCharsClass::Free_Character_Arrays (void)
17811763
delete ASCIICharArray[index];
17821764
ASCIICharArray[index] = NULL;
17831765
}
1784-
1785-
return ;
17861766
}

Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,6 @@ void RingRenderObjClass::Generate_Shared_Mesh_Arrays (void)
385385

386386
Ring_Array_Valid = true;
387387
}
388-
389-
return ;
390388
}
391389

392390

@@ -1121,8 +1119,6 @@ void RingRenderObjClass::Update_On_Visibilty(void)
11211119
} else if ((Is_Not_Hidden_At_All () == false) && Is_Animating ()) {
11221120
Stop_Animating ();
11231121
}
1124-
1125-
return ;
11261122
}
11271123

11281124
/***********************************************************************************************
@@ -1179,8 +1175,6 @@ void RingRenderObjClass::animate()
11791175
}
11801176
}
11811177
}
1182-
1183-
return ;
11841178
}
11851179

11861180

@@ -1470,8 +1464,6 @@ void RingMeshClass::Set_Tiling (int count)
14701464
u_value += u_inc;
14711465
}
14721466
}
1473-
1474-
return ;
14751467
}
14761468

14771469

@@ -1507,8 +1499,6 @@ void RingMeshClass::Scale (const Vector2 &inner_scale, const Vector2 &outer_scal
15071499

15081500
OuterScale = outer_scale;
15091501
}
1510-
1511-
return ;
15121502
}
15131503

15141504

@@ -1592,8 +1582,6 @@ void RingMeshClass::Generate(float radius, int slices)
15921582
tri_poly[index].J = index+1;
15931583
tri_poly[index].K = index+2;
15941584
}
1595-
1596-
return ;
15971585
}
15981586

15991587

Core/Libraries/Source/WWVegas/WW3D2/soundrobj.cpp

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ SoundRenderObjClass::~SoundRenderObjClass (void)
9797
Sound->Remove_From_Scene ();
9898
REF_PTR_RELEASE (Sound);
9999
}
100-
101-
return ;
102100
}
103101

104102

@@ -151,8 +149,6 @@ SoundRenderObjClass::Set_Sound (AudibleSoundDefinitionClass *definition)
151149
if (definition != NULL) {
152150
Sound = (AudibleSoundClass *)definition->Create ();
153151
}
154-
155-
return ;
156152
}
157153

158154

@@ -174,8 +170,6 @@ SoundRenderObjClass::On_Frame_Update (void)
174170
Sound->Attach_To_Object (NULL);
175171
Sound->Remove_From_Scene ();
176172
}
177-
178-
return ;
179173
}
180174

181175

@@ -197,8 +191,6 @@ SoundRenderObjClass::Set_Hidden (int onoff)
197191
IsInitialized = true;
198192
Update_On_Visibilty ();
199193
}
200-
201-
return ;
202194
}
203195

204196

@@ -220,8 +212,6 @@ SoundRenderObjClass::Set_Visible (int onoff)
220212
IsInitialized = true;
221213
Update_On_Visibilty ();
222214
}
223-
224-
return ;
225215
}
226216

227217

@@ -243,8 +233,6 @@ SoundRenderObjClass::Set_Animation_Hidden (int onoff)
243233
IsInitialized = true;
244234
Update_On_Visibilty ();
245235
}
246-
247-
return ;
248236
}
249237

250238

@@ -266,8 +254,6 @@ SoundRenderObjClass::Set_Force_Visible (int onoff)
266254
IsInitialized = true;
267255
Update_On_Visibilty ();
268256
}
269-
270-
return ;
271257
}
272258

273259

@@ -314,8 +300,6 @@ SoundRenderObjClass::Update_On_Visibilty (void)
314300
Sound->Remove_From_Scene ();
315301
}
316302
}
317-
318-
return ;
319303
}
320304

321305

@@ -347,8 +331,6 @@ SoundRenderObjClass::Set_Flag (uint32 flag, bool onoff)
347331
if (onoff) {
348332
Flags |= flag;
349333
}
350-
351-
return ;
352334
}
353335

354336

@@ -398,8 +380,6 @@ SoundRenderObjClass::Set_Transform (const Matrix3D &tm)
398380
IsInitialized = true;
399381
Update_On_Visibilty ();
400382
}
401-
402-
return ;
403383
}
404384

405385

@@ -417,8 +397,6 @@ SoundRenderObjClass::Set_Position (const Vector3 &pos)
417397
IsInitialized = true;
418398
Update_On_Visibilty ();
419399
}
420-
421-
return ;
422400
}
423401

424402

Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -315,8 +315,6 @@ void SphereRenderObjClass::Generate_Shared_Mesh_Arrays (const AlphaVectorStruct
315315

316316
Sphere_Array_Valid = true;
317317
}
318-
319-
return ;
320318
}
321319

322320

@@ -1078,8 +1076,6 @@ void SphereRenderObjClass::Update_On_Visibilty(void)
10781076
} else if ((Is_Not_Hidden_At_All () == false) && Is_Animating ()) {
10791077
Stop_Animating ();
10801078
}
1081-
1082-
return ;
10831079
}
10841080

10851081

@@ -1135,8 +1131,6 @@ void SphereRenderObjClass::animate (void)
11351131
}
11361132
}
11371133

1138-
return ;
1139-
11401134
}
11411135

11421136

@@ -1478,8 +1472,6 @@ void SphereMeshClass::Set_Alpha_Vector (const AlphaVectorStruct &v, bool inverse
14781472
Set_DCG (is_additive, idx, 1.0F - temp);
14791473
}
14801474
}
1481-
1482-
return ;
14831475
}
14841476

14851477

Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,6 @@ SphereMeshClass::Set_DCG (bool is_additive, int index, float value)
208208
dcg[index].Z = 1.0F;
209209
dcg[index].W = value;
210210
}
211-
212-
return ;
213211
}
214212

215213
// Note: SPHERE_NUM_LOD does not include the NULL LOD.

Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -755,8 +755,6 @@ void SurfaceClass::Attach (IDirect3DSurface8 *surface)
755755
if (D3DSurface != NULL) {
756756
D3DSurface->AddRef ();
757757
}
758-
759-
return ;
760758
}
761759

762760

0 commit comments

Comments
 (0)