From 00d554c59925c6b4234e82324662b0a0e0e5cb3b Mon Sep 17 00:00:00 2001 From: nakeee Date: Wed, 12 Nov 2008 08:33:56 +0000 Subject: [PATCH] Moved maps dir git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1146 8ced0084-cf51-0410-be5f-012b33b47a6e --- Binary/linux/Maps/GMBE8P.map | 34 ------------------------------ Binary/mac/Dolphin.ini | 24 --------------------- Binary/mac/Maps/GMBE8P.map | 34 ------------------------------ Binary/win32/Maps/GMBE8P.map | 34 ------------------------------ Binary/x64/Maps/GMBE8P.map | 34 ------------------------------ Source/Core/Common/Src/Paths.h | 2 ++ Source/Core/Core/Src/Boot/Boot.cpp | 2 +- 7 files changed, 3 insertions(+), 161 deletions(-) delete mode 100644 Binary/linux/Maps/GMBE8P.map delete mode 100644 Binary/mac/Dolphin.ini delete mode 100644 Binary/mac/Maps/GMBE8P.map delete mode 100644 Binary/win32/Maps/GMBE8P.map delete mode 100644 Binary/x64/Maps/GMBE8P.map diff --git a/Binary/linux/Maps/GMBE8P.map b/Binary/linux/Maps/GMBE8P.map deleted file mode 100644 index d83be68df3..0000000000 --- a/Binary/linux/Maps/GMBE8P.map +++ /dev/null @@ -1,34 +0,0 @@ -.text -800031f0 0000001c 800031f0 0 load_sp_rtoc -80007034 0000004c 80007034 0 .LoadQuantizers -80007080 00000030 80007080 0 .LoadInfinitiesEtc -800070b0 00000038 800070b0 0 .rsqrt -800070ec 00000040 800070ec 0 .sqrt_internal_needs_cr1 -8000712c 00000040 8000712c 0 .rsqrt_internal_needs_cr1 -800071e0 00000030 800071e0 0 .wrapping_once_fp_lookup -80007210 00000064 80007210 0 .weird2 -80007274 00000030 80007274 0 .lookup_some_float_in_table_with_neg_wrap -800072a4 00000180 800072a4 0 .atan2 -80007424 000000b8 80007424 0 .calls_sqrt -800074dc 0000005c 800074dc 0 .func -80007538 0000002c 80007538 0 .load_strange_matrix1 -80007564 0000002c 80007564 0 .load_strange_matrix3 -80007590 0000002c 80007590 0 .load_strange_matrix2 -80007834 00000044 80007834 0 .push_matrix_3x3? -80007878 00000038 80007878 0 .read_top_3x3matrix -800078b0 00000038 800078b0 0 .write_top_3x3_matrix -800078e8 0000003c 800078e8 0 .read_current_3x3_matrix -80007924 00000014 80007924 0 .pop_matrix_stack -80007a50 00000170 80007a50 0 .mult_matrix? -80007ecc 000000bc 80007ecc 0 .weird_vector_op_status_in_cr2 -80007f88 00000074 80007f88 0 .weird_param_in_p1_p2 -800080fc 00000078 800080fc 0 .evil_normalize -80008174 00000078 80008174 0 .evil_vec_setlength -800081ec 00000070 800081ec 0 .evil_vec_cosine -80008538 000000f0 80008538 0 .calls_evil1 -8000875c 00000088 8000875c 0 .another_caller -800087e4 0000008c 800087e4 0 .another_caller2 -80008d30 000001b4 80008d30 0 .another_caller3 -80036544 000001b4 80036544 0 .fctiwi_weird2 -8003dd1c 00000110 8003dd1c 0 .fctwi_weird -80043b48 000005bc 80043b48 0 .fctwi_weird3 diff --git a/Binary/mac/Dolphin.ini b/Binary/mac/Dolphin.ini deleted file mode 100644 index 4b60bacb0b..0000000000 --- a/Binary/mac/Dolphin.ini +++ /dev/null @@ -1,24 +0,0 @@ -[Default] -GFXPlugin = Plugins/libzeroogl.so -DSPPlugin = Plugins/libdsphle.so -PadPlugin = Plugins/libPlugin_nJoy_SDL.so -WiiMotePlugin = Plugins/libPlugin_Wiimote.so -[General] -LastFilename = -GCMPathes = 0 -[Core] -GFXPlugin = Plugins/libzeroogl.so -DSPPlugin = Plugins/libdsphle.so -PadPlugin = Plugins/libPlugin_nJoy_SDL.so -WiiMotePlugin = Plugins/libPlugin_Wiimote.so -HLEBios = True -UseDynarec = True -UseDualCore = False -SkipIdle = True -LockThreads = True -DefaultGCM = -DVDRoot = -OptimizeQuantizers = True -SelectedLanguage = 0 -RunCompareServer = False -RunCompareClient = False diff --git a/Binary/mac/Maps/GMBE8P.map b/Binary/mac/Maps/GMBE8P.map deleted file mode 100644 index d83be68df3..0000000000 --- a/Binary/mac/Maps/GMBE8P.map +++ /dev/null @@ -1,34 +0,0 @@ -.text -800031f0 0000001c 800031f0 0 load_sp_rtoc -80007034 0000004c 80007034 0 .LoadQuantizers -80007080 00000030 80007080 0 .LoadInfinitiesEtc -800070b0 00000038 800070b0 0 .rsqrt -800070ec 00000040 800070ec 0 .sqrt_internal_needs_cr1 -8000712c 00000040 8000712c 0 .rsqrt_internal_needs_cr1 -800071e0 00000030 800071e0 0 .wrapping_once_fp_lookup -80007210 00000064 80007210 0 .weird2 -80007274 00000030 80007274 0 .lookup_some_float_in_table_with_neg_wrap -800072a4 00000180 800072a4 0 .atan2 -80007424 000000b8 80007424 0 .calls_sqrt -800074dc 0000005c 800074dc 0 .func -80007538 0000002c 80007538 0 .load_strange_matrix1 -80007564 0000002c 80007564 0 .load_strange_matrix3 -80007590 0000002c 80007590 0 .load_strange_matrix2 -80007834 00000044 80007834 0 .push_matrix_3x3? -80007878 00000038 80007878 0 .read_top_3x3matrix -800078b0 00000038 800078b0 0 .write_top_3x3_matrix -800078e8 0000003c 800078e8 0 .read_current_3x3_matrix -80007924 00000014 80007924 0 .pop_matrix_stack -80007a50 00000170 80007a50 0 .mult_matrix? -80007ecc 000000bc 80007ecc 0 .weird_vector_op_status_in_cr2 -80007f88 00000074 80007f88 0 .weird_param_in_p1_p2 -800080fc 00000078 800080fc 0 .evil_normalize -80008174 00000078 80008174 0 .evil_vec_setlength -800081ec 00000070 800081ec 0 .evil_vec_cosine -80008538 000000f0 80008538 0 .calls_evil1 -8000875c 00000088 8000875c 0 .another_caller -800087e4 0000008c 800087e4 0 .another_caller2 -80008d30 000001b4 80008d30 0 .another_caller3 -80036544 000001b4 80036544 0 .fctiwi_weird2 -8003dd1c 00000110 8003dd1c 0 .fctwi_weird -80043b48 000005bc 80043b48 0 .fctwi_weird3 diff --git a/Binary/win32/Maps/GMBE8P.map b/Binary/win32/Maps/GMBE8P.map deleted file mode 100644 index d83be68df3..0000000000 --- a/Binary/win32/Maps/GMBE8P.map +++ /dev/null @@ -1,34 +0,0 @@ -.text -800031f0 0000001c 800031f0 0 load_sp_rtoc -80007034 0000004c 80007034 0 .LoadQuantizers -80007080 00000030 80007080 0 .LoadInfinitiesEtc -800070b0 00000038 800070b0 0 .rsqrt -800070ec 00000040 800070ec 0 .sqrt_internal_needs_cr1 -8000712c 00000040 8000712c 0 .rsqrt_internal_needs_cr1 -800071e0 00000030 800071e0 0 .wrapping_once_fp_lookup -80007210 00000064 80007210 0 .weird2 -80007274 00000030 80007274 0 .lookup_some_float_in_table_with_neg_wrap -800072a4 00000180 800072a4 0 .atan2 -80007424 000000b8 80007424 0 .calls_sqrt -800074dc 0000005c 800074dc 0 .func -80007538 0000002c 80007538 0 .load_strange_matrix1 -80007564 0000002c 80007564 0 .load_strange_matrix3 -80007590 0000002c 80007590 0 .load_strange_matrix2 -80007834 00000044 80007834 0 .push_matrix_3x3? -80007878 00000038 80007878 0 .read_top_3x3matrix -800078b0 00000038 800078b0 0 .write_top_3x3_matrix -800078e8 0000003c 800078e8 0 .read_current_3x3_matrix -80007924 00000014 80007924 0 .pop_matrix_stack -80007a50 00000170 80007a50 0 .mult_matrix? -80007ecc 000000bc 80007ecc 0 .weird_vector_op_status_in_cr2 -80007f88 00000074 80007f88 0 .weird_param_in_p1_p2 -800080fc 00000078 800080fc 0 .evil_normalize -80008174 00000078 80008174 0 .evil_vec_setlength -800081ec 00000070 800081ec 0 .evil_vec_cosine -80008538 000000f0 80008538 0 .calls_evil1 -8000875c 00000088 8000875c 0 .another_caller -800087e4 0000008c 800087e4 0 .another_caller2 -80008d30 000001b4 80008d30 0 .another_caller3 -80036544 000001b4 80036544 0 .fctiwi_weird2 -8003dd1c 00000110 8003dd1c 0 .fctwi_weird -80043b48 000005bc 80043b48 0 .fctwi_weird3 diff --git a/Binary/x64/Maps/GMBE8P.map b/Binary/x64/Maps/GMBE8P.map deleted file mode 100644 index d83be68df3..0000000000 --- a/Binary/x64/Maps/GMBE8P.map +++ /dev/null @@ -1,34 +0,0 @@ -.text -800031f0 0000001c 800031f0 0 load_sp_rtoc -80007034 0000004c 80007034 0 .LoadQuantizers -80007080 00000030 80007080 0 .LoadInfinitiesEtc -800070b0 00000038 800070b0 0 .rsqrt -800070ec 00000040 800070ec 0 .sqrt_internal_needs_cr1 -8000712c 00000040 8000712c 0 .rsqrt_internal_needs_cr1 -800071e0 00000030 800071e0 0 .wrapping_once_fp_lookup -80007210 00000064 80007210 0 .weird2 -80007274 00000030 80007274 0 .lookup_some_float_in_table_with_neg_wrap -800072a4 00000180 800072a4 0 .atan2 -80007424 000000b8 80007424 0 .calls_sqrt -800074dc 0000005c 800074dc 0 .func -80007538 0000002c 80007538 0 .load_strange_matrix1 -80007564 0000002c 80007564 0 .load_strange_matrix3 -80007590 0000002c 80007590 0 .load_strange_matrix2 -80007834 00000044 80007834 0 .push_matrix_3x3? -80007878 00000038 80007878 0 .read_top_3x3matrix -800078b0 00000038 800078b0 0 .write_top_3x3_matrix -800078e8 0000003c 800078e8 0 .read_current_3x3_matrix -80007924 00000014 80007924 0 .pop_matrix_stack -80007a50 00000170 80007a50 0 .mult_matrix? -80007ecc 000000bc 80007ecc 0 .weird_vector_op_status_in_cr2 -80007f88 00000074 80007f88 0 .weird_param_in_p1_p2 -800080fc 00000078 800080fc 0 .evil_normalize -80008174 00000078 80008174 0 .evil_vec_setlength -800081ec 00000070 800081ec 0 .evil_vec_cosine -80008538 000000f0 80008538 0 .calls_evil1 -8000875c 00000088 8000875c 0 .another_caller -800087e4 0000008c 800087e4 0 .another_caller2 -80008d30 000001b4 80008d30 0 .another_caller3 -80036544 000001b4 80036544 0 .fctiwi_weird2 -8003dd1c 00000110 8003dd1c 0 .fctwi_weird -80043b48 000005bc 80043b48 0 .fctwi_weird3 diff --git a/Source/Core/Common/Src/Paths.h b/Source/Core/Common/Src/Paths.h index c74e5880ff..f33677205c 100644 --- a/Source/Core/Common/Src/Paths.h +++ b/Source/Core/Common/Src/Paths.h @@ -26,6 +26,7 @@ #define WII_USER_DIR "Wii" #define CONFIG_DIR "Config" #define GAMECONFIG_DIR "GameConfig" +#define MAPS_DIR "Maps" #define CACHE_DIR "Cache" #define STATESAVES_DIR "StateSaves" #define SCREENSHOTS_DIR "ScreenShots" @@ -80,6 +81,7 @@ #define FULL_SCREENSHOTS_DIR FULL_USERDATA_DIR SCREENSHOTS_DIR #define FULL_LOGS_DIR FULL_USERDATA_DIR LOGS_DIR #define FULL_MAIL_LOGS_DIR FULL_LOGS_DIR MAIL_LOGS_DIR +#define FULL_MAPS_DIR FULL_USERDATA_DIR MAPS_DIR DIR_SEP // Sys dirs #define FULL_SYSDATA_DIR ROOT_DIR DIR_SEP SYSDATA_DIR DIR_SEP diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp index fd5ba34d84..bf61ba2a38 100644 --- a/Source/Core/Core/Src/Boot/Boot.cpp +++ b/Source/Core/Core/Src/Boot/Boot.cpp @@ -91,7 +91,7 @@ std::string CBoot::GenerateMapFilename() std::string strMapFilename; BuildCompleteFilename(strMapFilename, strDriveDirectory, strFullfilename); */ - return "Maps/" + Core::GetStartupParameter().GetUniqueID() + ".map"; + return FULL_MAPS_DIR + Core::GetStartupParameter().GetUniqueID() + ".map"; } bool CBoot::LoadMapFromFilename(const std::string &_rFilename, const char *_gameID)