thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-28 04:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge

Browse source
This commit is contained in:
Sally Coolatta 2020-08-10 15:56:45 -04:00
commit dd89f333e2
5 changed files with 1 additions and 44 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
//============================================================================= //=============================================================================

8
src/hardware/hw_light.h
View file

@ -1,13 +1,7 @@
// 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.
@ -22,8 +16,6 @@
#include "hw_glob.h" #include "hw_glob.h"
#include "hw_defs.h" #include "hw_defs.h"
<<<<<<< HEAD
=======
#define NUMLIGHTFREESLOTS 32 // Free light slots (for SOCs) #define NUMLIGHTFREESLOTS 32 // Free light slots (for SOCs)
#ifdef ALAM_LIGHTING #ifdef ALAM_LIGHTING

14
src/sdl/hwsym_sdl.c
View file

@ -104,29 +104,15 @@ void *hwSym(const char *funcName,void *handle)
GETFUNC(MakeScreenFinalTexture); GETFUNC(MakeScreenFinalTexture);
GETFUNC(DrawScreenFinalTexture); GETFUNC(DrawScreenFinalTexture);
<<<<<<< HEAD
GETFUNC(RenderSkyDome);
=======
>>>>>>> srb2/next
GETFUNC(LoadShaders); GETFUNC(LoadShaders);
GETFUNC(KillShaders); GETFUNC(KillShaders);
GETFUNC(SetShader); GETFUNC(SetShader);
GETFUNC(UnSetShader); GETFUNC(UnSetShader);
<<<<<<< HEAD
GETFUNC(LoadCustomShader);
GETFUNC(InitCustomShaders);
GETFUNC(StartBatching);
GETFUNC(RenderBatches);
=======
GETFUNC(SetShaderInfo); GETFUNC(SetShaderInfo);
GETFUNC(LoadCustomShader); GETFUNC(LoadCustomShader);
GETFUNC(InitCustomShaders); GETFUNC(InitCustomShaders);
>>>>>>> srb2/next
#else //HWRENDER #else //HWRENDER
if (0 == strcmp("FinishUpdate", funcName)) if (0 == strcmp("FinishUpdate", funcName))
return funcPointer; //&FinishUpdate; return funcPointer; //&FinishUpdate;

4
src/win32/win_dll.c
View file

@ -86,9 +86,6 @@ static VOID UnloadDLL (HMODULE* pModule)
// ========================================================================== // ==========================================================================
// note : the 3D driver loading should be put somewhere else.. // note : the 3D driver loading should be put somewhere else..
<<<<<<< HEAD
=======
#ifdef HWRENDER #ifdef HWRENDER
static HMODULE hwdModule = NULL; static HMODULE hwdModule = NULL;
@ -173,7 +170,6 @@ VOID Shutdown3DDriver (VOID)
} }
#endif #endif
>>>>>>> srb2/next
#ifdef HW3SOUND #ifdef HW3SOUND
static HMODULE hwsModule = NULL; static HMODULE hwsModule = NULL;

5
src/win32/win_vid.c
View file

@ -300,11 +300,6 @@ static inline boolean I_SkipFrame(void)
return false; return false;
/* FALLTHRU */ /* FALLTHRU */
//case GS_TIMEATTACK: -- sorry optimisation but now we have a cool level platter and that being laggardly looks terrible //case GS_TIMEATTACK: -- sorry optimisation but now we have a cool level platter and that being laggardly looks terrible
<<<<<<< HEAD
=======
#ifndef NONET
>>>>>>> srb2/next
/* FALLTHRU */
case GS_WAITINGPLAYERS: case GS_WAITINGPLAYERS:
return skip; // Skip odd frames return skip; // Skip odd frames
default: default: