diff --git a/CMakeLists.txt b/CMakeLists.txt index a14380e2..801015a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,8 +108,8 @@ add_subdirectory(lib/BRender-v1.3.2) add_subdirectory(lib/libsmacker) if(DETHRACE_SOUND_ENABLED) - add_subdirectory(lib/miniaudio2) - add_subdirectory(lib/stb2) + add_subdirectory(lib/miniaudio) + add_subdirectory(lib/stb) endif() add_library(compile_with_werror INTERFACE) diff --git a/src/DETHRACE/common/car.c b/src/DETHRACE/common/car.c index 0b0e5a4f..24cbdadc 100644 --- a/src/DETHRACE/common/car.c +++ b/src/DETHRACE/common/car.c @@ -473,7 +473,7 @@ void InitialiseCar2(tCar_spec* pCar, int pClear_disabled_flag) { break; default: - LOG_WARN("Case %d not handled", pCar->driver); + LOG_WARN2("Case %d not handled", pCar->driver); break; } PossibleService(); diff --git a/src/DETHRACE/common/controls.c b/src/DETHRACE/common/controls.c index 6ecc1237..5a2b3b1f 100644 --- a/src/DETHRACE/common/controls.c +++ b/src/DETHRACE/common/controls.c @@ -1144,7 +1144,6 @@ void CheckHelp(void) { void CheckLoadSave(void) { int save_load_allowed; int switched_res; - LOG_TRACE8("()"); save_load_allowed = !gProgram_state.saving && !gProgram_state.loading && gProgram_state.prog_status == eProg_game_ongoing && !gProgram_state.dont_save_or_load; diff --git a/src/DETHRACE/common/displays.c b/src/DETHRACE/common/displays.c index 1961998c..604e19fb 100644 --- a/src/DETHRACE/common/displays.c +++ b/src/DETHRACE/common/displays.c @@ -180,7 +180,6 @@ void DRPixelmapText(br_pixelmap* pPixelmap, int pX, int pY, tDR_font* pFont, cha int chr; int ch_width; unsigned char* ch; - LOG_TRACE9("(%p, %d, %d, %p, \"%s\", %d)", pPixelmap, pX, pY, pFont, pText, pRight_edge); len = strlen(pText); ch = (unsigned char*)pText; @@ -315,7 +314,6 @@ void DimRectangle(br_pixelmap* pPixelmap, int pLeft, int pTop, int pRight, int p int y; int line_skip; int width; - LOG_TRACE9("(%p, %d, %d, %d, %d, %d)", pPixelmap, pLeft, pTop, pRight, pBottom, pKnock_out_corners); if (gDevious_2d) { DeviouslyDimRectangle(pPixelmap, pLeft, pTop, pRight, pBottom, pKnock_out_corners); diff --git a/src/DETHRACE/common/finteray.c b/src/DETHRACE/common/finteray.c index 4ff02139..bd7712f4 100644 --- a/src/DETHRACE/common/finteray.c +++ b/src/DETHRACE/common/finteray.c @@ -199,7 +199,7 @@ int ActorRayPick2D(br_actor* ap, br_vector3* pPosition, br_vector3* pDir, br_mod int DRSceneRayPick2D(br_actor* world, br_vector3* pPosition, br_vector3* pDir, dr_pick2d_cbfn* callback) { BrMatrix34Inverse(&gPick_model_to_view__finteray, &world->t.t.mat); - LOG_WARN_ONCE("Missing material and model pointers to ActorRayPick2D"); + // LOG_WARN_ONCE("Missing material and model pointers to ActorRayPick2D"); return ActorRayPick2D(world, pPosition, pDir, NULL, NULL, callback); } diff --git a/src/DETHRACE/common/flicplay.c b/src/DETHRACE/common/flicplay.c index 1254b312..fc9455be 100644 --- a/src/DETHRACE/common/flicplay.c +++ b/src/DETHRACE/common/flicplay.c @@ -659,7 +659,6 @@ int TranslationMode(void) { // IDA: void __cdecl DontLetFlicFuckWithPalettes() // FUNCTION: CARM95 0x004959ea void DontLetFlicFuckWithPalettes(void) { - LOG_TRACE8("()"); gPalette_fuck_prevention = 1; } @@ -667,7 +666,6 @@ void DontLetFlicFuckWithPalettes(void) { // IDA: void __cdecl LetFlicFuckWithPalettes() // FUNCTION: CARM95 0x004959ff void LetFlicFuckWithPalettes(void) { - LOG_TRACE8("()"); gPalette_fuck_prevention = 0; } @@ -690,7 +688,6 @@ void ReilluminateFlics(void) { // IDA: void __cdecl TurnFlicTransparencyOn() // FUNCTION: CARM95 0x00495a43 void TurnFlicTransparencyOn(void) { - LOG_TRACE8("()"); gTransparency_on = 1; } @@ -698,7 +695,6 @@ void TurnFlicTransparencyOn(void) { // IDA: void __cdecl TurnFlicTransparencyOff() // FUNCTION: CARM95 0x00495a58 void TurnFlicTransparencyOff(void) { - LOG_TRACE8("()"); gTransparency_on = 0; } @@ -1094,7 +1090,6 @@ void DoDeltaTrans(tFlic_descriptor* pFlic_info, tU32 chunk_length) { tU32 the_row_bytes; tU16* line_pixel_ptr; tU16 the_word; - LOG_TRACE8("(%p, %d)", pFlic_info, chunk_length); line_count = MemReadU16(&pFlic_info->data); the_row_bytes = pFlic_info->the_pixelmap->row_bytes; @@ -1276,7 +1271,6 @@ void DoRunLengthTrans(tFlic_descriptor* pFlic_info, tU32 chunk_length) { tU8* line_pixel_ptr; tU8 the_byte; tU32 the_row_bytes; - LOG_TRACE8("(%p, %d)", pFlic_info, chunk_length); the_row_bytes = pFlic_info->the_pixelmap->row_bytes; pixel_ptr = pFlic_info->first_pixel; @@ -1797,7 +1791,6 @@ void ProcessFlicQueue(tU32 pInterval) { tFlic_descriptor* doomed_flic; tU32 new_time; int finished_playing; - LOG_TRACE8("(%d)", pInterval); DontLetFlicFuckWithPalettes(); TurnFlicTransparencyOn(); diff --git a/src/DETHRACE/common/graphics.c b/src/DETHRACE/common/graphics.c index d07c686f..024a7588 100644 --- a/src/DETHRACE/common/graphics.c +++ b/src/DETHRACE/common/graphics.c @@ -691,7 +691,6 @@ void CopyStripImage(br_pixelmap* pDest, br_int_16 pDest_x, br_int_16 pOffset_x, int chunk_length; char* destn_ptr; char* destn_ptr2; - LOG_TRACE8("(%p, %d, %d, %d, %d, %p, %d, %d, %d, %d)", pDest, pDest_x, pOffset_x, pDest_y, pOffset_y, pSource, pSource_x, pSource_y, pWidth, pHeight); if (gBack_screen->type == BR_PMT_RGB_565) { Copy8BitStripImageTo16Bit( @@ -2318,7 +2317,6 @@ void ResetPalette(void) { // FUNCTION: CARM95 0x004b7a74 void Darken(tU8* pPtr, unsigned int pDarken_amount) { unsigned int value; - LOG_TRACE10("(%p, %d)", pPtr, pDarken_amount); *pPtr = (pDarken_amount * *pPtr) / 256; } @@ -2329,7 +2327,6 @@ void SetFadedPalette(int pDegree) { int j; br_pixelmap* the_palette; char* the_pixels; - LOG_TRACE10("(%d)", pDegree); memcpy(gScratch_pixels, gCurrent_palette->pixels, 0x400u); for (j = 0; j < 256; j++) { diff --git a/src/DETHRACE/common/input.c b/src/DETHRACE/common/input.c index 4caf7af2..7c841751 100644 --- a/src/DETHRACE/common/input.c +++ b/src/DETHRACE/common/input.c @@ -128,7 +128,6 @@ void ResetPollKeys(void) { // IDA: void __cdecl CheckKeysForMouldiness() // FUNCTION: CARM95 0x00471cdb void CheckKeysForMouldiness(void) { - LOG_TRACE9("()"); if (PDGetTotalTime() - gLast_poll_keys > 500) { ResetPollKeys(); @@ -515,7 +514,6 @@ void RollLettersIn(void) { tU8* saved_char_ptr; tU8* source_ptr; tU8 the_byte; - LOG_TRACE9("()"); new_time = PDGetTotalTime(); if (gLast_roll) { diff --git a/src/DETHRACE/common/intrface.c b/src/DETHRACE/common/intrface.c index 4c3db5f8..6cae8d3f 100644 --- a/src/DETHRACE/common/intrface.c +++ b/src/DETHRACE/common/intrface.c @@ -121,7 +121,6 @@ void ChangeSelection(tInterface_spec* pSpec, int* pOld_selection, int* pNew_sele // FUNCTION: CARM95 0x0047507b void RecopyAreas(tInterface_spec* pSpec, br_pixelmap** pCopy_areas) { int i; - LOG_TRACE8("(%p, %p)", pSpec, pCopy_areas); for (i = 0; i < pSpec->number_of_recopy_areas; i++) { BrPixelmapRectangleCopy( diff --git a/src/DETHRACE/common/loading.c b/src/DETHRACE/common/loading.c index e0b0da75..a5184c0e 100644 --- a/src/DETHRACE/common/loading.c +++ b/src/DETHRACE/common/loading.c @@ -1586,7 +1586,6 @@ void LoadGear(FILE* pF, int pIndex, tCar_spec* pCar_spec) { // IDA: void __usercall AddRefOffset(int *pRef_holder@) // FUNCTION: CARM95 0x0042387c void AddRefOffset(int* pRef_holder) { - LOG_TRACE8("(%p)", pRef_holder); if (*pRef_holder >= 0) { *pRef_holder += gGroove_funk_offset; @@ -2441,14 +2440,14 @@ void LoadCar(char* pCar_name, tDriver pDriver, tCar_spec* pCar_spec, int pOwner, fclose(g); #if DETHRACE_FIX_BUGS -#define CHECK_BINDING_INDEX(IDX) \ - do { \ - if ((IDX) >= 0) { \ - if (IDX >= COUNT_OF(gGroove_funk_bindings) || gGroove_funk_bindings[IDX] == NULL) { \ - LOG_WARN("Disabling invalid groove binding for " #IDX "=%d (%d)", IDX, IDX - gGroove_funk_offset); \ - IDX = -1; \ - } \ - } \ +#define CHECK_BINDING_INDEX(IDX) \ + do { \ + if ((IDX) >= 0) { \ + if (IDX >= COUNT_OF(gGroove_funk_bindings) || gGroove_funk_bindings[IDX] == NULL) { \ + LOG_WARN3("Disabling invalid groove binding for " #IDX "=%d (%d)", IDX, IDX - gGroove_funk_offset); \ + IDX = -1; \ + } \ + } \ } while (0) for (i = 0; i < pCar_spec->number_of_steerable_wheels; i++) { CHECK_BINDING_INDEX(pCar_spec->steering_ref[i]); @@ -3483,7 +3482,6 @@ int GetCDPathFromPathsTxtFile(char* pPath_name) { static tPath_name cd_pathname; FILE* paths_txt_fp; tPath_name paths_txt; - LOG_TRACE9("()"); if (!got_it_already) { sprintf(paths_txt, "%s%s%s", gApplication_path, gDir_separator, "PATHS.TXT"); diff --git a/src/DETHRACE/common/newgame.c b/src/DETHRACE/common/newgame.c index 013fe2fc..f0c7458c 100644 --- a/src/DETHRACE/common/newgame.c +++ b/src/DETHRACE/common/newgame.c @@ -187,7 +187,6 @@ int FrankAnneDone(int pCurrent_choice, int pCurrent_mode, int pGo_ahead, int pEs // IDA: void __usercall FrankAnneDraw(int pCurrent_choice@, int pCurrent_mode@) // FUNCTION: CARM95 0x004b01fb void FrankAnneDraw(int pCurrent_choice, int pCurrent_mode) { - LOG_TRACE9("(%d, %d)", pCurrent_choice, pCurrent_mode); if (gTyping) { if (GetTotalTime() & 0x100) { diff --git a/src/DETHRACE/common/racestrt.c b/src/DETHRACE/common/racestrt.c index ff6ef944..3b25b6fb 100644 --- a/src/DETHRACE/common/racestrt.c +++ b/src/DETHRACE/common/racestrt.c @@ -1510,7 +1510,6 @@ void SelectRaceDraw(int pCurrent_choice, int pCurrent_mode) { tU32* test; // GLOBAL: CARM95 0x536430 static tU32 test2; - LOG_TRACE8("(%d, %d)", pCurrent_choice, pCurrent_mode); if (gProgram_state.view_type == eVT_Opponents) { the_opponent = &gOpponents[gCurrent_race.opponent_list[gOpponent_index].index]; @@ -2018,7 +2017,6 @@ int CalcGridOffset(int pPosition) { // IDA: void __usercall GridDraw(int pCurrent_choice@, int pCurrent_mode@) // FUNCTION: CARM95 0x00452039 void GridDraw(int pCurrent_choice, int pCurrent_mode) { - LOG_TRACE8("(%d, %d)", pCurrent_choice, pCurrent_mode); if (gDraw_grid_status > eGrid_draw_none) { DrawGrid(gCurrent_graf_data->grid_x_pitch * CalcGridOffset(gOur_starting_position), 0); @@ -2380,7 +2378,6 @@ int GridClickRight(int* pCurrent_choice, int* pCurrent_mode, int pX_offset, int // IDA: int __usercall CheckChallenge@(int *pCurrent_choice@, int *pCurrent_mode@) // FUNCTION: CARM95 0x0045378a int CheckChallenge(int* pCurrent_choice, int* pCurrent_mode) { - LOG_TRACE8("(%p, %p)", pCurrent_choice, pCurrent_mode); if (!gChallenge_time || PDGetTotalTime() < gChallenge_time) { return 0; diff --git a/src/DETHRACE/common/replay.c b/src/DETHRACE/common/replay.c index ae4eaaa7..a535d4b7 100644 --- a/src/DETHRACE/common/replay.c +++ b/src/DETHRACE/common/replay.c @@ -105,7 +105,6 @@ tAction_replay_camera_type gAction_replay_camera_mode; // IDA: int __cdecl ReplayIsPaused() // FUNCTION: CARM95 0x0041adc0 int ReplayIsPaused(void) { - LOG_TRACE8("()"); return gReplay_rate == 0.f; } diff --git a/src/DETHRACE/common/trig.c b/src/DETHRACE/common/trig.c index 811ec66f..5081dc33 100644 --- a/src/DETHRACE/common/trig.c +++ b/src/DETHRACE/common/trig.c @@ -382,7 +382,6 @@ void DRMatrix34RotateX(br_matrix34* mat, br_angle rx) { void DRMatrix34RotateY(br_matrix34* mat, br_angle ry) { br_scalar s; br_scalar c; - LOG_TRACE8("(%p, %d)", mat, ry); s = FastScalarSinAngle(ry); c = FastScalarCosAngle(ry); @@ -405,7 +404,6 @@ void DRMatrix34RotateY(br_matrix34* mat, br_angle ry) { void DRMatrix34RotateZ(br_matrix34* mat, br_angle rz) { br_scalar s; br_scalar c; - LOG_TRACE8("(%p, %d)", mat, rz); s = FastScalarSinAngle(rz); c = FastScalarCosAngle(rz); diff --git a/src/DETHRACE/common/utility.c b/src/DETHRACE/common/utility.c index 2a26124c..f93ea1bb 100644 --- a/src/DETHRACE/common/utility.c +++ b/src/DETHRACE/common/utility.c @@ -63,7 +63,6 @@ br_pixelmap* gSource_for_16bit_palette; // IDA: int __cdecl CheckQuit() // FUNCTION: CARM95 0x004c1590 int CheckQuit(void) { - LOG_TRACE8("()"); if (gIn_check_quit) { return 0; @@ -256,7 +255,6 @@ int IRandomPosNeg(int pN) { // IDA: float __cdecl FRandomBetween(float pA, float pB) // FUNCTION: CARM95 0x004c16bf float FRandomBetween(float pA, float pB) { - LOG_TRACE8("(%f, %f)", pA, pB); return (double)rand() * (pB - pA) / (double)RAND_MAX + pA; } @@ -270,7 +268,6 @@ float FRandomPosNeg(float pN) { // IDA: br_scalar __cdecl SRandomBetween(br_scalar pA, br_scalar pB) // FUNCTION: CARM95 0x004c1715 br_scalar SRandomBetween(br_scalar pA, br_scalar pB) { - LOG_TRACE8("(%f, %f)", pA, pB); return FRandomBetween(pA, pB); } @@ -351,7 +348,6 @@ char* GetALineWithNoPossibleService(FILE* pF, unsigned char* pS) { // IDA: char* __usercall GetALineAndDontArgue@(FILE *pF@, char *pS@) // FUNCTION: CARM95 0x004c1d44 char* GetALineAndDontArgue(FILE* pF, char* pS) { - // LOG_TRACE10("(%p, \"%s\")", pF, pS); PossibleService(); return GetALineWithNoPossibleService(pF, (unsigned char*)pS); @@ -793,7 +789,6 @@ void PrintScreen(void) { // IDA: tU32 __cdecl GetTotalTime() // FUNCTION: CARM95 0x004c2771 tU32 GetTotalTime(void) { - LOG_TRACE9("()"); if (gAction_replay_mode) { return gLast_replay_frame_time; @@ -1839,7 +1834,6 @@ void NobbleNonzeroBlacks(br_pixelmap* pPalette) { // IDA: int __usercall PDCheckDriveExists@(char *pThe_path@) // FUNCTION: CARM95 0x004c3e0c int PDCheckDriveExists(char* pThe_path) { - LOG_TRACE9("(\"%s\")", pThe_path); return PDCheckDriveExists2(pThe_path, NULL, 0); } diff --git a/src/DETHRACE/common/world.c b/src/DETHRACE/common/world.c index 1e992835..9ace1abb 100644 --- a/src/DETHRACE/common/world.c +++ b/src/DETHRACE/common/world.c @@ -3049,7 +3049,7 @@ void LoadTrack(char* pFile_name, tTrack_spec* pTrack_spec, tRace_info* pRace_inf #if defined(DETHRACE_FIX_BUGS) /* Display skidmarks even if the race has no specified skidmark material. */ if (!skid_mark_cnt && num_materials) { - LOG_WARN("Track %s has no valid skid mark material, setting the default one", + LOG_WARN2("Track %s has no valid skid mark material, setting the default one", pRace_info->track_file_name); LoadSinglePixelmap(&gTrack_storage_space, "SKIDMARK.PIX"); material = LoadSingleMaterial(&gTrack_storage_space, "SKIDMARK.MAT"); diff --git a/src/DETHRACE/pc-all/allsys.c b/src/DETHRACE/pc-all/allsys.c index 1ddf0114..d6a92edc 100644 --- a/src/DETHRACE/pc-all/allsys.c +++ b/src/DETHRACE/pc-all/allsys.c @@ -53,22 +53,14 @@ tS32 gJoystick_range1y; tS32 gJoystick_range1x; int gNo_voodoo; -<<<<<<< HEAD -// GLOBAL: CARM95 0x51d5d0 -======= // GLOBAL: CARM95 0x0051d5d0 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 int gSwitched_resolution; br_pixelmap* gReal_back_screen; tS32 gJoystick_min1x; -<<<<<<< HEAD -// GLOBAL: CARM95 0x51d59c -======= // GLOBAL: CARM95 0x0051d59c ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 br_pixelmap* gTemp_screen; int gReal_back_screen_locked; @@ -111,11 +103,7 @@ void KeyTranslation(tU8 pKey_index, tU8 pScan_code_1, tU8 pScan_code_2) { } // IDA: void __cdecl KeyBegin() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a6b34 -======= // FUNCTION: CARM95 0x004a6b34 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void KeyBegin(void) { gScan_code[KEY_0][0] = SCANCODE_0; gScan_code[KEY_2][0] = SCANCODE_2; @@ -247,11 +235,7 @@ int KeyDown22(int pKey_index) { } // IDA: void __usercall PDSetKeyArray(int *pKeys@, int pMark@) -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a7d4c -======= // FUNCTION: CARM95 0x004a7d4c ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDSetKeyArray(int* pKeys, int pMark) { int i; tS32 joyX; @@ -271,11 +255,7 @@ void PDSetKeyArray(int* pKeys, int pMark) { } } -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a7a49 -======= // FUNCTION: CARM95 0x004a7a49 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 int PDGetASCIIFromKey(int pKey) { if (PDKeyDown3(KEY_SHIFT_ANY)) return gASCII_shift_table[pKey]; @@ -283,11 +263,7 @@ int PDGetASCIIFromKey(int pKey) { return gASCII_table[pKey]; } -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a636c -======= // FUNCTION: CARM95 0x004a636c ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void Win32FatalError(char* pStr_1, char* pStr_2) { gShow_fatal_error = 1; sprintf(gFatal_error_string, "%s\n%s", pStr_1, pStr_2); @@ -296,33 +272,21 @@ void Win32FatalError(char* pStr_1, char* pStr_2) { } // IDA: void __usercall PDFatalError(char *pThe_str@) -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a633f -======= // FUNCTION: CARM95 0x004a633f ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDFatalError(char* pThe_str) { dr_dprintf("FATAL ERROR: %s\n", pThe_str); Win32FatalError(pThe_str, ""); } // IDA: void __usercall PDNonFatalError(char *pThe_str@) -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a63aa -======= // FUNCTION: CARM95 0x004a63aa ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDNonFatalError(char* pThe_str) { dr_dprintf("*** ERROR..."); dr_dprintf(pThe_str); } // IDA: void __cdecl PDInitialiseSystem() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a692c -======= // FUNCTION: CARM95 0x004a692c ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDInitialiseSystem(void) { tPath_name the_path; FILE* f; @@ -358,11 +322,7 @@ void PDInitialiseSystem(void) { } // IDA: void __cdecl PDShutdownSystem() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a6f6d -======= // FUNCTION: CARM95 0x004a6f6d ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDShutdownSystem(void) { static int been_here = 0; @@ -388,21 +348,13 @@ void PDSaveOriginalPalette(void) { } // IDA: void __cdecl PDRevertPalette() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a70a2 -======= // FUNCTION: CARM95 0x004a70a2 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDRevertPalette(void) { // empty function } // IDA: int __usercall PDInitScreenVars@(int pArgc@, char **pArgv@) -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a70ad -======= // FUNCTION: CARM95 0x004a70ad ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 int PDInitScreenVars(int pArgc, char** pArgv) { gGraf_specs[gGraf_spec_index].phys_width = gGraf_specs[gGraf_spec_index].total_width; gGraf_specs[gGraf_spec_index].phys_height = gGraf_specs[gGraf_spec_index].total_height; @@ -410,21 +362,13 @@ int PDInitScreenVars(int pArgc, char** pArgv) { } // IDA: void __cdecl PDInitScreen() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a70d6 -======= // FUNCTION: CARM95 0x004a70d6 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDInitScreen(void) { } // IDA: void __cdecl PDLockRealBackScreen() // In all retail 3dfx executables, it is void __usercall PDLockRealBackScreen(lock@) -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a7217 -======= // FUNCTION: CARM95 0x004a7217 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDLockRealBackScreen(int lock) { if (!gReal_back_screen_locked && !gReal_back_screen->pixels && lock <= gVoodoo_rush_mode) { BrPixelmapDirectLock(gReal_back_screen, 1); @@ -436,11 +380,7 @@ void PDLockRealBackScreen(int lock) { // IDA: void __cdecl PDUnlockRealBackScreen() // In all retail 3dfx executables, it is void __usercall PDUnlockRealBackScreen(lock@) -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a727d -======= // FUNCTION: CARM95 0x004a727d ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDUnlockRealBackScreen(int lock) { if (gReal_back_screen_locked && gReal_back_screen->pixels && lock <= gVoodoo_rush_mode) { BrPixelmapDirectUnlock(gReal_back_screen); @@ -449,11 +389,7 @@ void PDUnlockRealBackScreen(int lock) { } // IDA: void __cdecl PDAllocateScreenAndBack() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a728d -======= // FUNCTION: CARM95 0x004a728d ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDAllocateScreenAndBack(void) { gScreen = NULL; @@ -628,11 +564,7 @@ void CopyBackScreen(int pRendering_area_only) { } // IDA: void __usercall PDScreenBufferSwap(int pRendering_area_only@) -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a758e -======= // FUNCTION: CARM95 0x004a758e ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDScreenBufferSwap(int pRendering_area_only) { if (gSwitched_resolution) { BrPixelmapFill(gTemp_screen, 0); @@ -661,22 +593,14 @@ void PDPixelmapVLineOnScreen(br_pixelmap* dst, br_int_16 x1, br_int_16 y1, br_in NOT_IMPLEMENTED(); } -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a76e9 -======= // FUNCTION: CARM95 0x004a76e9 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void Win32BRenderWarningFunc(char* msg) { dr_dprintf("*******************************************************************************"); dr_dprintf("BRender WARNING: '%s'", msg); dr_dprintf("*******************************************************************************"); } -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a771f -======= // FUNCTION: CARM95 0x004a771f ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void Win32BRenderFailureFunc(char* msg) { dr_dprintf("*******************************************************************************"); dr_dprintf("BRender FAILURE: '%s'", msg); @@ -685,11 +609,7 @@ void Win32BRenderFailureFunc(char* msg) { } // IDA: void __cdecl PDInstallErrorHandlers() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a7766 -======= // FUNCTION: CARM95 0x004a7766 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDInstallErrorHandlers(void) { gBr_diaghandler.identifier = "LlantisilioBlahBlahBlahOgOgOch"; gBr_diaghandler.warning = Win32BRenderWarningFunc; @@ -698,22 +618,14 @@ void PDInstallErrorHandlers(void) { } // IDA: void __cdecl PDSetFileVariables() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a779c -======= // FUNCTION: CARM95 0x004a779c ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDSetFileVariables(void) { // gDir_separator[0] = '\\'; gDir_separator[0] = '/'; } // IDA: void __usercall PDBuildAppPath(char *pThe_path@) -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a77b3 -======= // FUNCTION: CARM95 0x004a77b3 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDBuildAppPath(char* pThe_path) { int pos; @@ -738,21 +650,13 @@ void PDForEveryFile(char* pThe_path, void (*pAction_routine)(char*)) { } // IDA: void __usercall PDSetPalette(br_pixelmap *pThe_palette@) -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a7903 -======= // FUNCTION: CARM95 0x004a7903 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDSetPalette(br_pixelmap* pThe_palette) { BrDevPaletteSetOld(pThe_palette); } // IDA: void __usercall PDSetPaletteEntries(br_pixelmap *pPalette@, int pFirst_colour@, int pCount@) -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a79d0 -======= // FUNCTION: CARM95 0x004a79d0 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDSetPaletteEntries(br_pixelmap* pPalette, int pFirst_colour, int pCount) { int i; tU8* p; @@ -770,33 +674,21 @@ void PDSetPaletteEntries(br_pixelmap* pPalette, int pFirst_colour, int pCount) { } // IDA: void __cdecl PDSwitchToRealResolution() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a71ce -======= // FUNCTION: CARM95 0x004a71ce ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDSwitchToRealResolution(void) { gBack_screen = gReal_back_screen; gSwitched_resolution = 1; } // IDA: void __cdecl PDSwitchToLoresMode() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a71f1 -======= // FUNCTION: CARM95 0x004a71f1 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDSwitchToLoresMode(void) { gBack_screen = gTemp_screen; gSwitched_resolution = 0; } // IDA: void __usercall PDMouseButtons(int *pButton_1@, int *pButton_2@) -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a79f2 -======= // FUNCTION: CARM95 0x004a79f2 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDMouseButtons(int* pButton_1, int* pButton_2) { br_uint_32 mouse_buttons; br_int_32 mouse_x; @@ -807,11 +699,7 @@ void PDMouseButtons(int* pButton_1, int* pButton_2) { } // IDA: void __usercall PDGetMousePosition(int *pX_coord@, int *pY_coord@) -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a7a11 -======= // FUNCTION: CARM95 0x004a7a11 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDGetMousePosition(int* pX_coord, int* pY_coord) { br_uint_32 mouse_buttons; br_int_32 mouse_x2; @@ -847,32 +735,20 @@ void PDGetMousePosition(int* pX_coord, int* pY_coord) { } // IDA: int __cdecl PDGetTotalTime() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a83c5 -======= // FUNCTION: CARM95 0x004a83c5 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 int PDGetTotalTime(void) { return gHarness_platform.GetTicks(); } // IDA: int __usercall PDServiceSystem@(tU32 pTime_since_last_call@) -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a7b63 -======= // FUNCTION: CARM95 0x004a7b63 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 int PDServiceSystem(tU32 pTime_since_last_call) { gHarness_platform.ProcessWindowMessages(); return 0; } // IDA: void __usercall PDAllocateActionReplayBuffer(char **pBuffer@, tU32 *pBuffer_size@) -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a68e2 -======= // FUNCTION: CARM95 0x004a68e2 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDAllocateActionReplayBuffer(char** pBuffer, tU32* pBuffer_size) { tU32 lba; tU32 required; @@ -901,11 +777,7 @@ void PDAllocateActionReplayBuffer(char** pBuffer, tU32* pBuffer_size) { } // IDA: void __usercall PDDisposeActionReplayBuffer(char *pBuffer@) -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a6906 -======= // FUNCTION: CARM95 0x004a6906 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDDisposeActionReplayBuffer(char* pBuffer) { free(pBuffer); } @@ -1027,11 +899,7 @@ int OurGetChar(void) { } // IDA: void __usercall PDEnterDebugger(char *pStr@) -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a60e3 -======= // FUNCTION: CARM95 0x004a60e3 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDEnterDebugger(char* pStr) { static unsigned char* save_it; @@ -1057,11 +925,7 @@ tU32 ReadJoystickAxis(int pBit) { } // IDA: void __cdecl PDReadJoySticks() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a8152 -======= // FUNCTION: CARM95 0x004a8152 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 void PDReadJoySticks(void) { tU32 temp1x; tU32 temp1y; @@ -1071,135 +935,83 @@ void PDReadJoySticks(void) { } // IDA: tS32 __cdecl PDGetJoy1X() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a81b5 -======= // FUNCTION: CARM95 0x004a81b5 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 tS32 PDGetJoy1X(void) { tS32 joy; NOT_IMPLEMENTED(); } // IDA: tS32 __cdecl PDGetJoy1Y() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a81e1 -======= // FUNCTION: CARM95 0x004a81e1 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 tS32 PDGetJoy1Y(void) { tS32 joy; NOT_IMPLEMENTED(); } // IDA: tS32 __cdecl PDGetJoy2X() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a820d -======= // FUNCTION: CARM95 0x004a820d ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 tS32 PDGetJoy2X(void) { tS32 joy; NOT_IMPLEMENTED(); } // IDA: tS32 __cdecl PDGetJoy2Y() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a8239 -======= // FUNCTION: CARM95 0x004a8239 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 tS32 PDGetJoy2Y(void) { tS32 joy; NOT_IMPLEMENTED(); } // IDA: int __cdecl PDGetJoy1Button1() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a8265 -======= // FUNCTION: CARM95 0x004a8265 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 int PDGetJoy1Button1(void) { NOT_IMPLEMENTED(); } // IDA: int __cdecl PDGetJoy1Button2() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a8291 -======= // FUNCTION: CARM95 0x004a8291 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 int PDGetJoy1Button2(void) { NOT_IMPLEMENTED(); } // IDA: int __cdecl PDGetJoy1Button3() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a82bd -======= // FUNCTION: CARM95 0x004a82bd ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 int PDGetJoy1Button3(void) { NOT_IMPLEMENTED(); } // IDA: int __cdecl PDGetJoy1Button4() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a82e9 -======= // FUNCTION: CARM95 0x004a82e9 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 int PDGetJoy1Button4(void) { NOT_IMPLEMENTED(); } // IDA: int __cdecl PDGetJoy2Button1() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a8315 -======= // FUNCTION: CARM95 0x004a8315 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 int PDGetJoy2Button1(void) { NOT_IMPLEMENTED(); } // IDA: int __cdecl PDGetJoy2Button2() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a8341 -======= // FUNCTION: CARM95 0x004a8341 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 int PDGetJoy2Button2(void) { NOT_IMPLEMENTED(); } // IDA: int __cdecl PDGetJoy2Button3() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a836d -======= // FUNCTION: CARM95 0x004a836d ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 int PDGetJoy2Button3(void) { NOT_IMPLEMENTED(); } // IDA: int __cdecl PDGetJoy2Button4() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a8399 -======= // FUNCTION: CARM95 0x004a8399 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 int PDGetJoy2Button4(void) { NOT_IMPLEMENTED(); } // IDA: int __usercall PDFileUnlock@(char *pThe_path@) -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a83e6 -======= // FUNCTION: CARM95 0x004a83e6 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 int PDFileUnlock(char* pThe_path) { unsigned int attr; // _dos_setfileattr_(pThe_path, 0); @@ -1207,11 +1019,7 @@ int PDFileUnlock(char* pThe_path) { } // IDA: int __usercall PDCheckDriveExists2@(char *pThe_path@, char *pFile_name@, tU32 pMin_size@) -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a8429 -======= // FUNCTION: CARM95 0x004a8429 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 int PDCheckDriveExists2(char* pThe_path, char* pFile_name, tU32 pMin_size) { struct stat buf; void (*old_critical_isr)(void); @@ -1238,11 +1046,7 @@ int PDCheckDriveExists2(char* pThe_path, char* pFile_name, tU32 pMin_size) { } // IDA: int __cdecl PDDoWeLeadAnAustereExistance() -<<<<<<< HEAD -// FUNCTION: CARM95 0x4a856f -======= // FUNCTION: CARM95 0x004a856f ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 int PDDoWeLeadAnAustereExistance(void) { return 0; } diff --git a/src/DETHRACE/pc-dos/dossys.c b/src/DETHRACE/pc-dos/dossys.c index 2ad451fc..e2f8d4c8 100644 --- a/src/DETHRACE/pc-dos/dossys.c +++ b/src/DETHRACE/pc-dos/dossys.c @@ -527,7 +527,6 @@ void CopyBackScreen(int pRendering_area_only) { // IDA: void __usercall PDScreenBufferSwap(int pRendering_area_only@) void PDScreenBufferSwap(int pRendering_area_only) { - LOG_TRACE10("(%d)", pRendering_area_only); if (gSwitched_resolution) { BrPixelmapFill(gTemp_screen, 0); diff --git a/src/DETHRACE/pc-win95/win95net.c b/src/DETHRACE/pc-win95/win95net.c index 1127b04d..fb54856f 100644 --- a/src/DETHRACE/pc-win95/win95net.c +++ b/src/DETHRACE/pc-win95/win95net.c @@ -411,7 +411,6 @@ int PDNetGetNextJoinGame(tNet_game_details* pGame, int pIndex) { int j; int number_of_hosts_has_changed; char str[256]; - LOG_TRACE9("(%p, %d)", pGame, pIndex); dr_dprintf("PDNetGetNextJoinGame(): pIndex is %d", pIndex); if (pIndex == 0) { diff --git a/src/library_brender.h b/src/library_brender.h index 808b9bf1..972a2d84 100644 --- a/src/library_brender.h +++ b/src/library_brender.h @@ -1,423 +1,3 @@ -<<<<<<< HEAD -// LIBRARY: CARM95 0x4345e0 -// BrActorToActorMatrix34 - -// LIBRARY: CARM95 0x434aa0 -// BrActorRelink - -// LIBRARY: CARM95 0x4c9610 -// BrPixelmapAllocateSub - -// LIBRARY: CARM95 0x4c9670 -// BrPixelmapFree - -// LIBRARY: CARM95 0x4c96d0 -// BrPixelmapMatch - -// LIBRARY: CARM95 0x4c9bf0 -// BrPixelmapFill - -// LIBRARY: CARM95 0x4c9e90 -// BrPixelmapRectangleCopy - -// LIBRARY: CARM95 0x4c9f40 -// BrPixelmapRectangleFill - -// LIBRARY: CARM95 0x4ca100 -// BrPixelmapPixelSet - -// LIBRARY: CARM95 0x4ca290 -// BrPixelmapLine - -// LIBRARY: CARM95 0x4ca310 -// BrPixelmapText - -// LIBRARY: CARM95 0x4ca360 -// BrPixelmapTextF - -// LIBRARY: CARM95 0x4ca3d0 -// BrPixelmapTextWidth - -// LIBRARY: CARM95 0x4ca7f0 -// BrPixelmapLoadMany - -// LIBRARY: CARM95 0x4cac60 -// BrPixelmapLoad - -// LIBRARY: CARM95 0x4cace0 -// BrPixelmapSave - -// LIBRARY: CARM95 0x4caef0 -// BrPixelmapAllocate - -// LIBRARY: CARM95 0x4d0bd0 -// BrMatrix34Copy - -// LIBRARY: CARM95 0x4d0c30 -// BrMatrix34Mul - -// LIBRARY: CARM95 0x4d0d90 -// BrMatrix34Identity - -// LIBRARY: CARM95 0x4d0e20 -// BrMatrix34RotateY - -// LIBRARY: CARM95 0x4d0ee0 -// BrMatrix34Rotate - -// LIBRARY: CARM95 0x4d1000 -// BrMatrix34Scale - -// LIBRARY: CARM95 0x4d1100 -// BrMatrix34Inverse - -// LIBRARY: CARM95 0x4d1480 -// BrMatrix34LPInverse - -// LIBRARY: CARM95 0x4d1520 -// BrMatrix34LPNormalise - -// LIBRARY: CARM95 0x4d1670 -// BrMatrix34RollingBall - -// LIBRARY: CARM95 0x4d1a00 -// BrMatrix34ApplyP - -// LIBRARY: CARM95 0x4d1a70 -// BrMatrix34ApplyV - -// LIBRARY: CARM95 0x4d1bb0 -// BrMatrix34TApplyV - -// LIBRARY: CARM95 0x4d1c10 -// BrMatrix34Pre - -// LIBRARY: CARM95 0x4d1c40 -// BrMatrix34Post - -// LIBRARY: CARM95 0x4d1c70 -// BrMatrix34PreRotateX - -// LIBRARY: CARM95 0x4d1db0 -// BrMatrix34PreRotateY - -// LIBRARY: CARM95 0x4d1ef0 -// BrMatrix34PreRotateZ - -// LIBRARY: CARM95 0x4d2030 -// BrMatrix34PreRotate - -// LIBRARY: CARM95 0x4d20b0 -// BrMatrix34PreTranslate - -// LIBRARY: CARM95 0x4d2130 -// BrMatrix34PostTranslate - -// LIBRARY: CARM95 0x4d21b0 -// BrMatrix34PreScale - -// LIBRARY: CARM95 0x4d2230 -// BrMatrix34PostScale - -// LIBRARY: CARM95 0x4d22b0 -// BrMatrix34PreShearX - -// LIBRARY: CARM95 0x4d2330 -// BrMatrix34PostShearX - -// LIBRARY: CARM95 0x4d2430 -// BrMatrix34PostShearY - -// LIBRARY: CARM95 0x4d2530 -// BrMatrix34PostShearZ - -// LIBRARY: CARM95 0x4d25b0 -// BrTransformToMatrix34 - -// LIBRARY: CARM95 0x4d2840 -// BrMatrix34PreTransform - -// LIBRARY: CARM95 0x4d2a50 -// BrTransformToTransform - -// LIBRARY: CARM95 0x4d2cd0 -// BrVector3SetFloat - -// LIBRARY: CARM95 0x4d3190 -// BrMatrix23Copy - -// LIBRARY: CARM95 0x4d31c0 -// BrMatrix23Mul - -// LIBRARY: CARM95 0x4d3240 -// BrMatrix23Identity - -// LIBRARY: CARM95 0x4d3ba0 -// BrMatrix4Copy - -// LIBRARY: CARM95 0x4d3c10 -// BrMatrix4Mul - -// LIBRARY: CARM95 0x4d3eb0 -// BrMatrix4Scale - -// LIBRARY: CARM95 0x4d3f00 -// BrMatrix4Inverse - -// LIBRARY: CARM95 0x4d45f0 -// BrMatrix4Perspective - -// LIBRARY: CARM95 0x4d4720 -// BrMatrix4ApplyP - -// LIBRARY: CARM95 0x4d4820 -// BrMatrix4TApply - -// LIBRARY: CARM95 0x4d4c70 -// BrEulerToMatrix34 - -// LIBRARY: CARM95 0x4d59b0 -// BrMemSet - -// LIBRARY: CARM95 0x4d5a80 -// BrStrCpy - -// LIBRARY: CARM95 0x4d5b50 -// BrAbort - -// LIBRARY: CARM95 0x4d5cd0 -// BrVSprintf - -// LIBRARY: CARM95 0x4d5de0 -// BrModelAdd - -// LIBRARY: CARM95 0x4d5e10 -// BrModelRemove - -// LIBRARY: CARM95 0x4d5e40 -// BrModelFindHook - -// LIBRARY: CARM95 0x4d5e50 -// BrModelAddMany - -// LIBRARY: CARM95 0x4d5f30 -// BrMaterialAdd - -// LIBRARY: CARM95 0x4d5f60 -// BrMaterialRemove - -// LIBRARY: CARM95 0x4d5f80 -// BrMaterialFind - -// LIBRARY: CARM95 0x4d5f90 -// BrMaterialFindHook - -// LIBRARY: CARM95 0x4d5fa0 -// BrMaterialAddMany - -// LIBRARY: CARM95 0x4d6060 -// BrMaterialEnum - -// LIBRARY: CARM95 0x4d6080 -// BrMapAdd - -// LIBRARY: CARM95 0x4d60b0 -// BrMapRemove - -// LIBRARY: CARM95 0x4d60d0 -// BrMapFind - -// LIBRARY: CARM95 0x4d60e0 -// BrMapFindHook - -// LIBRARY: CARM95 0x4d60f0 -// BrMapAddMany - -// LIBRARY: CARM95 0x4d61d0 -// BrTableAdd - -// LIBRARY: CARM95 0x4d6200 -// BrTableRemove - -// LIBRARY: CARM95 0x4d6220 -// BrTableFind - -// LIBRARY: CARM95 0x4d6230 -// BrTableFindHook - -// LIBRARY: CARM95 0x4d6300 -// BrTableEnum - -// LIBRARY: CARM95 0x4d6680 -// BrModelFree - -// LIBRARY: CARM95 0x4d6690 -// BrModelAllocate - -// LIBRARY: CARM95 0x4d6710 -// BrActorEnum - -// LIBRARY: CARM95 0x4d6820 -// BrActorAdd - -// LIBRARY: CARM95 0x4d68b0 -// BrActorRemove - -// LIBRARY: CARM95 0x4d69d0 -// BrActorAllocate - -// LIBRARY: CARM95 0x4d6af0 -// BrActorFree - -// LIBRARY: CARM95 0x4d72c0 -// BrActorToBounds - -// LIBRARY: CARM95 0x4d7af0 -// BrModelUpdate - -// LIBRARY: CARM95 0x4d90a0 -// BrModelClear - -// LIBRARY: CARM95 0x4d90e0 -// BrMaterialAllocate - -// LIBRARY: CARM95 0x4d9140 -// BrMaterialFree - -// LIBRARY: CARM95 0x4d9150 -// BrMaterialUpdate - -// LIBRARY: CARM95 0x4d9700 -// BrMaterialClear - -// LIBRARY: CARM95 0x4d9720 -// BrDbModelRender - -// LIBRARY: CARM95 0x4d9ab0 -// BrOnScreenCheck - -// LIBRARY: CARM95 0x4d9d30 -// BrZbSceneRenderBegin - -// LIBRARY: CARM95 0x4d9ea0 -// BrZbSceneRenderAdd - -// LIBRARY: CARM95 0x4da630 -// BrZbSceneRenderEnd - -// LIBRARY: CARM95 0x4dabf0 -// BrZbModelRender - -// LIBRARY: CARM95 0x4db8a0 -// BrModelLoadMany - -// LIBRARY: CARM95 0x4db920 -// BrModelSaveMany - -// LIBRARY: CARM95 0x4dbdf0 -// BrActorLoadMany - -// LIBRARY: CARM95 0x4dc0e0 -// BrMaterialLoadMany - -// LIBRARY: CARM95 0x4dc3d0 -// BrModelLoad - -// LIBRARY: CARM95 0x4dc4a0 -// BrMaterialLoad - -// LIBRARY: CARM95 0x4dc660 -// BrActorLoad - -// LIBRARY: CARM95 0x4dc6e0 -// BrActorSave - -// LIBRARY: CARM95 0x4dcde0 -// BrZbBegin - -// LIBRARY: CARM95 0x4dcfe0 -// BrV1dbBeginWrapper_Float - -// LIBRARY: CARM95 0x4dd130 -// BrClipPlaneEnable - -// LIBRARY: CARM95 0x4dd1e0 -// BrClipPlaneDisable - -// LIBRARY: CARM95 0x4dd330 -// BrEnvironmentSet - -// LIBRARY: CARM95 0x4dda70 -// BrTableUpdate - -// LIBRARY: CARM95 0x4df0b0 -// BrFailure - -// LIBRARY: CARM95 0x4df150 -// BrFatal - -// LIBRARY: CARM95 0x4df250 -// BrMemAllocate - -// LIBRARY: CARM95 0x4df280 -// BrMemFree - -// LIBRARY: CARM95 0x4df2e0 -// BrMemCalloc - -// LIBRARY: CARM95 0x4df370 -// BrResAllocate - -// LIBRARY: CARM95 0x4df460 -// BrResFree - -// LIBRARY: CARM95 0x4df5f0 -// BrResRemove - -// LIBRARY: CARM95 0x4df8b0 -// BrStrDup - -// LIBRARY: CARM95 0x4df920 -// BrMemSet2 - -// LIBRARY: CARM95 0x4df980 -// BrSwap32 - -// LIBRARY: CARM95 0x4dfd70 -// BrDiagHandlerSet - -// LIBRARY: CARM95 0x4dfda0 -// BrFilesystemSet - -// LIBRARY: CARM95 0x4dfdd0 -// BrAllocatorSet - -// LIBRARY: CARM95 0x4dfe00 -// BrResClassAdd - -// LIBRARY: CARM95 0x4e0930 -// BrScratchAllocate - -// LIBRARY: CARM95 0x4e09a0 -// BrScratchFree - -// LIBRARY: CARM95 0x4e5990 -// BrRegistryAdd - -// LIBRARY: CARM95 0x4e5a30 -// BrRegistryRemove - -// LIBRARY: CARM95 0x4e5c30 -// BrRegistryEnum - -// LIBRARY: CARM95 0x4e5f50 -// BrSimpleRemove - -// LIBRARY: CARM95 0x4e5f80 -// BrQsort - -// LIBRARY: CARM95 0x4e6160 -======= // LIBRARY: CARM95 0x004345e0 // BrActorToActorMatrix34 @@ -836,5 +416,4 @@ // BrQsort // LIBRARY: CARM95 0x004e6160 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 // BrFileRead diff --git a/src/library_msvc.h b/src/library_msvc.h index 7d988471..2bdb3c0f 100644 --- a/src/library_msvc.h +++ b/src/library_msvc.h @@ -1,426 +1,3 @@ -<<<<<<< HEAD -// LIBRARY: CARM95 0x455730 -// _iswxdigit - -// LIBRARY: CARM95 0x4a61ca -// _WinMain@16 - -// LIBRARY: CARM95 0x4ea660 -// _strtok - -// LIBRARY: CARM95 0x4ea8a0 -// _asin - -// LIBRARY: CARM95 0x4ea8aa -// _acos - -// LIBRARY: CARM95 0x4ea8b1 -// _atan - -// LIBRARY: CARM95 0x4ea8b8 -// _atan2 - -// LIBRARY: CARM95 0x4ea8f0 -// _sprintf - -// LIBRARY: CARM95 0x4eaa10 -// _memcpy - -// LIBRARY: CARM95 0x4eab60 -// _pow - -// LIBRARY: CARM95 0x4eab6a -// _log - -// LIBRARY: CARM95 0x4eab74 -// _log10 - -// LIBRARY: CARM95 0x4eab7b -// _exp - -// LIBRARY: CARM95 0x4eabe0 -// _fclose - -// LIBRARY: CARM95 0x4eacd0 -// _fprintf - -// LIBRARY: CARM95 0x4ead80 -// _qsort - -// LIBRARY: CARM95 0x4eafe0 -// _shortsort - -// LIBRARY: CARM95 0x4eb070 -// _swap - -// LIBRARY: CARM95 0x4eb0d0 -// _ldexp - -// LIBRARY: CARM95 0x4eb3e0 -// _rand - -// LIBRARY: CARM95 0x4eb430 -// _floor - -// LIBRARY: CARM95 0x4eb5a0 -// _ceil - -// LIBRARY: CARM95 0x4eb710 -// _fread - -// LIBRARY: CARM95 0x4eb8e0 -// _fwrite - -// LIBRARY: CARM95 0x4ebb00 -// _fseek - -// LIBRARY: CARM95 0x4ebc30 -// _sscanf - -// LIBRARY: CARM95 0x4ebd00 -// _fgets - -// LIBRARY: CARM95 0x4ebf40 -// _fopen - -// LIBRARY: CARM95 0x4ebf70 -// _strrchr - -// LIBRARY: CARM95 0x4ebfa0 -// _fscanf - -// LIBRARY: CARM95 0x4ec030 -// _ungetc - -// LIBRARY: CARM95 0x4ec350 -// _strchr - -// LIBRARY: CARM95 0x4ec410 -// _strstr - -// LIBRARY: CARM95 0x4ec490 -// _fgetc - -// LIBRARY: CARM95 0x4ec510 -// _fmod - -// LIBRARY: CARM95 0x4ec550 -// _fputs - -// LIBRARY: CARM95 0x4ec6e0 -// _strncmp - -// LIBRARY: CARM95 0x4ec720 -// _strpbrk - -// LIBRARY: CARM95 0x4ec760 -// _strncpy - -// LIBRARY: CARM95 0x4ec860 -// _rewind - -// LIBRARY: CARM95 0x4ec920 -// _ctime - -// LIBRARY: CARM95 0x4ec970 -// _time - -// LIBRARY: CARM95 0x4ecb00 -// _malloc - -// LIBRARY: CARM95 0x4ecfc0 -// _realloc_help - -// LIBRARY: CARM95 0x4ed9a0 -// _CheckBytes - -// LIBRARY: CARM95 0x4ee4a0 -// _memchr - -// LIBRARY: CARM95 0x4ee550 -// _printf - -// LIBRARY: CARM95 0x4ee5e0 -// _fputc - -// LIBRARY: CARM95 0x4ee680 -// _strtol - -// LIBRARY: CARM95 0x4ee6b0 -// _strtoxl - -// LIBRARY: CARM95 0x4eea40 -// _strtoul - -// LIBRARY: CARM95 0x4eee80 -// _CrtMessageWindow - -// LIBRARY: CARM95 0x4ef1b0 -// _ftell - -// LIBRARY: CARM95 0x4ef4b0 -// _exit - -// LIBRARY: CARM95 0x4ef4f0 -// _doexit - -// LIBRARY: CARM95 0x4ef630 -// _rename - -// LIBRARY: CARM95 0x4ef690 -// _remove - -// LIBRARY: CARM95 0x4ef6f0 -// _tolower - -// LIBRARY: CARM95 0x4efac0 -// _abort - -// LIBRARY: CARM95 0x4efaf0 -// _getenv - -// LIBRARY: CARM95 0x4efbe0 -// _strtod - -// LIBRARY: CARM95 0x4efd40 -// _vsprintf - -// LIBRARY: CARM95 0x4f0717 -// _rtforsqrtinf - -// LIBRARY: CARM95 0x4f071c -// _rtforsqrtzero - -// LIBRARY: CARM95 0x4f09f5 -// _rtforatn20 - -// LIBRARY: CARM95 0x4f0a11 -// _rtforatn200 - -// LIBRARY: CARM95 0x4f0a18 -// _rtforatnby0 - -// LIBRARY: CARM95 0x4f0a1e -// _rtsignpiby2 - -// LIBRARY: CARM95 0x4f1a60 -// _write_char - -// LIBRARY: CARM95 0x4f1ae0 -// _write_multi_char - -// LIBRARY: CARM95 0x4f1b30 -// _write_string - -// LIBRARY: CARM95 0x4f1b90 -// _get_int_arg - -// LIBRARY: CARM95 0x4f1bb0 -// _get_int64_arg - -// LIBRARY: CARM95 0x4f1be0 -// _get_short_arg - -// LIBRARY: CARM95 0x4f1c6e -// _rtfor0to0 - -// LIBRARY: CARM95 0x4f1ca4 -// _rtforln0 - -// LIBRARY: CARM95 0x4f1cb4 -// _rtforloginf - -// LIBRARY: CARM95 0x4f1cc8 -// _rtforyto0 - -// LIBRARY: CARM95 0x4f1ccd -// _rtfor0tox - -// LIBRARY: CARM95 0x4f1ce8 -// _rtfor0toneg - -// LIBRARY: CARM95 0x4f1d32 -// _expbigret - -// LIBRARY: CARM95 0x4f1d51 -// _rtforexpinf - -// LIBRARY: CARM95 0x4f1da1 -// _isintTOS - -// LIBRARY: CARM95 0x4f1dc6 -// _isintTOSret - -// LIBRARY: CARM95 0x4f1dd5 -// _usepowhlp - -// LIBRARY: CARM95 0x4f1fe0 -// _fflush - -// LIBRARY: CARM95 0x4f2140 -// _flsall - -// LIBRARY: CARM95 0x4f3b90 -// _memcpy_0 - -// LIBRARY: CARM95 0x4f55f0 -// _strlen - -// LIBRARY: CARM95 0x4f606f -// _tossnan1 - -// LIBRARY: CARM95 0x4f609d -// _tossnan2 - -// LIBRARY: CARM95 0x4f60a4 -// _tosnan2ret - -// LIBRARY: CARM95 0x4f60dc -// _snan2 - -// LIBRARY: CARM95 0x4f60e3 -// _nan2ret - -// LIBRARY: CARM95 0x4f7040 -// _asctime - -// LIBRARY: CARM95 0x4f71a0 -// _store_dt - -// LIBRARY: CARM95 0x4f71e0 -// _localtime - -// LIBRARY: CARM95 0x4f75a0 -// _memset - -// LIBRARY: CARM95 0x4f8e80 -// _toupper - -// LIBRARY: CARM95 0x4f9020 -// _xtoa - -// LIBRARY: CARM95 0x4f90e0 -// _strcpy - -// LIBRARY: CARM95 0x4f90f0 -// _strcat - -// LIBRARY: CARM95 0x4f93b0 -// _raise - -// LIBRARY: CARM95 0x4f95d0 -// _siglookup - -// LIBRARY: CARM95 0x4f9b00 -// _strncnt - -// LIBRARY: CARM95 0x4f9b7c -// _gu_return - -// LIBRARY: CARM95 0x4f9ba5 -// _uh_return - -// LIBRARY: CARM95 0x4f9bc3 -// _lu_top - -// LIBRARY: CARM95 0x4f9c00 -// _lu_done - -// LIBRARY: CARM95 0x4f9c30 -// _at_done - -// LIBRARY: CARM95 0x4f9e60 -// _xcptlookup - -// LIBRARY: CARM95 0x4f9ef0 -// _x_ismbbtype - -// LIBRARY: CARM95 0x4fa170 -// _parse_cmdline - -// LIBRARY: CARM95 0x4faac0 -// _getSystemCP - -// LIBRARY: CARM95 0x4fab50 -// _CPtoLCID - -// LIBRARY: CARM95 0x4fabf0 -// _setSBCS - -// LIBRARY: CARM95 0x4facc3 -// _lh_top - -// LIBRARY: CARM95 0x4fad17 -// _lh_continue - -// LIBRARY: CARM95 0x4fad22 -// _lh_dismiss - -// LIBRARY: CARM95 0x4fad29 -// _lh_bagit - -// LIBRARY: CARM95 0x4fad30 -// _lh_unwinding - -// LIBRARY: CARM95 0x4fad45 -// _lh_return - -// LIBRARY: CARM95 0x4fc210 -// _wctomb - -// LIBRARY: CARM95 0x4fcc00 -// _mbtowc - -// LIBRARY: CARM95 0x4fcda0 -// _isspace - -// LIBRARY: CARM95 0x4fdae0 -// _cvtdate - -// LIBRARY: CARM95 0x4fdcf0 -// _gmtime - -// LIBRARY: CARM95 0x4fdfa0 -// _wcslen - -// LIBRARY: CARM95 0x4fe450 -// _strncnt_0 - -// LIBRARY: CARM95 0x4fe830 -// _findenv - -// LIBRARY: CARM95 0x4fe8d0 -// _copy_environ - -// LIBRARY: CARM95 0x4ff930 -// _$I10_OUTPUT - -// LIBRARY: CARM95 0x500120 -// _atol - -// LIBRARY: CARM95 0x500240 -// _strcmp - -// LIBRARY: CARM95 0x5002d0 -// _wcstombs - -// LIBRARY: CARM95 0x500630 -// _wcsncnt - -// LIBRARY: CARM95 0x502f60 -// _feof - -// LIBRARY: CARM95 0x503140 -// _longjmp - -// LIBRARY: CARM95 0x50315b -// _lj_local_unwind - -// LIBRARY: CARM95 0x503183 -// _lj_old_unwind - -// LIBRARY: CARM95 0x503190 -======= // LIBRARY: CARM95 0x00455730 // _iswxdigit @@ -842,5 +419,4 @@ // _lj_old_unwind // LIBRARY: CARM95 0x00503190 ->>>>>>> d93b5a6293f40df80aa6b41eb61102c0f98e1707 // _lj_no_unwind diff --git a/test/DETHRACE/test_loading.c b/test/DETHRACE/test_loading.c index 903b37e8..8a84be49 100644 --- a/test/DETHRACE/test_loading.c +++ b/test/DETHRACE/test_loading.c @@ -225,7 +225,7 @@ void test_loading_LoadOpponentCar() { tBrender_storage storage; InitialiseStorageSpace(&storage, 50, 50, 50, 50); for (int i = 0; i < 10; i++) { - LOG_DEBUG("iteration %d", i); + LOG_DEBUG2("iteration %d", i); LoadCar("NEWEAGLE.TXT", eDriver_oppo, &car_spec, eFrankie, "playerName", &storage); ClearOutStorageSpace(&storage); } diff --git a/test/DETHRACE/test_utility.c b/test/DETHRACE/test_utility.c index 6bc35d0b..0257149a 100644 --- a/test/DETHRACE/test_utility.c +++ b/test/DETHRACE/test_utility.c @@ -11,7 +11,7 @@ void test_utility_EncodeLinex() { char input[] = "\x29\x2a\x9c\x22\x61\x4d\x5e\x5f\x60\x34\x64\x57\x8d\x2b\x82\x7b\x33\x4c"; strcpy(buf, input); EncodeLine(buf); - //TEST_ASSERT_EQUAL_INT(2, gEncryption_method); + // TEST_ASSERT_EQUAL_INT(2, gEncryption_method); char expected[] = "0.01\t\t\t\t\t// Hither"; TEST_ASSERT_EQUAL_STRING(expected, buf); } @@ -45,7 +45,7 @@ void test_utility_StripCR() { TEST_ASSERT_EQUAL_STRING("line", buf); } -static void get_system_temp_folder(char *buffer, size_t bufferSize) { +static void get_system_temp_folder(char* buffer, size_t bufferSize) { #ifdef _WIN32 GetTempPathA(bufferSize, buffer); #else @@ -116,7 +116,7 @@ void test_utility_IRandomBetween() { }; for (i = 0; i < BR_ASIZE(ranges); i++) { - LOG_INFO("Testing min=%d max=%d", ranges[i].min, ranges[i].max); + LOG_INFO3("Testing min=%d max=%d", ranges[i].min, ranges[i].max); actual_min = MIN(ranges[i].min, ranges[i].max); actual_max = MAX(ranges[i].min, ranges[i].max); for (j = 0; j < 1000; j++) {