diff --git a/CMakeLists.txt b/CMakeLists.txt index e554cca0a..0d37514f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,7 +113,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") set(CMAKE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") # Set EXE names so the assets CMakeLists can refer to its target -set(SRB2_SDL2_EXE_NAME drrr CACHE STRING "Executable binary output name") +set(SRB2_SDL2_EXE_NAME ringracers CACHE STRING "Executable binary output name") include_directories(${CMAKE_CURRENT_BINARY_DIR}/src) diff --git a/srb2.png b/srb2.png index fccde9c3f..dd84db0a0 100644 Binary files a/srb2.png and b/srb2.png differ diff --git a/srb2banner.png b/srb2banner.png index 9c13eae9a..ee4d3230e 100644 Binary files a/srb2banner.png and b/srb2banner.png differ diff --git a/src/Makefile b/src/Makefile index d32c6d6b4..904aa0bbe 100644 --- a/src/Makefile +++ b/src/Makefile @@ -235,7 +235,7 @@ bin:=../bin endif # default EXENAME (usually set by platform) -EXENAME?=drrr +EXENAME?=ringracers DBGNAME?=$(EXENAME).debug exe:=$(bin)/$(EXENAME) diff --git a/src/filesrch.c b/src/filesrch.c index 7729652d0..1d8d7bb6b 100644 --- a/src/filesrch.c +++ b/src/filesrch.c @@ -312,7 +312,7 @@ closedir (DIR * dirp) static CV_PossibleValue_t addons_cons_t[] = {{0, "Default"}, #if 1 - {1, "HOME"}, {2, "DRRR"}, + {1, "HOME"}, {2, "RINGRACERS"}, #endif {3, "CUSTOM"}, {0, NULL}}; diff --git a/src/sdl/SDL_icon.xpm b/src/sdl/SDL_icon.xpm index 0acac88ec..4feaa7ebe 100644 --- a/src/sdl/SDL_icon.xpm +++ b/src/sdl/SDL_icon.xpm @@ -1,100 +1,50 @@ /* XPM */ -static const char *SDL_icon_xpm[] = { +static char *_33e5d9ff7304dc1d1d0f768ae4abba7V9uNpHhxS4n6jAPA[] = { /* columns rows colors chars-per-pixel */ -"64 64 32 1", -" c None", -". c #E7E7E7", -"+ c #DFDFDF", -"@ c #AFAFAF", -"# c #979797", -"$ c #8F8F8F", -"% c #B7B7B7", -"& c #F7F7F7", -"* c #D7D7D7", -"= c #4F4F4F", -"- c #0F0F0F", -"; c #070707", -"> c #575757", -", c #C7C7C7", -"' c #676767", -") c #7F7F7F", -"! c #5F5F5F", -"~ c #777777", -"{ c #474747", -"] c #878787", -"^ c #6F6F6F", -"/ c #BFBFBF", -"( c #373737", -"_ c #1F1F1F", -": c #272727", -"< c #2F2F2F", -"[ c #3F3F3F", -"} c #EFEFEF", -"| c #A7A7A7", -"1 c #9F9F9F", -"2 c #171717", -"3 c #CFCFCF", -" ", -" .................... ", -" ...+@##$$$$###@%&....... ", -" ..*=-;;;-;;;;;;;;@........ ", -" ..+-;;;;--;;;;;;;>.......... ", -" ...,')!!'~>{!)$)>'....*]>^%&.. ", -" ../(__(>:{<)$![[[%&...^!!!!!~*. ", -" ..@;;;;;({=]:;;;;;~..*_;;;;;;;_.. ", -" .}>;;;;;^#=;;;;;;>...<;;;;;;;;;|.. ", -" ..*1)))))%]))))))%&..1])))))))))#}. ", -" ..%[;;;;;[2;;;;;;;:..#;;;2[[-;;;;;=.. ", -" .&:;[{;;;{;;;~={:;^.._;;'}...>;;;;;,. ", -" .}<;;:{;_:2!'-;;;]*.&(_].|{=@.~___[/.. ", -" ..*$))]@%//,111111}..|1*.@1111@.3111|&. ", -" .,:;;;;;'#^;;;;;;;]./;;+);;;;;;$*;;;;.. ", -" .^;;;;;;));;;;;;;;$.~;$*;;;;;;;-+^;;;#. ", -" ..$;;;;;;>;;;;;;;;>}.^-.!;;;;;;;;)*:;;|. ", -" .&@$|#)))|)))1||#]+..$/}]))))))))$.3))#.. ", -" .#;;;[{;->;-^[;;;;].~;@];;;;;;;;;;1#;;-}. ", -" .{;;;;{<[:(~-;;;;;$.(-.<;;;;;;;;;;{};;;3. ", -" ..);;;;;~~[!;;;;;;-/.>=.>;;;;;;;;;;2}^;:3. ", -" .&#)))))$}@)))))))@.}]3.*))))))))))).,)).. ", -" .3;;;;;;;);;;;;;;;2+|;%.';;;;;;;;;;;]1;;1. ", -" .1_(:;;;;{;;;[=[:;;.];}.);;;;;;;;;;;=,;;]. ", -" .%2-(!2;2{;_':;;;;).1;..+:;;;;;;;;;;_.;;1. ", -" .+))))@1$1#@))))))3.,@...1))))))))))].1#3. ", -" .{;;;;;^<>);;;;;;;-.[). .-;;;;;;;;;;;3{;#. ", -" ._;;;;;-~];;;;;;;;;};#. ._;;;;;;;;;;;/^;#. ", -" .$'!!!!!1]!!!!!!!!%}[,. .'[[[[[[[[[[[,|>}. ", -" ..'{::___!{___:(>___:[@...~[[[[[[[[[[[1#{,. ", -" .+;-<=(;;[:;;(=-;;;;;;;;;;;;;;;;;;;;;;;;;). ", -" .*;;;;[=;[_;{(;;;;;;;;;;;;;;;;;;;;;;;;;;-#. ", -" .&)!!!!)$]~)$!!!!!!!!!!!!!!!!!!!!!!!!!!!^+. ", -" .&(_____!$)!____________________________<3. ", -" .%;;;;;;;@|;;;;;;;;;;;;==))))))))))))))]*&. ", -" .*22;;;;;({;;;;;_-;;;;%.&.................. ", -" .&+~#]!!!~]!=[!^>[[[[{}... ", -" ../__:^^:(!_[$>[[[[[[{+. ", -" .<;;;;<^2{;'2;;;;;;;;]. ", -" .;;;;;;:~=>:;;;;;;;;;]. ", -" .@!!!!!!]3|!!!!!!!!!!*. ", -" .#_______#_____:<____~.. ", -" .^_{[_;;;=2;;;<<-;;;;;,.................. ", -" .@<;;{~2;_>;;((;;;;;;;3,-----------|.$-!. ", -" ..@))))|@)|)$|)))))))#}&/))))))))))}./)/. ", -" .&:;;;;;=>>;^;;;;;;;;;_.[;;;;;;;;;;^.{;|. ", -" ..2;;;;;;{#<[;;;;;;;;;;+';;;;;;;;;;~*;;.. ", -" .^;;;;;;;'%;;;;;;;;;;{&}#;;;;;;;;[+|;-.. ", -" .&3$1$))))%))))1]))))]+&}$))))))@&./)@. ", -" ..(;_<'{;;(-;;[2;;;;;;-@3;;;;;;;_}};;~. ", -" .=;;;;:~<-(;-[;;;;;;;;:.=;;;;;;>.!;;,. ", -" ./:;;;;;!!!;=-;;;;;;;;>.+$;;;;[.&_;=.. ", -" ..&|)))))$,|%)))))))))]1&.|]]@&.|]]}. ", -" .&;;;;;;;:@=;;;;;;;;;;;-/....3:;;;}. ", -" ..!;;;;;;;([;;;;_2;;;;;;;>)){;;;;^.. ", -" ..=2_:-;;;(;;;2<;;;;;;;;;;;;;;-).. ", -" ...%$#@%#)#))|))))))))))))))|}&. ", -" ..!;;;2!]{_-[;;;;;;;;;;;;;;;&.. ", -" ..^-;;;;^)(:;;;;;;;;;;;;;;'.. ", -" ..*'-;;;:]-;;;;;;;;;;;;-$.. ", -" ....}./1))))))))))))]/... ", -" ........}3||1#$$$]1... ", -" ................... ", -" "}; +"16 16 28 1 ", +" c None", +". c #470000", +"X c #5F0000", +"o c #7F0000", +"O c #533F1F", +"+ c #752900", +"@ c #7F532F", +"# c #21224E", +"$ c #AF0000", +"% c #DF0000", +"& c #FF3F3F", +"* c #874307", +"= c #9B5B13", +"- c #B37347", +"; c #FF5F5F", +": c #C39B2F", +"> c yellow", +", c #E39767", +"< c #EBDB57", +"1 c #414183", +"2 c #5252FF", +"3 c #979797", +"4 c gray75", +"5 c #FFB78B", +"6 c #FFCB97", +"7 c #FFCFB3", +"8 c #E4E4E4", +"9 c white", +/* pixels */ +" 9999 ", +" 99----99 ", +" 9-,6666,-9 ", +" 9@,679976,@9 ", +"99O-66677666-O99", +"*+X,61166116,X+*", +"==*+-22,,22-+*==", +"+*=*+##&&##+*=*+", +"=====*$;;$*=====", +"+++++++;;+++++++", +".X+5483883845+X.", +"oo:-59499495-:oo", +"oo::+,5665,+::oo", +"$%<>>-++++->><%$", +"%%>>:$$$$$$:>>%%", +"%%>:$%%%%%%$:>%%" +}; diff --git a/src/sdl/Srb2SDL.ico b/src/sdl/Srb2SDL.ico index 4e3f81336..f9caf642c 100644 Binary files a/src/sdl/Srb2SDL.ico and b/src/sdl/Srb2SDL.ico differ diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c index 627da09a4..af46d6632 100644 --- a/src/sdl/i_system.c +++ b/src/sdl/i_system.c @@ -145,10 +145,10 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T); // Locations for searching for main.kart #if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) -#define DEFAULTWADLOCATION1 "/usr/local/share/games/DRRR" -#define DEFAULTWADLOCATION2 "/usr/local/games/DRRR" -#define DEFAULTWADLOCATION3 "/usr/share/games/DRRR" -#define DEFAULTWADLOCATION4 "/usr/games/DRRR" +#define DEFAULTWADLOCATION1 "/usr/local/share/games/RingRacers" +#define DEFAULTWADLOCATION2 "/usr/local/games/RingRacers" +#define DEFAULTWADLOCATION3 "/usr/share/games/RingRacers" +#define DEFAULTWADLOCATION4 "/usr/games/RingRacers" #define DEFAULTSEARCHPATH1 "/usr/local/games" #define DEFAULTSEARCHPATH2 "/usr/games" #define DEFAULTSEARCHPATH3 "/usr/local" diff --git a/src/sdl/srb2icon.png b/src/sdl/srb2icon.png index 2aca4b204..17de4468e 100644 Binary files a/src/sdl/srb2icon.png and b/src/sdl/srb2icon.png differ diff --git a/src/sdl12/Srb2SDL.ico b/src/sdl12/Srb2SDL.ico index 4e3f81336..f9caf642c 100644 Binary files a/src/sdl12/Srb2SDL.ico and b/src/sdl12/Srb2SDL.ico differ diff --git a/src/sdl12/i_main.c b/src/sdl12/i_main.c index adcaae2fd..2cf2753aa 100644 --- a/src/sdl12/i_main.c +++ b/src/sdl12/i_main.c @@ -44,7 +44,7 @@ static char netmask[16] = {0}; #include PSP_HEAP_SIZE_KB(24*1024); PSP_MAIN_THREAD_ATTR(PSP_THREAD_ATTR_USER | PSP_THREAD_ATTR_VFPU); -PSP_MAIN_THREAD_NAME("SRB2Kart"); +PSP_MAIN_THREAD_NAME("Dr. Robotnik's Ring Racers"); PSP_MAIN_THREAD_STACK_SIZE_KB(256); #endif @@ -228,7 +228,7 @@ int main(int argc, char **argv) #endif #endif // startup SRB2 - CONS_Printf("%s", M_GetText("Setting up SRB2...\n")); + CONS_Printf("%s", M_GetText("Setting up Dr. Robotnik's Ring Racers...\n")); D_SRB2Main(); CONS_Printf("%s", M_GetText("Entering main game loop...\n")); // never return diff --git a/src/sdl12/i_system.c b/src/sdl12/i_system.c index 14d183748..b388a9bf5 100644 --- a/src/sdl12/i_system.c +++ b/src/sdl12/i_system.c @@ -155,9 +155,9 @@ void __set_fpscr(long); // in libgcc / kernel's startup.s? //#define DEFAULTSEARCHPATH3 "/pc/home/alam/srb2code/data" #elif defined (GP2X) #define DEFAULTWADLOCATION1 "/mnt/sd" -#define DEFAULTWADLOCATION2 "/mnt/sd/SRB2Kart" +#define DEFAULTWADLOCATION2 "/mnt/sd/RingRacers" #define DEFAULTWADLOCATION3 "/tmp/mnt/sd" -#define DEFAULTWADLOCATION4 "/tmp/mnt/sd/SRB2Kart" +#define DEFAULTWADLOCATION4 "/tmp/mnt/sd/RingRacers" #define DEFAULTSEARCHPATH1 "/mnt/sd" #define DEFAULTSEARCHPATH2 "/tmp/mnt/sd" #elif defined (_WII) @@ -184,10 +184,10 @@ void __set_fpscr(long); // in libgcc / kernel's startup.s? #define DEFAULTSEARCHPATH1 "host0:/" #define DEFAULTSEARCHPATH2 "ms0:/PSP/GAME/SRB2PSP" #elif defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) -#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2Kart" -#define DEFAULTWADLOCATION2 "/usr/local/games/SRB2Kart" -#define DEFAULTWADLOCATION3 "/usr/share/games/SRB2Kart" -#define DEFAULTWADLOCATION4 "/usr/games/SRB2Kart" +#define DEFAULTWADLOCATION1 "/usr/local/share/games/RingRacers" +#define DEFAULTWADLOCATION2 "/usr/local/games/RingRacers" +#define DEFAULTWADLOCATION3 "/usr/share/games/RingRacers" +#define DEFAULTWADLOCATION4 "/usr/games/RingRacers" #define DEFAULTSEARCHPATH1 "/usr/local/games" #define DEFAULTSEARCHPATH2 "/usr/games" #define DEFAULTSEARCHPATH3 "/usr/local" @@ -196,21 +196,21 @@ void __set_fpscr(long); // in libgcc / kernel's startup.s? #ifdef __GNUC__ #include #endif -#define DEFAULTWADLOCATION1 "c:\\srb2kart" -#define DEFAULTWADLOCATION2 "d:\\srb2kart" -#define DEFAULTWADLOCATION3 "e:\\srb2kart" -#define DEFAULTWADLOCATION4 "f:\\srb2kart" -#define DEFAULTWADLOCATION5 "g:\\srb2kart" -#define DEFAULTWADLOCATION6 "h:\\srb2kart" -#define DEFAULTWADLOCATION7 "i:\\srb2kart" +#define DEFAULTWADLOCATION1 "c:\\ringracers" +#define DEFAULTWADLOCATION2 "d:\\ringracers" +#define DEFAULTWADLOCATION3 "e:\\ringracers" +#define DEFAULTWADLOCATION4 "f:\\ringracers" +#define DEFAULTWADLOCATION5 "g:\\ringracers" +#define DEFAULTWADLOCATION6 "h:\\ringracers" +#define DEFAULTWADLOCATION7 "i:\\ringracers" #elif defined (_WIN32_WCE) #define NOCWD #define NOHOME -#define DEFAULTWADLOCATION1 "\\Storage Card\\SRB2Kart" +#define DEFAULTWADLOCATION1 "\\Storage Card\\RingRacers" #define DEFAULTSEARCHPATH1 "\\Storage Card" #elif defined (_WIN32) -#define DEFAULTWADLOCATION1 "c:\\games\\srb2kart" -#define DEFAULTWADLOCATION2 "\\games\\srb2kart" +#define DEFAULTWADLOCATION1 "c:\\games\\ringracers" +#define DEFAULTWADLOCATION2 "\\games\\ringracers" #define DEFAULTSEARCHPATH1 "c:\\games" #define DEFAULTSEARCHPATH2 "\\games" #endif @@ -701,7 +701,7 @@ static void I_StartupConsole(void) if (gotConsole) { - SetConsoleTitleA("SRB2Kart Console"); + SetConsoleTitleA("Dr. Robotnik's Ring Racers Console"); consolevent = SDL_TRUE; } @@ -2333,8 +2333,8 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener) return; if(mumble->uiVersion != 2) { - wcsncpy(mumble->name, L"SRB2Kart "VERSIONSTRING, 256); - wcsncpy(mumble->description, L"Sonic Robo Blast 2 Kart with integrated Mumble Link support.", 2048); + wcsncpy(mumble->name, L"Dr. Robotnik's Ring Racers "VERSIONSTRING, 256); + wcsncpy(mumble->description, L"Dr. Robotnik's Ring Racers with integrated Mumble Link support.", 2048); mumble->uiVersion = 2; } mumble->uiTick++; @@ -2905,7 +2905,7 @@ void I_StartupTimer(void) I_AddExitFunc(I_ShutdownTimer); #elif 0 //#elif !defined (_arch_dreamcast) && !defined(GP2X) // the DC have it own timer and GP2X have broken pthreads? if (SDL_InitSubSystem(SDL_INIT_TIMER) < 0) - I_Error("SRB2: Needs SDL_Timer, Error: %s", SDL_GetError()); + I_Error("Dr. Robotnik's Ring Racers: Needs SDL_Timer, Error: %s", SDL_GetError()); #endif } @@ -2925,13 +2925,13 @@ INT32 I_StartupSystem(void) const SDL_version *SDLlinked; #ifdef _XBOX #ifdef __GNUC__ - char DP[] =" Sonic Robo Blast 2!\n"; + char DP[] =" Dr. Robotnik's Ring Racers!\n"; debugPrint(DP); #endif - unlink("e:/Games/SRB2/stdout.txt"); - freopen("e:/Games/SRB2/stdout.txt", "w+", stdout); - unlink("e:/Games/SRB2/stderr.txt"); - freopen("e:/Games/SRB2/stderr.txt", "w+", stderr); + unlink("e:/Games/RingRacers/stdout.txt"); + freopen("e:/Games/RingRacers/stdout.txt", "w+", stdout); + unlink("e:/Games/RingRacers/stderr.txt"); + freopen("e:/Games/RingRacers/stderr.txt", "w+", stderr); #endif #ifdef _arch_dreamcast #ifdef _DEBUG @@ -2954,7 +2954,7 @@ INT32 I_StartupSystem(void) #else if (SDL_Init(SDL_INIT_NOPARACHUTE) < 0) #endif - I_Error("SRB2: SDL System Error: %s", SDL_GetError()); //Alam: Oh no.... + I_Error("Dr. Robotnik's Ring Racers: SDL System Error: %s", SDL_GetError()); //Alam: Oh no.... #ifndef NOMUMBLE I_SetupMumble(); #endif @@ -3106,7 +3106,7 @@ void I_Error(const char *error, ...) } #endif OutputDebugStringA(buffer); - MessageBoxA(vid.WndParent, buffer, "SRB2 Recursive Error", MB_OK|MB_ICONERROR); + MessageBoxA(vid.WndParent, buffer, "Dr. Robotnik's Ring Racers Recursive Error", MB_OK|MB_ICONERROR); #else // Don't print garbage va_start(argptr, error); diff --git a/src/sdl12/i_video.c b/src/sdl12/i_video.c index 45ce67cf5..e32885a3c 100644 --- a/src/sdl12/i_video.c +++ b/src/sdl12/i_video.c @@ -1719,7 +1719,7 @@ INT32 VID_SetMode(INT32 modeNum) BitsPerPixel = (Uint8)cv_scr_depth.value; //vid.bpp = BitsPerPixel==8?1:2; // Window title - SDL_WM_SetCaption("SRB2Kart "VERSIONSTRING, "SRB2Kart"); + SDL_WM_SetCaption("Dr. Robotnik's Ring Racers "VERSIONSTRING, "Dr. Robotnik's Ring Racers"); if (render_soft == rendermode) { @@ -1881,9 +1881,9 @@ void I_StartupGraphics(void) // Window title #ifdef _WIN32_WCE - SDL_WM_SetCaption("SRB2Kart "VERSIONSTRING, "SRB2Kart"); + SDL_WM_SetCaption("Dr. Robotnik's Ring Racers "VERSIONSTRING, "Dr. Robotnik's Ring Racers"); #else - SDL_WM_SetCaption("SRB2Kart: Starting up", "SRB2Kart"); + SDL_WM_SetCaption("Dr. Robotnik's Ring Racers: Starting up", "Dr. Robotnik's Ring Racers"); #endif // Window icon diff --git a/src/sdl12/sdl_sound.c b/src/sdl12/sdl_sound.c index 1a7525fee..eebcb65df 100644 --- a/src/sdl12/sdl_sound.c +++ b/src/sdl12/sdl_sound.c @@ -154,16 +154,16 @@ static SDL_mutex *Msc_Mutex = NULL; #ifdef _arch_dreamcast #define MIDI_PATH "/ram" #elif defined(GP2X) -#define MIDI_PATH "/mnt/sd/srb2" -#define MIDI_PATH2 "/tmp/mnt/sd/srb2" +#define MIDI_PATH "/mnt/sd/ringracers" +#define MIDI_PATH2 "/tmp/mnt/sd/ringracers" #else #define MIDI_PATH srb2home #if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) #define MIDI_PATH2 "/tmp" #endif #endif -#define MIDI_TMPFILE "srb2music" -#define MIDI_TMPFILE2 "srb2wav" +#define MIDI_TMPFILE "ringracersmusic" +#define MIDI_TMPFILE2 "ringracerswav" static INT32 musicvol = 62; #if SDL_MIXER_VERSION_ATLEAST(1,2,2) @@ -1932,7 +1932,7 @@ boolean I_StartDigSong(const char *musicname, boolean looping) loopstartDig = 0.0l; #else if (looping && strcmp(data, "OggS") == 0) - I_OutputMsg("I_StartDigSong: SRB2 was not compiled with looping music support(no Mix_FadeInMusicPos)\n"); + I_OutputMsg("I_StartDigSong: Ring Racers was not compiled with looping music support(no Mix_FadeInMusicPos)\n"); #endif if (!LoadSong(data, lumplength, 1)) diff --git a/src/win32/Srb2win.ico b/src/win32/Srb2win.ico index 4e3f81336..f9caf642c 100644 Binary files a/src/win32/Srb2win.ico and b/src/win32/Srb2win.ico differ