Subversion Repositories eduke32

Compare Revisions

Regard whitespace Rev 8790 → Rev 8789

/source/duke3d/src/screens.cpp
2109,51 → 2109,8
videoClearScreen(0L);
 
break;
 
case 4:
if (!WORLDTOUR)
return;
 
if (ud.lockout == 0)
{
S_StopMusic();
totalclocklock = totalclock = 0;
 
videoClearScreen(0L);
rotatesprite_fs(160<<16, 100<<16, 65536L, 0, FIREFLYGROWEFFECT, 0, 0, 2+8+64+BGSTRETCH);
videoNextPage();
 
fadepal(0, 0, 0, 252, 0, -4);
 
I_ClearAllInput();
 
S_PlaySound(E5L7_DUKE_QUIT_YOU);
 
do
{
if (engineFPSLimit())
{
totalclocklock = totalclock;
 
videoClearScreen(0L);
rotatesprite_fs(160<<16, 100<<16, 65536L, 0, FIREFLYGROWEFFECT, 0, 0, 2+8+64+BGSTRETCH);
videoNextPage();
}
 
gameHandleEvents();
 
if (I_GeneralTrigger()) break;
} while (1);
 
fadepal(0, 0, 0, 0, 252, 4);
}
 
S_StopMusic();
FX_StopAllSounds();
S_ClearSoundLocks();
break;
}
}
#endif
 
static void G_DisplayMPResultsScreen(void)
/source/duke3d/src/soundsdyn.cpp
186,7 → 186,6
{ "FLAMETHROWER_INTRO", DVPTR(FLAMETHROWER_INTRO), FLAMETHROWER_INTRO__STATIC },
{ "FLAMETHROWER_LOOP", DVPTR(FLAMETHROWER_LOOP), FLAMETHROWER_LOOP__STATIC },
{ "FLAMETHROWER_END", DVPTR(FLAMETHROWER_END), FLAMETHROWER_END__STATIC },
{ "E5L7_DUKE_QUIT_YOU", DVPTR(E5L7_DUKE_QUIT_YOU), E5L7_DUKE_QUIT_YOU__STATIC },
};
 
#ifdef DYNSOUNDREMAP_ENABLE
332,7 → 331,6
int32_t FLAMETHROWER_INTRO = FLAMETHROWER_INTRO__STATIC;
int32_t FLAMETHROWER_LOOP = FLAMETHROWER_LOOP__STATIC;
int32_t FLAMETHROWER_END = FLAMETHROWER_END__STATIC;
int32_t E5L7_DUKE_QUIT_YOU = E5L7_DUKE_QUIT_YOU__STATIC;
 
#if !defined LUNATIC
static hashtable_t h_names = {512, NULL};
/source/duke3d/src/soundsdyn.h
166,7 → 166,6
#define FLAMETHROWER_INTRO__STATIC 398
#define FLAMETHROWER_LOOP__STATIC 399
#define FLAMETHROWER_END__STATIC 400
#define E5L7_DUKE_QUIT_YOU__STATIC 401
 
extern int16_t DynamicSoundMap[MAXSOUNDS];
 
322,7 → 321,6
extern int32_t FLAMETHROWER_INTRO;
extern int32_t FLAMETHROWER_LOOP;
extern int32_t FLAMETHROWER_END;
extern int32_t E5L7_DUKE_QUIT_YOU;
 
#define DYNAMICSOUNDMAP(Soundnum) (DynamicSoundMap[Soundnum])