diff --git a/src/d_main.c b/src/d_main.c
index df86763c05efcef934e8833c7afcc344627b3e89..a27d3874ec45426b3fa6521e3f9da73f5929c1f6 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1334,10 +1334,10 @@ void D_SRB2Main(void)
ultimatemode = true;
}
- // rei/miru: bootmap (Idea: starts the game on a predefined map)
- if (bootmap && !(M_CheckParm("-warp") && M_IsNextParm()))
- {
- pstartmap = bootmap;
+ // rei/miru: bootmap (Idea: starts the game on a predefined map)
+ if (bootmap && !(M_CheckParm("-warp") && M_IsNextParm()))
+ {
+ pstartmap = bootmap;
if (pstartmap < 1 || pstartmap > NUMMAPS)
I_Error("Cannot warp to map %d (out of range)\n", pstartmap);
@@ -1347,8 +1347,8 @@ void D_SRB2Main(void)
//G_SetGameModified(true);
autostart = true;
}
- }
- //CONS_Printf("BOOT_MAP: %d\n", bootmap);
+ }
+ //CONS_Printf("BOOT_MAP: %d\n", bootmap);
if (autostart || netgame || M_CheckParm("+connect") || M_CheckParm("-connect"))
{
diff --git a/src/dehacked.c b/src/dehacked.c
index e43c04fedcd9abebb7f19dee2cb0cb467d3f8a5b..2a3e7ca3bc4361118f73708cfe6537aa819718fa 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -3099,7 +3099,7 @@ static void readmaincfg(MYFILE *f)
}
else if (fastcmp(word, "BOOTMAP"))
{
- // rei/miru: bootmap definition for maincfg
+ // rei/miru: bootmap definition for maincfg
// Support using the actual map name,
// i.e., Level AB, Level FZ, etc.
diff --git a/src/g_game.c b/src/g_game.c
index b148d98014a149c67ae61bbe2fb973485d3598ae..6a905d085e7f581bc2595bda1dd54239fa60eded 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -5683,42 +5683,42 @@ INT32 G_TicsToMilliseconds(tic_t tics)
// setAllDisplays - set all displays to the player number/node specified
void G_SetDisplayPlayer(player_t *player, INT32 displayNumber, boolean setAllDisplays)
{
- //TODO: fix black flashes when touching controls (this has to do with
- //((cmd->forwardmove || cmd->sidemove || cmd->buttons) && displayplayer != consoleplayer) )
- //TODO: proper implementation for using player node instead of -1 (unsure how)
+ //TODO: fix black flashes when touching controls (this has to do with
+ //((cmd->forwardmove || cmd->sidemove || cmd->buttons) && displayplayer != consoleplayer) )
+ //TODO: proper implementation for using player node instead of -1 (unsure how)
if (gamestate == GS_LEVEL)
{
- // no, not for non-sp
+ // no, not for non-sp
if (!netgame)
displayplayer = consoleplayer;
else
{
- // the player has to exist or you just get a bleeding display
- if (playeringame[displayNumber] || players[displayplayer].spectator && player == &players[displayplayer])
- {
- // switch the display number locally
- if (P_IsLocalPlayer(player) && displayplayer == consoleplayer)
- {
- displayplayer = displayNumber;
- }
- // or force all
- else if (setAllDisplays == true)
- {
- displayplayer = displayNumber;
- }
-
- // tell who's the view
- //CONS_Printf(M_GetText("Viewpoint: %s\n"), player_names[displayplayer]);
- }
- // Setting as -1 resets your view to normal
- else if (displayNumber == -1 && P_IsLocalPlayer(player)
- && displayplayer != consoleplayer)
- displayplayer = consoleplayer;
- else
- {
- // or do...nothing
- //CONS_Printf("Player doesn't exist (or viewing self).\n");
- }
+ // the player has to exist or you just get a bleeding display
+ if (playeringame[displayNumber] || players[displayplayer].spectator && player == &players[displayplayer])
+ {
+ // switch the display number locally
+ if (P_IsLocalPlayer(player) && displayplayer == consoleplayer)
+ {
+ displayplayer = displayNumber;
+ }
+ // or force all
+ else if (setAllDisplays == true)
+ {
+ displayplayer = displayNumber;
+ }
+
+ // tell who's the view
+ //CONS_Printf(M_GetText("Viewpoint: %s\n"), player_names[displayplayer]);
+ }
+ // Setting as -1 resets your view to normal
+ else if (displayNumber == -1 && P_IsLocalPlayer(player)
+ && displayplayer != consoleplayer)
+ displayplayer = consoleplayer;
+ else
+ {
+ // or do...nothing
+ //CONS_Printf("Player doesn't exist (or viewing self).\n");
+ }
}
}
}
diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index 6a451d91a6888ad4ea1c2da2a8ba92ab9d774b36..6db09c0c9ebfa21e73ee8823c062f8585989cff1 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -1798,10 +1798,10 @@ static int lib_sSetMusicPosition(lua_State *L)
static int lib_sGetMusicPosition(lua_State *L)
{
- float fpos = S_GetMusicPosition();
+ float fpos = S_GetMusicPosition();
lua_pushnumber(L, (lua_Number)(fpos*1000));
- //CONS_Printf("GetMusicPosition: %05f\n\n\n",fpos);
- return 1;
+ //CONS_Printf("GetMusicPosition: %05f\n\n\n",fpos);
+ return 1;
}
static int lib_sFadeOutMusic(lua_State *L)
@@ -1839,7 +1839,7 @@ static int lib_pSetActiveMotionBlur(lua_State *L)
static int lib_gSetDisplayPlayer(lua_State *L)
{
- // set args 1 2 & 3
+ // set args 1 2 & 3
player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
INT32 dispnum = luaL_checkint(L, 2);
boolean alldisps = luaL_checkboolean(L, 3);
@@ -2233,12 +2233,12 @@ static luaL_Reg lib[] = {
{"G_TicsToCentiseconds",lib_gTicsToCentiseconds},
{"G_TicsToMilliseconds",lib_gTicsToMilliseconds},
- //miru: Put everything added here, categorizing right now isn't something I want to wander through
+ //miru: Put everything added here, categorizing right now isn't something I want to wander through
{"S_SetMusicPosition",lib_sSetMusicPosition},
{"S_GetMusicPosition",lib_sGetMusicPosition},
{"S_FadeOutMusic",lib_sFadeOutMusic},
{"P_SetActiveMotionBlur",lib_pSetActiveMotionBlur},
- {"G_SetDisplayPlayer",lib_gSetDisplayPlayer},
+ {"G_SetDisplayPlayer",lib_gSetDisplayPlayer},
{NULL, NULL}
};
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 6d67ffe0b81d871671cfdc1877b0cc48adae04b0..610b96d012520c7fc72c872a9c6e7cde58fce4b6 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -3483,15 +3483,15 @@ void P_DestroyRobots(void)
//Note: motion blur should never ever be used excessively
void P_SetActiveMotionBlur(boolean active, INT32 param)
{
- camera_motionblur = active;
- forward_postimgparam = param;
+ camera_motionblur = active;
+ forward_postimgparam = param;
}
boolean P_CheckMotionBlur(void)
{
if (camera_motionblur == true)
- return true;
+ return true;
return false;
}
@@ -3537,13 +3537,13 @@ boolean P_CameraThinker(player_t *player, camera_t *thiscam, boolean resetcalled
postimg = postimg_water;
else if (P_CameraCheckHeat(&dummycam))
postimg = postimg_heat;
- else if (P_CheckMotionBlur())
+ else if (P_CheckMotionBlur())
{
- postimg = postimg_motion;
+ postimg = postimg_motion;
if (!forward_postimgparam)
- forward_postimgparam = 1;
- else
- postimgparam = forward_postimgparam;
+ forward_postimgparam = 1;
+ postimgparam = forward_postimgparam;
+ else
}
}
else
@@ -3561,11 +3561,11 @@ boolean P_CameraThinker(player_t *player, camera_t *thiscam, boolean resetcalled
postimg = postimg_heat;
else if (P_CheckMotionBlur())
{
- postimg = postimg_motion;
+ postimg = postimg_motion;
if (!forward_postimgparam)
- forward_postimgparam = 1;
- else
- postimgparam = forward_postimgparam;
+ forward_postimgparam = 1;
+ else
+ postimgparam = forward_postimgparam;
}
}
diff --git a/src/p_user.c b/src/p_user.c
index a3102125c8ca062bc6ba8ca1179725c980c0f0db..ff8133e67f411eecec3d47e033c9ec1dfd0bdb80 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8553,8 +8553,8 @@ static void P_CalcPostImg(player_t *player)
*param = (player->viewrollangle);
}
- //miru: Motion blur won't work without this i guess, either way its enabled
- //TODO: Opengl motion blur
+ //miru: Motion blur won't work without this i guess, either way its enabled
+ //TODO: Opengl motion blur
// Motion blur
if (player->mo && P_CheckMotionBlur())
{
diff --git a/src/s_sound.c b/src/s_sound.c
index 571f6fd28d2523ec98a0aff50f3de88ec4944e67..dadeb5ac0332f0a2c8441f7eb5c0a8b26902addc 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -1278,12 +1278,12 @@ void S_SetMusicPosition(float position)
float S_GetMusicPosition(void)
{
- return I_GetMusicPosition();
+ return I_GetMusicPosition();
}
void S_FadeOutMusic(int ms)
{
- I_FadeOutMusic(ms);
+ I_FadeOutMusic(ms);
}
boolean S_SpeedMusic(float speed)
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index d0d34ab3bf5c9be37a66ef46175649107e6243c4..c824ad9832106cc70ad94c7007ed30bccac7e8e4 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -458,22 +458,22 @@ static void music_loop(void)
//miru: some music hooks and callbacks (including music_pos above)
/*static void music_fadeloop(void)
{
- Mix_HookMusicFinished(NULL);
- // Mix_PlayMusic(music, 0);
- //if (music_pos >= I_GetMusicPosition() - 1000)
- // Mix_SetMusicPosition(loop_point);
+ Mix_HookMusicFinished(NULL);
+ // Mix_PlayMusic(music, 0);
+ //if (music_pos >= I_GetMusicPosition() - 1000)
+ // Mix_SetMusicPosition(loop_point);
- music_pos = (int)(loop_point * SAMPLE_RATE);
+ music_pos = (int)(loop_point * SAMPLE_RATE);
}*/
static void mixmusic_callback(void *udata, Uint8 *stream, int len)
{
- if(!Mix_PausedMusic()) {
- music_pos += len/4;
- music_pos_time = SDL_GetTicks();
- }
- //I_OutputMsg("MusicPos: %.3f", music_pos);
- //HU_DoCEcho(va("MusicPos: %.3f\\Stream: %d\\Length: %i", music_pos,stream,len));
+ if(!Mix_PausedMusic()) {
+ music_pos += len/4;
+ music_pos_time = SDL_GetTicks();
+ }
+ //I_OutputMsg("MusicPos: %.3f", music_pos);
+ //HU_DoCEcho(va("MusicPos: %.3f\\Stream: %d\\Length: %i", music_pos,stream,len));
}
@@ -716,13 +716,13 @@ boolean I_StartDigSong(const char *musicname, boolean looping)
}
Mix_VolumeMusic((UINT32)music_volume*128/31);
- Mix_SetPostMix(mixmusic_callback, NULL);
+ Mix_SetPostMix(mixmusic_callback, NULL);
music_pos = 0;
music_pos_time = SDL_GetTicks();
- //Mix_Chunk* lengthmusic;
+ //Mix_Chunk* lengthmusic;
//HU_SetCEchoDuration(4);
- //HU_DoCEcho(va("Length: %d\\", lengthmusic->alen));
+ //HU_DoCEcho(va("Length: %d\\", lengthmusic->alen));
if (looping)//if (loop_point != 0.0f)
Mix_HookMusicFinished(music_loop);
@@ -767,22 +767,22 @@ void I_SetMusicPosition(float position)
float I_GetMusicPosition(void)
{
float const pos = SAMPLE_RATE;
- return (
- (music_pos-2048) / pos
- ) + (
- (SDL_GetTicks() - music_pos_time) * 0.001f
- );
+ return (
+ (music_pos-2048) / pos
+ ) + (
+ (SDL_GetTicks() - music_pos_time) * 0.001f
+ );
}
void I_FadeInMusic(int ms)
{
- Mix_FadeInMusic(music, 0, ms);
+ Mix_FadeInMusic(music, 0, ms);
}
void I_FadeInMusicPos(int ms, float position)
{
- Mix_FadeInMusicPos(music, 0, ms, position);
- //music_pos = (int)(position * SAMPLE_RATE);
+ Mix_FadeInMusicPos(music, 0, ms, position);
+ //music_pos = (int)(position * SAMPLE_RATE);
}
/*
void I_VolumeMusic(int volume)
@@ -791,12 +791,12 @@ void I_VolumeMusic(int volume)
*/
void I_FadeOutMusic(int ms)
{
- //TODO: music ends if fading before a loop point, fix it
- Mix_PlayMusic(music, -1);
- Mix_SetMusicPosition(I_GetMusicPosition());
- Mix_FadeOutMusic(ms);
- Mix_HookMusicFinished(NULL);
- //Mix_HookMusicFinished(music_fadeloop);
+ //TODO: music ends if fading before a loop point, fix it
+ Mix_PlayMusic(music, -1);
+ Mix_SetMusicPosition(I_GetMusicPosition());
+ Mix_FadeOutMusic(ms);
+ Mix_HookMusicFinished(NULL);
+ //Mix_HookMusicFinished(music_fadeloop);
}
boolean I_SetSongSpeed(float speed)