← Back to branch summary

~flosoft/s25rttr/trunk

« back to all changes in this revision

Viewing changes to src/glArchivItem_Sound.cpp

  • Committer: FloSoft
  • Date: 2014-04-25 15:35:50 UTC
  • Revision ID: flosoft@siedler25.org-20140425153550-9muu4vodhlqu58m0
committing subversion revision 9357 by FloSoft
astyle

modified:
s25client/trunk/
s25client/trunk/contrib/lua/lin32/include/
s25client/trunk/contrib/lua/lin64/include/
s25client/trunk/contrib/lua/mac/include/
s25client/trunk/contrib/lua/win32/include/
s25client/trunk/contrib/lua/win64/include/
s25client/trunk/driver/audio/SDL/src/
s25client/trunk/driver/src/
s25client/trunk/driver/video/GLFW/src/
s25client/trunk/driver/video/SDL/src/
s25client/trunk/driver/video/WinAPI/src/
s25client/trunk/src/
s25client/trunk/win32/
s25client/trunk/win32/prebuild-mutex/src/

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/glArchivItem_Sound.cpp
1
 
// $Id: glArchivItem_Sound.cpp 7521 2011-09-08 20:45:55Z FloSoft $
 
1
// $Id: glArchivItem_Sound.cpp 9357 2014-04-25 15:35:25Z FloSoft $
2
2
//
3
3
// Copyright (c) 2005 - 2011 Settlers Freaks (sf-team at siedler25.org)
4
4
//
27
27
///////////////////////////////////////////////////////////////////////////////
28
28
// Makros / Defines
29
29
#if defined _WIN32 && defined _DEBUG && defined _MSC_VER
30
 
        #define new new(_NORMAL_BLOCK, THIS_FILE, __LINE__)
31
 
        #undef THIS_FILE
32
 
        static char THIS_FILE[] = __FILE__;
 
30
#define new new(_NORMAL_BLOCK, THIS_FILE, __LINE__)
 
31
#undef THIS_FILE
 
32
static char THIS_FILE[] = __FILE__;
33
33
#endif
34
34
 
35
35
///////////////////////////////////////////////////////////////////////////////
36
 
/** 
 
36
/**
37
37
 *  Konstruktor von @p glArchivItem_Sound.
38
38
 *
39
39
 *  @author FloSoft
40
40
 */
41
41
glArchivItem_Sound::glArchivItem_Sound(void)
42
 
        : baseArchivItem_Sound(), sound(NULL)
 
42
    : baseArchivItem_Sound(), sound(NULL)
43
43
{
44
44
}
45
45
 
46
46
///////////////////////////////////////////////////////////////////////////////
47
 
/** 
 
47
/**
48
48
 *  Kopiekonstruktor von @p glArchivItem_Sound.
49
49
 *
50
50
 *  @author FloSoft
51
51
 */
52
 
glArchivItem_Sound::glArchivItem_Sound(const glArchivItem_Sound *item)
53
 
        : baseArchivItem_Sound(item), sound(NULL)
 
52
glArchivItem_Sound::glArchivItem_Sound(const glArchivItem_Sound* item)
 
53
    : baseArchivItem_Sound(item), sound(NULL)
54
54
{
55
55
}
56
56
 
57
57
///////////////////////////////////////////////////////////////////////////////
58
 
/** 
 
58
/**
59
59
 *  Destruktor von @p glArchivItem_Sound.
60
60
 *
61
61
 *  @author FloSoft