Skip to content

Commit ce3fde2

Browse files
committed
Further remove reduntant return statements.
1 parent 909a43b commit ce3fde2

File tree

38 files changed

+0
-117
lines changed

38 files changed

+0
-117
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,8 +1164,6 @@ Render2DSentenceClass::Build_Sentence (const WCHAR *text, int *hkX, int *hkY)
11641164
else
11651165
Build_Sentence_Not_Centered(text, hkX, hkY);
11661166

1167-
return;
1168-
11691167
}
11701168

11711169

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,8 +1173,6 @@ void RenderObjClass::Add_Dependencies_To_List
11731173
file_list.Add (::Filename_From_Asset_Name (base_model_name));
11741174
}
11751175
}
1176-
1177-
return;
11781176
}
11791177

11801178

Core/Libraries/Source/WWVegas/WWAudio/WWAudio.cpp

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,8 +1145,6 @@ WWAudioClass::Free_Completed_Sounds (void)
11451145
// Try to give a play-handle back to a sound that was priority-bumped.
11461146
Reprioritize_Playlist ();
11471147
}
1148-
1149-
return;
11501148
}
11511149

11521150

@@ -1304,8 +1302,6 @@ WWAudioClass::Reprioritize_Playlist (void)
13041302
if (sound_to_get_handle != NULL) {
13051303
sound_to_get_handle->Allocate_Miles_Handle ();
13061304
}
1307-
1308-
return;
13091305
}
13101306

13111307

@@ -1338,8 +1334,6 @@ WWAudioClass::On_Frame_Update (unsigned int milliseconds)
13381334
AudibleSoundClass *sound_obj = m_Playlist[index];
13391335
sound_obj->On_Frame_Update (milliseconds);
13401336
}
1341-
1342-
return;
13431337
}
13441338

13451339

@@ -1393,8 +1387,6 @@ WWAudioClass::Allocate_2D_Handles (void)
13931387
// Record our actual number of available 2D sample handles
13941388
m_Max2DSamples = m_2DSampleHandles.Count ();
13951389
}
1396-
1397-
return;
13981390
}
13991391

14001392

@@ -1590,8 +1582,6 @@ WWAudioClass::Build_3D_Driver_List (void)
15901582
//m_Driver3D = info->driver;
15911583
}
15921584
}
1593-
1594-
return;
15951585
}
15961586

15971587

@@ -1840,8 +1830,6 @@ WWAudioClass::Allocate_3D_Handles (void)
18401830
}
18411831
}
18421832
}
1843-
1844-
return;
18451833
}
18461834

18471835

@@ -1918,8 +1906,6 @@ WWAudioClass::ReAssign_2D_Handles (void)
19181906
sound_obj->Allocate_Miles_Handle ();
19191907
}
19201908
}
1921-
1922-
return;
19231909
}
19241910

19251911

@@ -1942,8 +1928,6 @@ WWAudioClass::ReAssign_3D_Handles (void)
19421928
sound_obj->Allocate_Miles_Handle ();
19431929
}
19441930
}
1945-
1946-
return;
19471931
}
19481932

19491933

@@ -1964,8 +1948,6 @@ WWAudioClass::Remove_2D_Sound_Handles (void)
19641948
sound_obj->Free_Miles_Handle ();
19651949
}
19661950
}
1967-
1968-
return;
19691951
}
19701952

19711953

@@ -1986,8 +1968,6 @@ WWAudioClass::Remove_3D_Sound_Handles (void)
19861968
sound_obj->Free_Miles_Handle ();
19871969
}
19881970
}
1989-
1990-
return;
19911971
}
19921972

19931973

@@ -2011,8 +1991,6 @@ WWAudioClass::Set_Sound_Effects_Volume (float volume)
20111991
sound_obj->Update_Volume ();
20121992
}
20131993
}
2014-
2015-
return;
20161994
}
20171995

20181996

@@ -2036,8 +2014,6 @@ WWAudioClass::Set_Music_Volume (float volume)
20362014
sound_obj->Update_Volume ();
20372015
}
20382016
}
2039-
2040-
return;
20412017
}
20422018

20432019

@@ -2146,8 +2122,6 @@ WWAudioClass::Initialize
21462122
m_ReverbFilter = (HPROVIDER)INVALID_MILES_HANDLE;
21472123
}
21482124
}
2149-
2150-
return;
21512125
}
21522126

21532127

@@ -2317,8 +2291,6 @@ WWAudioClass::Allow_Sound_Effects (bool onoff)
23172291
}
23182292
}
23192293
}
2320-
2321-
return;
23222294
}
23232295

23242296

@@ -2353,8 +2325,6 @@ WWAudioClass::Allow_Music (bool onoff)
23532325
}
23542326
}
23552327
}
2356-
2357-
return;
23582328
}
23592329

23602330

@@ -2449,8 +2419,6 @@ WWAudioClass::Return_File (FileClass *file)
24492419
} else {
24502420
SAFE_DELETE (file);
24512421
}
2452-
2453-
return;
24542422
}
24552423

24562424

Core/Libraries/Source/WWVegas/WWDebug/wwdebug.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,5 @@ void WWDebug_DBWin32_Message_Handler( const char * str )
522522
CloseHandle(hSharedFile);
523523
CloseHandle(heventData);
524524
CloseHandle(heventDBWIN);
525-
526-
return;
527525
}
528526
#endif // WWDEBUG

Core/Libraries/Source/WWVegas/WWMath/matrix3d.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -741,8 +741,6 @@ void Matrix3D::Multiply(const Matrix3D & A,const Matrix3D & B,Matrix3D * set_res
741741
(*set_res)[0][3] = (*Aptr)[0][0]*tmp1 + (*Aptr)[0][1]*tmp2 + (*Aptr)[0][2]*tmp3 + (*Aptr)[0][3];
742742
(*set_res)[1][3] = (*Aptr)[1][0]*tmp1 + (*Aptr)[1][1]*tmp2 + (*Aptr)[1][2]*tmp3 + (*Aptr)[1][3];
743743
(*set_res)[2][3] = (*Aptr)[2][0]*tmp1 + (*Aptr)[2][1]*tmp2 + (*Aptr)[2][2]*tmp3 + (*Aptr)[2][3];
744-
745-
return;
746744
}
747745
*/
748746

Core/Tools/W3DView/EmitterColorPropPage.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ EmitterColorPropPageClass::~EmitterColorPropPageClass (void)
8484
SAFE_DELETE_ARRAY (m_CurrentColors.Values);
8585
SAFE_DELETE_ARRAY (m_CurrentOpacities.KeyTimes);
8686
SAFE_DELETE_ARRAY (m_CurrentOpacities.Values);
87-
return;
8887
}
8988

9089

Core/Tools/W3DView/EmitterGeneralPropPage.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ EmitterGeneralPropPageClass::EmitterGeneralPropPageClass (EmitterInstanceListCla
6565
//
6666
EmitterGeneralPropPageClass::~EmitterGeneralPropPageClass (void)
6767
{
68-
return;
6968
}
7069

7170

Core/Tools/W3DView/EmitterUserPropPage.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ EmitterUserPropPageClass::EmitterUserPropPageClass (EmitterInstanceListClass *pe
6161
//
6262
EmitterUserPropPageClass::~EmitterUserPropPageClass (void)
6363
{
64-
return;
6564
}
6665

6766

Core/Tools/W3DView/MainFrm.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2522,8 +2522,6 @@ CMainFrame::OnObjectRotateYBack (void)
25222522
rotation &= ~CGraphicView::RotateY;
25232523
pgraphic_view->RotateObject ((CGraphicView::OBJECT_ROTATION)rotation);
25242524
}
2525-
2526-
return;
25272525
}
25282526

25292527

@@ -2544,8 +2542,6 @@ CMainFrame::OnObjectRotateZBack (void)
25442542
rotation &= ~CGraphicView::RotateZ;
25452543
pgraphic_view->RotateObject ((CGraphicView::OBJECT_ROTATION)rotation);
25462544
}
2547-
2548-
return;
25492545
}
25502546

25512547

Core/Tools/W3DView/W3DViewDoc.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2704,8 +2704,6 @@ CW3DViewDoc::Toggle_Alternate_Materials(RenderObjClass * render_obj)
27042704
Toggle_Alternate_Materials(sub_obj);
27052705
}
27062706
}
2707-
2708-
return;
27092707
}
27102708

27112709

0 commit comments

Comments
 (0)