diff --git a/src/f_finale.c b/src/f_finale.c index dd024ecd0..b98570b48 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -531,8 +531,8 @@ static const char *credits[] = { "\"Xyzzy\"", "\"Chearii\"", " ", - "\"Sunflower\" aka \"AnimeSonic\"", - "\"Yuz\" aka \"Yuzler\"", + "\"Sunflower\"", + "\"Yuz\"", "\"Democrab\"", "\"EXpand\"", "\"Nexit\"", @@ -543,6 +543,7 @@ static const char *credits[] = { "\"Achii\"", "\"Anonimus\"", "\"scizor300\"", + "\"Lugent\"", "", "\1Special Thanks", "SEGA", diff --git a/src/m_menu.c b/src/m_menu.c index 6009122ea..e5a20a7fa 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2468,39 +2468,38 @@ static menuitem_t OP_HudOffsetMenu[] = static menuitem_t OP_SaturnCreditsMenu[] = { - {IT_HEADER, NULL, "Saturn Credits", NULL, 0}, + {IT_HEADER, NULL, "Thanks to all contributers <3", NULL, 0}, - {IT_HEADER, NULL, "Thanks to all contributers <3", NULL, 7}, + {IT_STRING2+IT_SPACE, NULL, "Alug", NULL, 10}, + {IT_STRING2+IT_SPACE, NULL, "Indev", NULL, 20}, + {IT_STRING2+IT_SPACE, NULL, "Haya", NULL, 30}, + {IT_STRING2+IT_SPACE, NULL, "Nepdisk", NULL, 40}, + {IT_STRING2+IT_SPACE, NULL, "GenericHeroGuy", NULL, 50}, + {IT_STRING2+IT_SPACE, NULL, "xyzzy", NULL, 60}, + {IT_STRING2+IT_SPACE, NULL, "Chearii", NULL, 70}, - {IT_STRING2+IT_SPACE, NULL, "Alug", NULL, 17}, - {IT_STRING2+IT_SPACE, NULL, "Indev", NULL, 27}, - {IT_STRING2+IT_SPACE, NULL, "Haya", NULL, 37}, - {IT_STRING2+IT_SPACE, NULL, "Nepdisk", NULL, 47}, - {IT_STRING2+IT_SPACE, NULL, "GenericHeroGuy", NULL, 57}, - {IT_STRING2+IT_SPACE, NULL, "xyzzy", NULL, 67}, - {IT_STRING2+IT_SPACE, NULL, "Chearii", NULL, 77}, + {IT_STRING2+IT_SPACE, NULL, "Sunflower", NULL, 80}, + {IT_STRING2+IT_SPACE, NULL, "Yuz", NULL, 90}, + {IT_STRING2+IT_SPACE, NULL, "Democrab", NULL, 100}, + {IT_STRING2+IT_SPACE, NULL, "EXpand", NULL, 110}, + {IT_STRING2+IT_SPACE, NULL, "Nexit", NULL, 120}, + {IT_STRING2+IT_SPACE, NULL, "Spee", NULL, 130}, + {IT_STRING2+IT_SPACE, NULL, "jin", NULL, 140}, + {IT_STRING2+IT_SPACE, NULL, "riomccloud", NULL, 150}, + {IT_STRING2+IT_SPACE, NULL, "chromaticpipe", NULL, 160}, + {IT_STRING2+IT_SPACE, NULL, "Achii", NULL, 170}, + {IT_STRING2+IT_SPACE, NULL, "Anonimus", NULL, 180}, + {IT_STRING2+IT_SPACE, NULL, "scizor300", NULL, 190}, + {IT_STRING2+IT_SPACE, NULL, "Lugent", NULL, 200}, - {IT_STRING2+IT_SPACE, NULL, "Sunflower aka AnimeSonic", NULL, 87}, - {IT_STRING2+IT_SPACE, NULL, "Yuz aka Yuzler", NULL, 97}, - {IT_STRING2+IT_SPACE, NULL, "Democrab", NULL, 107}, - {IT_STRING2+IT_SPACE, NULL, "EXpand", NULL, 117}, - {IT_STRING2+IT_SPACE, NULL, "Nexit", NULL, 127}, - {IT_STRING2+IT_SPACE, NULL, "Spee", NULL, 137}, - {IT_STRING2+IT_SPACE, NULL, "jin", NULL, 147}, - {IT_STRING2+IT_SPACE, NULL, "riomccloud", NULL, 157}, - {IT_STRING2+IT_SPACE, NULL, "chromaticpipe", NULL, 167}, - {IT_STRING2+IT_SPACE, NULL, "Achii", NULL, 177}, - {IT_STRING2+IT_SPACE, NULL, "Anonimus", NULL, 187}, - {IT_STRING2+IT_SPACE, NULL, "scizor300", NULL, 197}, + {IT_HEADER, NULL, "Special Thanks <3", NULL, 168}, - {IT_HEADER, NULL, "Special Thanks <3", NULL, 167}, + {IT_STRING2+IT_SPACE, NULL, "All of Sunflower's Garden", NULL, 178}, + {IT_STRING2+IT_SPACE, NULL, "The Moe Mansion and Birdhouse Team", NULL, 188}, + {IT_STRING2+IT_SPACE, NULL, "Galactice for Galaxy", NULL, 198}, - {IT_STRING2+IT_SPACE, NULL, "All of Sunflower's Garden", NULL, 177}, - {IT_STRING2+IT_SPACE, NULL, "The Moe Mansion and Birdhouse Team", NULL, 187}, - {IT_STRING2+IT_SPACE, NULL, "Galactice for Galaxy", NULL, 197}, - - {IT_STRING+IT_SPACE, NULL, "", NULL, 207}, // dummy text I - {IT_STRING, NULL, "", NULL, 267}, // dummy text II + {IT_STRING+IT_SPACE, NULL, "", NULL, 198}, // dummy text I + {IT_STRING, NULL, "", NULL, 258}, // dummy text II }; // sry we dont have space for this anymore :/ diff --git a/src/p_tick.c b/src/p_tick.c index 3c4583322..5e1af1b68 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -654,6 +654,7 @@ void P_Ticker(boolean run) { P_MapStart(); R_UpdateMobjInterpolators(); + R_UpdateLevelInterpolators(); OP_ObjectplaceMovement(&players[0]); P_MoveChaseCamera(&players[0], &camera[0], false); R_UpdateViewInterpolation(); diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c index f033b678a..9c14f7ed6 100644 --- a/src/sdl/i_main.c +++ b/src/sdl/i_main.c @@ -27,7 +27,7 @@ #include #endif -#ifdef __unix__ +#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) #include #endif diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp index 5282fc9d3..249f1f6f2 100644 --- a/src/sdl/i_system.cpp +++ b/src/sdl/i_system.cpp @@ -110,8 +110,11 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T); #endif #endif -#if defined (__unix__) || (defined (UNIXCOMMON) && !defined (__APPLE__)) +#if defined(UNIXCOMMON) #include +#endif + +#if defined (__unix__) || (defined (UNIXCOMMON) && !defined (__APPLE__)) #include #include #define NEWSIGNALHANDLER