Skip to content

Commit

Permalink
Changed copyright holders
Browse files Browse the repository at this point in the history
Indentation and reformatting source code to new coding style
  • Loading branch information
Dusan Jocic committed Oct 9, 2015
1 parent e17ea35 commit 5d2de47
Show file tree
Hide file tree
Showing 24 changed files with 641 additions and 479 deletions.
4 changes: 4 additions & 0 deletions code/Documents/Changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
10-09-2015 Dusan Jocic <dusanjocic@msn.com>
* Changed copyright holders
* Indentation and reformatting source code to new coding style

10-03-2015 Dusan Jocic <dusanjocic@msn.com>
* Added missing fmodex.dll inside game folder

Expand Down
4 changes: 2 additions & 2 deletions code/Engine/api/sndAPI.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
class sndAPI_s : public iFaceBase_i
{
public:
bool ( *Init ) ();
void ( *Shutdown) ( void );
bool ( *Init )();
void ( *Shutdown )( void );
};

extern sndAPI_s* g_sndAPI;
Expand Down
2 changes: 1 addition & 1 deletion code/Engine/client/cl_sound.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ void CL_SoundModule( void )
g_iFaceMan->registerIFaceUser( &g_snd, SND_API_IDENTSTR );
g_snd->Init();
Com_Printf( "-------------------------------\n" );

}
void CL_ShutdownSound( void )
{
Expand Down
14 changes: 7 additions & 7 deletions code/Engine/sound/snd_local.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
// Version: v1.00
// Created: 10-01-2015
// Compilers: Visual Studio
// Description:
// Description:
// -------------------------------------------------------------------------
// History:
//
Expand All @@ -39,14 +39,14 @@

typedef struct fmodSfx_s
{
char filename[256];
FMOD_SOUND *sound;
bool isDefault;
int lastUsedTime;
char filename[256];
FMOD_SOUND* sound;
bool isDefault;
int lastUsedTime;
} fmodSfx_t;

static FMOD_SYSTEM *fmodSystem;
static FMOD_SYSTEM* fmodSystem;
static fmodSfx_t loadedSfx[4096];

bool Sound_Init();
void Sound_Shutdown(void);
void Sound_Shutdown( void );
52 changes: 26 additions & 26 deletions code/Engine/sound/snd_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
// Version: v1.00
// Created: 10-01-2015
// Compilers: Visual Studio
// Description:
// Description:
// -------------------------------------------------------------------------
// History:
//
Expand All @@ -40,35 +40,35 @@

bool Sound_Init()
{
g_core->Print("------ Initializing FMOD Sound ------\n");

FMOD_RESULT result = FMOD_System_Create(&fmodSystem);
if (!fmodSystem)
g_core->Print( "------ Initializing FMOD Sound ------\n" );
FMOD_RESULT result = FMOD_System_Create( &fmodSystem );
if ( !fmodSystem )
{
g_core->Print("FMOD_System_Create failed (%s)\n", FMOD_ErrorString(result));
g_core->Print("Sound initialization failed.\n");
return false; // error
}

g_core->Print( "FMOD_System_Create failed (%s)\n", FMOD_ErrorString( result ) );
g_core->Print( "Sound initialization failed.\n" );
return false; // error
}
u32 version;
FMOD_System_GetVersion(fmodSystem, &version);
g_core->Print("FMOD Ex Version: %08x\n", version);

FMOD_System_Init(fmodSystem, MAX_FMOD_CHANNELS, DEFAULT_FMOD_INIT, NULL);
g_core->Print("FMOD Ex system initialized\n");

return true; // OK
FMOD_System_GetVersion( fmodSystem, &version );
g_core->Print( "FMOD Ex Version: %08x\n", version );
FMOD_System_Init( fmodSystem, MAX_FMOD_CHANNELS, DEFAULT_FMOD_INIT, NULL );
g_core->Print( "FMOD Ex system initialized\n" );
return true; // OK
}
void Sound_Shutdown(void)
void Sound_Shutdown( void )
{
g_core->Print("------ Shutdown Sound ------\n");

for (u32 i = 0; i < MAX_SFX; i++)
g_core->Print( "------ Shutdown Sound ------\n" );
for ( u32 i = 0; i < MAX_SFX; i++ )
{
FMOD_SOUND *sfx = loadedSfx[i].sound;
if (sfx)
FMOD_SOUND* sfx = loadedSfx[i].sound;
if ( sfx )
{
FMOD_Sound_Release(sfx);
}
}
FMOD_Sound_Release( sfx );
}
}
}
55 changes: 31 additions & 24 deletions code/GameLogic/cgame/cg_api.cpp
Original file line number Diff line number Diff line change
@@ -1,27 +1,34 @@
/*
============================================================================
Copyright (C) 2012 V.
This file is part of Qio source code.
Qio source code is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
Qio source code is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA,
or simply visit <http://www.gnu.org/licenses/>.
============================================================================
*/
// cg_api.cpp - cgame DLL entry point
////////////////////////////////////////////////////////////////////////////
//
// This file is part of OWEngine source code.
// Copyright (C) 2012 V.
// Copyright (C) 2015 Dusan Jocic <dusanjocic@msn.com>
//
// OWEngine source code is free software; you can redistribute it
// and/or modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// OWEngine source code is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software Foundation,
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA,
// or simply visit <http://www.gnu.org/licenses/>.
// -------------------------------------------------------------------------
// File name: cg_api.cpp
// Version: v1.00
// Created:
// Compilers: Visual Studio
// Description: cgame DLL entry point
// -------------------------------------------------------------------------
// History:
//
////////////////////////////////////////////////////////////////////////////

#include "cg_local.h"
#include <api/iFaceMgrAPI.h>
Expand Down
54 changes: 31 additions & 23 deletions code/GameLogic/cgame/cg_chat.cpp
Original file line number Diff line number Diff line change
@@ -1,27 +1,35 @@
/*
============================================================================
Copyright (C) 2013 V.
////////////////////////////////////////////////////////////////////////////
//
// This file is part of OWEngine source code.
// Copyright (C) 2013 V.
// Copyright (C) 2015 Dusan Jocic <dusanjocic@msn.com>
//
// OWEngine source code is free software; you can redistribute it
// and/or modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// OWEngine source code is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software Foundation,
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA,
// or simply visit <http://www.gnu.org/licenses/>.
// -------------------------------------------------------------------------
// File name: cg_chat.cpp
// Version: v1.00
// Created:
// Compilers: Visual Studio
// Description: cgame DLL entry point
// -------------------------------------------------------------------------
// History:
//
////////////////////////////////////////////////////////////////////////////

This file is part of Qio source code.
Qio source code is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
Qio source code is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA,
or simply visit <http://www.gnu.org/licenses/>.
============================================================================
*/
// cg_chat.cpp
#include "cg_local.h"
#include <shared/array.h>
#include <api/rAPI.h>
Expand Down
56 changes: 32 additions & 24 deletions code/GameLogic/cgame/cg_collision.cpp
Original file line number Diff line number Diff line change
@@ -1,28 +1,36 @@
/*
============================================================================
Copyright (C) 2012 V.
////////////////////////////////////////////////////////////////////////////
//
// This file is part of OWEngine source code.
// Copyright (C) 2012 V.
// Copyright (C) 2015 Dusan Jocic <dusanjocic@msn.com>
//
// OWEngine source code is free software; you can redistribute it
// and/or modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// OWEngine source code is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software Foundation,
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA,
// or simply visit <http://www.gnu.org/licenses/>.
// -------------------------------------------------------------------------
// File name: cg_collision.cpp
// Version: v1.00
// Created:
// Compilers: Visual Studio
// Description: Clientside-only collision detection system.
// Usefull for 3rd person camera clipping, local entities and particles.
// -------------------------------------------------------------------------
// History:
//
////////////////////////////////////////////////////////////////////////////

This file is part of Qio source code.
Qio source code is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
Qio source code is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA,
or simply visit <http://www.gnu.org/licenses/>.
============================================================================
*/
// cg_collision.cpp - clientside-only collision detection system.
// Usefull for 3rd person camera clipping, local entities and particles.
#include "cg_local.h"
#include <api/rAPI.h>
#include <api/rEntityAPI.h>
Expand Down
54 changes: 31 additions & 23 deletions code/GameLogic/cgame/cg_consoleCmds.cpp
Original file line number Diff line number Diff line change
@@ -1,27 +1,35 @@
/*
============================================================================
Copyright (C) 2014 V.
////////////////////////////////////////////////////////////////////////////
//
// This file is part of OWEngine source code.
// Copyright (C) 2014 V.
// Copyright (C) 2015 Dusan Jocic <dusanjocic@msn.com>
//
// OWEngine source code is free software; you can redistribute it
// and/or modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// OWEngine source code is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software Foundation,
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA,
// or simply visit <http://www.gnu.org/licenses/>.
// -------------------------------------------------------------------------
// File name: cg_consoleCmds.cpp
// Version: v1.00
// Created:
// Compilers: Visual Studio
// Description: cgame console commands
// -------------------------------------------------------------------------
// History:
//
////////////////////////////////////////////////////////////////////////////

This file is part of Qio source code.
Qio source code is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
Qio source code is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA,
or simply visit <http://www.gnu.org/licenses/>.
============================================================================
*/
// cg_consoleCmds.cpp - cgame console commands
#include <shared/autoCmd.h>
#include <api/coreAPI.h>
#include <api/rAPI.h>
Expand Down
Loading

0 comments on commit 5d2de47

Please sign in to comment.