stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-24 02:01:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into 'master'

Browse source 
Cleanup whitespaces and ignore build folders

See merge request STJr/SRB2!1859
This commit is contained in:
Alam Ed Arias 2022-11-12 02:35:53 +00:00
commit bd2bfe462c
16 changed files with 34 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -21,3 +21,5 @@ Win32_LIB_ASM_Release
/assets/debian
/make
/bin
/build
/build.*

1
src/blua/liolib.c
View file

@ -641,4 +641,3 @@ LUALIB_API int luaopen_io (lua_State *L) {
lua_pop(L, 1); /* pop environment for default files */
return 1;
}

2
src/hardware/hw_main.c
View file

@ -16,7 +16,7 @@
#ifdef HWRENDER
#include "hw_glob.h"
#include "hw_light.h"
#include "hw_light.h
#include "hw_drv.h"
#include "hw_batching.h"

1
src/p_user.c
View file

@ -1,3 +1,4 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.

2
src/s_sound.c
View file

@ -2302,7 +2302,7 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32
{
I_SetSongPosition(position);
I_FadeSong(100, fadeinms, NULL);
}
}
else // reset volume to 100 with same music
{
I_StopFadingSong();

1
src/sdl/i_video.c
View file

@ -1,3 +1,4 @@
// Emacs style mode select -*- C++ -*-
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------