diff --git a/src/p_enemy.c b/src/p_enemy.c index 26682ee326207d8c47c2c356592e612250174bea..987e83c5e15c09bcb871aef6ab5e7d3014a8c84a 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -11827,7 +11827,7 @@ void A_FlickyCenter(mobj_t *actor) if (actor->target && P_AproxDistance(actor->target->x - originx, actor->target->y - originy) < actor->extravalue1) { actor->extravalue2 = 1; - P_TeleportMove(actor, actor->target->x, actor->target->y, actor->target->z); + P_TeleportMove(actor, actor->target->x, actor->target->y, actor->target->z); } else if(actor->extravalue2) { diff --git a/src/p_user.c b/src/p_user.c index 1f14d96c135b6ca512371caab9ec2e327204206f..0765d3e2624dfd8160a966d47d8e01de41084ee5 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1,3 +1,4 @@ + // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. @@ -1518,8 +1519,8 @@ void P_PlayJingle(player_t *player, jingletype_t jingletype) char newmusic[7]; strncpy(newmusic, musname, 7); #ifdef HAVE_LUA_MUSICPLUS - if(LUAh_MusicJingle(jingletype, newmusic, &musflags, &looping)) - return; + if(LUAh_MusicJingle(jingletype, newmusic, &musflags, &looping)) + return; #endif newmusic[6] = 0; @@ -1609,7 +1610,7 @@ boolean P_EvaluateMusicStatus(UINT16 status, const char *musname) if (result) break; - } + } return result; } @@ -1666,8 +1667,8 @@ void P_RestoreMusic(player_t *player) else if (!S_RecallMusic(JT_NONE, false)) // go down the stack { CONS_Debug(DBG_BASIC, "Cannot find any music in resume stack!\n"); - S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0); - } + S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0); + } } // diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index a27a5ebd2687b9e7c6dee529e3a40aa9c76f54e1..ae661761ca8334ea8d95c2e174f6de022cacdf3a 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -1,3 +1,4 @@ + // Emacs style mode select -*- C++ -*- // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- @@ -1068,7 +1069,7 @@ void I_GetEvent(void) // update the menu if (currentMenu == &OP_JoystickSetDef) M_SetupJoystickMenu(0); - break; + break; case SDL_QUIT: LUA_HookBool(true, HOOK(GameQuit)); I_Quit();