thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge hardware/hw_light.c

Browse source
This commit is contained in:
SteelT 2020-08-10 15:33:36 -04:00
parent 0fed8c2ee3
commit 7d51db242d
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/hardware/hw_light.c
View file

@ -1,25 +1,15 @@
// SONIC ROBO BLAST 2 // SONIC ROBO BLAST 2
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
<<<<<<< HEAD
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
// Copyright (C) 1999-2019 by Sonic Team Junior.
=======
// Copyright (C) 1998-2000 by DooM Legacy Team. // Copyright (C) 1998-2000 by DooM Legacy Team.
// Copyright (C) 1999-2020 by Sonic Team Junior. // Copyright (C) 1999-2020 by Sonic Team Junior.
>>>>>>> srb2/next
// //
// This program is free software distributed under the // This program is free software distributed under the
// terms of the GNU General Public License, version 2. // terms of the GNU General Public License, version 2.
// See the 'LICENSE' file for more details. // See the 'LICENSE' file for more details.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
<<<<<<< HEAD
/// \file
=======
/// \file hw_light.c /// \file hw_light.c
/// \brief Corona/Dynamic/Static lighting add on by Hurdler /// \brief Corona/Dynamic/Static lighting add on by Hurdler
/// !!! Under construction !!! /// !!! Under construction !!!\
>>>>>>> srb2/next
#include "../doomdef.h" #include "../doomdef.h"
@ -35,8 +25,6 @@
#include "../r_main.h" #include "../r_main.h"
#include "../p_local.h" #include "../p_local.h"
<<<<<<< HEAD
=======
//============================================================================= //=============================================================================
// DEFINES // DEFINES
//============================================================================= //=============================================================================