# Conflicts:
#	src/lua_baselib.c
#	src/nds/i_sound.c
#	src/sdl12/mixer_sound.c
#	src/sdl12/sdl_sound.c
#	src/win32ce/win_snd.c

# Conflicts:
#	src/lua_hook.h

# Conflicts:
#	src/lua_hook.h
#	src/lua_hooklib.c

# Conflicts:
#	src/sdl12/mixer_sound.c

# Conflicts:
#	src/sdl12/mixer_sound.c

# Conflicts:
#	src/lua_baselib.c

# Conflicts:
#	src/nds/i_sound.c
#	src/sdl12/sdl_sound.c
#	src/win32ce/win_snd.c

# Conflicts:
#	src/sdl12/mixer_sound.c

# Conflicts:
#	src/sdl12/mixer_sound.c

# Conflicts:
#	src/sdl12/mixer_sound.c

# Conflicts:
#	src/sdl12/mixer_sound.c

# Conflicts:
#	src/sdl/mixer_sound.c
#	src/sdl12/mixer_sound.c

# Conflicts:
#	src/sdl12/mixer_sound.c

# Conflicts:
#	src/d_netcmd.c
#	src/lua_baselib.c
#	src/nds/i_sound.c
#	src/sdl12/mixer_sound.c
#	src/sdl12/sdl_sound.c
#	src/win32ce/win_snd.c

* Declared I_SetSongPosition, I_GetSongPosition
* Implemented S_PositionMusic and S_GetPositionMusic
* Exposed in console TUNES and lua
* Implemented set position in SDL, SDL12, WIN32
* Implemented get position in WIN32

# Conflicts:
#	src/nds/i_sound.c
#	src/sdl12/mixer_sound.c
#	src/sdl12/sdl_sound.c
#	src/win32ce/win_snd.c

Horizon line HOM fix

See merge request STJr/SRB2Internal!152

Polyobject sky plane crash fix

See merge request STJr/SRB2Internal!146

Leveltitle tinkering

See merge request STJr/SRB2Internal!134

# Conflicts:
#	src/hu_stuff.h

Woops! All trans

See merge request !265

NiGHTS: Handle sphere damage correctly upon timeout
* Spill spheres/chips, implement MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP
* Handle player->spheres and player->rings consistently

See merge request STJr/SRB2Internal!157

NiGHTS fix lap detection on inverted axis

See merge request STJr/SRB2Internal!138

Opting to handle this transparently via the Rings menu option. Doesn't seem worth making a separate entry for Spheres.

Hardcoding time again

See merge request STJr/SRB2Internal!130

Fixed sphere spill bug where no spheres spill if player->rings is 0

There may not be a point to this, other than to be consistent with how spheres are tracked. If non-special stage NiGHTS should tally a ring bonus, this may be useful.